Switch to \random_int(). Fixes #7 #9 #10

Author: willemstuursma

classes/mutex/PHPRedisMutex.php

@@ -12,9 +12,6 @@
  *
  * This implementation requires at least phpredis-2.2.4.
  *
- * Note: If you're going to use this mutex in a forked process, you have to call
- * {@link seedRandom()} in each instance.
- *
  * @author Markus Malkusch <[email protected]>
  * @license WTFPL
  *

classes/mutex/PredisMutex.php

@@ -10,9 +10,6 @@
 /**
  * Mutex based on the Redlock algorithm using the Predis API.
  *
- * Note: If you're going to use this mutex in a forked process, you have to call
- * {@link seedRandom()} in each instance.
- *
  * @author Markus Malkusch <[email protected]>
  * @license WTFPL
  *

classes/mutex/RedisMutex.php

@@ -11,9 +11,6 @@
 /**
  * Mutex based on the Redlock algorithm.
  *
- * Note: If you're going to use this mutex in a forked process, you have to call
- * {@link seedRandom()} in each instance.
- *
  * @author Markus Malkusch <[email protected]>
  * @license WTFPL
  *
@@ -53,7 +50,6 @@ public function __construct(array $redisAPIs, $name, $timeout = 3)
 
         $this->redisAPIs = $redisAPIs;
         $this->logger    = new NullLogger();
-        $this->seedRandom();
     }
 
     /**
@@ -71,21 +67,6 @@ public function setLogger(LoggerInterface $logger)
         $this->logger = $logger;
     }
 
-    /**
-     * Seeds the random number generator.
-     *
-     * Normally you don't need to seed, as this happens automatically. But
-     * if you experience a {@link LockReleaseException} this might come
-     * from identically created random tokens. In this case you could seed
-     * from /dev/urandom.
-     *
-     * @param int|null $seed The optional seed.
-     */
-    public function seedRandom($seed = null)
-    {
-        is_null($seed) ? srand() : srand($seed);
-    }
-    
     /**
      * @SuppressWarnings(PHPMD)
      * @internal
@@ -98,7 +79,7 @@ protected function acquire($key, $expire)
         // 2.
         $acquired = 0;
         $errored  = 0;
-        $this->token = rand();
+        $this->token = \random_int(0, 2147483647);
         $exception   = null;
         foreach ($this->redisAPIs as $redis) {
             try {

classes/util/Loop.php

@@ -77,7 +77,7 @@ public function execute(callable $code)
             }
             $min    = $minWait * pow(2, $i);
             $max    = $min * 2;
-            $usleep = rand($min, $max);
+            $usleep = \random_int($min, $max);
 
             usleep($usleep);
         }

composer.json

@@ -18,7 +18,8 @@
     },
     "require": {
         "php": ">=5.6",
-        "psr/log": "^1"
+        "psr/log": "^1",
+        "paragonie/random_compat": "^1|^2"
     },
     "require-dev": {
         "phpunit/phpunit": "^5",

tests/mutex/RedisMutexTest.php

@@ -36,45 +36,8 @@ protected function setUp()
         $this->registerForTearDown($sleep);
     }
 
-
-    /**
-     * Tests seeding produces different tokens for each process.
-     *
-     * @test
-     */
-    public function testSeedRandom()
-    {
-        $mutex = $this->buildRedisMutex(1);
-        $mutex->seedRandom();
-
-        $tokens = [];
-        $processManager = new ProcessManager();
-        for ($i = 0; $i < 2; $i++) {
-            $processManager->fork(function () {
-                $mutex = $this->buildRedisMutex(1);
-                $mutex->expects($this->any())->method("evalScript")->willReturn(true);
-
-                $token = null;
-                $mutex->expects($this->any())->method("add")->willReturnCallback(
-                    function ($redisAPI, $key, $value, $expire) use (&$token) {
-                        $token = "$value";
-                        return true;
-                    }
-                );
-                
-                $mutex->synchronized(function () {
-                });
-
-                return $token;
-            })->then(function (Fork $fork) use (&$tokens) {
-                $this->assertArrayNotHasKey($fork->getResult(), $tokens);
-                $tokens[$fork->getResult()] = $fork->getResult();
-            });
-        }
-    }
-    
     /**
-     * Builds a testaböe RedisMutex mock.
+     * Builds a testable RedisMutex mock.
      *
      * @param int $count The amount of redis apis.
      * @param int $timeout The timeout.