make format

matthiasmullie · Apr 7, 2024 · 50a3d72 · 50a3d72
1 parent 577545a
commit 50a3d72
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 28 deletions.
diff --git a/src/Adapters/Apc.php b/src/Adapters/Apc.php
@@ -57,7 +57,7 @@ public function get(string $key, mixed &$token = null): mixed
         return $value;
     }
 
-    public function getMulti(array $keys, array &$tokens = null): array
+    public function getMulti(array $keys, ?array &$tokens = null): array
     {
         $tokens = [];
         if (empty($keys)) {
@@ -532,11 +532,10 @@ protected function expire(string|array $key = [], int $ttl = 0): void
 
     /**
      * @param string|string[] $key
-     * @param bool            $success
      *
      * @return mixed|false
      */
-    protected function fetch(string|array $key, bool &$success = null): mixed
+    protected function fetch(string|array $key, ?bool &$success = null): mixed
     {
         /*
          * $key can also be numeric, in which case APC is able to retrieve it,

diff --git a/src/Adapters/Collections/Utils/PrefixKeys.php b/src/Adapters/Collections/Utils/PrefixKeys.php
@@ -30,7 +30,7 @@ public function get(string $key, mixed &$token = null): mixed
         return $this->cache->get($key, $token);
     }
 
-    public function getMulti(array $keys, array &$tokens = null): array
+    public function getMulti(array $keys, ?array &$tokens = null): array
     {
         $keys = array_map([$this, 'prefix'], $keys);
         $results = $this->cache->getMulti($keys, $tokens);

diff --git a/src/Adapters/Couchbase.php b/src/Adapters/Couchbase.php
@@ -30,7 +30,7 @@ class Couchbase implements KeyValueStore
     /**
      * @var int|null Timeout in ms
      */
-    protected int|null $timeout;
+    protected ?int $timeout;
 
     /**
      * @param int|null $timeout K/V timeout in ms
@@ -39,7 +39,7 @@ public function __construct(
         \Couchbase\Collection $client,
         \Couchbase\BucketManager|\Couchbase\Management\BucketManager $bucketManager,
         \Couchbase\Bucket $bucket,
-        int $timeout = null
+        ?int $timeout = null
     ) {
         $this->collection = $client;
         $this->bucketManager = $bucketManager;
@@ -71,7 +71,7 @@ public function get(string $key, mixed &$token = null): mixed
         }
     }
 
-    public function getMulti(array $keys, array &$tokens = null): array
+    public function getMulti(array $keys, ?array &$tokens = null): array
     {
         // SDK >=3.0 no longer provides *multi operations
         $results = [];

diff --git a/src/Adapters/Flysystem.php b/src/Adapters/Flysystem.php
@@ -63,7 +63,7 @@ public function get(string $key, mixed &$token = null): mixed
         return $value;
     }
 
-    public function getMulti(array $keys, array &$tokens = null): array
+    public function getMulti(array $keys, ?array &$tokens = null): array
     {
         $results = [];
         $tokens = [];

diff --git a/src/Adapters/Memcached.php b/src/Adapters/Memcached.php
@@ -51,7 +51,7 @@ public function get(string $key, mixed &$token = null): mixed
         return $values[$key];
     }
 
-    public function getMulti(array $keys, array &$tokens = null): array
+    public function getMulti(array $keys, ?array &$tokens = null): array
     {
         $tokens = [];
         if (empty($keys)) {

diff --git a/src/Adapters/MemoryStore.php b/src/Adapters/MemoryStore.php
@@ -30,7 +30,7 @@ class MemoryStore implements KeyValueStore
     /**
      * @param int|string|null $limit Memory limit in bytes (defaults to 10% of memory_limit)
      */
-    public function __construct(int|string $limit = null)
+    public function __construct(int|string|null $limit = null)
     {
         if ($limit === null) {
             $phpLimit = ini_get('memory_limit');
@@ -60,7 +60,7 @@ public function get(string $key, mixed &$token = null): mixed
         return unserialize($value, ['allowed_classes' => true]);
     }
 
-    public function getMulti(array $keys, array &$tokens = null): array
+    public function getMulti(array $keys, ?array &$tokens = null): array
     {
         $items = [];
         $tokens = [];

diff --git a/src/Adapters/PostgreSQL.php b/src/Adapters/PostgreSQL.php
@@ -34,7 +34,7 @@ public function get(string $key, mixed &$token = null): mixed
         return $return;
     }
 
-    public function getMulti(array $keys, array &$tokens = null): array
+    public function getMulti(array $keys, ?array &$tokens = null): array
     {
         $return = parent::getMulti($keys, $tokens);
 

diff --git a/src/Adapters/Redis.php b/src/Adapters/Redis.php
@@ -20,7 +20,7 @@ class Redis implements KeyValueStore
 {
     protected \Redis $client;
 
-    protected string|null $version = null;
+    protected ?string $version = null;
 
     public function __construct(\Redis $client)
     {
@@ -60,7 +60,7 @@ public function get(string $key, mixed &$token = null): mixed
         return $value;
     }
 
-    public function getMulti(array $keys, array &$tokens = null): array
+    public function getMulti(array $keys, ?array &$tokens = null): array
     {
         $tokens = [];
         if (empty($keys)) {
@@ -507,7 +507,7 @@ public function getCollection(string $name): KeyValueStore
      *
      * @return int|null TTL in seconds, or `null` for no expiration
      */
-    protected function ttl(int $expire): int|null
+    protected function ttl(int $expire): ?int
     {
         if ($expire === 0) {
             return null;

diff --git a/src/Adapters/SQL.php b/src/Adapters/SQL.php
@@ -70,7 +70,7 @@ public function get(string $key, mixed &$token = null): mixed
         return $this->unserialize($result['v']);
     }
 
-    public function getMulti(array $keys, array &$tokens = null): array
+    public function getMulti(array $keys, ?array &$tokens = null): array
     {
         $tokens = [];
         if (empty($keys)) {
@@ -396,7 +396,7 @@ protected function clearExpired(): void
      * Transforms expiration times into TIMESTAMP (Y-m-d H:i:s) format, which DB
      * will understand and be able to compare with other dates.
      */
-    protected function expire(int $expire): string|null
+    protected function expire(int $expire): ?string
     {
         if ($expire === 0) {
             return null;

diff --git a/src/Buffered/BufferedStore.php b/src/Buffered/BufferedStore.php
@@ -75,7 +75,7 @@ public function get(string $key, mixed &$token = null): mixed
      *
      * {@inheritdoc}
      */
-    public function getMulti(array $keys, array &$tokens = null): array
+    public function getMulti(array $keys, ?array &$tokens = null): array
     {
         $values = $this->transaction->getMulti($keys, $tokens);
 

diff --git a/src/Buffered/TransactionalStore.php b/src/Buffered/TransactionalStore.php
@@ -116,7 +116,7 @@ public function get(string $key, mixed &$token = null): mixed
         return end($this->transactions)->get($key, $token);
     }
 
-    public function getMulti(array $keys, array &$tokens = null): array
+    public function getMulti(array $keys, ?array &$tokens = null): array
     {
         return end($this->transactions)->getMulti($keys, $tokens);
     }

diff --git a/src/Buffered/Utils/Transaction.php b/src/Buffered/Utils/Transaction.php
@@ -113,7 +113,7 @@ public function get(string $key, mixed &$token = null): mixed
         return $value;
     }
 
-    public function getMulti(array $keys, array &$tokens = null): array
+    public function getMulti(array $keys, ?array &$tokens = null): array
     {
         // retrieve all that we can from local cache
         $values = $this->local->getMulti($keys);

diff --git a/src/KeyValueStore.php b/src/KeyValueStore.php
@@ -43,7 +43,7 @@ public function get(string $key, mixed &$token = null): mixed;
      *
      * @return mixed[] [key => value]
      */
-    public function getMulti(array $keys, array &$tokens = null): array;
+    public function getMulti(array $keys, ?array &$tokens = null): array;
 
     /**
      * Stores a value, regardless of whether or not the key already exists (in

diff --git a/src/Psr16/SimpleCache.php b/src/Psr16/SimpleCache.php
@@ -39,7 +39,7 @@ public function get(string $key, mixed $default = null): mixed
         return $multi[$key] ?? $default;
     }
 
-    public function set(string $key, mixed $value, int|\DateInterval $ttl = null): bool
+    public function set(string $key, mixed $value, int|\DateInterval|null $ttl = null): bool
     {
         $this->assertValidKey($key);
         $ttl = $this->ttl($ttl);
@@ -83,7 +83,7 @@ public function getMultiple(iterable $keys, mixed $default = null): iterable
         return array_merge($nulls, $results);
     }
 
-    public function setMultiple(iterable $values, int|\DateInterval $ttl = null): bool
+    public function setMultiple(iterable $values, int|\DateInterval|null $ttl = null): bool
     {
         if ($values instanceof \Traversable) {
             // we also need the keys, and an array is stricter about what it can
@@ -160,7 +160,7 @@ protected function assertValidKey(string $key): void
      * Accepts all TTL inputs valid in PSR-16 (null|int|DateInterval) and
      * converts them into TTL for KeyValueStore (int).
      */
-    protected function ttl(null|int|\DateInterval $ttl): int
+    protected function ttl(int|\DateInterval|null $ttl): int
     {
         if ($ttl === null) {
             return 0;

diff --git a/src/Psr6/Item.php b/src/Psr6/Item.php
@@ -25,7 +25,7 @@ class Item implements CacheItemInterface
 
     protected int $expire = 0;
 
-    protected bool|null $isHit;
+    protected ?bool $isHit;
 
     protected bool $changed = false;
 

diff --git a/src/Scale/Shard.php b/src/Scale/Shard.php
@@ -37,7 +37,7 @@ class Shard implements KeyValueStore
     /**
      * Overloadable with multiple KeyValueStore objects.
      */
-    public function __construct(KeyValueStore $cache1, KeyValueStore $cache2 = null /* , [KeyValueStore $cache3, [...]] */)
+    public function __construct(KeyValueStore $cache1, ?KeyValueStore $cache2 = null /* , [KeyValueStore $cache3, [...]] */)
     {
         $caches = func_get_args();
         $caches = array_filter($caches);
@@ -54,7 +54,7 @@ public function get(string $key, mixed &$token = null): mixed
         return $this->getShard($key)->get($key, $token);
     }
 
-    public function getMulti(array $keys, array &$tokens = null): array
+    public function getMulti(array $keys, ?array &$tokens = null): array
     {
         $shards = $this->getShards($keys);
         $results = [];

diff --git a/src/Scale/StampedeProtector.php b/src/Scale/StampedeProtector.php
@@ -77,7 +77,7 @@ public function get(string $key, mixed &$token = null): mixed
         return $values[$key] ?? false;
     }
 
-    public function getMulti(array $keys, array &$tokens = null): array
+    public function getMulti(array $keys, ?array &$tokens = null): array
     {
         // fetch both requested keys + stampede protection indicators at once
         $stampedeKeys = array_combine($keys, array_map([$this, 'stampedeKey'], $keys));