From 3f0e697c1b9582018b3328aae50733a7745528f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Uzna=C5=84ski?= Date: Wed, 14 Oct 2020 11:42:00 +0200 Subject: [PATCH] [TASK] Add more files to php sniffing and fixing (#123) Co-authored-by: Oliver Klee --- .php_cs.php | 4 +++- composer.json | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.php_cs.php b/.php_cs.php index bb74eb7..12a9c4a 100644 --- a/.php_cs.php +++ b/.php_cs.php @@ -178,6 +178,8 @@ $config = \PhpCsFixer\Config::create() ->setRules($rules); $finder = \PhpCsFixer\Finder::create() - ->in('Classes')->in('Tests'); + ->in('Classes') + ->in('Tests') + ->in('Configuration'); return $config->setFinder($finder); diff --git a/composer.json b/composer.json index c7ef455..170752b 100644 --- a/composer.json +++ b/composer.json @@ -68,7 +68,7 @@ "scripts": { "ci:php:lint": "find *.php Classes Configuration Tests -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l", "ci:php:codestyle": "php-cs-fixer fix --config .php_cs.php -v --dry-run --using-cache false --diff --diff-format=udiff", - "ci:php:sniff": ".Build/vendor/bin/phpcs Classes Tests", + "ci:php:sniff": ".Build/vendor/bin/phpcs Classes Configuration Tests", "ci:json:lint": "find . ! -path '*.Build/*' -name '*.json' | xargs .Build/vendor/bin/jsonlint -q", "ci:yaml:lint": "find . ! -path '*.Build/*' -name '*.yml' | xargs .Build/vendor/bin/yaml-lint", "ci:ts:lint": ".Build/vendor/bin/typoscript-lint -c Configuration/TsLint.yml --ansi -n --fail-on-warnings -vvv Configuration/TypoScript", @@ -93,8 +93,8 @@ "@php -r 'is_dir($extFolder=__DIR__.\"/.Build/public/typo3conf/ext/\") || mkdir($extFolder, 0777, true);'", "@php -r 'file_exists($extFolder=__DIR__.\"/.Build/public/typo3conf/ext/tea\") || symlink(__DIR__,$extFolder);'" ], - "fix:php-cs": "php-cs-fixer fix --config .php_cs.php", - "fix:php-sniff": "phpcbf Classes Tests", + "fix:php:cs": "php-cs-fixer fix --config .php_cs.php", + "fix:php:sniff": ".Build/vendor/bin/phpcs Classes Configuration Tests", "post-autoload-dump": [ "@link-extension" ]