update php-cs-fixer to version 2.17.2

qossmic · Dec 21, 2020 · c91cee1 · c91cee1
1 parent ef4b9e8
commit c91cee1
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="php-cs-fixer" version="^2.16.3" installed="2.16.4" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="php-cs-fixer" version="^2.16.3" installed="2.17.2" location="./tools/php-cs-fixer" copy="true"/>
   <phar name="phpunit" version="^8.5.6||^9.4" installed="8.5.9" location="./tools/phpunit.phar" copy="true"/>
   <phar name="phpstan" version="^0.12.29" installed="0.12.58" location="./tools/phpstan" copy="true"/>
   <phar name="psalm" version="^3.12.2" installed="3.18.2" location="./tools/psalm" copy="true"/>

diff --git a/.php_cs.dist b/.php_cs.dist
@@ -10,7 +10,7 @@ return PhpCsFixer\Config::create()
     ->setRules([
         '@Symfony' => true,
         'array_syntax' => ['syntax' => 'short'],
-        'final_static_access' => true,
+        'self_static_accessor' => true,
         'no_empty_comment' => true,
         'no_empty_phpdoc' => true,
         'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],

diff --git a/src/AstRunner/AstMap/ClassReferenceBuilder.php b/src/AstRunner/AstMap/ClassReferenceBuilder.php
@@ -26,7 +26,7 @@ private function __construct(string $filepath, string $classLikeName)
 
     public static function create(string $filepath, string $classLikeName): self
     {
-        return new static($filepath, $classLikeName);
+        return new self($filepath, $classLikeName);
     }
 
     /** @internal */

diff --git a/src/Configuration/ConfigurationCollector.php b/src/Configuration/ConfigurationCollector.php
@@ -20,7 +20,7 @@ public static function fromArray(array $args): self
             throw new \InvalidArgumentException('Collector needs a type.');
         }
 
-        return new static($args['type'], $args);
+        return new self($args['type'], $args);
     }
 
     /**

diff --git a/src/Configuration/ConfigurationLayer.php b/src/Configuration/ConfigurationLayer.php
@@ -23,7 +23,7 @@ public static function fromArray(array $args): self
             'collectors',
         ])->resolve($args);
 
-        return new static(
+        return new self(
             array_map(static function (array $v): ConfigurationCollector {
                 return ConfigurationCollector::fromArray($v);
             }, $options['collectors']),

diff --git a/src/Configuration/ConfigurationRuleset.php b/src/Configuration/ConfigurationRuleset.php
@@ -14,7 +14,7 @@ final class ConfigurationRuleset
      */
     public static function fromArray(array $arr): self
     {
-        return new static($arr);
+        return new self($arr);
     }
 
     /**

diff --git a/src/Configuration/ConfigurationSkippedViolation.php b/src/Configuration/ConfigurationSkippedViolation.php
@@ -17,7 +17,7 @@ final class ConfigurationSkippedViolation
      */
     public static function fromArray(array $arr): self
     {
-        return new static($arr);
+        return new self($arr);
     }
 
     /**

diff --git a/tests/PathNameFilterIteratorTest.php b/tests/PathNameFilterIteratorTest.php
@@ -19,7 +19,7 @@ public function testFilter(\Iterator $inner, array $matchPatterns, array $noMatc
         $iterator = new PathNameFilterIterator($inner, $matchPatterns, $noMatchPatterns);
 
         $values = array_map(
-            static function (\SplFileInfo $fileInfo) {
+            static function (SplFileInfo $fileInfo) {
                 return str_replace('/', \DIRECTORY_SEPARATOR, $fileInfo->getPathname());
             },
             iterator_to_array($iterator, false)