Adapt to last changes in yiisoft/hydrator

yiisoft · Oct 4, 2023 · 28f8564 · 28f8564
1 parent 15f396c
commit 28f8564
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 23 deletions.
diff --git a/src/Attribute/Validate.php b/src/Attribute/Validate.php
@@ -5,7 +5,7 @@
 namespace Yiisoft\Hydrator\Validator\Attribute;
 
 use Attribute;
-use Yiisoft\Hydrator\ParameterAttributeInterface;
+use Yiisoft\Hydrator\Attribute\Parameter\ParameterAttributeInterface;
 use Yiisoft\Validator\RuleInterface;
 
 /**

diff --git a/src/Attribute/ValidateResolver.php b/src/Attribute/ValidateResolver.php
@@ -4,11 +4,11 @@
 
 namespace Yiisoft\Hydrator\Validator\Attribute;
 
-use Yiisoft\Hydrator\Context;
-use Yiisoft\Hydrator\ParameterAttributeInterface;
-use Yiisoft\Hydrator\ParameterAttributeResolverInterface;
+use Yiisoft\Hydrator\Attribute\Parameter\ParameterAttributeInterface;
+use Yiisoft\Hydrator\Attribute\Parameter\ParameterAttributeResolverInterface;
+use Yiisoft\Hydrator\AttributeHandling\Exception\UnexpectedAttributeException;
+use Yiisoft\Hydrator\AttributeHandling\ParameterAttributeResolveContext;
 use Yiisoft\Hydrator\Result;
-use Yiisoft\Hydrator\UnexpectedAttributeException;
 use Yiisoft\Validator\Result as ValidationResult;
 use Yiisoft\Validator\ValidatorInterface;
 
@@ -40,7 +40,10 @@ public function setResult(?ValidationResult $result): void
         $this->result = $result;
     }
 
-    public function getParameterValue(ParameterAttributeInterface $attribute, Context $context): Result
+    public function getParameterValue(
+        ParameterAttributeInterface $attribute,
+        ParameterAttributeResolveContext $context,
+    ): Result
     {
         if (!$attribute instanceof Validate) {
             throw new UnexpectedAttributeException(Validate::class, $attribute);

diff --git a/src/ValidatingHydrator.php b/src/ValidatingHydrator.php
@@ -4,6 +4,7 @@
 
 namespace Yiisoft\Hydrator\Validator;
 
+use Yiisoft\Hydrator\DataInterface;
 use Yiisoft\Hydrator\HydratorInterface;
 use Yiisoft\Hydrator\Validator\Attribute\ValidateResolver;
 use Yiisoft\Validator\Result;
@@ -26,25 +27,17 @@ public function __construct(
     ) {
     }
 
-    public function hydrate(
-        object $object,
-        array $data = [],
-        array $map = [],
-        bool $strict = false
-    ): void {
+    public function hydrate(object $object, array|DataInterface $data = []): void
+    {
         $result = $this->beforeAction();
-        $this->hydrator->hydrate($object, $data, $map, $strict);
+        $this->hydrator->hydrate($object, $data);
         $this->afterAction($object, $result);
     }
 
-    public function create(
-        string $class,
-        array $data = [],
-        array $map = [],
-        bool $strict = false
-    ): object {
+    public function create(string $class, array|DataInterface $data = []): object
+    {
         $result = $this->beforeAction();
-        $object = $this->hydrator->create($class, $data, $map, $strict);
+        $object = $this->hydrator->create($class, $data);
         $this->afterAction($object, $result);
         return $object;
     }

diff --git a/tests/Attribute/ValidateResolverTest.php b/tests/Attribute/ValidateResolverTest.php
@@ -5,7 +5,7 @@
 namespace Yiisoft\Hydrator\Validator\Tests\Attribute;
 
 use PHPUnit\Framework\TestCase;
-use Yiisoft\Hydrator\UnexpectedAttributeException;
+use Yiisoft\Hydrator\AttributeHandling\Exception\UnexpectedAttributeException;
 use Yiisoft\Hydrator\Validator\Attribute\Validate;
 use Yiisoft\Hydrator\Validator\Tests\Support\Attribute\IncorrectValidateResolver;
 use Yiisoft\Hydrator\Validator\Tests\Support\TestHelper;

diff --git a/tests/Support/Attribute/IncorrectValidateResolver.php b/tests/Support/Attribute/IncorrectValidateResolver.php
@@ -5,7 +5,7 @@
 namespace Yiisoft\Hydrator\Validator\Tests\Support\Attribute;
 
 use Attribute;
-use Yiisoft\Hydrator\ParameterAttributeInterface;
+use Yiisoft\Hydrator\Attribute\Parameter\ParameterAttributeInterface;
 use Yiisoft\Hydrator\Validator\Attribute\ValidateResolver;
 
 #[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]

diff --git a/tests/Support/TestHelper.php b/tests/Support/TestHelper.php
@@ -4,9 +4,12 @@
 
 namespace Yiisoft\Hydrator\Validator\Tests\Support;
 
+use Yiisoft\Hydrator\AttributeHandling\ResolverFactory\ContainerAttributeResolverFactory;
 use Yiisoft\Hydrator\Hydrator;
+use Yiisoft\Hydrator\ObjectFactory\ContainerObjectFactory;
 use Yiisoft\Hydrator\Validator\Attribute\ValidateResolver;
 use Yiisoft\Hydrator\Validator\ValidatingHydrator;
+use Yiisoft\Injector\Injector;
 use Yiisoft\Test\Support\Container\SimpleContainer;
 use Yiisoft\Validator\Validator;
 
@@ -24,7 +27,12 @@ public static function createValidatingHydrator(): ValidatingHydrator
         );
 
         return new ValidatingHydrator(
-            new Hydrator($container),
+            new Hydrator(
+                attributeResolverFactory: new ContainerAttributeResolverFactory($container),
+                objectFactory: new ContainerObjectFactory(
+                    new Injector($container)
+                ),
+            ),
             $validator,
             $validateResolver,
         );