updated php-cs-fixer config

Guite · Dec 11, 2019 · 48306b9 · 48306b9
1 parent 592f227
commit 48306b9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -166,7 +166,7 @@ fi
 if [ "$TOOLS" = "all" ] || [[ "$TOOLS" == *",phpcs,"* ]]; then
     echo "Checks: coding style"
     # see https://github.com/squizlabs/PHP_CodeSniffer
-    ${TOOL_BIN_PATH}phpcs --standard=${TOOL_CONFIG_PATH}phpcs.xml --extensions=php --warning-severity=0 --ignore="${VENDOR_PATH}" "${MODULE_PATH}" --report=full
+    ${TOOL_BIN_PATH}phpcs --standard=${TOOL_CONFIG_PATH}phpcs.xml --extensions=php --ignore="${VENDOR_PATH}" "${MODULE_PATH}" --report=full
 fi
 if [ "$TOOLS" = "all" ] || [[ "$TOOLS" == *",php-cs-fixer,"* ]]; then
     echo "Checks: fix coding style"

diff --git a/tool-config/php_cs_fixer.dist b/tool-config/php_cs_fixer.dist
@@ -17,6 +17,8 @@ return PhpCsFixer\Config::create()
         'fopen_flags' => false,
         'protected_to_private' => false,
         'combine_nested_dirname' => true,
+        'concat_space' => ['spacing' => 'one'],
+        'no_whitespace_in_blank_line' => false, // due to generator
         'phpdoc_align' => ['align' => 'left'],
     ])
     ->setRiskyAllowed(true)