Replace AccessibleReturnTypeExtension with stub for AccessibleInterface (#419)

* Stub conditional return on AccessibleInterface::access

* use stub over AccessibleReturnTypeExtension

Author: mglaman

extension.neon

@@ -276,9 +276,6 @@ services:
 	-
 		class: mglaman\PHPStanDrupal\Type\UrlToStringDynamicReturnTypeExtension
 		tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
-	-
-		class: mglaman\PHPStanDrupal\Type\AccessibleReturnTypeExtension
-		tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
 	-
 		class: mglaman\PHPStanDrupal\Type\EntityAccessControlHandlerReturnTypeExtension
 		tags: [phpstan.broker.dynamicMethodReturnTypeExtension]

src/Type/AccessibleReturnTypeExtension.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Drupal\Core\Access;
+
+use Drupal\Core\Session\AccountInterface;
+
+interface AccessibleInterface {
+
+  /**
+   * @param string $operation
+   * @param \Drupal\Core\Session\AccountInterface $account
+   * @param bool $return_as_object
+   *
+   * @return ($return_as_object is true ? \Drupal\Core\Access\AccessResultInterface : bool)
+   */
+    public function access(string $operation, AccountInterface $account = NULL, bool $return_as_object = FALSE);
+}

stubs/Drupal/Core/Access/AccessibleInterface.stub

@@ -12,6 +12,7 @@ final class AccessibleReturnTypeExtensionTest extends TypeInferenceTestCase {
     public function dataFileAsserts(): iterable
     {
         yield from $this->gatherAssertTypes(__DIR__ . '/data/accessible.php');
+        yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-414.php');
     }
 
     /**

tests/src/Type/AccessibleReturnTypeExtensionTest.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Bug414;
+
+use Drupal\Core\Access\AccessResultInterface;
+use Drupal\Core\Entity\EntityInterface;
+use function PHPStan\Testing\assertType;
+
+function (EntityInterface $entity): void {
+    assertType('bool', $entity->access('view'));
+    assertType(AccessResultInterface::class, $entity->access('view', null, true));
+};
+
+function (EntityInterface $entity): void {
+    $accessArgs = ['delete'];
+    $access = $entity->access(...$accessArgs);
+    assertType('bool', $access);
+
+    $accessArgs = ['delete', null, false];
+    $access = $entity->access(...$accessArgs);
+    assertType('bool', $access);
+
+    // @todo test after https://github.com/phpstan/phpstan/issues/7369
+    // $accessArgs = ['delete', null, true];
+    // $access = $entity->access(...$accessArgs);
+    // assertType(AccessResultInterface::class, $access);
+};
+
+function (EntityInterface $entity): void {
+    $access = $entity->access('delete', return_as_object: true);
+    assertType(AccessResultInterface::class, $access);
+    $access = $entity->access('delete', return_as_object: false);
+    assertType('bool', $access);
+};