Merge branch '5.2' into 5.x

* 5.2:
  More cleanups and fixes
  More cleanups and fixes
  Fix merge

Author: nicolas-grekas

Tests/LockFactoryTest.php

@@ -54,7 +54,7 @@ public function testCreateLock()
 
     public function testCreateLockFromKey()
     {
-        $store = $this->getMockBuilder(PersistingStoreInterface::class)->getMock();
+        $store = $this->createMock(PersistingStoreInterface::class);
         $store->expects($this->any())->method('exists')->willReturn(false);
 
         $keys = [];
@@ -68,7 +68,7 @@ public function testCreateLockFromKey()
             }))
             ->willReturn(true);
 
-        $logger = $this->getMockBuilder(LoggerInterface::class)->getMock();
+        $logger = $this->createMock(LoggerInterface::class);
         $factory = new LockFactory($store);
         $factory->setLogger($logger);
 

Tests/LockTest.php

@@ -63,7 +63,7 @@ public function testAcquireNoBlockingWithPersistingStoreInterface()
     public function testAcquireBlockingWithPersistingStoreInterface()
     {
         $key = new Key(uniqid(__METHOD__, true));
-        $store = $this->getMockBuilder(PersistingStoreInterface::class)->getMock();
+        $store = $this->createMock(PersistingStoreInterface::class);
         $lock = new Lock($key, $store);
 
         $store
@@ -79,7 +79,7 @@ public function testAcquireBlockingWithPersistingStoreInterface()
     public function testAcquireBlockingRetryWithPersistingStoreInterface()
     {
         $key = new Key(uniqid(__METHOD__, true));
-        $store = $this->getMockBuilder(PersistingStoreInterface::class)->getMock();
+        $store = $this->createMock(PersistingStoreInterface::class);
         $lock = new Lock($key, $store);
 
         $store