From 6ba73f88b059bd0ed5a9cf7420d2f3717fd10f18 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 2 Jan 2024 23:34:17 +0000 Subject: [PATCH] update --- Config/phpcs.xml | 2 ++ Config/phpstan.neon | 1 + Config/rector.php | 5 +++++ Helper/Scripts/inspectproject.sh | 6 +++--- Helper/Scripts/serverInstall.sh | 14 ++++++++++++-- 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/Config/phpcs.xml b/Config/phpcs.xml index 57516f1..8390860 100755 --- a/Config/phpcs.xml +++ b/Config/phpcs.xml @@ -46,6 +46,7 @@ *Sha1.js *Sha1b.js [abcdef0-9]{32}/* +*.min.js @@ -148,6 +149,7 @@ + 7 diff --git a/Config/phpstan.neon b/Config/phpstan.neon index 03d3f22..50470a8 100755 --- a/Config/phpstan.neon +++ b/Config/phpstan.neon @@ -14,6 +14,7 @@ parameters: treatPhpDocTypesAsCertain: false excludePaths: - *.tpl.php + - *.min.js - */Modules/Media/Files/* - */omsSetup/* - */demoSetup/* diff --git a/Config/rector.php b/Config/rector.php index 4cb28db..8cc5baa 100644 --- a/Config/rector.php +++ b/Config/rector.php @@ -61,10 +61,15 @@ return static function (RectorConfig $rectorConfig) : void { $rectorConfig->skip([ $base . '/vendor', + '*/vendor', + '*/node_modules', + $base . '/privateSetup', + $base . '/demoSetup', $base . '/Build', $base . '/MainRepository', $base . '/Resources', $base . '/Tools', + $base . '/Sandbox', $base . '/cssOMS', '*/Admin/Install/Application', SimplifyEmptyCheckOnEmptyArrayRector::class, diff --git a/Helper/Scripts/inspectproject.sh b/Helper/Scripts/inspectproject.sh index a3022ec..8b261be 100644 --- a/Helper/Scripts/inspectproject.sh +++ b/Helper/Scripts/inspectproject.sh @@ -7,19 +7,19 @@ echo "#################################################" echo "# PHP strict" echo "#################################################" -grep -r -L "declare(strict_types=1);" --include=*.php --exclude-dir={*vendor*,*Files*,*privateSetup*,*demoSetup*,*LanguageDetection*,*Resources*,*node_modules*,*privateSetup*,*Build*} --exclude={*.tpl.php,*Hooks.php,*Routes.php,*SearchCommands.php} ${BPATH}/../../phpOMS ${BPATH}/../../Web ${BPATH}/../../Modules ${BPATH}/../../Model +grep -r -L "declare(strict_types=1);" --include=*.php --exclude-dir={*vendor*,*Files*,*privateSetup*,*demoSetup*,*LanguageDetection*,*Resources*,*node_modules*,*privateSetup*,*Build*} --exclude={*.tpl.php,*Hooks.php,*Routes.php,*SearchCommands.php} ${BPATH}/../../../phpOMS ${BPATH}/../../../Web ${BPATH}/../../../Modules ${BPATH}/../../../Model echo "#################################################" echo "# JS security inspection" echo "#################################################" -grep -rlni "onafterprint=\|onbeforeprint=\|onbeforeunload=\|onerror=\|onhaschange=\|onload=\|onmessage=\|onoffline=\|ononline=\|onpagehide=\|onpageshow=\|onpopstate=\|onredo=\|onresize=\|onstorage=\|onund=o\|onunload=\|onblur=\|onchage=\|oncontextmenu=\|onfocus=\|onformchange=\|onforminput=\|oninput=\|oninvalid=\|onreset=\|onselect=\|onsubmit=\|onkeydown=\|onkeypress=\|onkeyup=\|onclick=\|ondblclic=k\|ondrag=\|ondragend=\|ondragenter=\|ondragleave=\|ondragover=\|ondragstart=\|ondrop=\|onmousedown=\|onmousemove=\|onmouseout=\|onmouseover=\|onmouseup=\|onmousewheel=\|onscroll=\|onabor=t\|oncanplay=\|oncanplaythrough=\|ondurationchange=\|onemptied=\|onended=\|onerror=\|onloadeddata=\|onloadedmetadata=\|onloadstart=\|onpause=\|onplay=\|onplaying=\|onprogress=\|onratechange=\|onreadystatechange=\|onseeked=\|onseeking=\|onstalled=\|onsuspend=\|ontimeupdate=\|onvolumechange=" --include=*.js ${BPATH}/../../jsOMS ${BPATH}/../../Model ${BPATH}/../../Modules ${BPATH}/../../Web +grep -rlni "onafterprint=\|onbeforeprint=\|onbeforeunload=\|onerror=\|onhaschange=\|onload=\|onmessage=\|onoffline=\|ononline=\|onpagehide=\|onpageshow=\|onpopstate=\|onredo=\|onresize=\|onstorage=\|onund=o\|onunload=\|onblur=\|onchage=\|oncontextmenu=\|onfocus=\|onformchange=\|onforminput=\|oninput=\|oninvalid=\|onreset=\|onselect=\|onsubmit=\|onkeydown=\|onkeypress=\|onkeyup=\|onclick=\|ondblclic=k\|ondrag=\|ondragend=\|ondragenter=\|ondragleave=\|ondragover=\|ondragstart=\|ondrop=\|onmousedown=\|onmousemove=\|onmouseout=\|onmouseover=\|onmouseup=\|onmousewheel=\|onscroll=\|onabor=t\|oncanplay=\|oncanplaythrough=\|ondurationchange=\|onemptied=\|onended=\|onerror=\|onloadeddata=\|onloadedmetadata=\|onloadstart=\|onpause=\|onplay=\|onplaying=\|onprogress=\|onratechange=\|onreadystatechange=\|onseeked=\|onseeking=\|onstalled=\|onsuspend=\|ontimeupdate=\|onvolumechange=" --include=*.js ${BPATH}/../../../jsOMS ${BPATH}/../../../Model ${BPATH}/../../../Modules ${BPATH}/../../../Web echo "#################################################" echo "# PHPCS" echo "#################################################" -./vendor/bin/phpcs --severity=1 ./ --standard="Build/Config/phpcs.xml" +./vendor/bin/phpcs -s --severity=1 ./ --standard="Build/Config/phpcs.xml" echo "#################################################" echo "# PHP static inspection" diff --git a/Helper/Scripts/serverInstall.sh b/Helper/Scripts/serverInstall.sh index d8389ed..1021607 100644 --- a/Helper/Scripts/serverInstall.sh +++ b/Helper/Scripts/serverInstall.sh @@ -67,14 +67,24 @@ mysql -u root -p CREATE USER 'jingga'@'%' IDENTIFIED BY 'dYg8#@wLiWJ3vE'; CREATE USER 'demo'@'%' IDENTIFIED BY 'orange'; CREATE USER 'test'@'%' IDENTIFIED BY 'orange'; +CREATE USER 'build'@'%' IDENTIFIED BY 'orange'; +# website CREATE DATABASE jingga'; -CREATE DATABASE demo'; + +# demo +CREATE DATABASE omd'; + +# test CREATE DATABASE omt'; +# build +CREATE DATABASE omb'; + GRANT ALL PRIVILEGES ON jingga.* TO 'jingga'@'%'; -GRANT ALL PRIVILEGES ON demo.* TO 'demo'@'%'; +GRANT ALL PRIVILEGES ON omd.* TO 'demo'@'%'; GRANT ALL PRIVILEGES ON omt.* TO 'test'@'%'; +GRANT ALL PRIVILEGES ON omb.* TO 'build'@'%'; FLUSH PRIVILEGES;