Leave only *Handler API

Author: antonkomarev

src/Postgres/LockHandle/SessionLevelLockHandle.php

@@ -58,13 +58,4 @@ public function release(): bool
 
         return $wasReleased;
     }
-
-    /**
-     * Automatically release the lock when the handle is destroyed.
-     */
-    public function __destruct()
-    {
-        // TODO: Do we need to
-        $this->release();
-    }
 }

src/Postgres/LockHandle/TransactionLevelLockHandle.php

@@ -17,7 +17,6 @@
 use Cog\DbLocker\Postgres\Enum\PostgresLockLevelEnum;
 use Cog\DbLocker\Postgres\Enum\PostgresLockWaitModeEnum;
 use Cog\DbLocker\Postgres\LockHandle\SessionLevelLockHandle;
-use Cog\DbLocker\Postgres\LockHandle\TransactionLevelLockHandle;
 use LogicException;
 use PDO;
 
@@ -31,31 +30,19 @@ public function acquireTransactionLevelLock(
         PostgresLockKey $key,
         PostgresLockWaitModeEnum $waitMode = PostgresLockWaitModeEnum::NonBlocking,
         PostgresLockAccessModeEnum $accessMode = PostgresLockAccessModeEnum::Exclusive,
-    ): TransactionLevelLockHandle {
-        return new TransactionLevelLockHandle(
-            wasAcquired: $this->acquireLock(
-                $dbConnection,
-                $key,
-                PostgresLockLevelEnum::Transaction,
-                $waitMode,
-                $accessMode,
-            ),
+    ): bool {
+        return $this->acquireLock(
+            $dbConnection,
+            $key,
+            PostgresLockLevelEnum::Transaction,
+            $waitMode,
+            $accessMode,
         );
     }
 
     /**
      * Acquire a session-level advisory lock with configurable wait and access modes.
      *
-     * ⚠️ You MUST retain the returned handle in a variable.
-     * If the handle is not stored and is immediately garbage collected,
-     * the lock will be released in the lock handle __destruct method.
-     * @see SessionLevelLockHandle::__destruct
-     *
-     * @example
-     * $handle = $locker->acquireSessionLevelLock(...); // ✅ Lock held
-     *
-     * $locker->acquireSessionLevelLock(...); // ❌ Lock immediately released
-     *
      * ⚠️ Transaction-level advisory locks are strongly preferred whenever possible,
      * as they are automatically released at the end of a transaction and are less error-prone.
      * Use session-level locks only when transactional context is not available.
@@ -94,7 +81,6 @@ public function acquireSessionLevelLock(
      * ⚠️ Transaction-level advisory locks are strongly preferred whenever possible,
      * as they are automatically released at the end of a transaction and are less error-prone.
      * Use session-level locks only when transactional context is not available.
-     * @see acquireTransactionLevelLock() for preferred locking strategy.
      *
      * @param PDO $dbConnection Active database connection.
      * @param PostgresLockKey $key Lock key to be acquired.
@@ -106,6 +92,8 @@ public function acquireSessionLevelLock(
      * @template TReturn
      *
      * TODO: Cover with tests
+     * @see acquireTransactionLevelLock() for preferred locking strategy.
+     *
      */
     public function withinSessionLevelLock(
         PDO $dbConnection,

src/Postgres/PostgresAdvisoryLocker.php

@@ -71,7 +71,7 @@ public function testItCanTryAcquireLockWithinTransaction(
             accessMode: $accessMode,
         );
 
-        $this->assertTrue($isLockAcquired->wasAcquired);
+        $this->assertTrue($isLockAcquired);
         $this->assertPgAdvisoryLocksCount(1);
         $this->assertPgAdvisoryLockExistsInConnection($dbConnection, $lockKey, $accessMode);
     }
@@ -177,8 +177,7 @@ public function testItCannotAcquireSameLockInTwoConnections(): void
         $dbConnection1 = $this->initPostgresPdoConnection();
         $dbConnection2 = $this->initPostgresPdoConnection();
         $lockKey = PostgresLockKey::create('test');
-        // TODO: Fix corner-case: without variable its self-destructing instantly
-        $connection1Lock = $locker->acquireSessionLevelLock(
+        $locker->acquireSessionLevelLock(
             $dbConnection1,
             $lockKey,
         );
@@ -200,7 +199,7 @@ public function testItCanReleaseLock(
         $locker = $this->initLocker();
         $dbConnection = $this->initPostgresPdoConnection();
         $lockKey = PostgresLockKey::create('test');
-        $connectionLock = $locker->acquireSessionLevelLock(
+        $locker->acquireSessionLevelLock(
             $dbConnection,
             $lockKey,
             accessMode: $accessMode,
@@ -236,7 +235,7 @@ public function testItCanNotReleaseLockOfDifferentModes(
         $locker = $this->initLocker();
         $dbConnection = $this->initPostgresPdoConnection();
         $lockKey = PostgresLockKey::create('test');
-        $connectionLock = $locker->acquireSessionLevelLock(
+        $locker->acquireSessionLevelLock(
             $dbConnection,
             $lockKey,
             accessMode: $acquireMode,
@@ -272,11 +271,11 @@ public function testItCanReleaseLockTwiceIfAcquiredTwice(): void
         $locker = $this->initLocker();
         $dbConnection = $this->initPostgresPdoConnection();
         $lockKey = PostgresLockKey::create('test');
-        $connectionLock1 = $locker->acquireSessionLevelLock(
+        $locker->acquireSessionLevelLock(
             $dbConnection,
             $lockKey,
         );
-        $connectionLock2 = $locker->acquireSessionLevelLock(
+        $locker->acquireSessionLevelLock(
             $dbConnection,
             $lockKey,
         );
@@ -320,11 +319,11 @@ public function testItCannotAcquireLockInSecondConnectionAfterOneReleaseTwiceLoc
         $dbConnection1 = $this->initPostgresPdoConnection();
         $dbConnection2 = $this->initPostgresPdoConnection();
         $lockKey = PostgresLockKey::create('test');
-        $connection1Lock1 = $locker->acquireSessionLevelLock(
+        $locker->acquireSessionLevelLock(
             $dbConnection1,
             $lockKey,
         );
-        $connection1Lock2 = $locker->acquireSessionLevelLock(
+        $locker->acquireSessionLevelLock(
             $dbConnection1,
             $lockKey,
         );
@@ -360,7 +359,7 @@ public function testItCannotReleaseLockIfAcquiredInOtherConnection(): void
         $dbConnection1 = $this->initPostgresPdoConnection();
         $dbConnection2 = $this->initPostgresPdoConnection();
         $lockKey = PostgresLockKey::create('test');
-        $connection1Lock = $locker->acquireSessionLevelLock(
+        $locker->acquireSessionLevelLock(
             $dbConnection1,
             $lockKey,
         );
@@ -413,19 +412,19 @@ public function testItCanReleaseAllLocksInConnectionButKeepsOtherConnectionLocks
         $lockKey2 = PostgresLockKey::create('test2');
         $lockKey3 = PostgresLockKey::create('test3');
         $lockKey4 = PostgresLockKey::create('test4');
-        $connect1Lock1 = $locker->acquireSessionLevelLock(
+        $locker->acquireSessionLevelLock(
             $dbConnection1,
             $lockKey1,
         );
-        $connect1Lock2 = $locker->acquireSessionLevelLock(
+        $locker->acquireSessionLevelLock(
             $dbConnection1,
             $lockKey2,
         );
-        $connect2Lock3 = $locker->acquireSessionLevelLock(
+        $locker->acquireSessionLevelLock(
             $dbConnection2,
             $lockKey3,
         );
-        $connect2Lock4 = $locker->acquireSessionLevelLock(
+        $locker->acquireSessionLevelLock(
             $dbConnection2,
             $lockKey4,
         );
@@ -461,7 +460,7 @@ public function testItCannotAcquireLockInSecondConnectionIfTakenWithinTransactio
         $dbConnection2 = $this->initPostgresPdoConnection();
         $lockKey = PostgresLockKey::create('test');
         $dbConnection1->beginTransaction();
-        $connection1Lock = $locker->acquireSessionLevelLock(
+        $locker->acquireSessionLevelLock(
             $dbConnection1,
             $lockKey,
         );