Cache scan results. Make new rule a service

Author: eiriksm

extension.neon

@@ -23,7 +23,6 @@ parametersSchema:
 		entityTypeStorageMapping: arrayOf(string())
 	])
 rules:
-	- PHPStan\Rules\Drupal\LoadIncludes
 	- PHPStan\Rules\Classes\PluginManagerInspectionRule
 	- PHPStan\Rules\Drupal\Coder\DiscouragedFunctionsRule
 	- PHPStan\Rules\Drupal\GlobalDrupalDependencyInjectionRule
@@ -44,3 +43,8 @@ services:
 	-
 		class: PHPStan\Reflection\EntityFieldsViaMagicReflectionExtension
 		tags: [phpstan.broker.propertiesClassReflectionExtension]
+	-
+		class: PHPStan\Rules\Drupal\LoadIncludes
+		tags: [phpstan.rules.rule]
+		arguments:
+			- %drupal.drupal_root%

src/Drupal/ExtensionDiscovery.php

@@ -118,6 +118,15 @@ public function __construct($root)
      */
     public function scan($type)
     {
+        static $scanresult;
+        if (!$scanresult) {
+            $scanresult = [];
+        }
+
+        if (isset($scanresult[$type])) {
+            return $scanresult[$type];
+        }
+
         $searchdirs = [];
         // Search the core directory.
         $searchdirs[static::ORIGIN_CORE] = 'core';
@@ -152,7 +161,8 @@ public function scan($type)
         $files = $this->sort($files, $origin_weights);
 
         // Process and return the list of extensions keyed by extension name.
-        return $this->process($files);
+        $scanresult[$type] = $this->process($files);
+        return $scanresult[$type];
     }
 
     /**

src/Rules/Drupal/LoadIncludes.php

@@ -14,6 +14,22 @@
 
 class LoadIncludes implements Rule
 {
+
+    /**
+     * The project root.
+     *
+     * @var string
+     */
+    protected $projectRoot;
+
+    /**
+     * LoadIncludes constructor.
+     */
+    public function __construct($project_root)
+    {
+        $this->projectRoot = $project_root;
+    }
+
     public function getNodeType(): string
     {
         return Node\Expr\MethodCall::class;
@@ -46,7 +62,7 @@ public function processNode(Node $node, Scope $scope): array
             }
             // Try to invoke it similarily as the module handler itself.
             $finder = new DrupalFinder();
-            $finder->locateRoot(dirname($GLOBALS['autoloaderInWorkingDirectory']));
+            $finder->locateRoot($this->projectRoot);
             $drupal_root = $finder->getDrupalRoot();
             $extensionDiscovery = new ExtensionDiscovery($drupal_root);
             $modules = $extensionDiscovery->scan('module');