Merge branch '3.4' into 4.4
* 3.4: [Cache] fix parse error on PHP 5.5
This commit is contained in:
commit
e1050c9373
@ -12,7 +12,6 @@
|
|||||||
namespace Symfony\Component\Messenger\Tests\Transport\Doctrine;
|
namespace Symfony\Component\Messenger\Tests\Transport\Doctrine;
|
||||||
|
|
||||||
use Doctrine\DBAL\DBALException;
|
use Doctrine\DBAL\DBALException;
|
||||||
use Doctrine\DBAL\Driver\ResultStatement;
|
|
||||||
use Doctrine\DBAL\Platforms\AbstractPlatform;
|
use Doctrine\DBAL\Platforms\AbstractPlatform;
|
||||||
use Doctrine\DBAL\Query\QueryBuilder;
|
use Doctrine\DBAL\Query\QueryBuilder;
|
||||||
use Doctrine\DBAL\Schema\AbstractSchemaManager;
|
use Doctrine\DBAL\Schema\AbstractSchemaManager;
|
||||||
@ -143,7 +142,7 @@ class ConnectionTest extends TestCase
|
|||||||
return $queryBuilder;
|
return $queryBuilder;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function getStatementMock($expectedResult): ResultStatement
|
private function getStatementMock($expectedResult)
|
||||||
{
|
{
|
||||||
$stmt = $this->createMock(Statement::class);
|
$stmt = $this->createMock(Statement::class);
|
||||||
|
|
||||||
|
@ -13,7 +13,6 @@ namespace Symfony\Component\Messenger\Transport\Doctrine;
|
|||||||
|
|
||||||
use Doctrine\DBAL\Connection as DBALConnection;
|
use Doctrine\DBAL\Connection as DBALConnection;
|
||||||
use Doctrine\DBAL\DBALException;
|
use Doctrine\DBAL\DBALException;
|
||||||
use Doctrine\DBAL\Driver\ResultStatement;
|
|
||||||
use Doctrine\DBAL\Exception\TableNotFoundException;
|
use Doctrine\DBAL\Exception\TableNotFoundException;
|
||||||
use Doctrine\DBAL\Query\QueryBuilder;
|
use Doctrine\DBAL\Query\QueryBuilder;
|
||||||
use Doctrine\DBAL\Schema\Schema;
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
@ -310,7 +309,7 @@ class Connection
|
|||||||
->from($this->configuration['table_name'], 'm');
|
->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 {
|
try {
|
||||||
$stmt = $this->driverConnection->executeQuery($sql, $parameters, $types);
|
$stmt = $this->driverConnection->executeQuery($sql, $parameters, $types);
|
||||||
|
Reference in New Issue
Block a user