Merge pull request #18 from nutgram/improve_resolvers

Author: sergix44

src/Annotation/ConcreteResolver.php

@@ -12,10 +12,20 @@
 #[Attribute(Attribute::TARGET_CLASS)]
 abstract class ConcreteResolver
 {
+    protected array $concretes = [];
+
     /**
      * @param array $data
      *
-     * @return string
+     * @return string|null
+     */
+    abstract public function concreteFor(array $data): ?string;
+
+    /**
+     * @return array
      */
-    abstract public function getConcreteClass(array $data): string;
+    public function getConcretes(): array
+    {
+        return array_values($this->concretes);
+    }
 }

src/Hydrator.php

@@ -55,8 +55,6 @@ public function __construct(?ContainerInterface $container = null)
      * @param class-string<T>|T $object
      * @param array|object      $data
      *
-     * @throws InvalidArgumentException
-     *                                                    If the data isn't valid.
      * @throws Exception\UntypedPropertyException
      *                                                    If one of the object properties isn't typed.
      * @throws Exception\UnsupportedPropertyTypeException
@@ -67,6 +65,8 @@ public function __construct(?ContainerInterface $container = null)
      *                                                    If the given data contains an invalid value.
      * @throws Exception\HydrationException
      *                                                    If the object cannot be hydrated.
+     * @throws InvalidArgumentException
+     *                                                    If the data isn't valid.
      *
      * @return T
      *
@@ -150,10 +150,10 @@ public function hydrate(string|object $object, array|object $data): object
      * @param string            $json
      * @param ?int              $flags
      *
-     * @throws InvalidArgumentException
-     *                                      If the JSON cannot be decoded.
      * @throws Exception\HydrationException
      *                                      If the object cannot be hydrated.
+     * @throws InvalidArgumentException
+     *                                      If the JSON cannot be decoded.
      *
      * @return T
      *
@@ -179,14 +179,26 @@ public function hydrateWithJson(string|object $object, string $json, ?int $flags
         return $this->hydrate($object, $data);
     }
 
+    /**
+     * @param class-string|object $object
+     *
+     * @throws \ReflectionException
+     *
+     * @return object|null
+     */
+    public function getConcreteResolverFor(string|object $object): ?ConcreteResolver
+    {
+        return $this->getAttributeInstance(new ReflectionClass($object), ConcreteResolver::class, ReflectionAttribute::IS_INSTANCEOF);
+    }
+
     /**
      * Initializes the given object.
      *
      * @param class-string<T>|T $object
      *
+     * @throws InvalidArgumentException
      * @throws ContainerExceptionInterface
      *                                     If the object cannot be initialized.
-     * @throws InvalidArgumentException
      *
      * @return T
      *
@@ -218,7 +230,7 @@ private function initializeObject(string|object $object, array|object $data): ob
                 ));
             }
 
-            return $this->initializeObject($attribute->getConcreteClass($data), $data);
+            return $this->initializeObject($attribute->concreteFor($data), $data);
         }
 
         // if we have a container, get the instance through it
@@ -268,10 +280,10 @@ private function getAttributeInstance(ReflectionProperty|ReflectionClass $target
      * @param ReflectionNamedType $type
      * @param mixed               $value
      *
-     * @throws Exception\UnsupportedPropertyTypeException
-     *                                                    If the given property contains an unsupported type.
      * @throws Exception\InvalidValueException
      *                                                    If the given value isn't valid.
+     * @throws Exception\UnsupportedPropertyTypeException
+     *                                                    If the given property contains an unsupported type.
      *
      * @return void
      */

tests/Fixtures/Resolver/AppleResolver.php

@@ -10,12 +10,13 @@
 #[Attribute(Attribute::TARGET_CLASS)]
 class AppleResolver extends ConcreteResolver
 {
-    public function getConcreteClass(array $data): string
+    protected array $concretes = [
+        'jack'  => AppleJack::class,
+        'sauce' => AppleSauce::class,
+    ];
+
+    public function concreteFor(array $data): ?string
     {
-        return match ($data['type']) {
-            'jack'  => AppleJack::class,
-            'sauce' => AppleSauce::class,
-            default => throw new Exception('Invalid apple type'),
-        };
+        return $this->concretes[$data['type']] ?? null;
     }
 }

tests/HydratorTest.php

@@ -14,6 +14,7 @@
 use SergiX44\Hydrator\Tests\Fixtures\DI\Tree;
 use SergiX44\Hydrator\Tests\Fixtures\ObjectWithAbstract;
 use SergiX44\Hydrator\Tests\Fixtures\ObjectWithInvalidAbstract;
+use SergiX44\Hydrator\Tests\Fixtures\Resolver\AppleResolver;
 use SergiX44\Hydrator\Tests\Fixtures\Store\Apple;
 use SergiX44\Hydrator\Tests\Fixtures\Store\AppleJack;
 use SergiX44\Hydrator\Tests\Fixtures\Store\AppleSauce;
@@ -764,6 +765,14 @@ public function testHydrateAbstractObjectWithoutInterface(): void
         (new Hydrator())->hydrate(Fruit::class, ['name' => 'apple']);
     }
 
+    public function testItReturnsTheConcreteResolver(): void
+    {
+        $resolver = (new Hydrator())->getConcreteResolverFor(Apple::class);
+
+        $this->assertInstanceOf(AppleResolver::class, $resolver);
+        $this->assertSame([AppleJack::class, AppleSauce::class], $resolver->getConcretes());
+    }
+
     public function testHydrateAbstractProperty(): void
     {
         $o = (new Hydrator())->hydrate(new ObjectWithAbstract(), [