Skip to content

Commit d3a8a1f

Browse files
Merge branch '4.4' into 5.0
* 4.4: Handle fetch mode deprecation of DBAL 2.11. Fixed handling of CSRF logout error [WebProfilerBundle] changed label of memory usage in time panel (Mb into MiB) [DotEnv][WebLink][Templating][ErrorHandler] Updated README with minimal example
2 parents 2fd7248 + c041834 commit d3a8a1f

File tree

2 files changed

+89
-1
lines changed

2 files changed

+89
-1
lines changed

Security/RememberMe/DoctrineTokenProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function loadTokenBySeries(string $series)
6363
$paramValues = ['series' => $series];
6464
$paramTypes = ['series' => \PDO::PARAM_STR];
6565
$stmt = $this->conn->executeQuery($sql, $paramValues, $paramTypes);
66-
$row = $stmt->fetch(\PDO::FETCH_ASSOC);
66+
$row = method_exists($stmt, 'fetchAssociative') ? $stmt->fetchAssociative() : $stmt->fetch(\PDO::FETCH_ASSOC);
6767

6868
if ($row) {
6969
return new PersistentToken($row['class'], $row['username'], $series, $row['value'], new \DateTime($row['last_used']));
Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
<?php
2+
3+
namespace Security\RememberMe;
4+
5+
use Doctrine\DBAL\DriverManager;
6+
use PHPUnit\Framework\TestCase;
7+
use Symfony\Bridge\Doctrine\Security\RememberMe\DoctrineTokenProvider;
8+
use Symfony\Component\Security\Core\Authentication\RememberMe\PersistentToken;
9+
use Symfony\Component\Security\Core\Exception\TokenNotFoundException;
10+
11+
/**
12+
* @requires extension pdo_sqlite
13+
*/
14+
class DoctrineTokenProviderTest extends TestCase
15+
{
16+
public static function setUpBeforeClass()
17+
{
18+
if (\PHP_VERSION_ID >= 80000) {
19+
self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
20+
}
21+
}
22+
23+
public function testCreateNewToken()
24+
{
25+
$provider = $this->bootstrapProvider();
26+
27+
$token = new PersistentToken('someClass', 'someUser', 'someSeries', 'tokenValue', new \DateTime('2013-01-26T18:23:51'));
28+
$provider->createNewToken($token);
29+
30+
$this->assertEquals($provider->loadTokenBySeries('someSeries'), $token);
31+
}
32+
33+
public function testLoadTokenBySeriesThrowsNotFoundException()
34+
{
35+
$provider = $this->bootstrapProvider();
36+
37+
$this->expectException(TokenNotFoundException::class);
38+
$provider->loadTokenBySeries('someSeries');
39+
}
40+
41+
public function testUpdateToken()
42+
{
43+
$provider = $this->bootstrapProvider();
44+
45+
$token = new PersistentToken('someClass', 'someUser', 'someSeries', 'tokenValue', new \DateTime('2013-01-26T18:23:51'));
46+
$provider->createNewToken($token);
47+
$provider->updateToken('someSeries', 'newValue', $lastUsed = new \DateTime('2014-06-26T22:03:46'));
48+
$token = $provider->loadTokenBySeries('someSeries');
49+
50+
$this->assertEquals('newValue', $token->getTokenValue());
51+
$this->assertEquals($token->getLastUsed(), $lastUsed);
52+
}
53+
54+
public function testDeleteToken()
55+
{
56+
$provider = $this->bootstrapProvider();
57+
$token = new PersistentToken('someClass', 'someUser', 'someSeries', 'tokenValue', new \DateTime('2013-01-26T18:23:51'));
58+
$provider->createNewToken($token);
59+
$provider->deleteTokenBySeries('someSeries');
60+
61+
$this->expectException(TokenNotFoundException::class);
62+
63+
$provider->loadTokenBySeries('someSeries');
64+
}
65+
66+
/**
67+
* @return DoctrineTokenProvider
68+
*/
69+
private function bootstrapProvider()
70+
{
71+
$connection = DriverManager::getConnection([
72+
'driver' => 'pdo_sqlite',
73+
'url' => 'sqlite:///:memory:',
74+
]);
75+
$connection->executeUpdate(<<< 'SQL'
76+
CREATE TABLE rememberme_token (
77+
series char(88) UNIQUE PRIMARY KEY NOT NULL,
78+
value char(88) NOT NULL,
79+
lastUsed datetime NOT NULL,
80+
class varchar(100) NOT NULL,
81+
username varchar(200) NOT NULL
82+
);
83+
SQL
84+
);
85+
86+
return new DoctrineTokenProvider($connection);
87+
}
88+
}

0 commit comments

Comments
 (0)