Merge pull request #497 from Boegie/496

Author: mglaman

extension.neon

@@ -297,3 +297,7 @@ services:
 	-
 		class: mglaman\PHPStanDrupal\Drupal\DrupalStubFilesExtension
 		tags: [phpstan.stubFilesExtension]
+	-
+		class: mglaman\PHPStanDrupal\Type\EntityQuery\AccessCheckTypeSpecifyingExtension
+		tags:
+			- phpstan.typeSpecifier.methodTypeSpecifyingExtension

src/Type/EntityQuery/AccessCheckTypeSpecifyingExtension.php

@@ -0,0 +1,50 @@
+<?php declare(strict_types=1);
+
+namespace mglaman\PHPStanDrupal\Type\EntityQuery;
+
+use Drupal\Core\Entity\Query\QueryInterface;
+use PhpParser\Node\Expr\MethodCall;
+use PHPStan\Analyser\Scope;
+use PHPStan\Analyser\SpecifiedTypes;
+use PHPStan\Analyser\TypeSpecifier;
+use PHPStan\Analyser\TypeSpecifierAwareExtension;
+use PHPStan\Analyser\TypeSpecifierContext;
+use PHPStan\Reflection\MethodReflection;
+use PHPStan\Reflection\ParametersAcceptorSelector;
+use PHPStan\Type\MethodTypeSpecifyingExtension;
+
+final class AccessCheckTypeSpecifyingExtension implements MethodTypeSpecifyingExtension, TypeSpecifierAwareExtension
+{
+    private TypeSpecifier $typeSpecifier;
+    public function setTypeSpecifier(TypeSpecifier $typeSpecifier) : void
+    {
+        $this->typeSpecifier = $typeSpecifier;
+    }
+
+    public function getClass(): string
+    {
+        return QueryInterface::class;
+    }
+
+    public function isMethodSupported(
+        MethodReflection $methodReflection,
+        MethodCall $node,
+        TypeSpecifierContext $context
+    ): bool {
+        return $methodReflection->getName() === 'accessCheck';
+    }
+
+    public function specifyTypes(
+        MethodReflection $methodReflection,
+        MethodCall $node,
+        Scope $scope,
+        TypeSpecifierContext $context
+    ): SpecifiedTypes {
+        $returnType = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+        $expr = $node->var;
+        if (!$returnType instanceof EntityQueryType) {
+            return $this->typeSpecifier->create($expr, $returnType, TypeSpecifierContext::createTruthy());
+        }
+        return $this->typeSpecifier->create($expr, $returnType->withAccessCheck(), TypeSpecifierContext::createTruthy());
+    }
+}

tests/src/Rules/EntityQueryHasAccessCheckRuleTest.php

@@ -60,18 +60,14 @@ public function cases(): \Generator
             ]
         ];
 
-        // @todo 396a2 this passes when run individually, somehow.
-        /*
         yield 'bug-396a2.php' => [
             [__DIR__ . '/data/bug-396a2.php'],
             []
-        ];*/
-        // @todo not chained call, return type extension has no influence.
-        /*
+        ];
         yield 'bug-396a3.php' => [
             [__DIR__ . '/data/bug-396a3.php'],
             []
-        ];*/
+        ];
         yield 'bug-396b.php' => [
             [__DIR__ . '/data/bug-396b.php'],
             []
@@ -131,5 +127,10 @@ public function cases(): \Generator
                 ],
             ]
         ];
+
+        yield 'bug-496.php' => [
+            [__DIR__.'/data/bug-496.php'],
+            []
+        ];
     }
 }

tests/src/Rules/data/bug-496.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Bug496Example;
+
+class TestClass {
+
+    /**
+     * Tests non-chained entity queries with access check.
+     */
+    public function bug496(string $entity_type): void
+    {
+        $query = \Drupal::entityQuery('node');
+        $query->accessCheck(FALSE);
+        $query->condition('field_test', 'foo', '=');
+        $query->execute();
+
+        $query = \Drupal::entityQuery('node');
+        $query->condition('field_test', 'foo', '=');
+        $query->accessCheck(FALSE);
+        $query->execute();
+    }
+}