diff --git a/composer/helpers/v1/.php-cs-fixer.dist.php b/composer/helpers/v1/.php-cs-fixer.dist.php index c5ee772c546..72aafd40ee6 100644 --- a/composer/helpers/v1/.php-cs-fixer.dist.php +++ b/composer/helpers/v1/.php-cs-fixer.dist.php @@ -2,19 +2,16 @@ $finder = PhpCsFixer\Finder::create() ->in(__DIR__ . '/src') ->in(__DIR__ . '/bin'); -return PhpCsFixer\Config::create() +$config = new PhpCsFixer\Config(); +return $config ->setRules([ '@Symfony' => true, - 'array_syntax' => ['syntax' => 'short'], 'blank_line_after_opening_tag' => true, 'concat_space' => ['spacing' => 'one'], 'declare_strict_types' => true, 'increment_style' => ['style' => 'post'], - 'is_null' => ['use_yoda_style' => false], - 'list_syntax' => ['syntax' => 'short'], - 'method_argument_space' => ['ensure_fully_multiline' => true], 'modernize_types_casting' => true, - 'no_multiline_whitespace_before_semicolons' => true, + 'multiline_whitespace_before_semicolons' => true, 'no_useless_else' => true, 'no_useless_return' => true, 'ordered_imports' => true, diff --git a/composer/helpers/v1/composer.json b/composer/helpers/v1/composer.json index 2ddc9951978..058ada0d858 100644 --- a/composer/helpers/v1/composer.json +++ b/composer/helpers/v1/composer.json @@ -5,7 +5,7 @@ "composer/composer": "^1.10.9" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.9", + "friendsofphp/php-cs-fixer": "^3.0", "phpstan/phpstan": "~1.8.5" }, "autoload": {