Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 99627f327757 · 2022-01-27T14:04:46.000+01:00
* 5.4:
  [Lock] fix transient test
  [HttpKernel] fix tests
diff --git a/Tests/Store/DoctrineDbalStoreTest.php b/Tests/Store/DoctrineDbalStoreTest.php
@@ -99,7 +99,7 @@ public function provideDsn()
     public function testCreatesTableInTransaction(string $platform)
     {
         $conn = $this->createMock(Connection::class);
-        $conn->expects($this->exactly(3))
+        $conn->expects($this->atLeast(3))
             ->method('executeStatement')
             ->withConsecutive(
                 [$this->stringContains('INSERT INTO')],

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public function provideDsn()`
`99`	`99`	`public function testCreatesTableInTransaction(string $platform)`
`100`	`100`	`{`
`101`	`101`	`$conn = $this->createMock(Connection::class);`
`102`		`- $conn->expects($this->exactly(3))`
	`102`	`+ $conn->expects($this->atLeast(3))`
`103`	`103`	`->method('executeStatement')`
`104`	`104`	`->withConsecutive(`
`105`	`105`	`[$this->stringContains('INSERT INTO')],`