Merge branch '5.1' into 5.x

* 5.1:
  [Contracts] add branch-aliases for dev-main
  [Cache] Make Redis initializers static
  [Messenger] Fixed typos in Connection
  [CI] Fixed build on AppVeyor
  Fix tests typo
  [Lock] Reset Key lifetime time before we acquire it
  [CI] Silence errors when remove file/dir on test tearDown()
  Fix tests
  Remove content-type check on toArray methods

Author: nicolas-grekas

Lock.php

@@ -66,6 +66,7 @@ public function __destruct()
      */
     public function acquire(bool $blocking = false): bool
     {
+        $this->key->resetLifetime();
         try {
             if ($blocking) {
                 if (!$this->store instanceof BlockingStoreInterface) {

Tests/LockTest.php

@@ -460,7 +460,7 @@ public function exists(Key $key)
                 return isset($this->keys[spl_object_hash($key)]);
             }
 
-            public function putOffExpiration(Key $key, float $ttl)
+            public function putOffExpiration(Key $key, $ttl)
             {
                 $key->reduceLifetime($ttl);
                 $this->checkNotExpired($key);
@@ -476,6 +476,52 @@ public function putOffExpiration(Key $key, float $ttl)
         $lock->release();
     }
 
+    /**
+     * @group time-sensitive
+     */
+    public function testAcquireTwiceWithExpiration()
+    {
+        $key = new Key(uniqid(__METHOD__, true));
+        $store = new class() implements PersistingStoreInterface {
+            use ExpiringStoreTrait;
+            private $keys = [];
+            private $initialTtl = 30;
+
+            public function save(Key $key)
+            {
+                $key->reduceLifetime($this->initialTtl);
+                $this->keys[spl_object_hash($key)] = $key;
+                $this->checkNotExpired($key);
+
+                return true;
+            }
+
+            public function delete(Key $key)
+            {
+                unset($this->keys[spl_object_hash($key)]);
+            }
+
+            public function exists(Key $key)
+            {
+                return isset($this->keys[spl_object_hash($key)]);
+            }
+
+            public function putOffExpiration(Key $key, $ttl)
+            {
+                $key->reduceLifetime($ttl);
+                $this->checkNotExpired($key);
+            }
+        };
+        $ttl = 1;
+        $lock = new Lock($key, $store, $ttl);
+
+        $this->assertTrue($lock->acquire());
+        $lock->release();
+        sleep($ttl + 1);
+        $this->assertTrue($lock->acquire());
+        $lock->release();
+    }
+
     public function testAcquireReadBlockingWithBlockingSharedLockStoreInterface()
     {
         $key = new Key(uniqid(__METHOD__, true));