[Cache] allow DBAL v3
This commit is contained in:
parent
2799d559f3
commit
d12b3b6a72
@ -12,7 +12,6 @@
|
|||||||
namespace Symfony\Component\Cache\Tests\Adapter;
|
namespace Symfony\Component\Cache\Tests\Adapter;
|
||||||
|
|
||||||
use Doctrine\DBAL\DriverManager;
|
use Doctrine\DBAL\DriverManager;
|
||||||
use Doctrine\DBAL\Version;
|
|
||||||
use Symfony\Component\Cache\Adapter\PdoAdapter;
|
use Symfony\Component\Cache\Adapter\PdoAdapter;
|
||||||
use Symfony\Component\Cache\Tests\Traits\PdoPruneableTrait;
|
use Symfony\Component\Cache\Tests\Traits\PdoPruneableTrait;
|
||||||
|
|
||||||
@ -31,10 +30,6 @@ class PdoDbalAdapterTest extends AdapterTestCase
|
|||||||
self::markTestSkipped('Extension pdo_sqlite required.');
|
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');
|
self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
|
||||||
|
|
||||||
$pool = new PdoAdapter(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]));
|
$pool = new PdoAdapter(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]));
|
||||||
|
@ -12,7 +12,6 @@
|
|||||||
namespace Symfony\Component\Cache\Tests\Simple;
|
namespace Symfony\Component\Cache\Tests\Simple;
|
||||||
|
|
||||||
use Doctrine\DBAL\DriverManager;
|
use Doctrine\DBAL\DriverManager;
|
||||||
use Doctrine\DBAL\Version;
|
|
||||||
use Symfony\Component\Cache\Simple\PdoCache;
|
use Symfony\Component\Cache\Simple\PdoCache;
|
||||||
use Symfony\Component\Cache\Tests\Traits\PdoPruneableTrait;
|
use Symfony\Component\Cache\Tests\Traits\PdoPruneableTrait;
|
||||||
|
|
||||||
@ -31,10 +30,6 @@ class PdoDbalCacheTest extends CacheTestCase
|
|||||||
self::markTestSkipped('Extension pdo_sqlite required.');
|
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');
|
self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
|
||||||
|
|
||||||
$pool = new PdoCache(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]));
|
$pool = new PdoCache(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]));
|
||||||
|
@ -28,9 +28,9 @@
|
|||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"cache/integration-tests": "dev-master",
|
"cache/integration-tests": "dev-master",
|
||||||
"doctrine/cache": "~1.6",
|
"doctrine/cache": "^1.6",
|
||||||
"doctrine/dbal": "~2.4|~3.0",
|
"doctrine/dbal": "^2.4|^3.0",
|
||||||
"predis/predis": "~1.0"
|
"predis/predis": "^1.0"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
"symfony/var-dumper": "<3.3"
|
"symfony/var-dumper": "<3.3"
|
||||||
|
Reference in New Issue
Block a user