Cleanup

Author: danog

src/Psalm/Codebase.php

@@ -110,14 +110,6 @@
  */
 final class Codebase
 {
-    /**
-     * A map of fully-qualified use declarations to the files
-     * that reference them (keyed by filename)
-     *
-     * @var array<lowercase-string, array<string, CodeLocation>>
-     */
-    public array $use_referencing_locations = [];
-
     public FileStorageProvider $file_storage_provider;
 
     public ClassLikeStorageProvider $classlike_storage_provider;
@@ -784,13 +776,7 @@ public function findReferencesToProperty(string $property_id): array
     public function findReferencesToClassLike(string $fq_class_name): array
     {
         $fq_class_name_lc = strtolower($fq_class_name);
-        $locations = $this->code_use_graph?->getClassReferenceLocations($fq_class_name_lc) ?? [];
-
-        if (isset($this->use_referencing_locations[$fq_class_name_lc])) {
-            $locations = [...$locations, ...$this->use_referencing_locations[$fq_class_name_lc]];
-        }
-
-        return $locations;
+        return $this->code_use_graph?->getClassReferenceLocations($fq_class_name_lc) ?? [];
     }
 
     public function findReferencesToClassConstant(string $const_id): array

src/Psalm/Internal/Analyzer/CanAlias.php

@@ -51,6 +51,7 @@ trait CanAlias
 
     public function visitUse(PhpParser\Node\Stmt\Use_ $stmt): void
     {
+        /** @var Codebase $codebase */
         $codebase = $this->getCodebase();
 
         foreach ($stmt->uses as $use) {
@@ -75,11 +76,10 @@ public function visitUse(PhpParser\Node\Stmt\Use_ $stmt): void
                         (int) $use->getAttribute('endFilePos'),
                         $use_path,
                     );
-                    if ($codebase->collect_locations) {
-                        // register the path
-                        $loc = new CodeLocation($this, $use);
-                        $codebase->use_referencing_locations[$use_path_lc][$loc->getHash()] = $loc;
-                    }
+                    $codebase->addReferenceToClass(
+                        $use_path_lc,
+                        new CodeLocation($this, $use),
+                    );
 
                     if ($codebase->alter_code) {
                         if (isset($codebase->class_transforms[$use_path_lc])) {
@@ -127,11 +127,10 @@ public function visitGroupUse(PhpParser\Node\Stmt\GroupUse $stmt): void
                     break;
 
                 case PhpParser\Node\Stmt\Use_::TYPE_NORMAL:
-                    if ($codebase->collect_locations) {
-                        // register the path
-                        $loc = new CodeLocation($this, $use);
-                        $codebase->use_referencing_locations[strtolower($use_path)][$loc->getHash()] = $loc;
-                    }
+                    $codebase->addReferenceToClass(
+                        strtolower($use_path),
+                        new CodeLocation($this, $use),
+                    );
 
                     $this->aliased_classes[strtolower($use_alias)] = $use_path;
                     $this->aliased_classes_flipped[strtolower($use_path)] = $use_alias;