[DX] Add strict PHPStan rules - step #6 (#1335)

rectorphp · Nov 28, 2021 · f90d7e5 · f90d7e5
1 parent 21c4a84
commit f90d7e5
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 14 deletions.
diff --git a/composer.json b/composer.json
@@ -65,6 +65,7 @@
         "nategood/httpful": "^0.3.2",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan-nette": "^1.0",
+        "phpstan/phpstan-strict-rules": "^1.1",
         "phpstan/phpstan-webmozart-assert": "^1.0",
         "phpunit/phpunit": "^9.5",
         "rector/phpstan-rules": "^0.4.15",

diff --git a/packages/NodeTypeResolver/Contract/NodeTypeResolverInterface.php b/packages/NodeTypeResolver/Contract/NodeTypeResolverInterface.php
@@ -8,7 +8,7 @@
 use PHPStan\Type\Type;
 
 /**
- * @template TNode as Node
+ * @template TNode as \PhpParser\Node
  */
 interface NodeTypeResolverInterface
 {

diff --git a/packages/NodeTypeResolver/NodeTypeResolver/CastTypeResolver.php b/packages/NodeTypeResolver/NodeTypeResolver/CastTypeResolver.php
@@ -5,7 +5,6 @@
 namespace Rector\NodeTypeResolver\NodeTypeResolver;
 
 use PhpParser\Node;
-use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Cast;
 use PhpParser\Node\Expr\Cast\Array_;
 use PhpParser\Node\Expr\Cast\Bool_;
@@ -40,7 +39,7 @@ final class CastTypeResolver implements NodeTypeResolverInterface
     ];
 
     /**
-     * @return array<class-string<Expr>>
+     * @return array<class-string<Node>>
      */
     public function getNodeClasses(): array
     {

diff --git a/packages/NodeTypeResolver/NodeTypeResolver/ClassAndInterfaceTypeResolver.php b/packages/NodeTypeResolver/NodeTypeResolver/ClassAndInterfaceTypeResolver.php
@@ -24,7 +24,7 @@
 final class ClassAndInterfaceTypeResolver implements NodeTypeResolverInterface
 {
     /**
-     * @return class-string[]
+     * @return array<class-string<Node>>
      */
     public function getNodeClasses(): array
     {

diff --git a/packages/NodeTypeResolver/NodeTypeResolver/ClassMethodOrClassConstTypeResolver.php b/packages/NodeTypeResolver/NodeTypeResolver/ClassMethodOrClassConstTypeResolver.php
@@ -35,7 +35,7 @@ public function autowire(NodeTypeResolver $nodeTypeResolver): void
     }
 
     /**
-     * @return class-string[]
+     * @return array<class-string<Node>>
      */
     public function getNodeClasses(): array
     {

diff --git a/packages/NodeTypeResolver/NodeTypeResolver/NewTypeResolver.php b/packages/NodeTypeResolver/NodeTypeResolver/NewTypeResolver.php
@@ -5,7 +5,6 @@
 namespace Rector\NodeTypeResolver\NodeTypeResolver;
 
 use PhpParser\Node;
-use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Name;
 use PhpParser\Node\Stmt\Class_;
@@ -34,7 +33,7 @@ public function __construct(
     }
 
     /**
-     * @return array<class-string<Expr>>
+     * @return array<class-string<Node>>
      */
     public function getNodeClasses(): array
     {

diff --git a/packages/NodeTypeResolver/NodeTypeResolver/PropertyFetchTypeResolver.php b/packages/NodeTypeResolver/NodeTypeResolver/PropertyFetchTypeResolver.php
@@ -5,7 +5,6 @@
 namespace Rector\NodeTypeResolver\NodeTypeResolver;
 
 use PhpParser\Node;
-use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\PropertyFetch;
 use PhpParser\Node\Stmt\ClassLike;
 use PHPStan\Analyser\Scope;
@@ -43,7 +42,7 @@ public function autowire(NodeTypeResolver $nodeTypeResolver): void
     }
 
     /**
-     * @return array<class-string<Expr>>
+     * @return array<class-string<Node>>
      */
     public function getNodeClasses(): array
     {

diff --git a/packages/NodeTypeResolver/NodeTypeResolver/ScalarTypeResolver.php b/packages/NodeTypeResolver/NodeTypeResolver/ScalarTypeResolver.php
@@ -5,7 +5,6 @@
 namespace Rector\NodeTypeResolver\NodeTypeResolver;
 
 use PhpParser\Node;
-use PhpParser\Node\Expr;
 use PhpParser\Node\Scalar;
 use PhpParser\Node\Scalar\DNumber;
 use PhpParser\Node\Scalar\Encapsed;
@@ -26,7 +25,7 @@
 final class ScalarTypeResolver implements NodeTypeResolverInterface
 {
     /**
-     * @return array<class-string<Expr>>
+     * @return array<class-string<Node>>
      */
     public function getNodeClasses(): array
     {

diff --git a/packages/NodeTypeResolver/NodeTypeResolver/StaticCallMethodCallTypeResolver.php b/packages/NodeTypeResolver/NodeTypeResolver/StaticCallMethodCallTypeResolver.php
@@ -39,7 +39,7 @@ public function autowire(NodeTypeResolver $nodeTypeResolver): void
     }
 
     /**
-     * @return class-string[]
+     * @return array<class-string<Node>>
      */
     public function getNodeClasses(): array
     {

diff --git a/packages/NodeTypeResolver/NodeTypeResolver/VariableTypeResolver.php b/packages/NodeTypeResolver/NodeTypeResolver/VariableTypeResolver.php
@@ -5,7 +5,6 @@
 namespace Rector\NodeTypeResolver\NodeTypeResolver;
 
 use PhpParser\Node;
-use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Param;
 use PHPStan\Analyser\Scope;
@@ -30,7 +29,7 @@ public function __construct(
     }
 
     /**
-     * @return array<class-string<Expr>>
+     * @return array<class-string<Node>>
      */
     public function getNodeClasses(): array
     {

diff --git a/phpstan.neon b/phpstan.neon
@@ -590,3 +590,10 @@ parameters:
         - '#Method Rector\\PhpAttribute\\Contract\\AnnotationToAttributeMapperInterface\:\:map\(\) return type has no value type specified in iterable type array#'
         - '#Method Rector\\PhpAttribute\\AnnotationToAttributeMapper\\(.*?)AnnotationToAttributeMapper\:\:map\(\) return type has no value type specified in iterable type array#'
 
+        # confused generics
+        - '#Return type \(array<class\-string<PhpParser\\Node\>\>\) of method Rector\\NodeTypeResolver\\NodeTypeResolver\\(.*?)TypeResolver\:\:getNodeClasses\(\) should be covariant with return type \(array<class\-string<PhpParser\\Node\\(.*?)\>\>\) of method Rector\\NodeTypeResolver\\Contract\\NodeTypeResolverInterface<PhpParser\\Node\\(.*?)\>\:\:getNodeClasses\(\)#'
+
+        # confused from while re-type
+        -
+            message: '#Instanceof between PhpParser\\Node\\Expr\\BinaryOp\\BooleanAnd and PhpParser\\Node\\Expr\\BinaryOp will always evaluate to true#'
+            path: packages/NodeCollector/NodeAnalyzer/BooleanAndAnalyzer.php