Increase PHPStan rule level to 10

sebastianbergmann · Nov 17, 2024 · 699c44a · 699c44a
1 parent 0a1ec0a
commit 699c44a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 60 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,52 +1,6 @@
 parameters:
-    level: 9
+    level: 10
     paths:
         - src
         - tests/unit
         - tests/integration
-
-    ignoreErrors:
-        -
-            message: "#^Parameter \\#1 \\$items of class SebastianBergmann\\\\Complexity\\\\ComplexityCollection constructor expects array\\<int, SebastianBergmann\\\\Complexity\\\\Complexity\\>, array\\<int\\|string, SebastianBergmann\\\\Complexity\\\\Complexity\\> given\\.$#"
-            count: 1
-            path: src/Complexity/ComplexityCollection.php
-
-        -
-            message: "#^Return type \\(void\\) of method SebastianBergmann\\\\Complexity\\\\CyclomaticComplexityCalculatingVisitor\\:\\:enterNode\\(\\) should be compatible with return type \\(array\\<PhpParser\\\\Node\\>\\|int\\|PhpParser\\\\Node\\|null\\) of method PhpParser\\\\NodeVisitor\\:\\:enterNode\\(\\)$#"
-            count: 1
-            path: src/Visitor/CyclomaticComplexityCalculatingVisitor.php
-
-        -
-            message: "#^Return type \\(void\\) of method SebastianBergmann\\\\Complexity\\\\CyclomaticComplexityCalculatingVisitor\\:\\:enterNode\\(\\) should be compatible with return type \\(array\\<PhpParser\\\\Node\\>\\|int\\|PhpParser\\\\Node\\|null\\) of method PhpParser\\\\NodeVisitorAbstract\\:\\:enterNode\\(\\)$#"
-            count: 1
-            path: src/Visitor/CyclomaticComplexityCalculatingVisitor.php
-
-        -
-            message: "#^Return type \\(void\\) of method class@anonymous/tests/unit/ComplexityCalculatingVisitorTest\\.php\\:106\\:\\:enterNode\\(\\) should be compatible with return type \\(array\\<PhpParser\\\\Node\\>\\|int\\|PhpParser\\\\Node\\|null\\) of method PhpParser\\\\NodeVisitor\\:\\:enterNode\\(\\)$#"
-            count: 1
-            path: tests/unit/ComplexityCalculatingVisitorTest.php
-
-        -
-            message: "#^Return type \\(void\\) of method class@anonymous/tests/unit/ComplexityCalculatingVisitorTest\\.php\\:106\\:\\:enterNode\\(\\) should be compatible with return type \\(array\\<PhpParser\\\\Node\\>\\|int\\|PhpParser\\\\Node\\|null\\) of method PhpParser\\\\NodeVisitorAbstract\\:\\:enterNode\\(\\)$#"
-            count: 1
-            path: tests/unit/ComplexityCalculatingVisitorTest.php
-
-        -
-            message: "#^Return type \\(void\\) of method class@anonymous/tests/unit/ComplexityCalculatingVisitorTest\\.php\\:153\\:\\:enterNode\\(\\) should be compatible with return type \\(array\\<PhpParser\\\\Node\\>\\|int\\|PhpParser\\\\Node\\|null\\) of method PhpParser\\\\NodeVisitor\\:\\:enterNode\\(\\)$#"
-            count: 1
-            path: tests/unit/ComplexityCalculatingVisitorTest.php
-
-        -
-            message: "#^Return type \\(void\\) of method class@anonymous/tests/unit/ComplexityCalculatingVisitorTest\\.php\\:153\\:\\:enterNode\\(\\) should be compatible with return type \\(array\\<PhpParser\\\\Node\\>\\|int\\|PhpParser\\\\Node\\|null\\) of method PhpParser\\\\NodeVisitorAbstract\\:\\:enterNode\\(\\)$#"
-            count: 1
-            path: tests/unit/ComplexityCalculatingVisitorTest.php
-
-        -
-            message: "#^Return type \\(void\\) of method class@anonymous/tests/unit/ComplexityCalculatingVisitorTest\\.php\\:59\\:\\:enterNode\\(\\) should be compatible with return type \\(array\\<PhpParser\\\\Node\\>\\|int\\|PhpParser\\\\Node\\|null\\) of method PhpParser\\\\NodeVisitor\\:\\:enterNode\\(\\)$#"
-            count: 1
-            path: tests/unit/ComplexityCalculatingVisitorTest.php
-
-        -
-            message: "#^Return type \\(void\\) of method class@anonymous/tests/unit/ComplexityCalculatingVisitorTest\\.php\\:59\\:\\:enterNode\\(\\) should be compatible with return type \\(array\\<PhpParser\\\\Node\\>\\|int\\|PhpParser\\\\Node\\|null\\) of method PhpParser\\\\NodeVisitorAbstract\\:\\:enterNode\\(\\)$#"
-            count: 1
-            path: tests/unit/ComplexityCalculatingVisitorTest.php
diff --git a/src/Complexity/ComplexityCollection.php b/src/Complexity/ComplexityCollection.php
@@ -32,7 +32,7 @@
 
     public static function fromList(Complexity ...$items): self
     {
-        return new self($items);
+        return new self(array_values($items));
     }
 
     /**

diff --git a/src/Visitor/ComplexityCalculatingVisitor.php b/src/Visitor/ComplexityCalculatingVisitor.php
@@ -13,7 +13,6 @@
 use function is_array;
 use PhpParser\Node;
 use PhpParser\Node\Expr\New_;
-use PhpParser\Node\Name;
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
@@ -111,7 +110,6 @@ private function classMethodName(ClassMethod $node): string
         }
 
         assert(isset($parent->namespacedName));
-        assert($parent->namespacedName instanceof Name);
 
         return $parent->namespacedName->toString() . '::' . $node->name->toString();
     }
@@ -122,12 +120,7 @@ private function classMethodName(ClassMethod $node): string
     private function functionName(Function_ $node): string
     {
         assert(isset($node->namespacedName));
-        assert($node->namespacedName instanceof Name);
 
-        $functionName = $node->namespacedName->toString();
-
-        assert($functionName !== '');
-
-        return $functionName;
+        return $node->namespacedName->toString();
     }
 }
diff --git a/src/Visitor/CyclomaticComplexityCalculatingVisitor.php b/src/Visitor/CyclomaticComplexityCalculatingVisitor.php
@@ -31,7 +31,7 @@ final class CyclomaticComplexityCalculatingVisitor extends NodeVisitorAbstract
      */
     private int $cyclomaticComplexity = 1;
 
