Run the tests for the ORM using the native lazy objects when able

Author: mbabker

tests/Gedmo/Mapping/MappingTest.php

@@ -40,8 +40,14 @@ final class MappingTest extends TestCase
     protected function setUp(): void
     {
         $config = new Configuration();
-        $config->setProxyDir(TESTS_TEMP_DIR);
-        $config->setProxyNamespace('Gedmo\Mapping\Proxy');
+
+        /** @phpstan-ignore-next-line function.alreadyNarrowedType */
+        if (PHP_VERSION_ID >= 80400 && method_exists($config, 'enableNativeLazyObjects')) {
+            $config->enableNativeLazyObjects(true);
+        } else {
+            $config->setProxyDir(TESTS_TEMP_DIR);
+            $config->setProxyNamespace('Gedmo\Mapping\Proxy');
+        }
 
         if (PHP_VERSION_ID >= 80000) {
             $config->setMetadataDriverImpl(new AttributeDriver([]));

tests/Gedmo/Mapping/MetadataFactory/CustomDriverTest.php

@@ -39,10 +39,16 @@ final class CustomDriverTest extends TestCase
     protected function setUp(): void
     {
         $config = new Configuration();
-        $config->setProxyDir(TESTS_TEMP_DIR);
-        $config->setProxyNamespace('Gedmo\Mapping\Proxy');
         $config->setMetadataDriverImpl(new CustomDriver());
 
+        /** @phpstan-ignore-next-line function.alreadyNarrowedType */
+        if (PHP_VERSION_ID >= 80400 && method_exists($config, 'enableNativeLazyObjects')) {
+            $config->enableNativeLazyObjects(true);
+        } else {
+            $config->setProxyDir(TESTS_TEMP_DIR);
+            $config->setProxyNamespace('Gedmo\Mapping\Proxy');
+        }
+
         $conn = [
             'driver' => 'pdo_sqlite',
             'memory' => true,

tests/Gedmo/Mapping/MetadataFactory/ForcedMetadataTest.php

@@ -41,8 +41,14 @@ final class ForcedMetadataTest extends TestCase
     protected function setUp(): void
     {
         $config = new Configuration();
-        $config->setProxyDir(TESTS_TEMP_DIR);
-        $config->setProxyNamespace('Gedmo\Mapping\Proxy');
+
+        /** @phpstan-ignore-next-line function.alreadyNarrowedType */
+        if (PHP_VERSION_ID >= 80400 && method_exists($config, 'enableNativeLazyObjects')) {
+            $config->enableNativeLazyObjects(true);
+        } else {
+            $config->setProxyDir(TESTS_TEMP_DIR);
+            $config->setProxyNamespace('Gedmo\Mapping\Proxy');
+        }
 
         if (PHP_VERSION_ID >= 80000) {
             $config->setMetadataDriverImpl(new AttributeDriver([]));

tests/Gedmo/Mapping/ORMMappingTestCase.php

@@ -43,8 +43,14 @@ final protected function getBasicConfiguration(): Configuration
         $config = new Configuration();
         $config->setMetadataCache(new ArrayAdapter());
         $config->setQueryCache(new ArrayAdapter());
-        $config->setProxyDir(TESTS_TEMP_DIR);
-        $config->setProxyNamespace('Gedmo\Mapping\Proxy');
+
+        /** @phpstan-ignore-next-line function.alreadyNarrowedType */
+        if (PHP_VERSION_ID >= 80400 && method_exists($config, 'enableNativeLazyObjects')) {
+            $config->enableNativeLazyObjects(true);
+        } else {
+            $config->setProxyDir(TESTS_TEMP_DIR);
+            $config->setProxyNamespace('Gedmo\Mapping\Proxy');
+        }
 
         return $config;
     }

tests/Gedmo/Timestampable/TimestampableTest.php

@@ -12,7 +12,6 @@
 namespace Gedmo\Tests\Timestampable;
 
 use Doctrine\Common\EventManager;
-use Doctrine\Persistence\Proxy;
 use Gedmo\Tests\Clock;
 use Gedmo\Tests\Timestampable\Fixture\Article;
 use Gedmo\Tests\Timestampable\Fixture\Author;
@@ -230,7 +229,7 @@ public function testShouldSolveIssue767(): void
         $this->em->clear();
 
         $type = $this->em->getReference(Type::class, $type->getId());
-        static::assertInstanceOf(Proxy::class, $type);
+        static::assertTrue($this->em->isUninitializedObject($type));
 
         $art = new Article();
         $art->setTitle('Art');

tests/Gedmo/Tool/BaseTestCaseORM.php

@@ -96,8 +96,15 @@ abstract protected function getUsedEntityFixtures(): array;
     protected function getDefaultConfiguration(): Configuration
     {
         $config = new Configuration();
-        $config->setProxyDir(TESTS_TEMP_DIR);
-        $config->setProxyNamespace('Proxy');
+
+        /** @phpstan-ignore-next-line function.alreadyNarrowedType */
+        if (PHP_VERSION_ID >= 80400 && method_exists($config, 'enableNativeLazyObjects')) {
+            $config->enableNativeLazyObjects(true);
+        } else {
+            $config->setProxyDir(TESTS_TEMP_DIR);
+            $config->setProxyNamespace('Gedmo\Mapping\Proxy');
+        }
+
         $config->setMetadataDriverImpl($this->getMetadataDriverImplementation());
         $config->setMiddlewares([
             new Middleware($this->queryLogger),

tests/Gedmo/Translatable/Issue/Issue84Test.php

@@ -12,7 +12,6 @@
 namespace Gedmo\Tests\Translatable\Issue;
 
 use Doctrine\Common\EventManager;
-use Doctrine\Persistence\Proxy;
 use Gedmo\Tests\Tool\BaseTestCaseORM;
 use Gedmo\Tests\Translatable\Fixture\Article;
 use Gedmo\Translatable\Entity\Translation;
@@ -51,7 +50,7 @@ public function testIssue84(): void
         $this->em->clear();
 
         $article = $this->em->getReference(Article::class, 1);
-        static::assertInstanceOf(Proxy::class, $article);
+        static::assertTrue($this->em->isUninitializedObject($article));
 
         $trans = $repo->findTranslations($article);
         static::assertCount(1, $trans);

tests/Gedmo/Translator/TranslatableTest.php

@@ -12,7 +12,6 @@
 namespace Gedmo\Tests\Translator;
 
 use Doctrine\Common\EventManager;
-use Doctrine\Persistence\Proxy;
 use Gedmo\Tests\Tool\BaseTestCaseORM;
 use Gedmo\Tests\Translator\Fixture\Person;
 use Gedmo\Tests\Translator\Fixture\PersonCustom;
@@ -114,7 +113,7 @@ public function testShouldTranslateRelation(): void
         $person = $this->em->getRepository(Person::class)->findOneBy(['name' => 'Jen']);
         static::assertSame('Женя', $person->translate('ru')->getName());
         $parent = $person->getParent();
-        static::assertInstanceOf(Proxy::class, $parent);
+        static::assertTrue($this->em->isUninitializedObject($parent));
         static::assertInstanceOf(Person::class, $parent);
         static::assertSame('Женя starshai', $parent->translate('ru')->getName());
         static::assertSame('zenia', $parent->translate('fr')->getName());
@@ -133,7 +132,7 @@ public function testShouldHandleDomainObjectProxy(): void
         $this->em->clear();
 
         $personProxy = $this->em->getReference(Person::class, ['id' => 1]);
-        static::assertInstanceOf(Proxy::class, $personProxy);
+        static::assertTrue($this->em->isUninitializedObject($personProxy));
         $name = $personProxy->translate('ru_RU')->getName();
         static::assertSame('Женя', $name);
     }
@@ -153,7 +152,7 @@ public function testTranslatableProxyWithUpperCaseProperty(): void
         $this->em->clear();
 
         $personProxy = $this->em->getReference(Person::class, ['id' => 1]);
-        static::assertInstanceOf(Proxy::class, $personProxy);
+        static::assertTrue($this->em->isUninitializedObject($personProxy));
         $name = $personProxy->translate('ru_RU')->getName();
         static::assertSame('Женя', $name);
         $lastName = $personProxy->translate('ru_RU')->getLastName();

tests/Gedmo/Tree/MaterializedPathORMRepositoryTest.php

@@ -12,7 +12,6 @@
 namespace Gedmo\Tests\Tree;
 
 use Doctrine\Common\EventManager;
-use Doctrine\Persistence\Proxy;
 use Gedmo\Exception\InvalidArgumentException;
 use Gedmo\Tests\Tool\BaseTestCaseORM;
 use Gedmo\Tests\Tree\Fixture\MPCategory;
@@ -332,8 +331,7 @@ public function testIssue458(): void
         $newNode = $this->createCategory();
         $parent = $node->getParent();
 
-        static::assertInstanceOf(Proxy::class, $parent);
-        static::assertFalse($parent->__isInitialized());
+        static::assertTrue($this->em->isUninitializedObject($parent));
 
         $newNode->setTitle('New Node');
         $newNode->setParent($parent);

tests/Gedmo/Tree/TranslatableSluggableTreeTest.php

@@ -12,7 +12,6 @@
 namespace Gedmo\Tests\Tree;
 
 use Doctrine\Common\EventManager;
-use Doctrine\Persistence\Proxy;
 use Gedmo\Sluggable\SluggableListener;
 use Gedmo\Tests\Tool\BaseTestCaseORM;
 use Gedmo\Tests\Tree\Fixture\Article;
@@ -94,7 +93,7 @@ public function testTranslations(): void
         static::assertSame('Vegitables', $vegies->getTitle());
         $food = $vegies->getParent();
         // test if proxy triggers postLoad event
-        static::assertInstanceOf(Proxy::class, $food);
+        static::assertTrue($this->em->isUninitializedObject($food));
         static::assertInstanceOf(BehavioralCategory::class, $food);
         static::assertSame('Food', $food->getTitle());
 
@@ -104,7 +103,7 @@ public function testTranslations(): void
         $vegies = $repo->find(4);
         static::assertSame('Gemüse', $vegies->getTitle());
         $food = $vegies->getParent();
-        static::assertInstanceOf(Proxy::class, $food);
+        static::assertTrue($this->em->isUninitializedObject($food));
         static::assertInstanceOf(BehavioralCategory::class, $food);
         static::assertSame('Lebensmittel', $food->getTitle());
     }