Skip to content

Commit 0146355

Browse files
Merge branch '3.4' into 4.4
* 3.4: Correctly use doctrine/dbal v3+
2 parents cfa26d8 + 3617ccf commit 0146355

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Security/RememberMe/DoctrineTokenProvider.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Bridge\Doctrine\Security\RememberMe;
1313

1414
use Doctrine\DBAL\Connection;
15+
use Doctrine\DBAL\Driver\Result;
1516
use Doctrine\DBAL\Types\Type;
1617
use Doctrine\DBAL\Types\Types;
1718
use Symfony\Component\Security\Core\Authentication\RememberMe\PersistentToken;
@@ -63,7 +64,7 @@ public function loadTokenBySeries($series)
6364
$paramValues = ['series' => $series];
6465
$paramTypes = ['series' => \PDO::PARAM_STR];
6566
$stmt = $this->conn->executeQuery($sql, $paramValues, $paramTypes);
66-
$row = method_exists($stmt, 'fetchAssociative') ? $stmt->fetchAssociative() : $stmt->fetch(\PDO::FETCH_ASSOC);
67+
$row = $stmt instanceof Result ? $stmt->fetchAssociative() : $stmt->fetch(\PDO::FETCH_ASSOC);
6768

6869
if ($row) {
6970
return new PersistentToken($row['class'], $row['username'], $series, $row['value'], new \DateTime($row['last_used']));

0 commit comments

Comments
 (0)