diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix forward compatibility with Doctrine DBAL 3

Browse Source
This commit is contained in:
Christian Flothmann 2020-06-09 13:11:23 +02:00
parent 911c5d5cbd
commit 316efef8b8
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Component/Cache/Tests/Traits/PdoPruneableTrait.php
View File

@ -11,6 +11,8 @@
namespace Symfony\Component\Cache\Tests\Traits; namespace Symfony\Component\Cache\Tests\Traits;
use Doctrine\DBAL\Result;
trait PdoPruneableTrait trait PdoPruneableTrait
{ {
protected function isPruned($cache, $name) protected function isPruned($cache, $name)
@ -27,8 +29,8 @@ trait PdoPruneableTrait
/** @var \Doctrine\DBAL\Statement|\PDOStatement $select */ /** @var \Doctrine\DBAL\Statement|\PDOStatement $select */
$select = $getPdoConn->invoke($cache)->prepare('SELECT 1 FROM cache_items WHERE item_id LIKE :id'); $select = $getPdoConn->invoke($cache)->prepare('SELECT 1 FROM cache_items WHERE item_id LIKE :id');
$select->bindValue(':id', sprintf('%%%s', $name)); $select->bindValue(':id', sprintf('%%%s', $name));
$select->execute(); $result = $select->execute();
return 1 !== (int) (method_exists($select, 'fetchOne') ? $select->fetchOne() : $select->fetch(\PDO::FETCH_COLUMN)); return 1 !== (int) ($result instanceof Result ? $result->fetchOne() : $select->fetch(\PDO::FETCH_COLUMN));
} }
} }

14
src/Symfony/Component/Cache/Traits/PdoTrait.php
View File

@ -14,6 +14,7 @@ namespace Symfony\Component\Cache\Traits;
use Doctrine\DBAL\Connection; use Doctrine\DBAL\Connection;
use Doctrine\DBAL\DBALException; use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Driver\ServerInfoAwareConnection; use Doctrine\DBAL\Driver\ServerInfoAwareConnection;
use Doctrine\DBAL\Result;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Symfony\Component\Cache\Exception\InvalidArgumentException; use Symfony\Component\Cache\Exception\InvalidArgumentException;
@ -175,15 +176,16 @@ trait PdoTrait
foreach ($ids as $id) { foreach ($ids as $id) {
$stmt->bindValue(++$i, $id); $stmt->bindValue(++$i, $id);
} }
$stmt->execute(); $result = $stmt->execute();
if (method_exists($stmt, 'iterateNumeric')) { if ($result instanceof Result) {
$stmt = $stmt->iterateNumeric(); $result = $result->iterateNumeric();
} else { } else {
$stmt->setFetchMode(\PDO::FETCH_NUM); $stmt->setFetchMode(\PDO::FETCH_NUM);
$result = $stmt;
} }
foreach ($stmt as $row) { foreach ($result as $row) {
if (null === $row[1]) { if (null === $row[1]) {
$expired[] = $row[0]; $expired[] = $row[0];
} else { } else {
@ -213,9 +215,9 @@ trait PdoTrait
$stmt->bindValue(':id', $id); $stmt->bindValue(':id', $id);
$stmt->bindValue(':time', time(), \PDO::PARAM_INT); $stmt->bindValue(':time', time(), \PDO::PARAM_INT);
$stmt->execute(); $result = $stmt->execute();
return (bool) $stmt->fetchColumn(); return (bool) ($result instanceof Result ? $result->fetchOne() : $stmt->fetchColumn());
} }
/** /**