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

bug #37169 [Cache] fix forward compatibility with Doctrine DBAL 3 (xabbuh) 

This PR was merged into the 3.4 branch.

Discussion
----------

[Cache] fix forward compatibility with Doctrine DBAL 3

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       | Fix https://github.com/symfony/symfony/pull/36987#issuecomment-641208638
| License       | MIT
| Doc PR        |

Commits
-------

316efef8b8 fix forward compatibility with Doctrine DBAL 3
This commit is contained in:
Nicolas Grekas 2020-06-09 13:26:53 +02:00
parent 911c5d5cbd 316efef8b8
commit e26d5f217b
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;
use Doctrine\DBAL\Result;
trait PdoPruneableTrait
{
protected function isPruned($cache, $name)
@ -27,8 +29,8 @@ trait PdoPruneableTrait
/** @var \Doctrine\DBAL\Statement|\PDOStatement $select */
$select = $getPdoConn->invoke($cache)->prepare('SELECT 1 FROM cache_items WHERE item_id LIKE :id');
$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\DBALException;
use Doctrine\DBAL\Driver\ServerInfoAwareConnection;
use Doctrine\DBAL\Result;
use Doctrine\DBAL\Schema\Schema;
use Symfony\Component\Cache\Exception\InvalidArgumentException;
@ -175,15 +176,16 @@ trait PdoTrait
foreach ($ids as $id) {
$stmt->bindValue(++$i, $id);
}
$stmt->execute();
$result = $stmt->execute();
if (method_exists($stmt, 'iterateNumeric')) {
$stmt = $stmt->iterateNumeric();
if ($result instanceof Result) {
$result = $result->iterateNumeric();
} else {
$stmt->setFetchMode(\PDO::FETCH_NUM);
$result = $stmt;
}
foreach ($stmt as $row) {
foreach ($result as $row) {
if (null === $row[1]) {
$expired[] = $row[0];
} else {
@ -213,9 +215,9 @@ trait PdoTrait
$stmt->bindValue(':id', $id);
$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());
}
/**