Load includes not working from Drupal::moduleHandler()->loadInclude() (#550)

Author: mglaman

src/Rules/Drupal/LoadIncludes.php

@@ -6,7 +6,6 @@
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
 use PHPStan\Rules\RuleErrorBuilder;
-use PHPStan\ShouldNotHappenException;
 use PHPStan\Type\ObjectType;
 
 class LoadIncludes extends LoadIncludeBase
@@ -31,17 +30,9 @@ public function processNode(Node $node, Scope $scope): array
         if (\count($args) < 2) {
             return [];
         }
-        $variable = $node->var;
-        if (!$variable instanceof Node\Expr\Variable) {
-            return [];
-        }
-        $var_name = $variable->name;
-        if (!is_string($var_name)) {
-            throw new ShouldNotHappenException(sprintf('Expected string for variable in %s, please open an issue on GitHub https://github.com/mglaman/phpstan-drupal/issues', static::class));
-        }
+        $type = $scope->getType($node->var);
         $moduleHandlerInterfaceType = new ObjectType(ModuleHandlerInterface::class);
-        $variableType = $scope->getVariableType($var_name);
-        if (!$variableType->isSuperTypeOf($moduleHandlerInterfaceType)->yes()) {
+        if (!$type->isSuperTypeOf($moduleHandlerInterfaceType)->yes()) {
             return [];
         }
 

tests/src/Rules/LoadIncludesRuleTest.php

@@ -50,6 +50,20 @@ public function cases(): \Generator
             [__DIR__.'/data/bug-547.php'],
             []
         ];
+
+        yield 'bug-177.php' => [
+            [__DIR__.'/data/bug-177.php'],
+            [
+                [
+                    'File core/modules/locale/locale.fetch.php could not be loaded from Drupal\Core\Extension\ModuleHandlerInterface::loadInclude',
+                    6
+                ],
+                [
+                    'File core/modules/locale/locale.fetch.php could not be loaded from Drupal\Core\Extension\ModuleHandlerInterface::loadInclude',
+                    8
+                ],
+            ]
+        ];
     }
 
 }

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

@@ -0,0 +1,9 @@
+<?php
+
+namespace Bug177;
+
+function foo() {
+    \Drupal::moduleHandler()->loadInclude('locale', 'fetch.php');
+    $moduleHandler = \Drupal::moduleHandler();
+    $moduleHandler->loadInclude('locale', 'fetch.php');
+}