Merge pull request #410 from mglaman/fix-1.7.0-compat

Fix PHPStan 1.7.0 incompatibilities

Author: mglaman

.github/workflows/phpstan-dev.yml

@@ -0,0 +1,34 @@
+name: PHPStan dev
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+  schedule:
+    - cron: 0 0 * * *
+jobs:
+  verify:
+    runs-on: "ubuntu-latest"
+    name: Lint
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          php-version: 8.1
+          tools: composer:v2
+          extensions: dom, curl, libxml, mbstring, zip, pdo, mysql, pdo_mysql, gd
+      - name: "Bump PHPStan"
+        run: "composer require --no-update phpstan/phpstan:1.7.x-dev"
+      - name: "Add phpspec/prophecy-phpunit"
+        run: "composer require phpspec/prophecy-phpunit:^2 --dev --no-update"
+      - name: "Install dependencies"
+        run: "composer update --no-progress --prefer-dist"
+      - name: "PHPCS"
+        run: "php vendor/bin/phpcs"
+      - name: "PHPStan"
+        run: "php vendor/bin/phpstan analyze"
+      - name: "PHPUnit"
+        run: "php vendor/bin/phpunit"

composer.json

@@ -12,7 +12,7 @@
     "require": {
         "php": "^7.4 || ^8.0",
         "symfony/finder": "~3.4.5 ||^4.2 || ^5.0 || ^6.0",
-        "phpstan/phpstan": "^1.0",
+        "phpstan/phpstan": "^1.7.0",
         "symfony/yaml": "~3.4.5 || ^4.2|| ^5.0 || ^6.0",
         "webflo/drupal-finder": "^1.2"
     },

src/Reflection/EntityFieldsViaMagicReflectionExtension.php

@@ -28,16 +28,15 @@ public function hasProperty(ClassReflection $classReflection, string $propertyNa
             return false;
         }
 
-        $reflection = $classReflection->getNativeReflection();
         // We need to find a way to parse the entity annotation so that at the minimum the `entity_keys` are
         // supported. The real fix is Drupal developers _really_ need to start writing @property definitions in the
         // class doc if they don't get `get` methods.
-        if ($reflection->implementsInterface('Drupal\Core\Entity\ContentEntityInterface')) {
+        if ($classReflection->implementsInterface('Drupal\Core\Entity\ContentEntityInterface')) {
             // @todo revisit if it's a good idea to be true.
             // Content entities have magical __get... so it is kind of true.
             return true;
         }
-        if (self::classObjectIsSuperOfInterface($reflection, self::getFieldItemListInterfaceObject())->yes()) {
+        if (self::classObjectIsSuperOfInterface($classReflection->getName(), self::getFieldItemListInterfaceObject())->yes()) {
             return FieldItemListPropertyReflection::canHandleProperty($classReflection, $propertyName);
         }
 
@@ -46,21 +45,19 @@ public function hasProperty(ClassReflection $classReflection, string $propertyNa
 
     public function getProperty(ClassReflection $classReflection, string $propertyName): PropertyReflection
     {
-        $reflection = $classReflection->getNativeReflection();
-        if ($reflection->implementsInterface('Drupal\Core\Entity\EntityInterface')) {
+        if ($classReflection->implementsInterface('Drupal\Core\Entity\EntityInterface')) {
             return new EntityFieldReflection($classReflection, $propertyName);
         }
-        if (self::classObjectIsSuperOfInterface($reflection, self::getFieldItemListInterfaceObject())->yes()) {
+        if (self::classObjectIsSuperOfInterface($classReflection->getName(), self::getFieldItemListInterfaceObject())->yes()) {
             return new FieldItemListPropertyReflection($classReflection, $propertyName);
         }
 
         throw new \LogicException($classReflection->getName() . "::$propertyName should be handled earlier.");
     }
 
-    public static function classObjectIsSuperOfInterface(\ReflectionClass $reflection, ObjectType $interfaceObject) : TrinaryLogic
+    public static function classObjectIsSuperOfInterface(string $name, ObjectType $interfaceObject) : TrinaryLogic
     {
-        $classObject = new ObjectType($reflection->getName());
-        return $interfaceObject->isSuperTypeOf($classObject);
+        return $interfaceObject->isSuperTypeOf(new ObjectType($name));
     }
 
     protected static function getFieldItemListInterfaceObject() : ObjectType

src/Rules/Drupal/PluginManager/AbstractPluginManagerRule.php

@@ -2,6 +2,7 @@
 
 namespace mglaman\PHPStanDrupal\Rules\Drupal\PluginManager;
 
+use PHPStan\Reflection\ClassReflection;
 use PHPStan\Rules\Rule;
 
 /**
@@ -10,7 +11,7 @@
 abstract class AbstractPluginManagerRule implements Rule
 {
 
-    protected function isPluginManager(\ReflectionClass $classReflection): bool
+    protected function isPluginManager(ClassReflection $classReflection): bool
     {
         return
             !$classReflection->isInterface() &&

src/Rules/Drupal/PluginManager/PluginManagerSetsCacheBackendRule.php

@@ -42,9 +42,7 @@ public function processNode(Node $node, Scope $scope): array
             throw new ShouldNotHappenException();
         }
 
-        $classReflection = $scopeClassReflection->getNativeReflection();
-
-        if (!$this->isPluginManager($classReflection)) {
+        if (!$this->isPluginManager($scopeClassReflection)) {
             return [];
         }