Merge branch 'main' into fix/inspector-type-extension-mixed-null-phpstan-2147

Author: mglaman

src/Rules/Drupal/GlobalDrupalDependencyInjectionRule.php

@@ -40,10 +40,6 @@ public function processNode(Node $node, Scope $scope): array
             'PHPUnit\Framework\Test',
             // Typed data objects cannot use dependency injection.
             'Drupal\Core\TypedData\TypedDataInterface',
-            // Render elements cannot use dependency injection.
-            'Drupal\Core\Render\Element\ElementInterface',
-            'Drupal\Core\Render\Element\FormElementInterface',
-            'Drupal\config_translation\FormElement\ElementInterface',
             // Entities don't use services for now
             // @see https://www.drupal.org/project/drupal/issues/2913224
             'Drupal\Core\Entity\EntityInterface',

tests/src/Rules/GlobalDrupalDependencyInjectionRuleTest.php

@@ -70,6 +70,16 @@ public static function resultData(): \Generator
             [],
         ];
 
+        yield [
+            __DIR__ . '/data/bug-828.php',
+            [
+                [
+                    '\Drupal calls should be avoided in classes, use dependency injection instead',
+                    35,
+                ],
+            ],
+        ];
+
     }
 
 

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

@@ -0,0 +1,38 @@
+<?php
+
+namespace Bug828;
+
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\Core\Render\Element\RenderElementBase;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+// A render element using ContainerFactoryPluginInterface for DI.
+// Should NOT trigger the rule since it uses proper DI via create().
+class RenderElementWithDi extends RenderElementBase implements ContainerFactoryPluginInterface {
+
+    public function __construct(array $configuration, $plugin_id, $plugin_definition) {
+        parent::__construct($configuration, $plugin_id, $plugin_definition);
+    }
+
+    public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+        return new static($configuration, $plugin_id, $plugin_definition);
+    }
+
+    public function getInfo() {
+        return [];
+    }
+
+}
+
+// A render element using \Drupal directly. Should trigger the rule.
+class RenderElementWithDrupalCall extends RenderElementBase {
+
+    public function getInfo() {
+        return [];
+    }
+
+    public function someMethod() {
+        \Drupal::service('some.service');
+    }
+
+}