Fix build for latest PHPStan 2.1.8 (#296)

Author: janedbal

composer.json

@@ -11,7 +11,7 @@
     ],
     "require": {
         "php": "^7.4 || ^8.0",
-        "phpstan/phpstan": "^2.0"
+        "phpstan/phpstan": "^2.1.8"
     },
     "require-dev": {
         "editorconfig-checker/editorconfig-checker": "^10.6.0",

composer.lock

@@ -19,6 +19,8 @@
 class ClassSuffixNamingRule implements Rule
 {
 
+    private ReflectionProvider $reflectionProvider;
+
     /**
      * @var array<class-string, string>
      */
@@ -35,6 +37,7 @@ public function __construct(ReflectionProvider $reflectionProvider, array $super
             }
         }
 
+        $this->reflectionProvider = $reflectionProvider;
         $this->superclassToSuffixMapping = $superclassToSuffixMapping;
     }
 
@@ -63,7 +66,9 @@ public function processNode(
         }
 
         foreach ($this->superclassToSuffixMapping as $superClass => $suffix) {
-            if (!$classReflection->isSubclassOf($superClass)) {
+            $superClassReflection = $this->reflectionProvider->getClass($superClass);
+
+            if (!$classReflection->isSubclassOfClass($superClassReflection)) {
                 continue;
             }
 

src/Rule/ClassSuffixNamingRule.php

@@ -95,7 +95,7 @@ private function isException(Expr $node, Scope $scope): bool
         $type = $scope->getType($node);
 
         foreach ($type->getObjectClassReflections() as $classReflection) {
-            if ($classReflection->isSubclassOf(Throwable::class)) {
+            if ($classReflection->is(Throwable::class)) {
                 return true;
             }
         }

src/Rule/ForbidUnusedExceptionRule.php

@@ -112,7 +112,7 @@ private function removeNullAccessoryAndSubtractedTypes(Type $type): Type
             $newInnerTypes = [];
 
             foreach ($type->getTypes() as $innerType) {
-                if ($innerType instanceof AccessoryType) { // @phpstan-ignore phpstanApi.instanceofType
+                if ($innerType instanceof AccessoryType) {
                     continue;
                 }
 

src/Rule/ForbidVariableTypeOverwritingRule.php

@@ -88,7 +88,7 @@ public function testUnused(object $class, bool $bool, int $int): void
             true => 1,
         };
 
-        match ($int) { // error: Unused match result detected, possible returns: Exception
+        match ($int) { // error: Unused match result detected, possible returns: Exception|LogicException|RuntimeException
             0 => new LogicException(),
             1 => new RuntimeException(),
             default => new Exception(),

tests/Rule/data/ForbidUnusedMatchResultRule/code.php

@@ -2,6 +2,17 @@
 
 namespace ForbidVariableTypeOverwritingRule;
 
+/**
+ * Make PHPStan lose info about possible descendants (new Foo)
+ *
+ * @template T
+ * @param T
+ * @return T
+ */
+function passThru($iterable) {
+    return $iterable;
+}
+
 interface SomeInterface {
 
 }
@@ -39,14 +50,14 @@ function testGeneralizationAndNarrowing(
     ChildClass1 $childClass1,
     ChildClass2 $childClass2,
 ) {
-    $childClass1 = new ParentClass();
+    $childClass1 = passThru(new ParentClass());
     $parentClass = new ChildClass2();
     $childClass2 = new ChildClass1(); // error: Overwriting variable $childClass2 while changing its type from ForbidVariableTypeOverwritingRule\ChildClass2 to ForbidVariableTypeOverwritingRule\ChildClass1
 
     $object = new ParentClass();
     $intOrString1 = 1;
     $intOrString2 = []; // error: Overwriting variable $intOrString2 while changing its type from int|string to array{}
-    $classWithInterface1 = new ParentClass();
+    $classWithInterface1 = passThru(new ParentClass());
     $classWithInterface2 = new AnotherClassWithInterface(); // error: Overwriting variable $classWithInterface2 while changing its type from ForbidVariableTypeOverwritingRule\ParentClass&ForbidVariableTypeOverwritingRule\SomeInterface to ForbidVariableTypeOverwritingRule\AnotherClassWithInterface
     $classWithInterface3 = $interface;
 }