Merge branch '6.x' into 7.x

Author: driesvints

tests/Database/DatabaseConnectionTest.php

@@ -151,8 +151,9 @@ public function testTransactionLevelNotIncrementedOnTransactionException()
     public function testBeginTransactionMethodRetriesOnFailure()
     {
         $pdo = $this->createMock(DatabaseConnectionTestMockPDO::class);
-        $pdo->expects($this->exactly(2))->method('beginTransaction');
-        $pdo->expects($this->at(0))->method('beginTransaction')->will($this->throwException(new ErrorException('server has gone away')));
+        $pdo->expects($this->at(0))
+            ->method('beginTransaction')
+            ->will($this->throwException(new ErrorException('server has gone away')));
         $connection = $this->getMockConnection(['reconnect'], $pdo);
         $connection->expects($this->once())->method('reconnect');
         $connection->beginTransaction();