Use class from persistence package (#11330)

* Use class from persistence package

It is meant to remove duplication between the ORM and the ODM.

* Update UPGRADE.md

Co-authored-by: Steve Todd <[email protected]>

---------

Co-authored-by: Alexander M. Turek <[email protected]>
Co-authored-by: Steve Todd <[email protected]>

Author: 3 people

UPGRADE.md

@@ -1,5 +1,11 @@
 # Upgrade to 3.1
 
+## Deprecate `Doctrine\ORM\Mapping\ReflectionEnumProperty`
+
+This class is deprecated and will be removed in 4.0.
+Instead, use `Doctrine\Persistence\Reflection\EnumReflectionProperty` from
+`doctrine/persistence`.
+
 ## Deprecate passing null to `ClassMetadata::fullyQualifiedClassName()`
 
 Passing `null` to `Doctrine\ORM\ClassMetadata::fullyQualifiedClassName()` is

composer.json

@@ -30,7 +30,7 @@
         "doctrine/inflector": "^1.4 || ^2.0",
         "doctrine/instantiator": "^1.3 || ^2",
         "doctrine/lexer": "^3",
-        "doctrine/persistence": "^3.1.1",
+        "doctrine/persistence": "^3.3.1",
         "psr/cache": "^1 || ^2 || ^3",
         "symfony/console": "^5.4 || ^6.0 || ^7.0",
         "symfony/var-exporter": "~6.2.13 || ^6.3.2 || ^7.0"

src/Mapping/ClassMetadata.php

@@ -15,6 +15,7 @@
 use Doctrine\ORM\Id\AbstractIdGenerator;
 use Doctrine\Persistence\Mapping\ClassMetadata as PersistenceClassMetadata;
 use Doctrine\Persistence\Mapping\ReflectionService;
+use Doctrine\Persistence\Reflection\EnumReflectionProperty;
 use InvalidArgumentException;
 use LogicException;
 use ReflectionClass;
@@ -822,7 +823,7 @@ public function wakeupReflection(ReflectionService $reflService): void
                 assert($childProperty !== null);
 
                 if (isset($mapping->enumType)) {
-                    $childProperty = new ReflectionEnumProperty(
+                    $childProperty = new EnumReflectionProperty(
                         $childProperty,
                         $mapping->enumType,
                     );
@@ -841,7 +842,7 @@ public function wakeupReflection(ReflectionService $reflService): void
                 : $this->getAccessibleProperty($reflService, $this->name, $field);
 
             if (isset($mapping->enumType) && $this->reflFields[$field] !== null) {
-                $this->reflFields[$field] = new ReflectionEnumProperty(
+                $this->reflFields[$field] = new EnumReflectionProperty(
                     $this->reflFields[$field],
                     $mapping->enumType,
                 );

src/Mapping/ReflectionEmbeddedProperty.php

@@ -30,7 +30,7 @@ public function __construct(
         private readonly ReflectionProperty $childProperty,
         private readonly string $embeddedClass,
     ) {
-        parent::__construct($childProperty->class, $childProperty->name);
+        parent::__construct($childProperty->getDeclaringClass()->name, $childProperty->getName());
     }
 
     public function getValue(object|null $object = null): mixed

src/Mapping/ReflectionEnumProperty.php

@@ -11,6 +11,7 @@
 use function array_map;
 use function is_array;
 
+/** @deprecated use Doctrine\Persistence\Reflection\EnumReflectionProperty instead */
 final class ReflectionEnumProperty extends ReflectionProperty
 {
     /** @param class-string<BackedEnum> $enumType */