Merge pull request #292 from alexpott/fix/render-callback

Fix/render callback

Author: mglaman

src/Rules/Drupal/RenderCallbackRule.php

@@ -16,6 +16,7 @@
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\ObjectType;
+use PHPStan\Type\UnionType;
 use PHPStan\Type\VerbosityLevel;
 
 final class RenderCallbackRule implements Rule
@@ -59,7 +60,10 @@ public function processNode(Node $node, Scope $scope): array
             return [];
         }
 
-        $trustedCallbackType = new ObjectType('Drupal\Core\Security\TrustedCallbackInterface');
+        $trustedCallbackType = new UnionType([
+            new ObjectType('Drupal\Core\Security\TrustedCallbackInterface'),
+            new ObjectType('Drupal\Core\Render\Element\RenderCallbackInterface'),
+        ]);
         $errors = [];
         foreach ($value->items as $pos => $item) {
             if (!$item instanceof Node\Expr\ArrayItem) {

tests/fixtures/drupal/modules/pre_render_callback_rule/src/RenderCallbackInterfaceObject.php

@@ -0,0 +1,25 @@
+<?php declare(strict_types=1);
+
+namespace Drupal\pre_render_callback_rule;
+
+use Drupal\Core\Render\Element\RenderCallbackInterface;
+use Drupal\Core\Url;
+
+final class RenderCallbackInterfaceObject implements RenderCallbackInterface {
+
+    public function staticCallback(): array {
+        return [
+            '#type' => 'link',
+            '#url' => Url::fromRoute('<front>'),
+            '#title' => 'FooBar',
+            '#pre_render' => [
+                [$this, 'preRenderCallback'],
+            ]
+        ];
+    }
+
+    public static function preRenderCallback(array $element) {
+        return $element;
+    }
+
+}

tests/src/Rules/PreRenderCallbackRuleTest.php

@@ -65,6 +65,10 @@ public function fileData(): \Generator
             __DIR__ . '/../../fixtures/drupal/modules/pre_render_callback_rule/src/RenderArrayWithPreRenderCallback.php',
             []
         ];
+        yield [
+            __DIR__ . '/../../fixtures/drupal/modules/pre_render_callback_rule/src/RenderCallbackInterfaceObject.php',
+            []
+        ];
         yield [
             __DIR__ . '/../../fixtures/drupal/modules/pre_render_callback_rule/src/FormWithClosure.php',
             [