-    public function enterNode(Node $node): void
+    public function enterNode(Node $node): null
     {
         switch ($node::class) {
             case BooleanAnd::class:
@@ -49,6 +49,8 @@ public function enterNode(Node $node): void
             case While_::class:
                 $this->cyclomaticComplexity++;
         }
+
+        return null;
     }
 
     /**

diff --git a/tests/unit/ComplexityCalculatingVisitorTest.php b/tests/unit/ComplexityCalculatingVisitorTest.php
@@ -60,9 +60,11 @@ public function testCalculatesComplexityForAbstractSyntaxTreeOfClass(bool $short
         {
             private int $numberOfNodesVisited = 0;
 
-            public function enterNode(Node $node): void
+            public function enterNode(Node $node): null
             {
                 $this->numberOfNodesVisited++;
+
+                return null;
             }
 
             public function numberOfNodesVisited(): int
@@ -107,9 +109,11 @@ public function testCalculatesComplexityForAbstractSyntaxTreeOfAnonymousClass(bo
         {
             private int $numberOfNodesVisited = 0;
 
-            public function enterNode(Node $node): void
+            public function enterNode(Node $node): null
             {
                 $this->numberOfNodesVisited++;
+
+                return null;
             }
 
             public function numberOfNodesVisited(): int
@@ -154,9 +158,11 @@ public function testCalculatesComplexityForAbstractSyntaxTreeOfInterface(bool $s
         {
             private int $numberOfNodesVisited = 0;
 
-            public function enterNode(Node $node): void
+            public function enterNode(Node $node): null
             {
                 $this->numberOfNodesVisited++;
+
+                return null;
             }
 
             public function numberOfNodesVisited(): int
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,7 @@ @@
         public static function fromList(Complexity ...$items): self
         {
-            return new self($items);
+            return new self(array_values($items));
         }
         /**
@@ Expand Down @@