Switch to spatie/async for testing concurrency

Author: Willem Stuursma

composer.json

@@ -53,14 +53,14 @@
         "ext-pdo_sqlite": "*",
         "ext-sysvsem": "*",
         "eloquent/liberator": "^2.0",
+        "friendsofphp/php-cs-fixer": "^2.16",
         "johnkary/phpunit-speedtrap": "^3.0",
-        "kriswallsmith/spork": "^0.3",
         "mikey179/vfsstream": "^1.6",
         "php-mock/php-mock-phpunit": "^2.1",
         "phpunit/phpunit": "^9.4",
         "predis/predis": "^1.1",
-        "squizlabs/php_codesniffer": "^3.3",
-        "symfony/event-dispatcher": "^2.8"
+        "spatie/async": "^1.5",
+        "squizlabs/php_codesniffer": "^3.3"
     },
     "suggest": {
         "ext-igbinary": "To use this library with PHP Redis igbinary serializer enabled.",

tests/mutex/LockMutexTest.php

@@ -34,7 +34,7 @@ protected function setUp(): void
     public function testLockFails()
     {
         $this->expectException(LockAcquireException::class);
-        
+
         $this->mutex->expects($this->once())
             ->method('lock')
             ->willThrowException(new LockAcquireException());

tests/mutex/MutexConcurrencyTest.php

@@ -6,7 +6,7 @@
 use PHPUnit\Framework\TestCase;
 use Predis\Client;
 use Redis;
-use Spork\ProcessManager;
+use Spatie\Async\Pool;
 
 /**
  * Concurrency Tests for Mutex.
@@ -69,16 +69,15 @@ private function getPDO(string $dsn, string $user): \PDO
      * @param int $concurrency The amount of forks.
      * @param callable $code The code for the fork.
      */
-    private function fork($concurrency, callable $code)
+    private function fork(int $concurrency, callable $code)
     {
-        $manager = new ProcessManager();
-        $manager->setDebug(true);
+        $pool = Pool::create();
 
         for ($i = 0; $i < $concurrency; $i++) {
-            $manager->fork($code);
+            $pool[] = async($code);
         }
 
-        $manager->check();
+        await($pool);
     }
 
     /**
@@ -92,8 +91,8 @@ private function fork($concurrency, callable $code)
      */
     public function testHighContention(callable $code, callable $mutexFactory)
     {
-        $concurrency = 2;
-        $iterations = 20000 / $concurrency;
+        $concurrency = 10;
+        $iterations = 1000 / $concurrency;
         $timeout = $concurrency * 20;
 
         $this->fork($concurrency, function () use ($mutexFactory, $timeout, $iterations, $code): void {
@@ -112,31 +111,25 @@ public function testHighContention(callable $code, callable $mutexFactory)
 
     /**
      * Returns test cases for testHighContention().
-     *
-     * @return array The test cases.
      */
-    public function provideTestHighContention()
+    public function provideTestHighContention(): array
     {
         $cases = array_map(function (array $mutexFactory) {
-            $file = tmpfile();
-            $this->assertEquals(4, fwrite($file, pack('i', 0)), 'Expected 4 bytes to be written to temporary file.');
+            $filename = tempnam(sys_get_temp_dir(), 'php-lock');
+
+            file_put_contents($filename, pack('i', 0));
 
             return [
-                function (int $increment) use ($file): int {
-                    rewind($file);
-                    flock($file, LOCK_EX);
-                    $data = fread($file, 4);
+                function (int $increment) use ($filename): int {
+                    $data = file_get_contents($filename);
 
                     $this->assertEquals(4, strlen($data), 'Expected four bytes to be present in temporary file.');
 
                     $counter = unpack('i', $data)[1];
 
                     $counter += $increment;
 
-                    rewind($file);
-                    fwrite($file, pack('i', $counter));
-
-                    flock($file, LOCK_UN);
+                    file_put_contents($filename, pack('i', $counter));
 
                     return $counter;
                 },