Merge pull request #53 from staabm/once

Run analyzer only once

Author: pb30

extension.neon

@@ -4,8 +4,6 @@ services:
         arguments:
             cwd: %currentWorkingDirectory%
             options: %composerAnalysis%
-        tags:
-            - phpstan.collector
 
 rules:
     - ComposerAnalyzer\ComposerRule

phpstan.neon

@@ -6,10 +6,6 @@ parameters:
     paths:
         - src
 
-    ignoreErrors:
-        -
-            identifier: missingType.generics
-
     composerAnalysis:
         ignoreAllShadowDeps: false
         ignoreAllDevDepsInProd: false

src/ComposerCollector.php

@@ -16,11 +16,8 @@
 use ShipMonk\ComposerDependencyAnalyser\Result\SymbolUsage;
 use ShipMonk\ComposerDependencyAnalyser\Stopwatch;
 
-class ComposerCollector implements Collector
+class ComposerCollector
 {
-    /** @var RuleError[] */
-    public static array $results;
-
     private string $cwd;
 
     /** @var string[] */
@@ -58,9 +55,16 @@ public function __construct(string $cwd, array $options)
         $this->ignoreAllUnusedDeps = boolval($options['ignoreAllUnusedDeps'] ?? false);
         $this->disableExtensionsAnalysis = boolval($options['disableExtensionsAnalysis'] ?? false);
         $this->ignoreSpecificUnusedDeps = $options['ignoreSpecificUnusedDeps'] ?? [];
+    }
 
+    /**
+     * @return RuleError[]
+     */
+    public function analyze(): array
+    {
         $results = $this->runComposerDependencyAnalyser();
-        self::$results = $this->reformatResults($results);
+
+        return $this->reformatResults($results);
     }
 
     private function runComposerDependencyAnalyser(): AnalysisResult

src/ComposerRule.php

@@ -8,6 +8,9 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleError;
 
+/**
+ * @implements Rule<CollectedDataNode>
+ */
 class ComposerRule implements Rule
 {
     private ComposerCollector $depAnalyzer;
@@ -19,6 +22,8 @@ public function __construct(ComposerCollector $depAnalyzer)
 
     public function getNodeType(): string
     {
+        // use collector rule, to make sure we run the underlying analyzer only once
+        // see https://github.com/pb30/phpstan-composer-analysis/issues/10
         return CollectedDataNode::class;
     }
 
@@ -27,9 +32,10 @@ public function getNodeType(): string
      */
     public function processNode(Node $node, Scope $scope): array
     {
-        $errors = $this->depAnalyzer::$results;
-        $this->depAnalyzer::$results = [];
+        if ($node->isOnlyFilesAnalysis()) {
+            return [];
+        }
 
-        return $errors;
+        return $this->depAnalyzer->analyze();
     }
 }