fix

Author: vjik

composer.json

@@ -43,12 +43,12 @@
         "spatie/phpunit-watcher": "^1.24",
         "vimeo/psalm": "^5.26.1 || ^6.9.1",
         "vlucas/phpdotenv": "^5.6.2",
-        "yiisoft/cache": "^3.1",
         "yiisoft/db-mssql": "^2.0",
         "yiisoft/db-mysql": "^2.0",
         "yiisoft/db-oracle": "^2.0",
         "yiisoft/db-pgsql": "^2.0",
         "yiisoft/db-sqlite": "^2.0",
+        "yiisoft/psr-dummy-provider": "^1.0.2",
         "yiisoft/test-support": "^3.0"
     },
     "autoload": {

tests/Mssql/DatabaseTrait.php

@@ -4,12 +4,12 @@
 
 namespace Yiisoft\Data\Db\Tests\Mssql;
 
-use Yiisoft\Cache\ArrayCache;
 use Yiisoft\Data\Db\Tests\TestHelper;
 use Yiisoft\Db\Cache\SchemaCache;
 use Yiisoft\Db\Driver\Pdo\PdoConnectionInterface;
 use Yiisoft\Db\Mssql\Connection;
 use Yiisoft\Db\Mssql\Driver;
+use Yiisoft\Test\Support\SimpleCache\MemorySimpleCache;
 
 trait DatabaseTrait
 {
@@ -28,7 +28,7 @@ protected function makeConnection(): PdoConnectionInterface
         );
         $pdoDriver->charset('UTF8MB4');
 
-        $db = new Connection($pdoDriver, new SchemaCache(new ArrayCache()));
+        $db = new Connection($pdoDriver, new SchemaCache(new MemorySimpleCache()));
 
         TestHelper::loadFixtures($db);
 

tests/Mysql/DatabaseTrait.php

@@ -4,12 +4,12 @@
 
 namespace Yiisoft\Data\Db\Tests\Mysql;
 
-use Yiisoft\Cache\ArrayCache;
 use Yiisoft\Data\Db\Tests\TestHelper;
 use Yiisoft\Db\Cache\SchemaCache;
 use Yiisoft\Db\Driver\Pdo\PdoConnectionInterface;
 use Yiisoft\Db\Mysql\Connection;
 use Yiisoft\Db\Mysql\Driver;
+use Yiisoft\Test\Support\SimpleCache\MemorySimpleCache;
 
 trait DatabaseTrait
 {
@@ -24,7 +24,7 @@ protected function makeConnection(): PdoConnectionInterface
         $pdoDriver = new Driver("mysql:host=$host;dbname=$database;port=$port", $user, $password);
         $pdoDriver->charset('UTF8MB4');
 
-        $db = new Connection($pdoDriver, new SchemaCache(new ArrayCache()));
+        $db = new Connection($pdoDriver, new SchemaCache(new MemorySimpleCache()));
 
         TestHelper::loadFixtures($db);
 

tests/Oracle/DatabaseTrait.php

@@ -5,12 +5,12 @@
 namespace Yiisoft\Data\Db\Tests\Oracle;
 
 use PDO;
-use Yiisoft\Cache\ArrayCache;
 use Yiisoft\Data\Db\Tests\TestHelper;
 use Yiisoft\Db\Cache\SchemaCache;
 use Yiisoft\Db\Driver\Pdo\PdoConnectionInterface;
 use Yiisoft\Db\Oracle\Connection;
 use Yiisoft\Db\Oracle\Driver;
+use Yiisoft\Test\Support\SimpleCache\MemorySimpleCache;
 
 trait DatabaseTrait
 {
@@ -26,7 +26,7 @@ protected function makeConnection(): PdoConnectionInterface
         $pdoDriver->charset('AL32UTF8');
         $pdoDriver->attributes([PDO::ATTR_STRINGIFY_FETCHES => true]);
 
-        $db = new Connection($pdoDriver, new SchemaCache(new ArrayCache()));
+        $db = new Connection($pdoDriver, new SchemaCache(new MemorySimpleCache()));
 
         TestHelper::loadFixtures($db);
 

tests/Pgsql/DatabaseTrait.php

@@ -4,12 +4,12 @@
 
 namespace Yiisoft\Data\Db\Tests\Pgsql;
 
-use Yiisoft\Cache\ArrayCache;
 use Yiisoft\Data\Db\Tests\TestHelper;
 use Yiisoft\Db\Cache\SchemaCache;
 use Yiisoft\Db\Driver\Pdo\PdoConnectionInterface;
 use Yiisoft\Db\Pgsql\Connection;
 use Yiisoft\Db\Pgsql\Driver;
+use Yiisoft\Test\Support\SimpleCache\MemorySimpleCache;
 
 trait DatabaseTrait
 {
@@ -24,7 +24,7 @@ protected function makeConnection(): PdoConnectionInterface
         $pdoDriver = new Driver("pgsql:host=$host;dbname=$database;port=$port", $user, $password);
         $pdoDriver->charset('UTF8');
 
-        $db = new Connection($pdoDriver, new SchemaCache(new ArrayCache()));
+        $db = new Connection($pdoDriver, new SchemaCache(new MemorySimpleCache()));
 
         TestHelper::loadFixtures($db);
 

tests/Sqlite/DatabaseTrait.php

@@ -4,19 +4,19 @@
 
 namespace Yiisoft\Data\Db\Tests\Sqlite;
 
-use Yiisoft\Cache\ArrayCache;
 use Yiisoft\Data\Db\Tests\TestHelper;
 use Yiisoft\Db\Cache\SchemaCache;
 use Yiisoft\Db\Sqlite\Connection;
 use Yiisoft\Db\Sqlite\Driver;
+use Yiisoft\Test\Support\SimpleCache\MemorySimpleCache;
 
 trait DatabaseTrait
 {
     protected function makeConnection(): Connection
     {
         $db = new Connection(
             new Driver('sqlite::memory:'),
-            new SchemaCache(new ArrayCache()),
+            new SchemaCache(new MemorySimpleCache()),
         );
         TestHelper::loadFixtures($db);
         return $db;

tests/TestHelper.php

@@ -4,7 +4,6 @@
 
 namespace Yiisoft\Data\Db\Tests;
 
-use Yiisoft\Cache\NullCache;
 use Yiisoft\Data\Db\FieldMapper\ArrayFieldMapper;
 use Yiisoft\Data\Db\FilterHandler;
 use Yiisoft\Data\Db\FilterHandler\AllHandler;
@@ -30,14 +29,15 @@
 use Yiisoft\Db\Schema\Column\ColumnBuilder;
 use Yiisoft\Db\Sqlite\Connection;
 use Yiisoft\Db\Sqlite\Driver;
+use Yiisoft\Test\Support\SimpleCache\MemorySimpleCache;
 
 final class TestHelper
 {
     public static function createSqliteConnection(): Connection
     {
         return new Connection(
             new Driver('sqlite::memory:'),
-            new SchemaCache(new NullCache()),
+            new SchemaCache(new MemorySimpleCache()),
         );
     }