Style, missing getReflectionProperties()Property() that were renamed.

doctrine · Oct 10, 2024 · a885445 · a885445
1 parent 5af3b15
commit a885445
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 16 deletions.
diff --git a/src/Mapping/ClassMetadata.php b/src/Mapping/ClassMetadata.php
@@ -13,7 +13,6 @@
 use Doctrine\ORM\Cache\Exception\NonCacheableEntityAssociation;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Id\AbstractIdGenerator;
-use Doctrine\ORM\Mapping\PropertyAccessors\AccessorFactory;
 use Doctrine\ORM\Mapping\PropertyAccessors\EmbeddablePropertyAccessor;
 use Doctrine\ORM\Mapping\PropertyAccessors\EnumPropertyAccessor;
 use Doctrine\ORM\Mapping\PropertyAccessors\ObjectCastPropertyAccessor;
@@ -22,7 +21,6 @@
 use Doctrine\ORM\Mapping\PropertyAccessors\TypedNoDefaultPropertyAccessor;
 use Doctrine\Persistence\Mapping\ClassMetadata as PersistenceClassMetadata;
 use Doctrine\Persistence\Mapping\ReflectionService;
-use Doctrine\Persistence\Reflection\EnumReflectionProperty;
 use InvalidArgumentException;
 use LogicException;
 use ReflectionClass;
