Merge branch '5.4' into 6.3

nicolas-grekas · nicolas-grekas · commit b26a32b8eb8c · 2024-01-23T15:35:58.000+01:00
* 5.4:
  Fix implicitly-required parameters
  List CS fix in .git-blame-ignore-revs
  Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value
  [Messenger][AmazonSqs] Allow async-aws/sqs version 2
diff --git a/Adapter/AbstractAdapter.php b/Adapter/AbstractAdapter.php
@@ -87,7 +87,7 @@ static function ($deferred, $namespace, &$expiredIds, $getId, $defaultLifetime)
      *
      * Using ApcuAdapter makes system caches compatible with read-only filesystems.
      */
-    public static function createSystemCache(string $namespace, int $defaultLifetime, string $version, string $directory, LoggerInterface $logger = null): AdapterInterface
+    public static function createSystemCache(string $namespace, int $defaultLifetime, string $version, string $directory, ?LoggerInterface $logger = null): AdapterInterface
     {
         $opcache = new PhpFilesAdapter($namespace, $defaultLifetime, $directory, true);
         if (null !== $logger) {
diff --git a/Adapter/ApcuAdapter.php b/Adapter/ApcuAdapter.php
@@ -25,7 +25,7 @@ class ApcuAdapter extends AbstractAdapter
     /**
      * @throws CacheException if APCu is not enabled
      */
-    public function __construct(string $namespace = '', int $defaultLifetime = 0, string $version = null, MarshallerInterface $marshaller = null)
+    public function __construct(string $namespace = '', int $defaultLifetime = 0, ?string $version = null, ?MarshallerInterface $marshaller = null)
     {
         if (!static::isSupported()) {
             throw new CacheException('APCu is not enabled.');
diff --git a/Adapter/ArrayAdapter.php b/Adapter/ArrayAdapter.php
@@ -74,7 +74,7 @@ static function ($key, $value, $isHit, $tags) {
         );
     }
 
-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
+    public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null): mixed
     {
         $item = $this->getItem($key);
         $metadata = $item->getMetadata();
diff --git a/Adapter/ChainAdapter.php b/Adapter/ChainAdapter.php
@@ -88,7 +88,7 @@ static function ($sourceItem, $item, $defaultLifetime, $sourceMetadata = null) {
         );
     }
 
-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
+    public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null): mixed
     {
         $doSave = true;
         $callback = static function (CacheItem $item, bool &$save) use ($callback, &$doSave) {
@@ -98,7 +98,7 @@ public function get(string $key, callable $callback, float $beta = null, array &
             return $value;
         };
 
-        $wrap = function (CacheItem $item = null, bool &$save = true) use ($key, $callback, $beta, &$wrap, &$doSave, &$metadata) {
+        $wrap = function (?CacheItem $item = null, bool &$save = true) use ($key, $callback, $beta, &$wrap, &$doSave, &$metadata) {
             static $lastItem;
             static $i = 0;
             $adapter = $this->adapters[$i];
diff --git a/Adapter/CouchbaseBucketAdapter.php b/Adapter/CouchbaseBucketAdapter.php
@@ -39,7 +39,7 @@ class CouchbaseBucketAdapter extends AbstractAdapter
     private \CouchbaseBucket $bucket;
     private MarshallerInterface $marshaller;
 
-    public function __construct(\CouchbaseBucket $bucket, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
+    public function __construct(\CouchbaseBucket $bucket, string $namespace = '', int $defaultLifetime = 0, ?MarshallerInterface $marshaller = null)
     {
         if (!static::isSupported()) {
             throw new CacheException('Couchbase >= 2.6.0 < 3.0.0 is required.');
diff --git a/Adapter/CouchbaseCollectionAdapter.php b/Adapter/CouchbaseCollectionAdapter.php
@@ -32,7 +32,7 @@ class CouchbaseCollectionAdapter extends AbstractAdapter
     private Collection $connection;
     private MarshallerInterface $marshaller;
 
-    public function __construct(Collection $connection, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
+    public function __construct(Collection $connection, string $namespace = '', int $defaultLifetime = 0, ?MarshallerInterface $marshaller = null)
     {
         if (!static::isSupported()) {
             throw new CacheException('Couchbase >= 3.0.5 < 4.0.0 is required.');
diff --git a/Adapter/DoctrineDbalAdapter.php b/Adapter/DoctrineDbalAdapter.php
@@ -59,7 +59,7 @@ class DoctrineDbalAdapter extends AbstractAdapter implements PruneableInterface
      *
      * @throws InvalidArgumentException When namespace contains invalid characters
      */
-    public function __construct(Connection|string $connOrDsn, string $namespace = '', int $defaultLifetime = 0, array $options = [], MarshallerInterface $marshaller = null)
+    public function __construct(Connection|string $connOrDsn, string $namespace = '', int $defaultLifetime = 0, array $options = [], ?MarshallerInterface $marshaller = null)
     {
         if (isset($namespace[0]) && preg_match('#[^-+.A-Za-z0-9]#', $namespace, $match)) {
             throw new InvalidArgumentException(sprintf('Namespace contains "%s" but only characters in [-+.A-Za-z0-9] are allowed.', $match[0]));
diff --git a/Adapter/FilesystemAdapter.php b/Adapter/FilesystemAdapter.php
@@ -20,7 +20,7 @@ class FilesystemAdapter extends AbstractAdapter implements PruneableInterface
 {
     use FilesystemTrait;
 
-    public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null, MarshallerInterface $marshaller = null)
+    public function __construct(string $namespace = '', int $defaultLifetime = 0, ?string $directory = null, ?MarshallerInterface $marshaller = null)
     {
         $this->marshaller = $marshaller ?? new DefaultMarshaller();
         parent::__construct('', $defaultLifetime);
diff --git a/Adapter/FilesystemTagAwareAdapter.php b/Adapter/FilesystemTagAwareAdapter.php
@@ -35,7 +35,7 @@ class FilesystemTagAwareAdapter extends AbstractTagAwareAdapter implements Prune
      */
     private const TAG_FOLDER = 'tags';
 
-    public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null, MarshallerInterface $marshaller = null)
+    public function __construct(string $namespace = '', int $defaultLifetime = 0, ?string $directory = null, ?MarshallerInterface $marshaller = null)
     {
         $this->marshaller = new TagAwareMarshaller($marshaller);
         parent::__construct('', $defaultLifetime);
diff --git a/Adapter/MemcachedAdapter.php b/Adapter/MemcachedAdapter.php
@@ -46,7 +46,7 @@ class MemcachedAdapter extends AbstractAdapter
      *
      * Using a MemcachedAdapter as a pure items store is fine.
      */
-    public function __construct(\Memcached $client, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
+    public function __construct(\Memcached $client, string $namespace = '', int $defaultLifetime = 0, ?MarshallerInterface $marshaller = null)
     {
         if (!static::isSupported()) {
             throw new CacheException('Memcached > 3.1.5 is required.');
diff --git a/Adapter/NullAdapter.php b/Adapter/NullAdapter.php
@@ -37,7 +37,7 @@ static function ($key) {
         );
     }
 
-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
+    public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null): mixed
     {
         $save = true;
 
diff --git a/Adapter/PdoAdapter.php b/Adapter/PdoAdapter.php
@@ -55,7 +55,7 @@ class PdoAdapter extends AbstractAdapter implements PruneableInterface
      * @throws InvalidArgumentException When PDO error mode is not PDO::ERRMODE_EXCEPTION
      * @throws InvalidArgumentException When namespace contains invalid characters
      */
-    public function __construct(#[\SensitiveParameter] \PDO|string $connOrDsn, string $namespace = '', int $defaultLifetime = 0, array $options = [], MarshallerInterface $marshaller = null)
+    public function __construct(#[\SensitiveParameter] \PDO|string $connOrDsn, string $namespace = '', int $defaultLifetime = 0, array $options = [], ?MarshallerInterface $marshaller = null)
     {
         if (\is_string($connOrDsn) && str_contains($connOrDsn, '://')) {
             throw new InvalidArgumentException(sprintf('Usage of Doctrine DBAL URL with "%s" is not supported. Use a PDO DSN or "%s" instead.', __CLASS__, DoctrineDbalAdapter::class));
diff --git a/Adapter/PhpArrayAdapter.php b/Adapter/PhpArrayAdapter.php
@@ -78,7 +78,7 @@ public static function create(string $file, CacheItemPoolInterface $fallbackPool
         return new static($file, $fallbackPool);
     }
 
-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
+    public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null): mixed
     {
         if (!isset($this->values)) {
             $this->initialize();
diff --git a/Adapter/PhpFilesAdapter.php b/Adapter/PhpFilesAdapter.php
@@ -43,7 +43,7 @@ class PhpFilesAdapter extends AbstractAdapter implements PruneableInterface
      *
      * @throws CacheException if OPcache is not enabled
      */
-    public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null, bool $appendOnly = false)
+    public function __construct(string $namespace = '', int $defaultLifetime = 0, ?string $directory = null, bool $appendOnly = false)
     {
         $this->appendOnly = $appendOnly;
         self::$startTime ??= $_SERVER['REQUEST_TIME'] ?? time();
diff --git a/Adapter/ProxyAdapter.php b/Adapter/ProxyAdapter.php
@@ -80,7 +80,7 @@ static function (CacheItemInterface $innerItem, CacheItem $item, $expiry = null)
         );
     }
 
-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
+    public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null): mixed
     {
         if (!$this->pool instanceof CacheInterface) {
             return $this->doGet($this, $key, $callback, $beta, $metadata);
diff --git a/Adapter/RedisAdapter.php b/Adapter/RedisAdapter.php
@@ -18,7 +18,7 @@ class RedisAdapter extends AbstractAdapter
 {
     use RedisTrait;
 
-    public function __construct(\Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|\Relay\Relay $redis, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
+    public function __construct(\Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|\Relay\Relay $redis, string $namespace = '', int $defaultLifetime = 0, ?MarshallerInterface $marshaller = null)
     {
         $this->init($redis, $namespace, $defaultLifetime, $marshaller);
     }
diff --git a/Adapter/RedisTagAwareAdapter.php b/Adapter/RedisTagAwareAdapter.php
@@ -60,7 +60,7 @@ class RedisTagAwareAdapter extends AbstractTagAwareAdapter
     private string $redisEvictionPolicy;
     private string $namespace;
 
-    public function __construct(\Redis|Relay|\RedisArray|\RedisCluster|\Predis\ClientInterface $redis, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
+    public function __construct(\Redis|Relay|\RedisArray|\RedisCluster|\Predis\ClientInterface $redis, string $namespace = '', int $defaultLifetime = 0, ?MarshallerInterface $marshaller = null)
     {
         if ($redis instanceof \Predis\ClientInterface && $redis->getConnection() instanceof ClusterInterface && !$redis->getConnection() instanceof PredisCluster) {
             throw new InvalidArgumentException(sprintf('Unsupported Predis cluster connection: only "%s" is, "%s" given.', PredisCluster::class, get_debug_type($redis->getConnection())));
diff --git a/Adapter/TagAwareAdapter.php b/Adapter/TagAwareAdapter.php
@@ -51,7 +51,7 @@ class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterfac
     private static \Closure $getTagsByKey;
     private static \Closure $saveTags;
 
-    public function __construct(AdapterInterface $itemsPool, AdapterInterface $tagsPool = null, float $knownTagVersionsTtl = 0.15)
+    public function __construct(AdapterInterface $itemsPool, ?AdapterInterface $tagsPool = null, float $knownTagVersionsTtl = 0.15)
     {
         $this->pool = $itemsPool;
         $this->tags = $tagsPool ?? $itemsPool;
diff --git a/Adapter/TraceableAdapter.php b/Adapter/TraceableAdapter.php
@@ -35,7 +35,7 @@ public function __construct(AdapterInterface $pool)
         $this->pool = $pool;
     }
 
-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
+    public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null): mixed
     {
         if (!$this->pool instanceof CacheInterface) {
             throw new \BadMethodCallException(sprintf('Cannot call "%s::get()": this class doesn\'t implement "%s".', get_debug_type($this->pool), CacheInterface::class));
diff --git a/DataCollector/CacheDataCollector.php b/DataCollector/CacheDataCollector.php
@@ -36,7 +36,7 @@ public function addInstance(string $name, TraceableAdapter $instance): void
         $this->instances[$name] = $instance;
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null): void
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
     {
         $empty = ['calls' => [], 'adapters' => [], 'config' => [], 'options' => [], 'statistics' => []];
         $this->data = ['instances' => $empty, 'total' => $empty];
diff --git a/LockRegistry.php b/LockRegistry.php
@@ -83,7 +83,7 @@ public static function setFiles(array $files): array
         return $previousFiles;
     }
 
-    public static function compute(callable $callback, ItemInterface $item, bool &$save, CacheInterface $pool, \Closure $setMetadata = null, LoggerInterface $logger = null): mixed
+    public static function compute(callable $callback, ItemInterface $item, bool &$save, CacheInterface $pool, ?\Closure $setMetadata = null, ?LoggerInterface $logger = null): mixed
     {
         if ('\\' === \DIRECTORY_SEPARATOR && null === self::$lockedFiles) {
             // disable locking on Windows by default
diff --git a/Marshaller/DefaultMarshaller.php b/Marshaller/DefaultMarshaller.php
@@ -23,7 +23,7 @@ class DefaultMarshaller implements MarshallerInterface
     private bool $useIgbinarySerialize = true;
     private bool $throwOnSerializationFailure = false;
 
-    public function __construct(bool $useIgbinarySerialize = null, bool $throwOnSerializationFailure = false)
+    public function __construct(?bool $useIgbinarySerialize = null, bool $throwOnSerializationFailure = false)
     {
         if (null === $useIgbinarySerialize) {
             $useIgbinarySerialize = \extension_loaded('igbinary') && version_compare('3.1.6', phpversion('igbinary'), '<=');
diff --git a/Marshaller/SodiumMarshaller.php b/Marshaller/SodiumMarshaller.php
@@ -29,7 +29,7 @@ class SodiumMarshaller implements MarshallerInterface
      *                                 more rotating keys can be provided to decrypt values;
      *                                 each key must be generated using sodium_crypto_box_keypair()
      */
-    public function __construct(array $decryptionKeys, MarshallerInterface $marshaller = null)
+    public function __construct(array $decryptionKeys, ?MarshallerInterface $marshaller = null)
     {
         if (!self::isSupported()) {
             throw new CacheException('The "sodium" PHP extension is not loaded.');
diff --git a/Marshaller/TagAwareMarshaller.php b/Marshaller/TagAwareMarshaller.php
@@ -20,7 +20,7 @@ class TagAwareMarshaller implements MarshallerInterface
 {
     private MarshallerInterface $marshaller;
 
-    public function __construct(MarshallerInterface $marshaller = null)
+    public function __construct(?MarshallerInterface $marshaller = null)
     {
         $this->marshaller = $marshaller ?? new DefaultMarshaller();
     }
diff --git a/Messenger/EarlyExpirationDispatcher.php b/Messenger/EarlyExpirationDispatcher.php
@@ -27,14 +27,14 @@ class EarlyExpirationDispatcher
     private ReverseContainer $reverseContainer;
     private ?\Closure $callbackWrapper;
 
-    public function __construct(MessageBusInterface $bus, ReverseContainer $reverseContainer, callable $callbackWrapper = null)
+    public function __construct(MessageBusInterface $bus, ReverseContainer $reverseContainer, ?callable $callbackWrapper = null)
     {
         $this->bus = $bus;
         $this->reverseContainer = $reverseContainer;
         $this->callbackWrapper = null === $callbackWrapper ? null : $callbackWrapper(...);
     }
 
-    public function __invoke(callable $callback, CacheItem $item, bool &$save, AdapterInterface $pool, \Closure $setMetadata, LoggerInterface $logger = null)
+    public function __invoke(callable $callback, CacheItem $item, bool &$save, AdapterInterface $pool, \Closure $setMetadata, ?LoggerInterface $logger = null)
     {
         if (!$item->isHit() || null === $message = EarlyExpirationMessage::create($this->reverseContainer, $callback, $item, $pool)) {
             // The item is stale or the callback cannot be reversed: we must compute the value now
diff --git a/Tests/Adapter/AbstractRedisAdapterTestCase.php b/Tests/Adapter/AbstractRedisAdapterTestCase.php
@@ -25,7 +25,7 @@ abstract class AbstractRedisAdapterTestCase extends AdapterTestCase
 
     protected static $redis;
 
-    public function createCachePool(int $defaultLifetime = 0, string $testMethod = null): CacheItemPoolInterface
+    public function createCachePool(int $defaultLifetime = 0, ?string $testMethod = null): CacheItemPoolInterface
     {
         return new RedisAdapter(self::$redis, str_replace('\\', '.', __CLASS__), $defaultLifetime);
     }
diff --git a/Tests/Adapter/AdapterTestCase.php b/Tests/Adapter/AdapterTestCase.php
@@ -234,7 +234,7 @@ public function testPrune()
         /** @var PruneableInterface|CacheItemPoolInterface $cache */
         $cache = $this->createCachePool();
 
-        $doSet = function ($name, $value, \DateInterval $expiresAfter = null) use ($cache) {
+        $doSet = function ($name, $value, ?\DateInterval $expiresAfter = null) use ($cache) {
             $item = $cache->getItem($name);
             $item->set($value);
 
diff --git a/Tests/Adapter/ChainAdapterTest.php b/Tests/Adapter/ChainAdapterTest.php
@@ -30,7 +30,7 @@
  */
 class ChainAdapterTest extends AdapterTestCase
 {
-    public function createCachePool(int $defaultLifetime = 0, string $testMethod = null): CacheItemPoolInterface
+    public function createCachePool(int $defaultLifetime = 0, ?string $testMethod = null): CacheItemPoolInterface
     {
         if ('testGetMetadata' === $testMethod) {
             return new ChainAdapter([new FilesystemAdapter('a', $defaultLifetime), new FilesystemAdapter('b', $defaultLifetime)], $defaultLifetime);
diff --git a/Tests/Adapter/DoctrineDbalAdapterTest.php b/Tests/Adapter/DoctrineDbalAdapterTest.php
@@ -106,7 +106,7 @@ public function testConfigureSchemaTableExists()
     /**
      * @dataProvider provideDsnWithSQLite
      */
-    public function testDsnWithSQLite(string $dsn, string $file = null)
+    public function testDsnWithSQLite(string $dsn, ?string $file = null)
     {
         try {
             $pool = new DoctrineDbalAdapter($dsn);
diff --git a/Tests/Adapter/MemcachedAdapterTest.php b/Tests/Adapter/MemcachedAdapterTest.php
@@ -44,7 +44,7 @@ public static function setUpBeforeClass(): void
         }
     }
 
-    public function createCachePool(int $defaultLifetime = 0, string $testMethod = null, string $namespace = null): CacheItemPoolInterface
+    public function createCachePool(int $defaultLifetime = 0, ?string $testMethod = null, ?string $namespace = null): CacheItemPoolInterface
     {
         $client = $defaultLifetime ? AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST')) : self::$client;
 
diff --git a/Tests/Adapter/NamespacedProxyAdapterTest.php b/Tests/Adapter/NamespacedProxyAdapterTest.php
@@ -21,7 +21,7 @@
  */
 class NamespacedProxyAdapterTest extends ProxyAdapterTest
 {
-    public function createCachePool(int $defaultLifetime = 0, string $testMethod = null): CacheItemPoolInterface
+    public function createCachePool(int $defaultLifetime = 0, ?string $testMethod = null): CacheItemPoolInterface
     {
         if ('testGetMetadata' === $testMethod) {
             return new ProxyAdapter(new FilesystemAdapter(), 'foo', $defaultLifetime);
diff --git a/Tests/Adapter/PdoAdapterTest.php b/Tests/Adapter/PdoAdapterTest.php
@@ -68,7 +68,7 @@ public function testCleanupExpiredItems()
     /**
      * @dataProvider provideDsnSQLite
      */
-    public function testDsnWithSQLite(string $dsn, string $file = null)
+    public function testDsnWithSQLite(string $dsn, ?string $file = null)
     {
         try {
             $pool = new PdoAdapter($dsn);
diff --git a/Tests/Adapter/PdoDbalAdapterTest.php b/Tests/Adapter/PdoDbalAdapterTest.php
diff --git a/Tests/Adapter/PhpArrayAdapterTest.php b/Tests/Adapter/PhpArrayAdapterTest.php
diff --git a/Tests/Adapter/PredisTagAwareAdapterTest.php b/Tests/Adapter/PredisTagAwareAdapterTest.php
diff --git a/Tests/Adapter/PredisTagAwareClusterAdapterTest.php b/Tests/Adapter/PredisTagAwareClusterAdapterTest.php
diff --git a/Tests/Adapter/ProxyAdapterAndRedisAdapterTest.php b/Tests/Adapter/ProxyAdapterAndRedisAdapterTest.php
diff --git a/Tests/Adapter/ProxyAdapterTest.php b/Tests/Adapter/ProxyAdapterTest.php
diff --git a/Tests/Adapter/RedisAdapterTest.php b/Tests/Adapter/RedisAdapterTest.php
diff --git a/Tests/Adapter/RedisClusterAdapterTest.php b/Tests/Adapter/RedisClusterAdapterTest.php
diff --git a/Tests/Adapter/RedisTagAwareAdapterTest.php b/Tests/Adapter/RedisTagAwareAdapterTest.php
diff --git a/Tests/Adapter/RedisTagAwareArrayAdapterTest.php b/Tests/Adapter/RedisTagAwareArrayAdapterTest.php
diff --git a/Tests/Adapter/RedisTagAwareClusterAdapterTest.php b/Tests/Adapter/RedisTagAwareClusterAdapterTest.php
diff --git a/Traits/ContractsTrait.php b/Traits/ContractsTrait.php
diff --git a/Traits/FilesystemCommonTrait.php b/Traits/FilesystemCommonTrait.php
diff --git a/Traits/RedisTrait.php b/Traits/RedisTrait.php

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ static function ($deferred, $namespace, &$expiredIds, $getId, $defaultLifetime)`
`87`	`87`	`*`
`88`	`88`	`* Using ApcuAdapter makes system caches compatible with read-only filesystems.`
`89`	`89`	`*/`
`90`		`- public static function createSystemCache(string $namespace, int $defaultLifetime, string $version, string $directory, LoggerInterface $logger = null): AdapterInterface`
	`90`	`+ public static function createSystemCache(string $namespace, int $defaultLifetime, string $version, string $directory, ?LoggerInterface $logger = null): AdapterInterface`
`91`	`91`	`{`
`92`	`92`	`$opcache = new PhpFilesAdapter($namespace, $defaultLifetime, $directory, true);`
`93`	`93`	`if (null !== $logger) {`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class ApcuAdapter extends AbstractAdapter`
`25`	`25`	`/**`
`26`	`26`	`* @throws CacheException if APCu is not enabled`
`27`	`27`	`*/`
`28`		`- public function __construct(string $namespace = '', int $defaultLifetime = 0, string $version = null, MarshallerInterface $marshaller = null)`
	`28`	`+ public function __construct(string $namespace = '', int $defaultLifetime = 0, ?string $version = null, ?MarshallerInterface $marshaller = null)`
`29`	`29`	`{`
`30`	`30`	`if (!static::isSupported()) {`
`31`	`31`	`throw new CacheException('APCu is not enabled.');`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ static function ($key, $value, $isHit, $tags) {`
`74`	`74`	`);`
`75`	`75`	`}`
`76`	`76`
`77`		`- public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed`
	`77`	`+ public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null): mixed`
`78`	`78`	`{`
`79`	`79`	`$item = $this->getItem($key);`
`80`	`80`	`$metadata = $item->getMetadata();`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class CouchbaseBucketAdapter extends AbstractAdapter`
`39`	`39`	`private \CouchbaseBucket $bucket;`
`40`	`40`	`private MarshallerInterface $marshaller;`
`41`	`41`
`42`		`- public function __construct(\CouchbaseBucket $bucket, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)`
	`42`	`+ public function __construct(\CouchbaseBucket $bucket, string $namespace = '', int $defaultLifetime = 0, ?MarshallerInterface $marshaller = null)`
`43`	`43`	`{`
`44`	`44`	`if (!static::isSupported()) {`
`45`	`45`	`throw new CacheException('Couchbase >= 2.6.0 < 3.0.0 is required.');`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class CouchbaseCollectionAdapter extends AbstractAdapter`
`32`	`32`	`private Collection $connection;`
`33`	`33`	`private MarshallerInterface $marshaller;`
`34`	`34`
`35`		`- public function __construct(Collection $connection, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)`
	`35`	`+ public function __construct(Collection $connection, string $namespace = '', int $defaultLifetime = 0, ?MarshallerInterface $marshaller = null)`
`36`	`36`	`{`
`37`	`37`	`if (!static::isSupported()) {`
`38`	`38`	`throw new CacheException('Couchbase >= 3.0.5 < 4.0.0 is required.');`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ class DoctrineDbalAdapter extends AbstractAdapter implements PruneableInterface`
`59`	`59`	`*`
`60`	`60`	`* @throws InvalidArgumentException When namespace contains invalid characters`
`61`	`61`	`*/`
`62`		`- public function __construct(Connection\|string $connOrDsn, string $namespace = '', int $defaultLifetime = 0, array $options = [], MarshallerInterface $marshaller = null)`
	`62`	`+ public function __construct(Connection\|string $connOrDsn, string $namespace = '', int $defaultLifetime = 0, array $options = [], ?MarshallerInterface $marshaller = null)`
`63`	`63`	`{`
`64`	`64`	`if (isset($namespace[0]) && preg_match('#[^-+.A-Za-z0-9]#', $namespace, $match)) {`
`65`	`65`	`throw new InvalidArgumentException(sprintf('Namespace contains "%s" but only characters in [-+.A-Za-z0-9] are allowed.', $match[0]));`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class FilesystemAdapter extends AbstractAdapter implements PruneableInterface`
`20`	`20`	`{`
`21`	`21`	`use FilesystemTrait;`
`22`	`22`
`23`		`- public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null, MarshallerInterface $marshaller = null)`
	`23`	`+ public function __construct(string $namespace = '', int $defaultLifetime = 0, ?string $directory = null, ?MarshallerInterface $marshaller = null)`
`24`	`24`	`{`
`25`	`25`	`$this->marshaller = $marshaller ?? new DefaultMarshaller();`
`26`	`26`	`parent::__construct('', $defaultLifetime);`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class FilesystemTagAwareAdapter extends AbstractTagAwareAdapter implements Prune`
`35`	`35`	`*/`
`36`	`36`	`private const TAG_FOLDER = 'tags';`
`37`	`37`
`38`		`- public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null, MarshallerInterface $marshaller = null)`
	`38`	`+ public function __construct(string $namespace = '', int $defaultLifetime = 0, ?string $directory = null, ?MarshallerInterface $marshaller = null)`
`39`	`39`	`{`
`40`	`40`	`$this->marshaller = new TagAwareMarshaller($marshaller);`
`41`	`41`	`parent::__construct('', $defaultLifetime);`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class MemcachedAdapter extends AbstractAdapter`
`46`	`46`	`*`
`47`	`47`	`* Using a MemcachedAdapter as a pure items store is fine.`
`48`	`48`	`*/`
`49`		`- public function __construct(\Memcached $client, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)`
	`49`	`+ public function __construct(\Memcached $client, string $namespace = '', int $defaultLifetime = 0, ?MarshallerInterface $marshaller = null)`
`50`	`50`	`{`
`51`	`51`	`if (!static::isSupported()) {`
`52`	`52`	`throw new CacheException('Memcached > 3.1.5 is required.');`