Add PHP 8.5 support

.github/workflows/test-unit.yml

@@ -64,7 +64,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php: ['8.2', '8.3', '8.4', '8.5']
         type: ['Phpunit', 'Phpunit Lowest']
         include:
           - php: 'latest'

composer.json

@@ -33,7 +33,7 @@
     ],
     "homepage": "https://github.com/malkusch/lock",
     "require": {
-        "php": ">=7.4 <8.5",
+        "php": ">=8.2 <8.6",
         "psr/log": "^1.0 || ^2.0 || ^3.0",
         "symfony/polyfill-php80": "^1.28"
     },
@@ -47,7 +47,6 @@
         "ext-pdo_sqlite": "*",
         "ext-redis": "*",
         "ext-sysvsem": "*",
-        "eloquent/liberator": "^2.0 || ^3.0",
         "ergebnis/composer-normalize": "^2.13",
         "ergebnis/phpunit-slow-test-detector": "^2.9",
         "friendsofphp/php-cs-fixer": "^3.0",
@@ -57,7 +56,7 @@
         "phpstan/phpstan": "^2.0",
         "phpstan/phpstan-deprecation-rules": "^2.0",
         "phpstan/phpstan-strict-rules": "^2.0",
-        "phpunit/phpunit": "^9.5.25 || ^10.0 || ^11.0",
+        "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0",
         "predis/predis": "^1.1.8 || ^2.0",
         "spatie/async": "^1.5"
     },

src/Mutex/DistributedMutex.php

