diff --git a/Config/.eslintrc.json b/Config/.eslintrc.json index 5f265b3..1319bb1 100644 --- a/Config/.eslintrc.json +++ b/Config/.eslintrc.json @@ -173,6 +173,12 @@ "error", "always-multiline" ], + "max-len": [ + "error", + { + "code": 180 + } + ], "new-cap": [ "error", { diff --git a/Config/phpcs.xml b/Config/phpcs.xml index 7e66885..4ad0718 100755 --- a/Config/phpcs.xml +++ b/Config/phpcs.xml @@ -50,7 +50,7 @@ - 3 + 0 3 @@ -66,7 +66,15 @@ --> - + @@ -78,13 +86,6 @@ - - 3 - - - - - */tests/* @@ -115,13 +116,6 @@ - - 3 - *StringUtils.php - *FinanceFormulas.php - *StockBonds.php - *ExponentialSmoothing.php - *Server.php @@ -134,7 +128,7 @@ - + 3 @@ -160,12 +154,9 @@ - - 3 - - - + + 3 *Pdf.php *Excel.php @@ -223,7 +214,7 @@ - + *ResponseType.js *HttpUri.js diff --git a/Helper/inspectproject.sh b/Helper/inspectproject.sh index dc7543b..2c42f7e 100755 --- a/Helper/inspectproject.sh +++ b/Helper/inspectproject.sh @@ -3,16 +3,6 @@ SCRIPT=$(readlink -f "$0") BPATH=$(dirname "$SCRIPT") -# html checks -printf "\nHTML checks\n\n" -find ${BPATH}/../../Web ${BPATH}/../../Install ${BPATH}/../../Modules -name "*tpl.php" | xargs -0 grep -E '=\"[\#\$\%\^\&\*\(\)\\/\ ]*\"' -find ${BPATH}/../../Web ${BPATH}/../../Install ${BPATH}/../../Modules -name "*tpl.php" | xargs -0 grep -P '(\)' -find ${BPATH}/../../Web ${BPATH}/../../Install ${BPATH}/../../Modules -name "*tpl.php" | xargs -0 grep -P '()' -find ${BPATH}/../../Web ${BPATH}/../../Install ${BPATH}/../../Modules -name "*tpl.php" | xargs -0 grep -P '()' -find ${BPATH}/../../Web ${BPATH}/../../Install ${BPATH}/../../Modules -name "*tpl.php" | xargs -0 grep -P '(style=)' -find ${BPATH}/../../Web ${BPATH}/../../Install ${BPATH}/../../Modules -name "*tpl.php" | xargs -0 grep -P '(value|title|alt|aria\-label)(=\")((?!\<\?).)*(>)' -find ${BPATH}/../../Web ${BPATH}/../../Install ${BPATH}/../../Modules -name "*tpl.php" | xargs -0 grep -P '(\|\|\|\)[0-9a-zA-Z\.\?]+)' - # php/js strict checks printf "\nStrict checks\n\n" grep -r -L "declare(strict_types=1);" --include=*.php --exclude={*.tpl.php,*Hooks.php,*Routes.php,*SearchCommands.php} ${BPATH}/../../phpOMS ${BPATH}/../../Web ${BPATH}/../../Modules ${BPATH}/../../Model @@ -31,6 +21,6 @@ printf "\nWhitespace check\n\n" find ${BPATH}/../../Web ${BPATH}/../../phpOMS ${BPATH}/../../jsOMS ${BPATH}/../../cOMS ${BPATH}/../../Model ${BPATH}/../../Build ${BPATH}/../../Modules \( -name "*.php" -o -name "*.js" -o -name "*.sh" -o -name "*.cpp" -o -name "*.h" -o -name "*.json" \) | xargs -0 grep -P ' $' # php cs + phpstan + eslint -./vendor/bin/phpcs ./ --standard="Build/Config/phpcs.xml" +./vendor/bin/phpcs --severity=1 ./ --standard="Build/Config/phpcs.xml" ./vendor/bin/phpstan analyse --autoload-file=phpOMS/Autoloader.php -l 8 -c Build/Config/phpstan.neon ./ npx eslint jsOMS/ -c Build/Config/.eslintrc.json \ No newline at end of file diff --git a/Helper/testreport.sh b/Helper/testreport.sh index 69e5109..a818dfa 100755 --- a/Helper/testreport.sh +++ b/Helper/testreport.sh @@ -3,7 +3,7 @@ mkdir -p Build/test # php cs + phpstan + eslint file generation -./vendor/bin/phpcs ./ --standard="Build/Config/phpcs.xml" -s --report-junit=Build/test/junit_phpcs.xml +./vendor/bin/phpcs --severity=1 ./ --standard="Build/Config/phpcs.xml" -s --report-junit=Build/test/junit_phpcs.xml ./vendor/bin/phpstan analyse --autoload-file=phpOMS/Autoloader.php -l 9 -c Build/Config/phpstan.neon --error-format=prettyJson ./ > Build/test/phpstan.json npx eslint jsOMS/ -c Build/Config/.eslintrc.json -o Build/test/junit_eslint.xml -f junit diff --git a/Inspection/Html/attributes.sh b/Inspection/Html/attributes.sh deleted file mode 100755 index 4bc7711..0000000 --- a/Inspection/Html/attributes.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -. config.sh - -echo "#################################################" -echo "Start html inspection" -echo "#################################################" - -# Find invalid html -find {ROOT_PATH}/Web {ROOT_PATH}/phpOMS {ROOT_PATH}/Build {ROOT_PATH}/Modules -name "*tpl.php" | xargs grep -E '=\"[\#\$\%\^\&\*\(\)\\/\ ]*\"' > ${INSPECTION_PATH}/Modules/html/invalid_html.log -find {ROOT_PATH}/Web {ROOT_PATH}/phpOMS {ROOT_PATH}/Build {ROOT_PATH}/Modules -name "*tpl.php" | xargs grep -P '(\)' >> ${INSPECTION_PATH}/Modules/html/invalid_html.log -find {ROOT_PATH}/Web {ROOT_PATH}/phpOMS {ROOT_PATH}/Build {ROOT_PATH}/Modules -name "*tpl.php" | xargs grep -P '()' >> ${INSPECTION_PATH}/Modules/html/invalid_html.log -find {ROOT_PATH}/Web {ROOT_PATH}/phpOMS {ROOT_PATH}/Build {ROOT_PATH}/Modules -name "*tpl.php" | xargs grep -P '()' >> ${INSPECTION_PATH}/Modules/html/invalid_html.log -find {ROOT_PATH}/Web {ROOT_PATH}/phpOMS {ROOT_PATH}/Build {ROOT_PATH}/Modules -name "*tpl.php" | xargs grep -P '(style=)' >> ${INSPECTION_PATH}/Modules/html/invalid_html.log -find {ROOT_PATH}/Web {ROOT_PATH}/phpOMS {ROOT_PATH}/Build {ROOT_PATH}/Modules -name "*tpl.php" | xargs grep -P '(value|title|alt|aria\-label)(=\")((?!\<\?).)*(>)' >> ${INSPECTION_PATH}/Modules/html/invalid_html.log -find {ROOT_PATH}/Web {ROOT_PATH}/phpOMS {ROOT_PATH}/Build {ROOT_PATH}/Modules -name "*tpl.php" | xargs grep -P '(\|\|\|\)[0-9a-zA-Z\.\?]+)' >> ${INSPECTION_PATH}/Modules/html/invalid_html.log \ No newline at end of file diff --git a/Inspection/inspect.sh b/Inspection/inspect.sh index a17bc45..cb34766 100755 --- a/Inspection/inspect.sh +++ b/Inspection/inspect.sh @@ -42,7 +42,6 @@ echo "#################################################" echo "Custom html inspection" echo "#################################################" . ${BUILD_PATH}/Inspection/Html/tags.sh -. ${BUILD_PATH}/Inspection/Html/attributes.sh # Custom php inspections echo "#################################################"