@@ -571,6 +569,16 @@ public function __construct(public string $name, NamingStrategy|null $namingStra
      * @return ReflectionProperty[]|null[] An array of ReflectionProperty instances.
      * @psalm-return array<ReflectionProperty|null>
      */
+    public function getReflectionProperties(): array
+    {
+        return $this->reflFields;
+    }
+
+    /**
+     * Gets the ReflectionProperties of the mapped class.
+     *
+     * @return PropertyAccessor[] An array of PropertyAccessor instances.
+     */
     public function getPropertyAccessors(): array
     {
         return $this->propertyAccessors;
@@ -579,9 +587,14 @@ public function getPropertyAccessors(): array
     /**
      * 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];
+        return $this->propertyAccessors[$name] ?? null;
     }
 
     /**

diff --git a/src/Mapping/LegacyReflectionFields.php b/src/Mapping/LegacyReflectionFields.php
@@ -1,15 +1,22 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Doctrine\ORM\Mapping;
 
-use Doctrine\ORM\Mapping\PropertyAccessors\EmbeddablePropertyAccessor;
+use ArrayAccess;
 use Doctrine\Persistence\Mapping\ReflectionService;
 use Doctrine\Persistence\Reflection\EnumReflectionProperty;
-use ReflectionClass;
+use IteratorAggregate;
+use OutOfBoundsException;
 use ReflectionProperty;
 use Traversable;
 
-class LegacyReflectionFields implements \ArrayAccess, \IteratorAggregate
+use function array_keys;
+use function str_contains;
+use function str_replace;
+
+class LegacyReflectionFields implements ArrayAccess, IteratorAggregate
 {
     private array $reflFields = [];
 
@@ -55,7 +62,7 @@ public function offsetGet($field): mixed
                 if ($this->classMetadata->fieldMappings[$field]->originalField !== null) {
                     $parentField = str_replace('.' . $fieldName, '', $field);
 
-                    if (!str_contains($parentField, '.')) {
+                    if (! str_contains($parentField, '.')) {
                         $parentClass = $this->classMetadata->name;
                     } else {
                         $parentClass = $this->classMetadata->fieldMappings[$parentField]->originalClass;
@@ -72,7 +79,7 @@ public function offsetGet($field): mixed
             return $this->reflFields[$field];
         }
 
-        throw new \OutOfBoundsException('Unknown field: ' . $this->classMetadata->name .' ::$' . $field);
+        throw new OutOfBoundsException('Unknown field: ' . $this->classMetadata->name . ' ::$' . $field);
     }
 
     public function offsetSet($offset, $value): void

diff --git a/src/Mapping/PropertyAccessors/EmbeddablePropertyAccessor.php b/src/Mapping/PropertyAccessors/EmbeddablePropertyAccessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Doctrine\ORM\Mapping\PropertyAccessors;
 
 use Doctrine\Instantiator\Instantiator;

diff --git a/src/Mapping/PropertyAccessors/EnumPropertyAccessor.php b/src/Mapping/PropertyAccessors/EnumPropertyAccessor.php
@@ -1,9 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Doctrine\ORM\Mapping\PropertyAccessors;
 
 use BackedEnum;
 
+use function array_map;
+use function is_array;
+use function reset;
+
 class EnumPropertyAccessor implements PropertyAccessor
 {
     public function __construct(private PropertyAccessor $parent, private string $enumType)
@@ -46,7 +52,7 @@ private function fromEnum($enum)
      *
      * @return ($value is int|string|BackedEnum ? BackedEnum : BackedEnum[])
      */
-    private function toEnum($value)
+    private function toEnum(int|string|array|BackedEnum $value)
     {
         if ($value instanceof BackedEnum) {
             return $value;

diff --git a/src/Mapping/PropertyAccessors/ObjectCastPropertyAccessor.php b/src/Mapping/PropertyAccessors/ObjectCastPropertyAccessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Doctrine\ORM\Mapping\PropertyAccessors;
 
 use Doctrine\ORM\Proxy\InternalProxy;

diff --git a/src/Mapping/PropertyAccessors/PropertyAccessor.php b/src/Mapping/PropertyAccessors/PropertyAccessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Doctrine\ORM\Mapping\PropertyAccessors;
 
 interface PropertyAccessor

diff --git a/src/Mapping/PropertyAccessors/ReadonlyAccessor.php b/src/Mapping/PropertyAccessors/ReadonlyAccessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Doctrine\ORM\Mapping\PropertyAccessors;
 
 use InvalidArgumentException;

diff --git a/src/Mapping/PropertyAccessors/TypedNoDefaultPropertyAccessor.php b/src/Mapping/PropertyAccessors/TypedNoDefaultPropertyAccessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Doctrine\ORM\Mapping\PropertyAccessors;
 
 use Closure;

diff --git a/src/Proxy/ProxyFactory.php b/src/Proxy/ProxyFactory.php
@@ -18,7 +18,6 @@
 
 use function array_combine;
 use function array_flip;
-use function array_intersect_key;
 use function assert;
 use function bin2hex;
 use function chmod;

diff --git a/tests/Tests/ORM/Functional/ValueObjectsTest.php b/tests/Tests/ORM/Functional/ValueObjectsTest.php
@@ -5,7 +5,6 @@
 namespace Doctrine\Tests\ORM\Functional;
 
 use DateTime;
-use Doctrine\Common\Reflection\RuntimePublicReflectionProperty as CommonRuntimePublicReflectionProperty;
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\Mapping\DiscriminatorColumn;
 use Doctrine\ORM\Mapping\DiscriminatorMap;
@@ -17,15 +16,11 @@
 use Doctrine\ORM\Mapping\InheritanceType;
 use Doctrine\ORM\Mapping\MappedSuperclass;
 use Doctrine\ORM\Mapping\MappingException;
-use Doctrine\ORM\Mapping\ReflectionEmbeddedProperty;
 use Doctrine\ORM\Query\QueryException;
-use Doctrine\Persistence\Reflection\RuntimeReflectionProperty;
 use Doctrine\Tests\OrmFunctionalTestCase;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Group;
-use ReflectionProperty;
 
-use function class_exists;
 use function sprintf;
 
 #[Group('DDC-93')]

diff --git a/tests/Tests/ORM/Mapping/ClassMetadataLoadEventTest.php b/tests/Tests/ORM/Mapping/ClassMetadataLoadEventTest.php
@@ -14,7 +14,6 @@
 use Doctrine\ORM\Mapping\Table;
 use Doctrine\Tests\OrmTestCase;
 use PHPUnit\Framework\Attributes\Group;
-use ReflectionProperty;
 
 class ClassMetadataLoadEventTest extends OrmTestCase
 {

diff --git a/tests/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Tests/ORM/Mapping/ClassMetadataTest.php
@@ -53,6 +53,7 @@
 use ReflectionClass;
 use stdClass;
 
+use function array_keys;
 use function assert;
 use function count;
 use function serialize;