8000 [Cache] allow DBAL v3 · symfony/symfony@d12b3b6 · GitHub
[go: up one dir, main page]

Skip to content

Commit d12b3b6

Browse files
[Cache] allow DBAL v3
1 parent 2799d55 commit d12b3b6

File tree

3 files changed

+3
-13
lines changed

3 files changed

+3
-13
lines changed

src/Symfony/Component/Cache/Tests/Adapter/PdoDbalAdapterTest.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\Cache\Tests\Adapter;
1313

1414
use Doctrine\DBAL\DriverManager;
15-
use Doctrine\DBAL\Version;
1615
use Symfony\Component\Cache\Adapter\PdoAdapter;
1716
use Symfony\Component\Cache\Tests\Traits\PdoPruneableTrait;
1817

@@ -31,10 +30,6 @@ public static function setUpBeforeClass()
3130
self::markTestSkipped('Extension pdo_sqlite required.');
3231
}
3332

34-
if (\PHP_VERSION_ID >= 80000 && class_exists(Version::class)) {
35-
self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
36-
}
37-
3833
self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
3934

4035
$pool = new PdoAdapter(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]));

src/Symfony/Component/Cache/Tests/Simple/PdoDbalCacheTest.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\Cache\Tests\Simple;
1313

1414
use Doctrine\DBAL\DriverManager;
15-
use Doctrine\DBAL\Version;
1615
use Symfony\Component\Cache\Simple\PdoCache;
1716
use 8000 Symfony\Component\Cache\Tests\Traits\PdoPruneableTrait;
1817

@@ -31,10 +30,6 @@ public static function setUpBeforeClass()
3130
self::markTestSkipped('Extension pdo_sqlite required.');
3231
}
3332

34-
if (\PHP_VERSION_ID >= 80000 && class_exists(Version::class)) {
35-
self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
36-
}
37-
3833
self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
3934

4035
$pool = new PdoCache(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]));

src/Symfony/Component/Cache/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
},
2929
"require-dev": {
3030
"cache/integration-tests": "dev-master",
31-
"doctrine/cache": "~1.6",
32-
"doctrine/dbal": "~2.4|~3.0",
33-
"predis/predis": "~1.0"
31+
"doctrine/cache": "^1.6",
32+
"doctrine/dbal": "^2.4|^3.0",
33+
"predis/predis": "^1.0"
3434
},
3535
"conflict": {
3636
"symfony/var-dumper": "<3.3"

0 commit comments

Comments
 (0)
0