Skip to content

Commit 4167037

Browse files
jderussejderusse
committed
Allows URL DSN in Lock and Cache
1 parent 3f759d7 commit 4167037

File tree

6 files changed

+84
-6
lines changed

6 files changed

+84
-6
lines changed

‎src/Symfony/Component/Cache/Tests/Adapter/PdoAdapterTest.php‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,33 @@ public function testCleanupExpiredItems()
7171
$this->assertFalse($newItem->isHit());
7272
$this->assertSame(0, $getCacheItemCount(), 'PDOAdapter must clean up expired items');
7373
}
74+
75+
/**
76+
* @dataProvider provideDsn
77+
*/
78+
public function testDsn(string $dsn, string $file = null)
79+
{
80+
try {
81+
$pool = new PdoAdapter($dsn);
82+
$pool->createTable();
83+
84+
$item = $pool->getItem('key');
85+
$item->set('value');
86+
$this->assertTrue($pool->save($item));
87+
} finally {
88+
if (null !== $file) {
89+
@unlink($file);
90+
}
91+
}
92+
}
93+
94+
public function provideDsn()
95+
{
96+
$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
97+
yield ['sqlite://localhost/'.$dbFile, ''.$dbFile];
98+
yield ['sqlite:'.$dbFile, ''.$dbFile];
99+
yield ['sqlite3:///'.$dbFile, ''.$dbFile];
100+
yield ['sqlite://localhost/:memory:'];
101+
yield ['sqlite::memory:'];
102+
}
74103
}

‎src/Symfony/Component/Cache/Traits/PdoTrait.php‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Doctrine\DBAL\Connection;
1515
use Doctrine\DBAL\DBALException;
1616
use Doctrine\DBAL\Driver\ServerInfoAwareConnection;
17+
use Doctrine\DBAL\DriverManager;
1718
use Doctrine\DBAL\Exception\TableNotFoundException;
1819
use Doctrine\DBAL\Schema\Schema;
1920
use Symfony\Component\Cache\Exception\InvalidArgumentException;
@@ -370,8 +371,15 @@ protected function doSave(array $values, $lifetime)
370371
private function getConnection()
371372
{
372373
if (null === $this->conn) {
373-
$this->conn = new \PDO($this->dsn, $this->username, $this->password, $this->connectionOptions);
374-
$this->conn->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
374+
if (strpos($this->dsn, '://')) {
375+
if (!class_exists(DriverManager::class)) {
376+
throw new InvalidArgumentException(sprintf('Fail to parse the DSN "%s". Try running "composer require doctrine/dbal".', $this->dsn));
377+
}
378+
$this->conn = DriverManager::getConnection(['url' => $this->dsn]);
379+
} else {
380+
$this->conn = new \PDO($this->dsn, $this->username, $this->password, $this->connectionOptions);
381+
$this->conn->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
382+
}
375383
}
376384
if (null === $this->driver) {
377385
if ($this->conn instanceof \PDO) {

‎src/Symfony/Component/Cache/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"require-dev": {
3232
"cache/integration-tests": "dev-master",
3333
"doctrine/cache": "~1.6",
34-
"doctrine/dbal": "~2.5",
34+
"doctrine/dbal": "~2.5@stable",
3535
"predis/predis": "~1.1",
3636
"psr/simple-cache": "^1.0",
3737
"symfony/config": "^4.2|^5.0",

‎src/Symfony/Component/Lock/Store/PdoStore.php‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Doctrine\DBAL\Connection;
1515
use Doctrine\DBAL\DBALException;
16+
use Doctrine\DBAL\DriverManager;
1617
use Doctrine\DBAL\Schema\Schema;
1718
use Symfony\Component\Lock\Exception\InvalidArgumentException;
1819
use Symfony\Component\Lock\Exception\InvalidTtlException;
@@ -229,8 +230,15 @@ private function getUniqueToken(Key $key): string
229230
private function getConnection()
230231
{
231232
if (null === $this->conn) {
232-
$this->conn = new \PDO($this->dsn, $this->username, $this->password, $this->connectionOptions);
233-
$this->conn->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
233+
if (strpos($this->dsn, '://')) {
234+
if (!class_exists(DriverManager::class)) {
235+
throw new InvalidArgumentException(sprintf('Fail to parse the DSN "%s". Try running "composer require doctrine/dbal".', $this->dsn));
236+
}
237+
$this->conn = DriverManager::getConnection(['url' => $this->dsn]);
238+
} else {
239+
$this->conn = new \PDO($this->dsn, $this->username, $this->password, $this->connectionOptions);
240+
$this->conn->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
241+
}
234242
}
235243

236244
return $this->conn;

‎src/Symfony/Component/Lock/Tests/Store/PdoStoreTest.php‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,34 @@ public function testInvalidTtlConstruct()
7373

7474
return new PdoStore('sqlite:'.self::$dbFile, [], 0.1, 0.1);
7575
}
76+
77+
/**
78+
* @dataProvider provideDsn
79+
*/
80+
public function testDsn(string $dsn, string $file = null)
81+
{
82+
$key = new Key(uniqid(__METHOD__, true));
83+
84+
try {
85+
$store = new PdoStore($dsn);
86+
$store->createTable();
87+
88+
$store->save($key);
89+
$this->assertTrue($store->exists($key));
90+
} finally {
91+
if (null !== $file) {
92+
@unlink($file);
93+
}
94+
}
95+
}
96+
97+
public function provideDsn()
98+
{
99+
$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
100+
yield ['sqlite://localhost/'.$dbFile, ''.$dbFile];
101+
yield ['sqlite:'.$dbFile, ''.$dbFile];
102+
yield ['sqlite3:///'.$dbFile, ''.$dbFile];
103+
yield ['sqlite://localhost/:memory:'];
104+
yield ['sqlite::memory:'];
105+
}
76106
}

‎src/Symfony/Component/Lock/composer.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,13 @@
2020
"psr/log": "~1.0"
2121
},
2222
"require-dev": {
23-
"doctrine/dbal": "~2.4",
23+
"doctrine/dbal": "~2.5@stable",
2424
"mongodb/mongodb": "~1.1",
2525
"predis/predis": "~1.0"
2626
},
27+
"conflict": {
28+
"doctrine/dbal": "<2.5"
29+
},
2730
"autoload": {
2831
"psr-4": { "Symfony\\Component\\Lock\\": "" },
2932
"exclude-from-classmap": [

0 commit comments

Comments
 (0)