upgrade to php-cs-fixer v3

permafrost-dev · Jun 1, 2021 · 6d8882a · 6d8882a
1 parent 669260e
commit 6d8882a
Show file tree

Hide file tree

Showing 14 changed files with 34 additions and 21 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -0,0 +1,11 @@
+<?php
+require_once(__DIR__.'/vendor/autoload.php');
+
+use Permafrost\PhpCsFixerRules\Finders\ComposerPackageFinder;
+use Permafrost\PhpCsFixerRules\Rulesets\DefaultRuleset;
+use Permafrost\PhpCsFixerRules\SharedConfig;
+
+// optional: chain additiional custom Finder options:
+$finder = ComposerPackageFinder::create(__DIR__);
+
+return SharedConfig::create($finder, new DefaultRuleset());
diff --git a/.php_cs.dist.example → .php-cs-fixer.dist.php.example b/.php_cs.dist.example → .php-cs-fixer.dist.php.example
diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
         "symfony/console": "^5.2"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.16",
+        "friendsofphp/php-cs-fixer": "^3.0",
         "phpunit/phpunit": "^9.4"
     },
     "autoload": {

diff --git a/src/Commands/Prompts/ConsoleSelectPathsForCustomFinderPrompt.php b/src/Commands/Prompts/ConsoleSelectPathsForCustomFinderPrompt.php
@@ -84,7 +84,7 @@ public function prepareItems(array $items, array $excludeItems): array
 
         return Collection::create($items)
             ->exclude($excludeItems)
-            ->filter(function ($item) {
+            ->filter(function($item) {
                 return !Str::startsWith($item, '.');
             })
             ->values()

diff --git a/src/Commands/Support/CustomConfigGenerator.php b/src/Commands/Support/CustomConfigGenerator.php
@@ -26,13 +26,13 @@ public function setPaths($includePaths, $excludePaths)
     public function generateFinderCode(): string
     {
         $includeCode = trim(Collection::create($this->includePaths)
-            ->map(function ($item) {
+            ->map(function($item) {
                 return "        __DIR__ . '/$item',";
             })
             ->implode(PHP_EOL));
 
         $excludeCode = Collection::create($this->excludePaths)
-            ->map(function ($item) {
+            ->map(function($item) {
                 return "    ->notPath('$item/*')";
             })
             ->implode(PHP_EOL);

diff --git a/src/Commands/Support/Options.php b/src/Commands/Support/Options.php
@@ -17,7 +17,7 @@ public function __construct($input)
         $this->initialize();
     }
 
-    protected function initialize(string $defaultFilename = '.php_cs.dist'): void
+    protected function initialize(string $defaultFilename = '.php-cs-fixer.dist.php'): void
     {
         $this->filename = $this->input->hasOption('outfile')
             ? $this->input->getOption('outfile')

diff --git a/src/Finders/BaseFinder.php b/src/Finders/BaseFinder.php
@@ -6,7 +6,7 @@ abstract class BaseFinder
 {
     public static function onlyExistingPaths(array $paths): array
     {
-        return array_filter($paths, function ($path) {
+        return array_filter($paths, function($path) {
             return file_exists($path) && is_dir($path);
         });
     }

diff --git a/src/Rulesets/DefaultRuleset.php b/src/Rulesets/DefaultRuleset.php
@@ -17,7 +17,6 @@ public static function name(): string
     public function rules(): array
     {
         return array_merge([
-            'psr0' => false,
             '@PSR2' => true,
             '@Symfony' => true,
             'array_syntax' => [
@@ -44,16 +43,15 @@ public function rules(): array
                 'closure_function_spacing' => 'none',
             ],
             'increment_style' => [
-                'style' => 'post'
+                'style' => 'post',
             ],
             'indentation_type' => true,
             'linebreak_after_opening_tag' => true,
             'line_ending' => true,
-            'lowercase_constants' => false,
             'lowercase_keywords' => true,
-            'method_argument_space' => [
-                'ensure_fully_multiline' => true,
-            ],
+            //'method_argument_space' => [
+            //    'ensure_fully_multiline' => true,
+            //],
             'no_break_comment' => false,
             'no_closing_tag' => true,
             'no_spaces_after_function_name' => true,
@@ -64,7 +62,7 @@ public function rules(): array
             'no_unused_imports' => true,
             'not_operator_with_successor_space' => false,
             'ordered_imports' => [
-                'sortAlgorithm' => 'alpha',
+                'sort_algorithm' => 'alpha',
             ],
             'phpdoc_align' => [
                 'align' => 'left',

diff --git a/src/Rulesets/LaravelShiftRuleset.php b/src/Rulesets/LaravelShiftRuleset.php
@@ -41,6 +41,7 @@ public function rules(): array
             'concat_space' => [
                 'spacing' => 'none',
             ],
+            'constant_case' => ['case' => 'lower'],
             'declare_equal_normalize' => true,
             'elseif' => true,
             'encoding' => true,
@@ -55,7 +56,6 @@ public function rules(): array
             'linebreak_after_opening_tag' => true,
             'line_ending' => true,
             'lowercase_cast' => true,
-            'lowercase_constants' => true,
             'lowercase_keywords' => true,
             'lowercase_static_reference' => true, // added from Symfony
             'magic_method_casing' => true, // added from Symfony
@@ -104,7 +104,7 @@ public function rules(): array
             'object_operator_without_whitespace' => true,
             'ordered_imports' => ['sortAlgorithm' => 'alpha'],
             'phpdoc_indent' => true,
-            'phpdoc_inline_tag' => true,
+            //'phpdoc_inline_tag' => true,
             'phpdoc_no_access' => true,
             'phpdoc_no_package' => true,
             'phpdoc_no_useless_inheritdoc' => true,
@@ -133,7 +133,9 @@ public function rules(): array
             'switch_case_semicolon_to_colon' => true,
             'switch_case_space' => true,
             'ternary_operator_spaces' => true,
-            'trailing_comma_in_multiline_array' => true,
+            'trailing_comma_in_multiline' => [
+                'elements' => ['arrays'],
+            ],
             'trim_array_spaces' => true,
             'unary_operator_spaces' => true,
             'visibility_required' => [

diff --git a/src/Rulesets/PhpUnitRuleset.php b/src/Rulesets/PhpUnitRuleset.php
@@ -116,7 +116,7 @@ public function rules(): array
             'no_null_property_initialization' => true,
             'no_php4_constructor' => true,
             'no_short_bool_cast' => true,
-            'no_short_echo_tag' => true,
+            'echo_tag_syntax' => ['format' => 'long'],
             'no_singleline_whitespace_before_semicolons' => true,
             'no_spaces_after_function_name' => true,
             'no_spaces_around_offset' => true,

diff --git a/src/Rulesets/SpatieRuleset.php b/src/Rulesets/SpatieRuleset.php
@@ -27,7 +27,9 @@ public function rules(): array
             'ordered_imports' => ['sortAlgorithm' => 'alpha'],
             'no_unused_imports' => true,
             'not_operator_with_successor_space' => true,
-            'trailing_comma_in_multiline_array' => true,
+            'trailing_comma_in_multiline' => [
+                'elements' => ['arrays'],
+            ],
             'phpdoc_scalar' => true,
             'unary_operator_spaces' => true,
             'binary_operator_spaces' => true,

diff --git a/src/Support/Collection.php b/src/Support/Collection.php
@@ -36,7 +36,7 @@ public function push(...$items): self
 
     public function exclude(array $items): self
     {
-        return $this->filter(function ($value) use ($items) {
+        return $this->filter(function($value) use ($items) {
             return !in_array($value, $items);
         })->values();
     }

diff --git a/src/Support/Path.php b/src/Support/Path.php
@@ -15,7 +15,7 @@ public static function getSubDirectoryNames(string $path, array $excludeNames =
         return Collection::create($files)
             ->exclude(['.', '..'])
             ->exclude($excludeNames)
-            ->filter(function ($item) {
+            ->filter(function($item) {
                 return is_dir($item);
             })
             ->values();

diff --git a/src/Support/Str.php b/src/Support/Str.php
@@ -72,7 +72,7 @@ public static function afterLast(string $value, string $after): string
         if ($offset === false) {
             $offset = 0;
         } else {
-            ++$offset;
+            $offset++;
         }
 
         return substr($value, $offset);