Migrate to PHP-CS-Fixer 3.x (#161)

spatie · Jun 4, 2021 · 28e77b8 · 28e77b8
1 parent 7198c98
commit 28e77b8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
@@ -13,7 +13,7 @@ jobs:
             -   name: Fix style
                 uses: docker://oskarstark/php-cs-fixer-ga
                 with:
-                    args: --config=.php_cs --allow-risky=yes
+                    args: --config=.php-cs-fixer.dist.php --allow-risky=yes
 
             -   name: Extract branch name
                 shell: bash

diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,4 @@ composer.lock
 vendor
 docs
 .phpunit.result.cache
-.php_cs.cache
+.php-cs-fixer.cache
diff --git a/.php_cs → .php-cs-fixer.dist.php b/.php_cs → .php-cs-fixer.dist.php
@@ -13,14 +13,14 @@
     ->ignoreDotFiles(true)
     ->ignoreVCS(true);
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config)
     ->setRules([
         '@PSR2' => true,
         'array_syntax' => ['syntax' => 'short'],
-        'ordered_imports' => ['sortAlgorithm' => 'alpha'],
+        'ordered_imports' => ['sort_algorithm' => 'alpha'],
         'no_unused_imports' => true,
         'not_operator_with_successor_space' => true,
-        'trailing_comma_in_multiline_array' => true,
+        'trailing_comma_in_multiline' => true,
         'phpdoc_scalar' => true,
         'unary_operator_spaces' => true,
         'binary_operator_spaces' => true,
@@ -31,7 +31,8 @@
         'phpdoc_var_without_name' => true,
         'class_attributes_separation' => [
             'elements' => [
-                'method', 'property',
+                'method' => 'one',
+                'property' => 'one',
             ],
         ],
         'method_argument_space' => [

diff --git a/tests/CookieConsentTest.php b/tests/CookieConsentTest.php
@@ -47,5 +47,4 @@ public function it_contains_the_necessary_css_classes_for_javascript_functionali
         $this->assertStringContainsString('js-cookie-consent', $html);
         $this->assertStringContainsString('js-cookie-consent-agree', $html);
     }
-
 }
-Original file line number
+Diff line change
@@ Expand Up @@
             $this->assertStringContainsString('js-cookie-consent', $html);
             $this->assertStringContainsString('js-cookie-consent-agree', $html);
         }
     }