@@ -57,7 +57,13 @@ protected function acquireWithToken(string $key, float $expireTimeout)
         $exception = null;
         foreach ($this->getMutexesInRandomOrder() as $index => $mutex) {
             try {
-                if ($this->acquireMutex($mutex, $key, $acquireTimeout - (microtime(true) - $startTs), $expireTimeout)) {
+                $remainingTimeout = $acquireTimeout - (microtime(true) - $startTs);
+                // Prevent INF/NAN from being passed to acquireMutex
+                if (is_infinite($remainingTimeout) || is_nan($remainingTimeout) || $remainingTimeout < 0) {
+                    $remainingTimeout = 0.0;
+                }
+
+                if ($this->acquireMutex($mutex, $key, $remainingTimeout, $expireTimeout)) {
                     $acquiredIndexes[] = $index;
                 }
             } catch (LockAcquireException $exception) {

src/Util/LockUtil.php

@@ -71,11 +71,21 @@ public function castFloatToInt(float $value): int
      */
     public function formatTimeout(float $value): string
     {
+       // Handle NaN explicitly (normalize to a safe numeric string)
+        if (\is_nan($value)) {
+            return '0.0';
+        }
+
+        // Handle infinities explicitly
+        if (!\is_finite($value)) {
+            return $value > 0 ? 'INF' : '-INF';
+        }
+
         $res = (string) round($value, 6);
-        if (\is_finite($value) && strpos($res, '.') === false) {
+        if (strpos($res, '.') === false) {
             $res .= '.0';
         }
-
+        
         return $res;
     }
 }

tests/Mutex/FlockMutexTest.php

@@ -4,10 +4,11 @@
 
 namespace Malkusch\Lock\Tests\Mutex;
 
-use Eloquent\Liberator\Liberator;
+require_once __DIR__ . '/../TestAccess.php';
 use Malkusch\Lock\Exception\DeadlineException;
 use Malkusch\Lock\Exception\LockAcquireTimeoutException;
 use Malkusch\Lock\Mutex\FlockMutex;
+use Malkusch\Lock\Tests\TestAccess;
 use Malkusch\Lock\Util\LockUtil;
 use Malkusch\Lock\Util\PcntlTimeout;
 use PHPUnit\Framework\Attributes\DataProvider;
@@ -28,7 +29,7 @@ protected function setUp(): void
 
         $this->file = LockUtil::getInstance()->makeRandomTemporaryFilePath('flock');
         touch($this->file);
-        $this->mutex = Liberator::liberate(new FlockMutex(fopen($this->file, 'r'), 1)); // @phpstan-ignore assign.propertyType
+        $this->mutex = new FlockMutex(fopen($this->file, 'r'), 1);
     }
 
     #[\Override]
@@ -47,7 +48,7 @@ protected function tearDown(): void
     #[DataProvider('provideTimeoutableStrategiesCases')]
     public function testCodeExecutedOutsideLockIsNotThrown(string $strategy): void
     {
-        $this->mutex->strategy = $strategy; // @phpstan-ignore property.private
+        (new TestAccess($this->mutex))->setProperty('strategy', $strategy);
 
         self::assertTrue($this->mutex->synchronized(static function () { // @phpstan-ignore staticMethod.alreadyNarrowedType
             usleep(1100 * 1000);

tests/Mutex/MutexConcurrencyTest.php

@@ -4,7 +4,7 @@
 
 namespace Malkusch\Lock\Tests\Mutex;
 
-use Eloquent\Liberator\Liberator;
+require_once __DIR__ . '/../TestAccess.php';
 use Malkusch\Lock\Mutex\DistributedMutex;
 use Malkusch\Lock\Mutex\FlockMutex;
 use Malkusch\Lock\Mutex\MemcachedMutex;
@@ -163,19 +163,19 @@
         if (extension_loaded('pcntl')) {
             yield 'flockWithTimoutPcntl' => [static function ($timeout) use ($filename) {
                 $file = fopen($filename, 'w');
-                $lock = Liberator::liberate(new FlockMutex($file, $timeout));
-                $lock->strategy = \Closure::bind(static fn () => FlockMutex::STRATEGY_PCNTL, null, FlockMutex::class)(); // @phpstan-ignore property.notFound
+                $lock = new FlockMutex($file, $timeout);
+                (new \Malkusch\Lock\Tests\TestAccess($lock))->setProperty('strategy', \Closure::bind(static fn () => FlockMutex::STRATEGY_PCNTL, null, FlockMutex::class)());
 
                 return $lock->popsValue();
             }];
         }
 
         yield 'flockWithTimoutLoop' => [static function ($timeout) use ($filename) {
             $file = fopen($filename, 'w');
-            $lock = Liberator::liberate(new FlockMutex($file, $timeout));
-            $lock->strategy = \Closure::bind(static fn () => FlockMutex::STRATEGY_LOOP, null, FlockMutex::class)(); // @phpstan-ignore property.notFound
+            $lock = new FlockMutex($file, $timeout);
+            (new \Malkusch\Lock\Tests\TestAccess($lock))->setProperty('strategy', \Closure::bind(static fn () => FlockMutex::STRATEGY_LOOP, null, FlockMutex::class)());
 
             return $lock->popsValue();
         }];
 
         if (extension_loaded('sysvsem')) {
@@ -185,7 +185,7 @@
                     $semaphore,
                     self::logicalOr(
                         self::isInstanceOf(\SysvSemaphore::class),
                         new IsType(IsType::TYPE_RESOURCE)
                     )
                 );
 

tests/Mutex/MutexTest.php

@@ -4,7 +4,7 @@
 
 namespace Malkusch\Lock\Tests\Mutex;
 
-use Eloquent\Liberator\Liberator;
+require_once __DIR__ . '/../TestAccess.php';
 use Malkusch\Lock\Mutex\AbstractLockMutex;
 use Malkusch\Lock\Mutex\AbstractSpinlockMutex;
 use Malkusch\Lock\Mutex\DistributedMutex;
@@ -114,17 +114,17 @@ public static function provideMutexFactoriesCases(): iterable
         if (extension_loaded('pcntl')) {
             yield 'flockWithTimoutPcntl' => [static function () {
                 $file = fopen(vfsStream::url('test/lock'), 'w');
-                $lock = Liberator::liberate(new FlockMutex($file, 3));
-                $lock->strategy = \Closure::bind(static fn () => FlockMutex::STRATEGY_PCNTL, null, FlockMutex::class)(); // @phpstan-ignore property.notFound
+                $lock = new FlockMutex($file, 3);
+                (new \Malkusch\Lock\Tests\TestAccess($lock))->setProperty('strategy', \Closure::bind(static fn () => FlockMutex::STRATEGY_PCNTL, null, FlockMutex::class)());
 
                 return $lock->popsValue();
             }];
         }
 
         yield 'flockWithTimoutLoop' => [static function () {
             $file = fopen(vfsStream::url('test/lock'), 'w');
-            $lock = Liberator::liberate(new FlockMutex($file, 3));
-            $lock->strategy = \Closure::bind(static fn () => FlockMutex::STRATEGY_LOOP, null, FlockMutex::class)(); // @phpstan-ignore property.notFound
+            $lock = new FlockMutex($file, 3);
+            (new \Malkusch\Lock\Tests\TestAccess($lock))->setProperty('strategy', \Closure::bind(static fn () => FlockMutex::STRATEGY_LOOP, null, FlockMutex::class)());
 
             return $lock->popsValue();
         }];

tests/Mutex/PostgreSQLMutexTest.php

@@ -4,7 +4,7 @@
 
 namespace Malkusch\Lock\Tests\Mutex;
 
-use Eloquent\Liberator\Liberator;
+use Malkusch\Lock\Tests\TestAccess;
 use Malkusch\Lock\Exception\LockAcquireTimeoutException;
 use Malkusch\Lock\Mutex\PostgreSQLMutex;
 use PHPUnit\Framework\Constraint\IsType;
@@ -26,7 +26,8 @@ protected function setUp(): void
 
         $this->pdo = $this->createMock(\PDO::class);
 
-        $this->mutex = Liberator::liberate(new PostgreSQLMutex($this->pdo, 'test-one-negative-key')); // @phpstan-ignore assign.propertyType
+        $this->mutex = new PostgreSQLMutex($this->pdo, 'test-one-negative-key');
+        $this->mutex = new TestAccess($this->mutex); // @phpstan-ignore assign.propertyType
     }
 
     private function isPhpunit9x(): bool

tests/TestAccess.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace Malkusch\Lock\Tests;
+
+/**
+ * TestAccess - Helper for accessing private/protected properties and methods in tests.
+ */
+class TestAccess
+{
+    private $object;
+
+    public function __construct($object)
+    {
+        $this->object = $object;
+    }
+
+    public function getProperty($property)
+    {
+        $ref = new \ReflectionProperty($this->object, $property);
+        if (\PHP_VERSION_ID < 80100) {
+            $ref->setAccessible(true);
+        }
+
+        return $ref->getValue($this->object);
+    }
+
+    public function setProperty($property, $value)
+    {
+        $ref = new \ReflectionProperty($this->object, $property);
+        if (\PHP_VERSION_ID < 80100) {
+            $ref->setAccessible(true);
+        }
+        $ref->setValue($this->object, $value);
+    }
+
+    public function callMethod($method, ...$args)
+    {
+        $ref = new \ReflectionMethod($this->object, $method);
+        if (\PHP_VERSION_ID < 80100) {
+            $ref->setAccessible(true);
+        }
+
+        return $ref->invokeArgs($this->object, $args);
+    }
+}