Remove optimization of collector emits (#166)

Author: janedbal

src/Collector/BufferedUsageCollector.php

@@ -2,9 +2,7 @@
 
 namespace ShipMonk\PHPStan\DeadCode\Collector;
 
-use PhpParser\Node;
 use PHPStan\Analyser\Scope;
-use PHPStan\Node\ClassMethodsNode;
 use ShipMonk\PHPStan\DeadCode\Graph\CollectedUsage;
 use function array_map;
 
@@ -14,30 +12,23 @@ trait BufferedUsageCollector
     /**
      * @var list<CollectedUsage>
      */
-    private array $usageBuffer = [];
+    private array $usages = [];
 
     /**
      * @return non-empty-list<string>|null
      */
-    private function tryFlushBuffer(
-        Node $node,
-        Scope $scope
-    ): ?array
+    private function emitUsages(Scope $scope): ?array
     {
-        if (!$scope->isInClass() || $node instanceof ClassMethodsNode) { // @phpstan-ignore-line ignore BC promise
-            $data = $this->usageBuffer;
-            $this->usageBuffer = [];
-
-            // collect data once per class to save memory & resultCache size
-            return $data === []
+        try {
+            return $this->usages === []
                 ? null
                 : array_map(
                     static fn (CollectedUsage $usage): string => $usage->serialize($scope->getFile()),
-                    $data,
+                    $this->usages,
                 );
+        } finally {
+            $this->usages = [];
         }
-
-        return null;
     }
 
 }

src/Collector/ConstantFetchCollector.php

@@ -73,7 +73,7 @@ public function processNode(
             $this->registerFunctionCall($node, $scope);
         }
 
-        return $this->tryFlushBuffer($node, $scope);
+        return $this->emitUsages($scope);
     }
 
     private function registerFunctionCall(FuncCall $node, Scope $scope): void
@@ -199,7 +199,7 @@ private function registerUsage(ClassConstantUsage $usage, Node $node, Scope $sco
             }
         }
 
-        $this->usageBuffer[] = new CollectedUsage($usage, $excluderName);
+        $this->usages[] = new CollectedUsage($usage, $excluderName);
     }
 
 }

src/Collector/MethodCallCollector.php

@@ -91,7 +91,7 @@ public function processNode(
             $this->registerAttribute($node, $scope);
         }
 
-        return $this->tryFlushBuffer($node, $scope);
+        return $this->emitUsages($scope);
     }
 
     /**
@@ -287,7 +287,7 @@ private function registerUsage(ClassMethodUsage $usage, Node $node, Scope $scope
             }
         }
 
-        $this->usageBuffer[] = new CollectedUsage($usage, $excluderName);
+        $this->usages[] = new CollectedUsage($usage, $excluderName);
     }
 
 }

src/Collector/ProvidedUsagesCollector.php

@@ -69,11 +69,11 @@ public function processNode(
                 $collectedUsage = $this->resolveExclusion($newUsage, $node, $scope);
 
                 $this->validateUsage($newUsage, $memberUsageProvider, $node, $scope);
-                $this->usageBuffer[] = $collectedUsage;
+                $this->usages[] = $collectedUsage;
             }
         }
 
-        return $this->tryFlushBuffer($node, $scope);
+        return $this->emitUsages($scope);
     }
 
     private function validateUsage(