Simplify constructor arguments of MongoLock

Author: GromNaN

src/Cache/MongoLock.php

@@ -16,20 +16,18 @@ final class MongoLock extends Lock
     /**
      * Create a new lock instance.
      *
-     * @param Collection  $collection              The MongoDB collection
-     * @param string      $name                    Name of the lock
-     * @param int         $seconds                 Time-to-live of the lock in seconds
-     * @param string|null $owner                   A unique string that identifies the owner. Random if not set
-     * @param array       $lottery                 The prune probability odds
-     * @param int         $defaultTimeoutInSeconds The default number of seconds that a lock should be held
+     * @param Collection  $collection The MongoDB collection
+     * @param string      $name       Name of the lock
+     * @param int         $seconds    Time-to-live of the lock in seconds
+     * @param string|null $owner      A unique string that identifies the owner. Random if not set
+     * @param array       $lottery    Probability [chance, total] of pruning expired cache items. Set to [0] to disable
      */
     public function __construct(
         private readonly Collection $collection,
         string $name,
         int $seconds,
         ?string $owner = null,
         private readonly array $lottery = [2, 100],
-        private readonly int $defaultTimeoutInSeconds = 86400,
     ) {
         parent::__construct($name, $seconds, $owner);
     }
@@ -62,7 +60,7 @@ public function acquire(): bool
                         'expiration' => [
                             '$cond' => [
                                 'if' => $isExpiredOrAlreadyOwned,
-                                'then' => $this->expiresAt(),
+                                'then' => $this->getUTCDateTime($this->seconds),
                                 'else' => '$expiration',
                             ],
                         ],
@@ -135,17 +133,7 @@ protected function getCurrentOwner(): ?string
         )['owner'] ?? null;
     }
 
-    /**
-     * Get the UNIX timestamp indicating when the lock should expire.
-     */
-    private function expiresAt(): UTCDateTime
-    {
-        $lockTimeout = $this->seconds > 0 ? $this->seconds : $this->defaultTimeoutInSeconds;
-
-        return $this->getUTCDateTime($lockTimeout);
-    }
-
-    protected function getUTCDateTime(int $additionalSeconds = 0): UTCDateTime
+    private function getUTCDateTime(int $additionalSeconds = 0): UTCDateTime
     {
         return new UTCDateTime(Carbon::now()->addSeconds($additionalSeconds));
     }

src/Cache/MongoStore.php

@@ -34,7 +34,7 @@ final class MongoStore implements LockProvider, Store
      * @param string          $prefix                      Prefix for the name of cache items
      * @param Connection|null $lockConnection              The MongoDB connection to use for the lock, if different from the cache connection
      * @param string          $lockCollectionName          Name of the collection where locks are stored
-     * @param array{int, int} $lockLottery                 Probability [chance, total] of pruning expired cache items
+     * @param array{int, int} $lockLottery                 Probability [chance, total] of pruning expired cache items. Set to [0] to disable
      * @param int             $defaultLockTimeoutInSeconds Time-to-live of the locks in seconds
      */
     public function __construct(
@@ -62,10 +62,9 @@ public function lock($name, $seconds = 0, $owner = null): MongoLock
         return new MongoLock(
             ($this->lockConnection ?? $this->connection)->getCollection($this->lockCollectionName),
             $this->prefix . $name,
-            $seconds,
+            $seconds ?: $this->defaultLockTimeoutInSeconds,
             $owner,
             $this->lockLottery,
-            $this->defaultLockTimeoutInSeconds,
         );
     }
 
@@ -307,7 +306,7 @@ private function unserialize($value): mixed
         return unserialize($value);
     }
 
-    protected function getUTCDateTime(int $additionalSeconds = 0): UTCDateTime
+    private function getUTCDateTime(int $additionalSeconds = 0): UTCDateTime
     {
         return new UTCDateTime(Carbon::now()->addSeconds($additionalSeconds));
     }