[Cache] allow DBAL v3

symfony · May 23, 2020 · d12b3b6 · d12b3b6
1 parent 2799d55
commit d12b3b6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PdoDbalAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PdoDbalAdapterTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Cache\Tests\Adapter;
 
 use Doctrine\DBAL\DriverManager;
-use Doctrine\DBAL\Version;
 use Symfony\Component\Cache\Adapter\PdoAdapter;
 use Symfony\Component\Cache\Tests\Traits\PdoPruneableTrait;
 
@@ -31,10 +30,6 @@ public static function setUpBeforeClass()
             self::markTestSkipped('Extension pdo_sqlite required.');
         }
 
-        if (\PHP_VERSION_ID >= 80000 && class_exists(Version::class)) {
-            self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
-        }
-
         self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
 
         $pool = new PdoAdapter(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]));

diff --git a/src/Symfony/Component/Cache/Tests/Simple/PdoDbalCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/PdoDbalCacheTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Cache\Tests\Simple;
 
 use Doctrine\DBAL\DriverManager;
-use Doctrine\DBAL\Version;
 use Symfony\Component\Cache\Simple\PdoCache;
 use Symfony\Component\Cache\Tests\Traits\PdoPruneableTrait;
 
@@ -31,10 +30,6 @@ public static function setUpBeforeClass()
             self::markTestSkipped('Extension pdo_sqlite required.');
         }
 
-        if (\PHP_VERSION_ID >= 80000 && class_exists(Version::class)) {
-            self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
-        }
-
         self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
 
         $pool = new PdoCache(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]));

diff --git a/src/Symfony/Component/Cache/composer.json b/src/Symfony/Component/Cache/composer.json
@@ -28,9 +28,9 @@
     },
     "require-dev": {
         "cache/integration-tests": "dev-master",
-        "doctrine/cache": "~1.6",
-        "doctrine/dbal": "~2.4|~3.0",
-        "predis/predis": "~1.0"
+        "doctrine/cache": "^1.6",
+        "doctrine/dbal": "^2.4|^3.0",
+        "predis/predis": "^1.0"
     },
     "conflict": {
         "symfony/var-dumper": "<3.3"