PHPStan 1.11.x updates (#765)

* PHPStan 1.11.x updates

* add back ignore

* keep reportUnmatchedIgnoredErrors for now

Author: mglaman

.github/workflows/phpstan-dev.yml

@@ -13,7 +13,6 @@ jobs:
     strategy:
       matrix:
         phpstan:
-          - '1.10.x-dev'
           - '1.11.x-dev'
     steps:
       - name: "Checkout"

phpstan.neon

@@ -1,8 +1,11 @@
 parameters:
 	level: 8
-	checkGenericClassInNonGenericObjectType: false
-	checkMissingIterableValueType: false
 	reportUnmatchedIgnoredErrors: false
+	ignoreErrors:
+		-
+			identifier: missingType.iterableValue
+		-
+			identifier: missingType.generics
 	paths:
 		- src
 		- drupal-autoloader.php

src/Internal/NamespaceCheck.php

@@ -11,7 +11,6 @@ final class NamespaceCheck
 {
     public static function isDrupalNamespace(Class_ $class): bool
     {
-        // @phpstan-ignore-next-line
         if (!isset($class->namespacedName)) {
             return false;
         }
@@ -25,7 +24,6 @@ public static function isSharedNamespace(Class_ $class): bool
             return false;
         }
 
-        // @phpstan-ignore-next-line
         if (!isset($class->namespacedName)) {
             return false;
         }

src/Rules/Classes/ClassExtendsInternalClassRule.php

@@ -47,7 +47,6 @@ public function processNode(Node $node, Scope $scope): array
             return [];
         }
 
-        // @phpstan-ignore-next-line
         if (!isset($node->namespacedName)) {
             return [$this->buildError(null, $extendedClassName)->build()];
         }

tests/src/Rules/EntityParameterTypehintRuleTest.php

@@ -20,7 +20,9 @@ protected function getRule(): Rule
                 true,
                 true,
                 []
-            ));
+            ),
+            true
+        );
     }
 
     public function testRule(): void

tests/src/Rules/GetDeprecatedServiceRuleTest.php

@@ -23,7 +23,6 @@ public function testRuleDrupal8(string $path, array $errorMessages): void
         if (version_compare('9.0.0', \Drupal::VERSION) !== 1) {
             self::markTestSkipped('Only tested on Drupal 8.x.x');
         }
-        // @phpstan-ignore-next-line
         $this->analyse([$path], $errorMessages);
     }
 
@@ -36,7 +35,6 @@ public function testRuleDrupal9(string $path, array $errorMessages): void
         if ($version !== '9') {
             self::markTestSkipped('Only tested on Drupal 9.x.x');
         }
-        // @phpstan-ignore-next-line
         $this->analyse([$path], $errorMessages);
     }
 

tests/src/Rules/RevisionableStorageInterfaceStubTest.php

@@ -29,14 +29,14 @@ public function testRule(): void
             // There's a quirk on 10.1.x+ which false reports this error but was fixed on 11.x.
             if (version_compare($drupalVersion, '10.2', '<')) {
                 $errors[] = [
-                    'Call to deprecated method loadRevision() of class Drupal\Core\Entity\EntityStorageInterface:
+                    'Call to deprecated method loadRevision() of interface Drupal\Core\Entity\EntityStorageInterface:
 in drupal:10.1.0 and is removed from drupal:11.0.0. Use
 \Drupal\Core\Entity\RevisionableStorageInterface::loadRevision instead.',
                     12
                 ];
             }
             $errors[] = [
-                'Call to deprecated method loadRevision() of class Drupal\Core\Entity\EntityStorageInterface:
+                'Call to deprecated method loadRevision() of interface Drupal\Core\Entity\EntityStorageInterface:
 in drupal:10.1.0 and is removed from drupal:11.0.0. Use
 \Drupal\Core\Entity\RevisionableStorageInterface::loadRevision instead.',
                 15