[Lock] Add types to private properties

Signed-off-by: Alexander M. Turek <me@derrabus.de>

Author: derrabus

Key.php

@@ -20,10 +20,10 @@
  */
 final class Key
 {
-    private $resource;
-    private $expiringTime;
-    private $state = [];
-    private $serializable = true;
+    private string $resource;
+    private ?float $expiringTime = null;
+    private array $state = [];
+    private bool $serializable = true;
 
     public function __construct(string $resource)
     {

Lock.php

@@ -29,11 +29,11 @@ final class Lock implements SharedLockInterface, LoggerAwareInterface
 {
     use LoggerAwareTrait;
 
-    private $store;
-    private $key;
-    private $ttl;
-    private $autoRelease;
-    private $dirty = false;
+    private PersistingStoreInterface $store;
+    private Key $key;
+    private ?float $ttl;
+    private bool $autoRelease;
+    private bool $dirty = false;
 
     /**
      * @param float|null $ttl         Maximum expected lock duration in seconds

LockFactory.php

@@ -25,7 +25,7 @@ class LockFactory implements LoggerAwareInterface
 {
     use LoggerAwareTrait;
 
-    private $store;
+    private PersistingStoreInterface $store;
 
     public function __construct(PersistingStoreInterface $store)
     {

Store/CombinedStore.php

@@ -32,11 +32,10 @@ class CombinedStore implements SharedLockStoreInterface, LoggerAwareInterface
     use LoggerAwareTrait;
 
     /** @var PersistingStoreInterface[] */
-    private $stores;
-    /** @var StrategyInterface */
-    private $strategy;
+    private array $stores;
+    private StrategyInterface $strategy;
     /** @var SharedLockStoreInterface[] */
-    private $sharedLockStores;
+    private array $sharedLockStores;
 
     /**
      * @param PersistingStoreInterface[] $stores The list of synchronized stores

Store/FlockStore.php

@@ -30,7 +30,7 @@
  */
 class FlockStore implements BlockingStoreInterface, SharedLockStoreInterface
 {
-    private $lockPath;
+    private ?string $lockPath;
 
     /**
      * @param string|null $lockPath the directory to store the lock, defaults to the system's temporary directory

Store/InMemoryStore.php

@@ -23,8 +23,8 @@
  */
 class InMemoryStore implements SharedLockStoreInterface
 {
-    private $locks = [];
-    private $readLocks = [];
+    private array $locks = [];
+    private array $readLocks = [];
 
     public function save(Key $key)
     {

Store/MemcachedStore.php

@@ -26,10 +26,9 @@ class MemcachedStore implements PersistingStoreInterface
 {
     use ExpiringStoreTrait;
 
-    private $memcached;
-    private $initialTtl;
-    /** @var bool */
-    private $useExtendedReturn;
+    private \Memcached $memcached;
+    private int $initialTtl;
+    private bool $useExtendedReturn;
 
     public static function isSupported()
     {
@@ -151,11 +150,7 @@ private function getUniqueToken(Key $key): string
 
     private function getValueAndCas(Key $key): array
     {
-        if (null === $this->useExtendedReturn) {
-            $this->useExtendedReturn = version_compare(phpversion('memcached'), '2.9.9', '>');
-        }
-
-        if ($this->useExtendedReturn) {
+        if ($this->useExtendedReturn ??= version_compare(phpversion('memcached'), '2.9.9', '>')) {
             $extendedReturn = $this->memcached->get((string) $key, null, \Memcached::GET_EXTENDED);
             if (\Memcached::GET_ERROR_RETURN_VALUE === $extendedReturn) {
                 return [$extendedReturn, 0.0];

Store/MongoDbStore.php

@@ -49,11 +49,11 @@ class MongoDbStore implements PersistingStoreInterface
 {
     use ExpiringStoreTrait;
 
-    private $collection;
-    private $client;
-    private $uri;
-    private $options;
-    private $initialTtl;
+    private Collection $collection;
+    private Client $client;
+    private string $uri;
+    private array $options;
+    private float $initialTtl;
 
     /**
      * @param Collection|Client|string $mongo      An instance of a Collection or Client or URI @see https://docs.mongodb.com/manual/reference/connection-string/
@@ -322,13 +322,11 @@ private function isDuplicateKeyException(WriteException $e): bool
 
     private function getCollection(): Collection
     {
-        if (null !== $this->collection) {
+        if (isset($this->collection)) {
             return $this->collection;
         }
 
-        if (null === $this->client) {
-            $this->client = new Client($this->uri, $this->options['uriOptions'], $this->options['driverOptions']);
-        }
+        $this->client ??= new Client($this->uri, $this->options['uriOptions'], $this->options['driverOptions']);
 
         $this->collection = $this->client->selectCollection(
             $this->options['database'],

Store/PdoStore.php

@@ -40,18 +40,18 @@ class PdoStore implements PersistingStoreInterface
 {
     use ExpiringStoreTrait;
 
-    private $conn;
-    private $dsn;
-    private $driver;
-    private $table = 'lock_keys';
-    private $idCol = 'key_id';
-    private $tokenCol = 'key_token';
-    private $expirationCol = 'key_expiration';
-    private $username = '';
-    private $password = '';
-    private $connectionOptions = [];
-    private $gcProbability;
-    private $initialTtl;
+    private \PDO|Connection $conn;
+    private string $dsn;
+    private string $driver;
+    private string $table = 'lock_keys';
+    private string $idCol = 'key_id';
+    private string $tokenCol = 'key_token';
+    private string $expirationCol = 'key_expiration';
+    private string $username = '';
+    private string $password = '';
+    private array $connectionOptions = [];
+    private float $gcProbability;
+    private int $initialTtl;
 
     /**
      * You can either pass an existing database connection as PDO instance or
@@ -232,7 +232,7 @@ private function getUniqueToken(Key $key): string
 
     private function getConnection(): \PDO|Connection
     {
-        if (null === $this->conn) {
+        if (!isset($this->conn)) {
             if (strpos($this->dsn, '://')) {
                 if (!class_exists(DriverManager::class)) {
                     throw new InvalidArgumentException(sprintf('Failed to parse the DSN "%s". Try running "composer require doctrine/dbal".', $this->dsn));
@@ -336,7 +336,7 @@ private function prune(): void
 
     private function getDriver(): string
     {
-        if (null !== $this->driver) {
+        if (isset($this->driver)) {
             return $this->driver;
         }
 

Store/PostgreSqlStore.php

@@ -28,12 +28,12 @@
  */
 class PostgreSqlStore implements BlockingSharedLockStoreInterface, BlockingStoreInterface
 {
-    private $conn;
-    private $dsn;
-    private $username = '';
-    private $password = '';
-    private $connectionOptions = [];
-    private static $storeRegistry = [];
+    private \PDO|Connection $conn;
+    private string $dsn;
+    private string $username = '';
+    private string $password = '';
+    private array $connectionOptions = [];
+    private static array $storeRegistry = [];
 
     /**
      * You can either pass an existing database connection as PDO instance or
@@ -234,7 +234,7 @@ private function unlockShared(Key $key): void
 
     private function getConnection(): \PDO|Connection
     {
-        if (null === $this->conn) {
+        if (!isset($this->conn)) {
             if (strpos($this->dsn, '://')) {
                 if (!class_exists(DriverManager::class)) {
                     throw new InvalidArgumentException(sprintf('Failed to parse the DSN "%s". Try running "composer require doctrine/dbal".', $this->dsn));

Store/RedisStore.php

@@ -31,9 +31,9 @@ class RedisStore implements SharedLockStoreInterface
 {
     use ExpiringStoreTrait;
 
-    private $redis;
-    private $initialTtl;
-    private $supportTime;
+    private \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|RedisProxy|RedisClusterProxy $redis;
+    private float $initialTtl;
+    private bool $supportTime;
 
     /**
      * @param float $initialTtl The expiration delay of locks in seconds
@@ -293,7 +293,7 @@ private function getUniqueToken(Key $key): string
 
     private function getNowCode(): string
     {
-        if (null === $this->supportTime) {
+        if (!isset($this->supportTime)) {
             // Redis < 5.0 does not support TIME (not deterministic) in script.
             // https://redis.io/commands/eval#replicating-commands-instead-of-scripts
             // This code asserts TIME can be use, otherwise will fallback to a timestamp generated by the PHP process.

Store/ZookeeperStore.php

@@ -27,7 +27,7 @@ class ZookeeperStore implements PersistingStoreInterface
 {
     use ExpiringStoreTrait;
 
-    private $zookeeper;
+    private \Zookeeper $zookeeper;
 
     public function __construct(\Zookeeper $zookeeper)
     {