Merge branch '6.3' into 6.4

* 6.3:
  minor #53524 [Messenger] [AmazonSqs] Allow `async-aws/sqs` version 2 (smoench)
  Fix bad merge
  List CS fix in .git-blame-ignore-revs
  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

Author: nicolas-grekas

Lock.php

@@ -175,7 +175,7 @@ public function acquireRead(bool $blocking = false): bool
         }
     }
 
-    public function refresh(float $ttl = null): void
+    public function refresh(?float $ttl = null): void
     {
         if (!$ttl ??= $this->ttl) {
             throw new InvalidArgumentException('You have to define an expiration duration.');

LockInterface.php

@@ -41,7 +41,7 @@ public function acquire(bool $blocking = false): bool;
      * @throws LockConflictedException If the lock is acquired by someone else
      * @throws LockAcquiringException  If the lock cannot be refreshed
      */
-    public function refresh(float $ttl = null);
+    public function refresh(?float $ttl = null);
 
     /**
      * Returns whether or not the lock is acquired.

NoLock.php

@@ -26,7 +26,7 @@ public function acquire(bool $blocking = false): bool
         return true;
     }
 
-    public function refresh(float $ttl = null): void
+    public function refresh(?float $ttl = null): void
     {
     }
 

Store/FlockStore.php

@@ -37,7 +37,7 @@ class FlockStore implements BlockingStoreInterface, SharedLockStoreInterface
      *
      * @throws LockStorageException If the lock directory doesn’t exist or is not writable
      */
-    public function __construct(string $lockPath = null)
+    public function __construct(?string $lockPath = null)
     {
         if (!is_dir($lockPath ??= sys_get_temp_dir())) {
             if (false === @mkdir($lockPath, 0777, true) && !is_dir($lockPath)) {

Tests/Store/DoctrineDbalStoreTest.php

@@ -76,7 +76,7 @@ public function testAbortAfterExpiration()
     /**
      * @dataProvider provideDsnWithSQLite
      */
-    public function testDsnWithSQLite(string $dsn, string $file = null)
+    public function testDsnWithSQLite(string $dsn, ?string $file = null)
     {
         $key = new Key(uniqid(__METHOD__, true));
 

Tests/Store/PdoStoreTest.php

@@ -72,7 +72,7 @@ public function testInvalidTtlConstruct()
     /**
      * @dataProvider provideDsnWithSQLite
      */
-    public function testDsnWithSQLite(string $dsn, string $file = null)
+    public function testDsnWithSQLite(string $dsn, ?string $file = null)
     {
         $key = new Key(uniqid(__METHOD__, true));