minor #59371 [Lock] Use a WeakMap as store registry (rosier)

nicolas-grekas · nicolas-grekas · commit 137fe02a74d8 · 2025-01-06T15:45:24.000+01:00
This PR was merged into the 7.3 branch. Discussion ---------- [Lock] Use a WeakMap as store registry | Q | A | ------------- | --- | Branch? | 7.3 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | - | License | MIT As suggested here #59355 (comment) Commits ------- ba1c9e3 Use a WeakMap as store registry
diff --git a/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php b/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php
@@ -33,7 +33,6 @@
 class DoctrineDbalPostgreSqlStore implements BlockingSharedLockStoreInterface, BlockingStoreInterface
 {
     private Connection $conn;
-    private static array $storeRegistry = [];
 
     /**
      * You can either pass an existing database connection a Doctrine DBAL Connection
@@ -278,8 +277,8 @@ private function filterDsn(#[\SensitiveParameter] string $dsn): string
 
     private function getInternalStore(): SharedLockStoreInterface
     {
-        $namespace = spl_object_hash($this->conn);
+        static $storeRegistry = new \WeakMap();
 
-        return self::$storeRegistry[$namespace] ??= new InMemoryStore();
+        return $storeRegistry[$this->conn] ??= new InMemoryStore();
     }
 }
diff --git a/src/Symfony/Component/Lock/Store/PostgreSqlStore.php b/src/Symfony/Component/Lock/Store/PostgreSqlStore.php
@@ -31,7 +31,6 @@ class PostgreSqlStore implements BlockingSharedLockStoreInterface, BlockingStore
     private ?string $username = null;
     private ?string $password = null;
     private array $connectionOptions = [];
-    private static array $storeRegistry = [];
 
     /**
      * You can either pass an existing database connection as PDO instance or
@@ -283,8 +282,8 @@ private function checkDriver(): void
 
     private function getInternalStore(): SharedLockStoreInterface
     {
-        $namespace = spl_object_hash($this->getConnection());
+        static $storeRegistry = new \WeakMap();
 
-        return self::$storeRegistry[$namespace] ??= new InMemoryStore();
+        return $storeRegistry[$this->getConnection()] ??= new InMemoryStore();
     }
 }
