Changes after PR review

rectorphp · Nov 15, 2024 · 9818b42 · 9818b42
1 parent 4df6e0b
commit 9818b42
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 13 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -19,3 +19,16 @@ parameters:
 
         # overly detailed generics
         - '#Rector\\TypePerfect\\Tests\\Rules\\(.*?) generic (class|interface)#'
+
+        -
+            identifier: phpstanApi.instanceofType
+            paths:
+                - src/Printer/CollectorMetadataPrinter.php
+                - src/Rules/NarrowPrivateClassMethodParamTypeRule.php
+                - src/Rules/NoArrayAccessOnObjectRule.php
+                - src/Rules/ReturnNullOverFalseRule.php
+
+        -
+            identifier: phpstanApi.instanceofAssumption
+            paths:
+                - src/Rules/NoParamTypeRemovalRule.php
diff --git a/src/Printer/CollectorMetadataPrinter.php b/src/Printer/CollectorMetadataPrinter.php
@@ -13,15 +13,12 @@
 use PhpParser\Node\NullableType;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\UnionType;
+use PhpParser\PrettyPrinter\Standard;
 use PHPStan\Node\Printer\Printer;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\ExtendedMethodReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
-use PHPStan\Type\ArrayType;
-use PHPStan\Type\BooleanType;
-use PHPStan\Type\ClassStringType;
 use PHPStan\Type\ClosureType;
-use PHPStan\Type\Enum\EnumCaseObjectType;
 use PHPStan\Type\IntegerRangeType;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
@@ -35,9 +32,11 @@
 
 final readonly class CollectorMetadataPrinter
 {
+    private Standard $printer;
+
     public function __construct(
-        private Printer $printer
     ) {
+        $this->printer = new Standard();
     }
 
     public function printArgTypesAsString(MethodCall $methodCall, ExtendedMethodReflection $extendedMethodReflection, Scope $scope): string
@@ -54,7 +53,6 @@ public function printArgTypesAsString(MethodCall $methodCall, ExtendedMethodRefl
                 return ResolvedTypes::UNKNOWN_TYPES;
             }
 
-            // @phpstan-ignore phpstanApi.instanceofType
             if ($argType instanceof IntersectionType) {
                 return ResolvedTypes::UNKNOWN_TYPES;
             }

diff --git a/src/Reflection/ReflectionParser.php b/src/Reflection/ReflectionParser.php
@@ -11,7 +11,6 @@
 use PhpParser\NodeVisitor\NameResolver;
 use PhpParser\Parser;
 use PhpParser\ParserFactory;
-use PhpParser\PhpVersion;
 use PHPStan\Reflection\ClassReflection;
 use Throwable;
 
@@ -27,7 +26,7 @@ final class ReflectionParser
     public function __construct()
     {
         $parserFactory = new ParserFactory();
-        $this->parser = $parserFactory->createForVersion(PhpVersion::fromString('7.4'));
+        $this->parser = $parserFactory->createForNewestSupportedVersion();
     }
 
     public function parseClassReflection(ClassReflection $classReflection): ?ClassLike

diff --git a/src/Rules/NarrowPrivateClassMethodParamTypeRule.php b/src/Rules/NarrowPrivateClassMethodParamTypeRule.php
@@ -145,7 +145,6 @@ private function validateParam(Param $param, int $position, Expr $expr, Scope $s
             return null;
         }
 
-        // @phpstan-ignore phpstanApi.instanceofType
         if ($argType instanceof IntersectionType) {
             return null;
         }

diff --git a/src/Rules/NoArrayAccessOnObjectRule.php b/src/Rules/NoArrayAccessOnObjectRule.php
@@ -43,7 +43,6 @@ public function getNodeType(): string
     public function processNode(Node $node, Scope $scope): array
     {
         $varType = $scope->getType($node->var);
-        // @phpstan-ignore phpstanApi.instanceofType
         if (! $varType instanceof ObjectType) {
             return [];
         }

diff --git a/src/Rules/NoParamTypeRemovalRule.php b/src/Rules/NoParamTypeRemovalRule.php
@@ -55,7 +55,6 @@ public function processNode(Node $node, Scope $scope): array
         }
 
         $parentClassMethodReflection = $this->methodNodeAnalyser->matchFirstParentClassMethod($scope, $classMethodName);
-        // @phpstan-ignore phpstanApi.instanceofAssumption
         if (! $parentClassMethodReflection instanceof PhpMethodReflection) {
             return [];
         }

diff --git a/src/Rules/ReturnNullOverFalseRule.php b/src/Rules/ReturnNullOverFalseRule.php
@@ -13,7 +13,6 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleError;
 use PHPStan\Rules\RuleErrorBuilder;
-use PHPStan\Type\BooleanType;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use Rector\TypePerfect\Configuration;
 
@@ -74,7 +73,6 @@ public function processNode(Node $node, Scope $scope): array
             }
 
             $exprType = $scope->getType($return->expr);
-            // @phpstan-ignore phpstanApi.instanceofType
             if (! $exprType instanceof ConstantBooleanType) {
                 if ($exprType->isBoolean()->yes()) {
                     return [];