Replace more docblocks by type-hints

Author: nicolas-grekas

Key.php

@@ -22,9 +22,6 @@ final class Key
     private $expiringTime;
     private $state = array();
 
-    /**
-     * @param string $resource
-     */
     public function __construct(string $resource)
     {
         $this->resource = $resource;

Lock.php

@@ -41,12 +41,12 @@ final class Lock implements LockInterface, LoggerAwareInterface
      * @param float|null     $ttl         Maximum expected lock duration in seconds
      * @param bool           $autoRelease Whether to automatically release the lock or not when the lock instance is destroyed
      */
-    public function __construct(Key $key, StoreInterface $store, $ttl = null, $autoRelease = true)
+    public function __construct(Key $key, StoreInterface $store, float $ttl = null, bool $autoRelease = true)
     {
         $this->store = $store;
         $this->key = $key;
         $this->ttl = $ttl;
-        $this->autoRelease = (bool) $autoRelease;
+        $this->autoRelease = $autoRelease;
 
         $this->logger = new NullLogger();
     }

Store/FlockStore.php

@@ -36,7 +36,7 @@ class FlockStore implements StoreInterface
      *
      * @throws LockStorageException If the lock directory could not be created or is not writable
      */
-    public function __construct($lockPath = null)
+    public function __construct(string $lockPath = null)
     {
         if (null === $lockPath) {
             $lockPath = sys_get_temp_dir();

Store/MemcachedStore.php

@@ -44,7 +44,7 @@ public static function isSupported()
      * @param \Memcached $memcached
      * @param int        $initialTtl the expiration delay of locks in seconds
      */
-    public function __construct(\Memcached $memcached, $initialTtl = 300)
+    public function __construct(\Memcached $memcached, int $initialTtl = 300)
     {
         if (!static::isSupported()) {
             throw new InvalidArgumentException('Memcached extension is required');
@@ -155,12 +155,8 @@ public function exists(Key $key)
 
     /**
      * Retrieve an unique token for the given key.
-     *
-     * @param Key $key
-     *
-     * @return string
      */
-    private function getToken(Key $key)
+    private function getToken(Key $key): string
     {
         if (!$key->hasState(__CLASS__)) {
             $token = base64_encode(random_bytes(32));

Store/RedisStore.php

@@ -39,7 +39,7 @@ class RedisStore implements StoreInterface
      * @param \Redis|\RedisArray|\RedisCluster|\Predis\Client $redisClient
      * @param float                                           $initialTtl  the expiration delay of locks in seconds
      */
-    public function __construct($redisClient, $initialTtl = 300.0)
+    public function __construct($redisClient, float $initialTtl = 300.0)
     {
         if (!$redisClient instanceof \Redis && !$redisClient instanceof \RedisArray && !$redisClient instanceof \RedisCluster && !$redisClient instanceof \Predis\Client) {
             throw new InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\Client, %s given', __METHOD__, is_object($redisClient) ? get_class($redisClient) : gettype($redisClient)));
@@ -131,13 +131,9 @@ public function exists(Key $key)
     /**
      * Evaluates a script in the corresponding redis client.
      *
-     * @param string $script
-     * @param string $resource
-     * @param array  $args
-     *
      * @return mixed
      */
-    private function evaluate($script, $resource, array $args)
+    private function evaluate(string $script, string $resource, array $args)
     {
         if ($this->redis instanceof \Redis || $this->redis instanceof \RedisCluster) {
             return $this->redis->eval($script, array_merge(array($resource), $args), 1);
@@ -156,12 +152,8 @@ private function evaluate($script, $resource, array $args)
 
     /**
      * Retrieves an unique token for the given key.
-     *
-     * @param Key $key
-     *
-     * @return string
      */
-    private function getToken(Key $key)
+    private function getToken(Key $key): string
     {
         if (!$key->hasState(__CLASS__)) {
             $token = base64_encode(random_bytes(32));

Store/RetryTillSaveStore.php

@@ -37,7 +37,7 @@ class RetryTillSaveStore implements StoreInterface, LoggerAwareInterface
      * @param int            $retrySleep Duration in ms between 2 retry
      * @param int            $retryCount Maximum amount of retry
      */
-    public function __construct(StoreInterface $decorated, $retrySleep = 100, $retryCount = PHP_INT_MAX)
+    public function __construct(StoreInterface $decorated, int $retrySleep = 100, int $retryCount = PHP_INT_MAX)
     {
         $this->decorated = $decorated;
         $this->retrySleep = $retrySleep;