[Lock] Various fixes and hardenings

symfony · nicolas-grekas · May 19, 2026 · May 15, 2026 · May 19, 2026 · b6450a78a4085267558f2b9538d55ec019fdc882
commit b6450a78a4085267558f2b9538d55ec019fdc882
@@ -33,6 +33,10 @@ public static function isSupported(): bool
        return \extension_loaded('sysvsem');
    }

+    /**
+     * @param string $projectId A scoping prefix folded into the System V key derivation to isolate one
+     *                          application's semaphore namespace from another's running on the same host
+     */
    public function __construct(
        private readonly string $projectId = '',
    ) {

@@ -68,7 +68,7 @@ public static function createStore(#[\SensitiveParameter] object|string $connect
                return new SemaphoreStore();

            case str_starts_with($connection, 'semaphore://'):
-                return new SemaphoreStore(substr($connection, 12));
+                return new SemaphoreStore(rawurldecode(substr($connection, 12)));

            case str_starts_with($connection, 'dynamodb://'):
                self::requireBridgeClass(DynamoDbStore::class, 'symfony/amazon-dynamo-db-lock');

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Lock\Tests\Store;

 use PHPUnit\Framework\Attributes\RequiresPhpExtension;
+use Symfony\Component\Lock\Exception\LockConflictedException;
 use Symfony\Component\Lock\Key;
 use Symfony\Component\Lock\PersistingStoreInterface;
 use Symfony\Component\Lock\Store\SemaphoreStore;
@@ -46,6 +47,7 @@ public function testResourceRemoval()

    public function testProjectIdSeparatesLocks()
    {
+        $initialCount = $this->getOpenedSemaphores();
        $keyName = __METHOD__;
        $storeA = new SemaphoreStore('project-a');
        $storeB = new SemaphoreStore('project-b');
@@ -56,10 +58,30 @@ public function testProjectIdSeparatesLocks()
        $storeA->save($keyA);
        $storeB->save($keyB);

+        $this->assertSame($initialCount + 2, $this->getOpenedSemaphores(), 'Two distinct semaphores should be opened for the same key under different project IDs');
+
        $storeA->delete($keyA);
        $storeB->delete($keyB);
+    }
+
+    public function testSameProjectIdCollidesOnSameKey()
+    {
+        $keyName = __METHOD__;
+        $storeA = new SemaphoreStore('shared-project');
+        $storeB = new SemaphoreStore('shared-project');

-        $this->addToAssertionCount(1);
+        $keyA = new Key($keyName);
+        $keyB = new Key($keyName);
+
+        $storeA->save($keyA);
+
+        try {
+            $this->expectException(LockConflictedException::class);
+            $storeB->save($keyB);
+        } finally {
+            $storeA->delete($keyA);
+            $storeB->delete($keyB);
+        }
    }

    private function getOpenedSemaphores()

@@ -14,6 +14,7 @@
 use AsyncAws\DynamoDb\DynamoDbClient;
 use Doctrine\DBAL\Connection;
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Cache\Adapter\AbstractAdapter;
 use Symfony\Component\Cache\Adapter\MemcachedAdapter;
@@ -43,6 +44,15 @@ public function testCreateStore($connection, string $expectedStoreClass)
        $this->assertInstanceOf($expectedStoreClass, $store);
    }

+    #[RequiresPhpExtension('sysvsem')]
+    public function testCreateSemaphoreStoreDecodesProjectId()
+    {
+        $store = StoreFactory::createStore('semaphore://my%20project%2Fid');
+
+        $this->assertInstanceOf(SemaphoreStore::class, $store);
+        $this->assertSame('my project/id', (new \ReflectionProperty(SemaphoreStore::class, 'projectId'))->getValue($store));
+    }
+
    public static function validConnections(): \Generator
    {
        if (class_exists(\Redis::class)) {