Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit e1050c93731b · 2020-06-09T14:08:55.000+02:00
* 3.4:
  [Cache] fix parse error on PHP 5.5
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/ConnectionTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/ConnectionTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Messenger\Tests\Transport\Doctrine;
 
 use Doctrine\DBAL\DBALException;
-use Doctrine\DBAL\Driver\ResultStatement;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Query\QueryBuilder;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
@@ -143,7 +142,7 @@ private function getQueryBuilderMock()
         return $queryBuilder;
     }
 
-    private function getStatementMock($expectedResult): ResultStatement
+    private function getStatementMock($expectedResult)
     {
         $stmt = $this->createMock(Statement::class);
 
diff --git a/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php b/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php
@@ -13,7 +13,6 @@
 
 use Doctrine\DBAL\Connection as DBALConnection;
 use Doctrine\DBAL\DBALException;
-use Doctrine\DBAL\Driver\ResultStatement;
 use Doctrine\DBAL\Exception\TableNotFoundException;
 use Doctrine\DBAL\Query\QueryBuilder;
 use Doctrine\DBAL\Schema\Schema;
@@ -310,7 +309,7 @@ private function createQueryBuilder(): QueryBuilder
             ->from($this->configuration['table_name'], 'm');
     }
 
-    private function executeQuery(string $sql, array $parameters = [], array $types = []): ResultStatement
+    private function executeQuery(string $sql, array $parameters = [], array $types = [])
     {
         try {
             $stmt = $this->driverConnection->executeQuery($sql, $parameters, $types);

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`namespace Symfony\Component\Messenger\Tests\Transport\Doctrine;`
`13`	`13`
`14`	`14`	`use Doctrine\DBAL\DBALException;`
`15`		`-use Doctrine\DBAL\Driver\ResultStatement;`
`16`	`15`	`use Doctrine\DBAL\Platforms\AbstractPlatform;`
`17`	`16`	`use Doctrine\DBAL\Query\QueryBuilder;`
`18`	`17`	`use Doctrine\DBAL\Schema\AbstractSchemaManager;`
`@@ -143,7 +142,7 @@ private function getQueryBuilderMock()`
`143`	`142`	`return $queryBuilder;`
`144`	`143`	`}`
`145`	`144`
`146`		`- private function getStatementMock($expectedResult): ResultStatement`
	`145`	`+ private function getStatementMock($expectedResult)`
`147`	`146`	`{`
`148`	`147`	`$stmt = $this->createMock(Statement::class);`
`149`	`148`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`
`14`	`14`	`use Doctrine\DBAL\Connection as DBALConnection;`
`15`	`15`	`use Doctrine\DBAL\DBALException;`
`16`		`-use Doctrine\DBAL\Driver\ResultStatement;`
`17`	`16`	`use Doctrine\DBAL\Exception\TableNotFoundException;`
`18`	`17`	`use Doctrine\DBAL\Query\QueryBuilder;`
`19`	`18`	`use Doctrine\DBAL\Schema\Schema;`
`@@ -310,7 +309,7 @@ private function createQueryBuilder(): QueryBuilder`
`310`	`309`	`->from($this->configuration['table_name'], 'm');`
`311`	`310`	`}`
`312`	`311`
`313`		`- private function executeQuery(string $sql, array $parameters = [], array $types = []): ResultStatement`
	`312`	`+ private function executeQuery(string $sql, array $parameters = [], array 492B $types = [])`
`314`	`313`	`{`
`315`	`314`	`try {`
`316`	`315`	`$stmt = $this->driverConnection->executeQuery($sql, $parameters, $types);`