Move classes requiring PHP 8.4 outside of the Documents directory, as its scanned by several tests

Author: GromNaN

composer.json

@@ -68,6 +68,7 @@
             "Doctrine\\ODM\\MongoDB\\Tests\\": "tests/Doctrine/ODM/MongoDB/Tests",
             "Documentation\\": "tests/Documentation",
             "Documents\\": "tests/Documents",
+            "Documents84\\": "tests/Documents84",
             "Stubs\\": "tests/Stubs",
             "TestDocuments\\" :"tests/Doctrine/ODM/MongoDB/Tests/Mapping/Driver/fixtures"
         }

lib/Doctrine/ODM/MongoDB/DocumentManager.php

@@ -626,7 +626,6 @@ public function getReference(string $documentName, $identifier): object
             return $document;
         }
 
-        /** @var T $document */
         $document = $this->proxyFactory->getProxy($class, $identifier);
         $this->unitOfWork->registerManaged($document, $identifier, []);
 

tests/Doctrine/ODM/MongoDB/Tests/BaseTestCase.php

@@ -20,6 +20,7 @@
 use MongoDB\Model\DatabaseInfo;
 use PHPUnit\Framework\TestCase;
 use ProxyManager\Proxy\LazyLoadingInterface;
+use ReflectionClass;
 
 use function array_key_exists;
 use function array_map;
@@ -39,6 +40,7 @@
 
 use const DOCTRINE_MONGODB_DATABASE;
 use const DOCTRINE_MONGODB_SERVER;
+use const PHP_VERSION_ID;
 
 abstract class BaseTestCase extends TestCase
 {
@@ -135,7 +137,7 @@ public static function assertArraySubset(array $subset, array $array, bool $chec
 
     public static function isLazyObject(object $document): bool
     {
-        if (PHP_VERSION_ID >= 80400 && (new \ReflectionClass($document))->getLazyInitializer($document)) {
+        if (PHP_VERSION_ID >= 80400 && (new ReflectionClass($document))->getLazyInitializer($document)) {
             return true;
         }
 

tests/Doctrine/ODM/MongoDB/Tests/Functional/PropertyHooksTest.php

@@ -6,8 +6,8 @@
 
 use Doctrine\ODM\MongoDB\Mapping\MappingException;
 use Doctrine\ODM\MongoDB\Tests\BaseTestCase;
-use Documents\PropertyHooks\MappingVirtualProperty;
-use Documents\PropertyHooks\User;
+use Documents84\PropertyHooks\MappingVirtualProperty;
+use Documents84\PropertyHooks\User;
 use PHPUnit\Framework\Attributes\RequiresPhp;
 
 #[RequiresPhp('>= 8.4.0')]

tests/Doctrine/ODM/MongoDB/Tests/Mapping/AbstractAnnotationDriverTestCase.php

@@ -16,6 +16,7 @@
 use stdClass;
 
 use function assert;
+use function class_exists;
 
 abstract class AbstractAnnotationDriverTestCase extends AbstractMappingDriverTestCase
 {
@@ -96,8 +97,6 @@ public function testGetAllClassNamesIsIdempotent(): void
     {
         $annotationDriver = $this->loadDriverForCMSDocuments();
         $original         = $annotationDriver->getAllClassNames();
-
-        $annotationDriver = $this->loadDriverForCMSDocuments();
         $afterTestReset   = $annotationDriver->getAllClassNames();
 
         self::assertEquals($original, $afterTestReset);
@@ -118,6 +117,7 @@ public function testGetAllClassNamesIsIdempotentEvenWithDifferentDriverInstances
     /** @group DDC-318 */
     public function testGetAllClassNamesReturnsAlreadyLoadedClassesIfAppropriate(): void
     {
+        self::assertTrue(class_exists(CmsUser::class), 'Pre-load the class');
         $annotationDriver = $this->loadDriverForCMSDocuments();
         $classes          = $annotationDriver->getAllClassNames();
 

tests/Doctrine/ODM/MongoDB/Tests/Mapping/PropertyAccessors/RawValuePropertyAccessorTest.php

@@ -6,7 +6,7 @@
 
 use Doctrine\ODM\MongoDB\Mapping\PropertyAccessors\RawValuePropertyAccessor;
 use Doctrine\ODM\MongoDB\Tests\BaseTestCase;
-use Documents\PropertyHooks\User;
+use Documents84\PropertyHooks\User;
 use PHPUnit\Framework\Attributes\RequiresPhp;
 use ReflectionObject;
 

tests/Documents/PropertyHooks/MappingVirtualProperty.php renamed to tests/Documents84/PropertyHooks/MappingVirtualProperty.php

@@ -1,6 +1,6 @@
 <?php // phpcs:ignoreFile
 
-namespace Documents\PropertyHooks;
+namespace Documents84\PropertyHooks;
 
 use Doctrine\ODM\MongoDB\Mapping\Annotations\Document;
 use Doctrine\ODM\MongoDB\Mapping\Annotations\Field;

tests/Documents/PropertyHooks/User.php renamed to tests/Documents84/PropertyHooks/User.php

@@ -1,6 +1,6 @@
 <?php // phpcs:ignoreFile
 
-namespace Documents\PropertyHooks;
+namespace Documents84\PropertyHooks;
 
 use Doctrine\ODM\MongoDB\Mapping\Annotations\Document;
 use Doctrine\ODM\MongoDB\Mapping\Annotations\Field;