Remove PHP Deprecated: Implicitly marking parameter as nullable. (#143)

terabytesoftw · web-flow · commit 9fddac5ef489 · 2024-07-19T09:07:55.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - New #132: Add interface `SerializerInterface` for data serialization, and `PhpSerializer` implementation (@Gerych1984)
 - Chg #139: Make `normalize()` method static in `CacheKeyNormalizer` class (@terabytesoftw)
+- Enh #142: Minor refactoring: explicitly mark parameters as nullable (@terabytesoftw)
 
 ## 3.0.0 February 15, 2023
 
diff --git a/src/Cache.php b/src/Cache.php
@@ -63,7 +63,7 @@ public function getOrSet(
         mixed $key,
         callable $callable,
         DateInterval|int|null $ttl = null,
-        Dependency $dependency = null,
+        Dependency|null $dependency = null,
         float $beta = 1.0
     ) {
         $key = CacheKeyNormalizer::normalize($key);
diff --git a/src/CacheInterface.php b/src/CacheInterface.php
@@ -59,7 +59,7 @@ public function getOrSet(
         mixed $key,
         callable $callable,
         DateInterval|int|null $ttl = null,
-        Dependency $dependency = null,
+        Dependency|null $dependency = null,
         float $beta = 1.0
     );
 
diff --git a/src/Dependency/TagDependency.php b/src/Dependency/TagDependency.php
@@ -47,7 +47,7 @@ final class TagDependency extends Dependency
      * For a single tag, you may specify it as a string.
      * @param int|null $ttl The TTL value of this item. null means infinity.
      */
-    public function __construct(array|string $tags, int $ttl = null)
+    public function __construct(array|string $tags, int|null $ttl = null)
     {
         $this->tags = (array) $tags;
 
diff --git a/src/Exception/CacheException.php b/src/Exception/CacheException.php
@@ -13,7 +13,7 @@ public function __construct(
         private string $key,
         string $message = '',
         int $code = 0,
-        Throwable $previous = null
+        Throwable|null $previous = null
     ) {
         parent::__construct($message, $code, $previous);
     }

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ final class TagDependency extends Dependency`
`47`	`47`	`* For a single tag, you may specify it as a string.`
`48`	`48`	`* @param int\|null $ttl The TTL value of this item. null means infinity.`
`49`	`49`	`*/`
`50`		`- public function __construct(array\|string $tags, int $ttl = null)`
	`50`	`+ public function __construct(array\|string $tags, int\|null $ttl = null)`
`51`	`51`	`{`
`52`	`52`	`$this->tags = (array) $tags;`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public function __construct(`
`13`	`13`	`private string $key,`
`14`	`14`	`string $message = '',`
`15`	`15`	`int $code = 0,`
`16`		`- Throwable $previous = null`
	`16`	`+ Throwable\|null $previous = null`
`17`	`17`	`) {`
`18`	`18`	`parent::__construct($message, $code, $previous);`
`19`	`19`	`}`