orm3 support restore

beberlei · Feb 5, 2024 · 667230f · 667230f
1 parent df8b8e3
commit 667230f
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 8 deletions.
diff --git a/tests/Query/DbTestCase.php b/tests/Query/DbTestCase.php
@@ -2,6 +2,7 @@
 
 namespace DoctrineExtensions\Tests\Query;
 
+use Composer\InstalledVersions;
 use Doctrine\DBAL\DriverManager;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManager;
@@ -20,13 +21,24 @@ class DbTestCase extends TestCase
 
     public function setUp(): void
     {
-        $this->configuration = new Configuration();
-        $this->configuration->setMetadataCache(new ArrayAdapter());
-        $this->configuration->setQueryCache(new ArrayAdapter());
+        if (method_exists(ORMSetup::class, 'createAttributeMetadataConfiguration')) {
+            $this->configuration = ORMSetup::createAttributeMetadataConfiguration([__DIR__ . '/../Entities'], true);
+        } else {
+            $this->configuration = new Configuration();
+            $this->configuration->setMetadataDriverImpl(ORMSetup::createDefaultAnnotationDriver([__DIR__ . '/../../Entities']));
+        }
+
+        if (method_exists($this->configuration, 'setMetadataCacheImpl') && method_exists($this->configuration, 'setQueryCacheImpl')) {
+            $this->configuration->setMetadataCacheImpl(new ArrayAdapter());
+            $this->configuration->setQueryCacheImpl(new ArrayAdapter());
+        } else {
+            $this->configuration->setMetadataCache(new ArrayAdapter());
+            $this->configuration->setQueryCache(new ArrayAdapter());
+        }
+
         $this->configuration->setProxyDir(__DIR__ . '/Proxies');
         $this->configuration->setProxyNamespace('DoctrineExtensions\Tests\Proxies');
         $this->configuration->setAutoGenerateProxyClasses(true);
-        $this->configuration->setMetadataDriverImpl(ORMSetup::createDefaultAnnotationDriver([__DIR__ . '/../Entities']));
         $this->entityManager = new EntityManager(
             DriverManager::getConnection(['driver' => 'pdo_sqlite', 'memory' => true], $this->configuration),
             $this->configuration

diff --git a/tests/Types/CarbonDateTest.php b/tests/Types/CarbonDateTest.php
@@ -54,6 +54,7 @@ public function setUp(): void
             $config->setMetadataCache(new ArrayAdapter());
             $config->setQueryCache(new ArrayAdapter());
         }
+
         $config->setProxyDir(__DIR__ . '/Proxies');
         $config->setProxyNamespace('DoctrineExtensions\Tests\PHPUnit\Proxies');
         $config->setAutoGenerateProxyClasses(true);

diff --git a/tests/Types/ZendDateTest.php b/tests/Types/ZendDateTest.php
@@ -35,13 +35,24 @@ public static function setUpBeforeClass(): void
 
     public function setUp(): void
     {
-        $config = new Configuration();
-        $config->setMetadataCache(new ArrayAdapter());
-        $config->setQueryCache(new ArrayAdapter());
+        if (method_exists(ORMSetup::class, 'createAttributeMetadataConfiguration')) {
+            $config = ORMSetup::createAttributeMetadataConfiguration([__DIR__ . '/../Entities'], true);
+        } else {
+            $config = new Configuration();
+            $config->setMetadataDriverImpl(ORMSetup::createDefaultAnnotationDriver([__DIR__ . '/../../Entities']));
+        }
+
+        if (method_exists($config, 'setMetadataCacheImpl') && method_exists($config, 'setQueryCacheImpl')) {
+            $config->setMetadataCacheImpl(new ArrayAdapter());
+            $config->setQueryCacheImpl(new ArrayAdapter());
+        } else {
+            $config->setMetadataCache(new ArrayAdapter());
+            $config->setQueryCache(new ArrayAdapter());
+        }
+
         $config->setProxyDir(__DIR__ . '/Proxies');
         $config->setProxyNamespace('DoctrineExtensions\Tests\PHPUnit\Proxies');
         $config->setAutoGenerateProxyClasses(true);
-        $config->setMetadataDriverImpl(ORMSetup::createDefaultAnnotationDriver([__DIR__ . '/../../Entities']));
 
         $this->em = new EntityManager(
             DriverManager::getConnection([