Merge branch '5.4' into 6.0

* 5.4:
  [Lock] fix transient test

Author: nicolas-grekas

Tests/Store/DoctrineDbalStoreTest.php

@@ -145,7 +145,7 @@ public function providePlatforms()
     public function testTableCreationInTransactionNotSupported()
     {
         $conn = $this->createMock(Connection::class);
-        $conn->expects($this->exactly(2))
+        $conn->expects($this->atLeast(2))
             ->method('executeStatement')
             ->withConsecutive(
                 [$this->stringContains('INSERT INTO')],
@@ -168,7 +168,7 @@ public function testTableCreationInTransactionNotSupported()
         $platform->method('getCreateTableSQL')
             ->willReturn(['create sql stmt']);
 
-        $conn->expects($this->exactly(2))
+        $conn->expects($this->atLeast(2))
             ->method('getDatabasePlatform');
 
         $store = new DoctrineDbalStore($conn);
@@ -181,7 +181,7 @@ public function testTableCreationInTransactionNotSupported()
     public function testCreatesTableOutsideTransaction()
     {
         $conn = $this->createMock(Connection::class);
-        $conn->expects($this->exactly(3))
+        $conn->expects($this->atLeast(3))
             ->method('executeStatement')
             ->withConsecutive(
                 [$this->stringContains('INSERT INTO')],