Merge pull request #132 from gndk/php-cs-fixer

Update php-cs-fixer config

Author: freekmurze

.gitattributes

@@ -2,14 +2,14 @@
 # https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
 
 # Ignore all test and documentation with "export-ignore".
-/.editorconfig     export-ignore
-/.gitattributes     export-ignore
-/.github            export-ignore
-/.gitignore         export-ignore
-/.php_cs.dist       export-ignore
-/example            export-ignore
-/phpunit.xml.dist   export-ignore
-/tests              export-ignore
+/.editorconfig              export-ignore
+/.gitattributes             export-ignore
+/.github                    export-ignore
+/.gitignore                 export-ignore
+/.php-cs-fixer.dist.php     export-ignore
+/example                    export-ignore
+/phpunit.xml.dist           export-ignore
+/tests                      export-ignore
 
 # All test snapshots and text stubs must have LF line endings
 tests/**/__snapshots__/**   text eol=lf

.github/workflows/php-cs-fixer.yml

@@ -15,7 +15,7 @@ jobs:
             - name: Run PHP CS Fixer
               uses: docker://oskarstark/php-cs-fixer-ga
               with:
-                  args: --config=.php_cs.dist --allow-risky=yes
+                  args: --config=.php-cs-fixer.dist.php --allow-risky=yes
 
             - name: Commit changes
               uses: stefanzweifel/git-auto-commit-action@v4

.gitignore

@@ -1,6 +1,5 @@
 .idea
-.php_cs
-.php_cs.cache
+.php-cs-fixer.cache
 .phpunit.result.cache
 build
 composer.lock

.php_cs.dist renamed to .php-cs-fixer.dist.php

@@ -1,6 +1,6 @@
 <?php
 
-$finder = Symfony\Component\Finder\Finder::create()
+$finder = PhpCsFixer\Finder::create()
     ->in([
         __DIR__ . '/src',
         __DIR__ . '/tests',
@@ -10,14 +10,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' => ['elements' => ['arrays']],
         'phpdoc_scalar' => true,
         'unary_operator_spaces' => true,
         'binary_operator_spaces' => true,
@@ -28,7 +28,7 @@
         'phpdoc_var_without_name' => true,
         'class_attributes_separation' => [
             'elements' => [
-                'method',
+                'method' => 'one',
             ],
         ],
         'method_argument_space' => [

src/Filename.php

@@ -4,7 +4,7 @@
 
 class Filename
 {
-    static public function cleanFilename(string $raw): string
+    public static function cleanFilename(string $raw): string
     {
         // Remove anything which isn't a word, whitespace, number
         // or any of the following caracters -_~,;[]().