Reduce memory consumption of collectors (TomasVotruba#131)

ngmy · Dec 19, 2024 · 884b4a1 · 884b4a1
1 parent 574961c
commit 884b4a1
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 22 deletions.
diff --git a/src/Collectors/Callable_/AttributeCallableCollector.php b/src/Collectors/Callable_/AttributeCallableCollector.php
@@ -17,7 +17,7 @@
 use TomasVotruba\UnusedPublic\ValueObject\ClassAndMethodArrayExprs;
 
 /**
- * @implements Collector<AttributeGroup, array<string>|null>
+ * @implements Collector<AttributeGroup, non-empty-array<string>|null>
  */
 final readonly class AttributeCallableCollector implements Collector
 {

diff --git a/src/Collectors/Callable_/CallUserFuncCollector.php b/src/Collectors/Callable_/CallUserFuncCollector.php
@@ -13,7 +13,7 @@
 use TomasVotruba\UnusedPublic\Configuration;
 
 /**
- * @implements Collector<FuncCall, array<string>|null>
+ * @implements Collector<FuncCall, non-empty-array<string>|null>
  */
 final readonly class CallUserFuncCollector implements Collector
 {

diff --git a/src/Collectors/ClassConstFetchCollector.php b/src/Collectors/ClassConstFetchCollector.php
@@ -17,7 +17,7 @@
 use TomasVotruba\UnusedPublic\ValueObject\ConstantReference;
 
 /**
- * @implements Collector<ClassConstFetch, string[]>
+ * @implements Collector<ClassConstFetch, non-empty-array<string>|null>
  */
 final readonly class ClassConstFetchCollector implements Collector
 {
@@ -35,12 +35,12 @@ public function getNodeType(): string
 
     /**
      * @param ClassConstFetch $node
-     * @return string[]|null
+     * @return non-empty-array<string>|null
      */
     public function processNode(Node $node, Scope $scope): ?array
     {
         if (! $this->configuration->isUnusedConstantsEnabled()) {
-            return [];
+            return null;
         }
 
         if (! $node->class instanceof Name) {

diff --git a/src/Collectors/FormTypeClassCollector.php b/src/Collectors/FormTypeClassCollector.php
@@ -14,7 +14,7 @@
 
 /**
  * Match Symfony data_class element in forms types, as those use magic setters/getters
- * @implements Collector<ArrayItem, array<string>|null>
+ * @implements Collector<ArrayItem, non-empty-array<string>|null>
  */
 final readonly class FormTypeClassCollector implements Collector
 {
@@ -30,7 +30,7 @@ public function getNodeType(): string
 
     /**
      * @param ArrayItem $node
-     * @return string[]|null
+     * @return non-empty-array<string>|null
      */
     public function processNode(Node $node, Scope $scope): ?array
     {

diff --git a/src/Collectors/MethodCall/MethodCallCollector.php b/src/Collectors/MethodCall/MethodCallCollector.php
@@ -15,7 +15,7 @@
 use TomasVotruba\UnusedPublic\Configuration;
 
 /**
- * @implements Collector<MethodCall, array<string>|null>
+ * @implements Collector<MethodCall, non-empty-array<string>|null>
  */
 final readonly class MethodCallCollector implements Collector
 {

diff --git a/src/Collectors/MethodCall/MethodCallableCollector.php b/src/Collectors/MethodCall/MethodCallableCollector.php
@@ -14,7 +14,7 @@
 use TomasVotruba\UnusedPublic\Configuration;
 
 /**
- * @implements Collector<MethodCallableNode, array<string>|null>
+ * @implements Collector<MethodCallableNode, non-empty-array<string>|null>
  */
 final readonly class MethodCallableCollector implements Collector
 {

diff --git a/src/Collectors/PublicClassLikeConstCollector.php b/src/Collectors/PublicClassLikeConstCollector.php
@@ -14,7 +14,7 @@
 use TomasVotruba\UnusedPublic\InternalDocStmtAnalyzer;
 
 /**
- * @implements Collector<ClassConst, array<array{class-string, string, int}>>
+ * @implements Collector<ClassConst, non-empty-array<array{class-string, string, int}>|null>
  */
 final readonly class PublicClassLikeConstCollector implements Collector
 {
@@ -32,12 +32,12 @@ public function getNodeType(): string
 
     /**
      * @param ClassConst $node
-     * @return array<array{class-string, string, int}>|null
+     * @return non-empty-array<array{class-string, string, int}>|null
      */
     public function processNode(Node $node, Scope $scope): ?array
     {
         if (! $this->configuration->isUnusedConstantsEnabled()) {
-            return [];
+            return null;
         }
 
         if (! $node->isPublic()) {
@@ -65,6 +65,10 @@ public function processNode(Node $node, Scope $scope): ?array
             ];
         }
 
+        if ([] === $constantNames) {
+            return null;
+        }
+
         return $constantNames;
     }
 }
diff --git a/src/Collectors/PublicPropertyCollector.php b/src/Collectors/PublicPropertyCollector.php
@@ -16,7 +16,7 @@
 use TomasVotruba\UnusedPublic\InternalDocStmtAnalyzer;
 
 /**
- * @implements Collector<InClassNode, array<array{class-string, string, int}>>
+ * @implements Collector<InClassNode, non-empty-array<array{class-string, string, int}>>
  */
 final readonly class PublicPropertyCollector implements Collector
 {
@@ -42,7 +42,7 @@ public function getNodeType(): string
 
     /**
      * @param InClassNode $node
-     * @return array<array{string, string, int}>|null
+     * @return non-empty-array<array{string, string, int}>|null
      */
     public function processNode(Node $node, Scope $scope): ?array
     {
@@ -83,6 +83,10 @@ public function processNode(Node $node, Scope $scope): ?array
             }
         }
 
+        if ($publicPropertyNames === []) {
+            return null;
+        }
+
         return $publicPropertyNames;
     }
 

diff --git a/src/Collectors/PublicPropertyFetchCollector.php b/src/Collectors/PublicPropertyFetchCollector.php
@@ -17,7 +17,7 @@
 use TomasVotruba\UnusedPublic\ValueObject\PropertyReference;
 
 /**
- * @implements Collector<PropertyFetch, string[]>
+ * @implements Collector<PropertyFetch, non-empty-array<string>|null>
  */
 final readonly class PublicPropertyFetchCollector implements Collector
 {
@@ -38,7 +38,7 @@ public function getNodeType(): string
 
     /**
      * @param PropertyFetch $node
-     * @return string[]|null
+     * @return non-empty-array<string>|null
      */
     public function processNode(Node $node, Scope $scope): ?array
     {
@@ -79,6 +79,10 @@ public function processNode(Node $node, Scope $scope): ?array
             $result = [...$result, (string) $propertyReference, ...$parentPropertyReferences];
         }
 
+        if ($result === []) {
+            return null;
+        }
+
         return $result;
     }
 }
diff --git a/src/Collectors/PublicStaticPropertyFetchCollector.php b/src/Collectors/PublicStaticPropertyFetchCollector.php
@@ -16,7 +16,7 @@
 use TomasVotruba\UnusedPublic\PropertyReference\ParentPropertyReferenceResolver;
 
 /**
- * @implements Collector<StaticPropertyFetch, string[]>
+ * @implements Collector<StaticPropertyFetch, non-empty-array<string>|null>
  */
 final readonly class PublicStaticPropertyFetchCollector implements Collector
 {
@@ -34,7 +34,7 @@ public function getNodeType(): string
 
     /**
      * @param StaticPropertyFetch $node
-     * @return string[]|null
+     * @return non-empty-array<string>|null
      */
     public function processNode(Node $node, Scope $scope): ?array
     {
@@ -81,6 +81,10 @@ public function processNode(Node $node, Scope $scope): ?array
             $result = [...$result, ...$propertyReferences, ...$parentPropertyReferences];
         }
 
+        if ($result === []) {
+            return null;
+        }
+
         return $result;
     }
 }
diff --git a/src/Collectors/StaticCall/StaticMethodCallCollector.php b/src/Collectors/StaticCall/StaticMethodCallCollector.php
@@ -16,7 +16,7 @@
 use TomasVotruba\UnusedPublic\ValueObject\MethodCallReference;
 
 /**
- * @implements Collector<StaticCall, array<string>|null>
+ * @implements Collector<StaticCall, non-empty-array<string>|null>
  */
 final readonly class StaticMethodCallCollector implements Collector
 {
@@ -33,7 +33,7 @@ public function getNodeType(): string
 
     /**
      * @param StaticCall $node
-     * @return string[]|null
+     * @return non-empty-array<string>|null
      */
     public function processNode(Node $node, Scope $scope): ?array
     {

diff --git a/src/Collectors/StaticCall/StaticMethodCallableCollector.php b/src/Collectors/StaticCall/StaticMethodCallableCollector.php
@@ -16,7 +16,7 @@
 use TomasVotruba\UnusedPublic\ValueObject\MethodCallReference;
 
 /**
- * @implements Collector<StaticMethodCallableNode, array<string>|null>
+ * @implements Collector<StaticMethodCallableNode, non-empty-array<string>|null>
  */
 final readonly class StaticMethodCallableCollector implements Collector
 {
@@ -33,7 +33,7 @@ public function getNodeType(): string
 
     /**
      * @param StaticMethodCallableNode $node
-     * @return string[]|null
+     * @return non-empty-array<string>|null
      */
     public function processNode(Node $node, Scope $scope): ?array
     {

diff --git a/src/Rules/UnusedPublicClassConstRule.php b/src/Rules/UnusedPublicClassConstRule.php
@@ -70,6 +70,10 @@ public function processNode(Node $node, Scope $scope): array
 
         foreach ($publicClassLikeConstCollector as $filePath => $declarationsGroups) {
             foreach ($declarationsGroups as $declarationGroup) {
+                if ($declarationGroup === null) {
+                    continue;
+                }
+
                 foreach ($declarationGroup as [$className, $constantName, $line, $isInternal]) {
                     if ($this->isClassConstantUsed(
                         $className,