Merge branch '5.4' into 6.0

* 5.4:
  [Lock] Release DoctrineDbalPostgreSqlStore connection lock on failure
  [DependencyInjection][HttpKernel] Fix enum typed bindings
  make login link handler tests time sensitive
  [CI] Remove macOS jobs
  Suppress psalm error for UndefinedDocblockClass for PHP 8.1 classes

Author: nicolas-grekas

Store/DoctrineDbalPostgreSqlStore.php

@@ -58,18 +58,28 @@ public function save(Key $key)
         // prevent concurrency within the same connection
         $this->getInternalStore()->save($key);
 
-        $sql = 'SELECT pg_try_advisory_lock(:key)';
-        $result = $this->conn->executeQuery($sql, [
-            'key' => $this->getHashedKey($key),
-        ]);
+        $lockAcquired = false;
 
-        // Check if lock is acquired
-        if (true === $result->fetchOne()) {
-            $key->markUnserializable();
-            // release sharedLock in case of promotion
-            $this->unlockShared($key);
+        try {
+            $sql = 'SELECT pg_try_advisory_lock(:key)';
+            $result = $this->conn->executeQuery($sql, [
+                'key' => $this->getHashedKey($key),
+            ]);
 
-            return;
+            // Check if lock is acquired
+            if (true === $result->fetchOne()) {
+                $key->markUnserializable();
+                // release sharedLock in case of promotion
+                $this->unlockShared($key);
+
+                $lockAcquired = true;
+
+                return;
+            }
+        } finally {
+            if (!$lockAcquired) {
+                $this->getInternalStore()->delete($key);
+            }
         }
 
         throw new LockConflictedException();
@@ -80,18 +90,28 @@ public function saveRead(Key $key)
         // prevent concurrency within the same connection
         $this->getInternalStore()->saveRead($key);
 
-        $sql = 'SELECT pg_try_advisory_lock_shared(:key)';
-        $result = $this->conn->executeQuery($sql, [
-            'key' => $this->getHashedKey($key),
-        ]);
+        $lockAcquired = false;
+
+        try {
+            $sql = 'SELECT pg_try_advisory_lock_shared(:key)';
+            $result = $this->conn->executeQuery($sql, [
+                'key' => $this->getHashedKey($key),
+            ]);
 
-        // Check if lock is acquired
-        if (true === $result->fetchOne()) {
-            $key->markUnserializable();
-            // release lock in case of demotion
-            $this->unlock($key);
+            // Check if lock is acquired
+            if (true === $result->fetchOne()) {
+                $key->markUnserializable();
+                // release lock in case of demotion
+                $this->unlock($key);
 
-            return;
+                $lockAcquired = true;
+
+                return;
+            }
+        } finally {
+            if (!$lockAcquired) {
+                $this->getInternalStore()->delete($key);
+            }
         }
 
         throw new LockConflictedException();

Tests/Store/DoctrineDbalPostgreSqlStoreTest.php

@@ -13,6 +13,7 @@
 
 use Doctrine\DBAL\DriverManager;
 use Symfony\Component\Lock\Exception\InvalidArgumentException;
+use Symfony\Component\Lock\Exception\LockConflictedException;
 use Symfony\Component\Lock\Key;
 use Symfony\Component\Lock\PersistingStoreInterface;
 use Symfony\Component\Lock\Store\DoctrineDbalPostgreSqlStore;
@@ -59,4 +60,30 @@ public function getInvalidDrivers()
         yield ['sqlite:///tmp/foo.db'];
         yield [DriverManager::getConnection(['url' => 'sqlite:///tmp/foo.db'])];
     }
+
+    public function testSaveAfterConflict()
+    {
+        $store1 = $this->getStore();
+        $store2 = $this->getStore();
+
+        $key = new Key(uniqid(__METHOD__, true));
+
+        $store1->save($key);
+        $this->assertTrue($store1->exists($key));
+
+        $lockConflicted = false;
+        try {
+            $store2->save($key);
+        } catch (LockConflictedException $lockConflictedException) {
+            $lockConflicted = true;
+        }
+
+        $this->assertTrue($lockConflicted);
+        $this->assertFalse($store2->exists($key));
+
+        $store1->delete($key);
+
+        $store2->save($key);
+        $this->assertTrue($store2->exists($key));
+    }
 }