Use the RuntimeReflectionService to obtain the same ReflectionProperty subclasses as used by ORM internals

Author: mpdude

src/Doctrine/PolyglotListener.php

@@ -14,6 +14,7 @@
 use Doctrine\ORM\Event\PostFlushEventArgs;
 use Doctrine\ORM\Event\PreFlushEventArgs;
 use Doctrine\Persistence\Event\LifecycleEventArgs;
+use Doctrine\Persistence\Mapping\RuntimeReflectionService;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use WeakReference;
@@ -51,6 +52,7 @@ final class PolyglotListener implements EventSubscriber
     public function __construct(
         private readonly DefaultLocaleProvider $defaultLocaleProvider,
         private readonly LoggerInterface $logger = null ?? new NullLogger(),
+        private readonly RuntimeReflectionService $reflectionService = new RuntimeReflectionService(),
     ) {
     }
 
@@ -154,7 +156,7 @@ private function loadTranslationMetadataForClass($className, EntityManager $em):
 
                 return null;
             } else {
-                $wakeup = TranslatableClassMetadata::wakeup($data);
+                $wakeup = TranslatableClassMetadata::wakeup($data, $this->reflectionService);
                 $wakeup->setLogger($this->logger);
                 $this->translatedClasses[$className] = $wakeup;
 

src/Doctrine/TranslatableClassMetadata.php

@@ -12,6 +12,7 @@
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Mapping\ClassMetadataFactory;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
+use Doctrine\Persistence\Mapping\RuntimeReflectionService;
 use Psr\Log\LoggerInterface;
 use ReflectionClass;
 use ReflectionProperty;
@@ -126,23 +127,23 @@ public function sleep(): SerializedTranslatableClassMetadata
         return $sleep;
     }
 
-    public static function wakeup(SerializedTranslatableClassMetadata $data): self
+    public static function wakeup(SerializedTranslatableClassMetadata $data, RuntimeReflectionService $reflectionService): self
     {
         $self = new self($data->class);
         $self->primaryLocale = $data->primaryLocale;
-        $self->translationClass = new ReflectionClass($data->translationClass);
+        $self->translationClass = $reflectionService->getClass($data->translationClass);
 
         foreach ($data->translationFieldMapping as $fieldname => $property) {
-            $self->translationFieldMapping[$fieldname] = new ReflectionProperty(...$property);
+            $self->translationFieldMapping[$fieldname] = $reflectionService->getAccessibleProperty(...$property);
         }
 
         foreach ($data->translatedProperties as $fieldname => $property) {
-            $self->translatedProperties[$fieldname] = new ReflectionProperty(...$property);
+            $self->translatedProperties[$fieldname] = $reflectionService->getAccessibleProperty(...$property);
         }
 
-        $self->translationsCollectionProperty = new ReflectionProperty(...$data->translationsCollectionProperty);
-        $self->translationMappingProperty = new ReflectionProperty(...$data->translationMappingProperty);
-        $self->translationLocaleProperty = new ReflectionProperty(...$data->translationLocaleProperty);
+        $self->translationsCollectionProperty = $reflectionService->getAccessibleProperty(...$data->translationsCollectionProperty);
+        $self->translationMappingProperty = $reflectionService->getAccessibleProperty(...$data->translationMappingProperty);
+        $self->translationLocaleProperty = $reflectionService->getAccessibleProperty(...$data->translationLocaleProperty);
 
         return $self;
     }
@@ -192,7 +193,7 @@ private function findTranslatedProperties(ClassMetadataInfo $cm, ClassMetadataFa
                 continue;
             }
 
-            $reflectionProperty = $cm->getReflectionClass()->getProperty($fieldName);
+            $reflectionProperty = $cm->getReflectionProperty($fieldName);
             $attributes = $reflectionProperty->getAttributes(Attribute\Translatable::class);
 
             if (!$attributes) {

tests/Doctrine/TranslatableClassMetadataTest.php

@@ -3,6 +3,7 @@
 namespace Webfactory\Bundle\PolyglotBundle\Tests\Doctrine;
 
 use Doctrine\ORM\Mapping\Driver\AttributeDriver;
+use Doctrine\Persistence\Mapping\RuntimeReflectionService;
 use PHPUnit\Framework\TestCase;
 use Webfactory\Bundle\PolyglotBundle\Doctrine\TranslatableClassMetadata;
 use Webfactory\Bundle\PolyglotBundle\Tests\TestEntity;
@@ -19,7 +20,7 @@ public function can_be_serialized_and_retrieved(): void
         $metadata = $this->createMetadata();
 
         $serialize = serialize($metadata->sleep());
-        $unserialized = TranslatableClassMetadata::wakeup(unserialize($serialize));
+        $unserialized = TranslatableClassMetadata::wakeup(unserialize($serialize), new RuntimeReflectionService());
 
         self::assertEquals($metadata, $unserialized);
     }