Merge pull request doctrine#12050 from greg0ire/no-legacy-refl-fields

Remove ClassMetadata::$reflFields

Author: greg0ire

UPGRADE.md

@@ -1,5 +1,11 @@
 # Upgrade to 4.0
 
+## BC BREAK: `Doctrine\ORM\Mapping\LegacyReflectionFields` is removed
+
+The `Doctrine\ORM\Mapping\LegacyReflectionFields` class has been removed.
+Also, `Doctrine\ORM\Mapping\ClassMetadata::$reflFields` has been removed, as
+well as methods depending on it.
+
 ## BC BREAK: Userland lazy objects are no longer supported
 
 Userland lazy objects are no longer supported.

phpstan-baseline.neon

@@ -1434,18 +1434,6 @@ parameters:
 			count: 1
 			path: src/Mapping/JoinTableMapping.php
 
-		-
-			message: '#^Method Doctrine\\ORM\\Mapping\\LegacyReflectionFields\:\:__construct\(\) has parameter \$classMetadata with generic class Doctrine\\ORM\\Mapping\\ClassMetadata but does not specify its types\: T$#'
-			identifier: missingType.generics
-			count: 1
-			path: src/Mapping/LegacyReflectionFields.php
-
-		-
-			message: '#^Parameter \#1 \$class of method Doctrine\\Persistence\\Mapping\\ReflectionService\:\:getAccessibleProperty\(\) expects class\-string, string given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Mapping/LegacyReflectionFields.php
-
 		-
 			message: '#^Method Doctrine\\ORM\\Mapping\\MappedSuperclass\:\:__construct\(\) has parameter \$repositoryClass with generic class Doctrine\\ORM\\EntityRepository but does not specify its types\: T$#'
 			identifier: missingType.generics

src/Mapping/ClassMetadata.php

@@ -24,7 +24,6 @@
 use LogicException;
 use ReflectionClass;
 use ReflectionNamedType;
-use ReflectionProperty;
 use Stringable;
 
 use function array_column;
@@ -538,13 +537,6 @@ class ClassMetadata implements PersistenceClassMetadata, Stringable
      */
     protected NamingStrategy $namingStrategy;
 
-    /**
-     * The ReflectionProperty instances of the mapped class.
-     *
-     * @var LegacyReflectionFields|array<string, ReflectionProperty>
-     */
-    public LegacyReflectionFields|array $reflFields = [];
-
     /** @var array<string, PropertyAccessors\PropertyAccessor> */
     public array $propertyAccessors = [];
 
@@ -567,17 +559,6 @@ public function __construct(public string $name, NamingStrategy|null $namingStra
         $this->typedFieldMapper = $typedFieldMapper ?? new DefaultTypedFieldMapper();
     }
 
-    /**
-     * Gets the ReflectionProperties of the mapped class.
-     *
-     * @return LegacyReflectionFields|ReflectionProperty[] An array of ReflectionProperty instances.
-     * @phpstan-return LegacyReflectionFields|array<string, ReflectionProperty>
-     */
-    public function getReflectionProperties(): array|LegacyReflectionFields
-    {
-        return $this->reflFields;
-    }
-
     /**
      * Gets the ReflectionProperties of the mapped class.
      *
@@ -588,29 +569,11 @@ public function getPropertyAccessors(): array
         return $this->propertyAccessors;
     }
 
-    /**
-     * Gets a ReflectionProperty for a specific field of the mapped class.
-     */
-    public function getReflectionProperty(string $name): ReflectionProperty|null
-    {
-        return $this->reflFields[$name];
-    }
-
     public function getPropertyAccessor(string $name): PropertyAccessor|null
     {
         return $this->propertyAccessors[$name] ?? null;
     }
 
-    /** @throws BadMethodCallException If the class has a composite identifier. */
-    public function getSingleIdReflectionProperty(): ReflectionProperty|null
-    {
-        if ($this->isIdentifierComposite) {
-            throw new BadMethodCallException('Class ' . $this->name . ' has a composite identifier.');
-        }
-
-        return $this->reflFields[$this->identifier[0]];
-    }
-
     /** @throws BadMethodCallException If the class has a composite identifier. */
     public function getSingleIdPropertyAccessor(): PropertyAccessor|null
     {
@@ -704,9 +667,8 @@ public function __toString(): string
      * That means any metadata properties that are not set or empty or simply have
      * their default value are NOT serialized.
      *
-     * Parts that are also NOT serialized because they can not be properly unserialized:
-     *      - reflClass (ReflectionClass)
-     *      - reflFields (ReflectionProperty array)
+     * Parts that are also NOT serialized because they can not be properly
+     * unserialized, e.g. reflClass (ReflectionClass)
      *
      * @return string[] The names of all the fields that should be serialized.
      */
@@ -816,7 +778,6 @@ public function wakeupReflection(ReflectionService $reflService): void
     {
         // Restore ReflectionClass and properties
         $this->reflClass    = $reflService->getClass($this->name);
-        $this->reflFields   = new LegacyReflectionFields($this, $reflService);
         $this->instantiator = $this->instantiator ?: new Instantiator();
 
         $parentAccessors = [];