more test + fix

yiisoft · Oct 25, 2023 · 2a19ae0 · 2a19ae0
1 parent 4662c55
commit 2a19ae0
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 3 deletions.
diff --git a/src/TypeCaster/HydratorTypeCaster.php b/src/TypeCaster/HydratorTypeCaster.php
@@ -7,6 +7,7 @@
 use ReflectionClass;
 use ReflectionNamedType;
 use ReflectionUnionType;
+use Yiisoft\Hydrator\Exception\NonInstantiableException;
 use Yiisoft\Hydrator\HydratorInterface;
 use Yiisoft\Hydrator\Result;
 
@@ -58,9 +59,12 @@ private function castInternal(array $value, ReflectionNamedType $type, HydratorI
 
         $reflection = new ReflectionClass($class);
         if ($reflection->isInstantiable()) {
-            return Result::success(
-                $hydrator->create($class, $value)
-            );
+            try {
+                $object = $hydrator->create($class, $value);
+            } catch (NonInstantiableException) {
+                return Result::fail();
+            }
+            return Result::success($object);
         }
 
         return Result::fail();

diff --git a/tests/Support/PrivateConstructorObject.php b/tests/Support/PrivateConstructorObject.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Hydrator\Tests\Support;
+
+final class PrivateConstructorObject
+{
+    private function __construct()
+    {
+    }
+}
diff --git a/tests/TestEnvironments/Php82/TypeCaster/HydratorTypeCasterTest.php b/tests/TestEnvironments/Php82/TypeCaster/HydratorTypeCasterTest.php
@@ -30,6 +30,11 @@ public function dataBase(): array
                 ['string' => 'hello'],
                 $this->createContext(static fn(StringableObject|(Stringable&Countable) $object) => null),
             ],
+            'incompatible array to union type with intersection type' => [
+                Result::fail(),
+                ['var' => 'hello'],
+                $this->createContext(static fn(StringableObject|(Stringable&Countable) $object) => null),
+            ],
         ];
     }
 

diff --git a/tests/TypeCaster/HydratorTypeCasterTest.php b/tests/TypeCaster/HydratorTypeCasterTest.php
@@ -9,6 +9,7 @@
 use ReflectionFunction;
 use Yiisoft\Hydrator\Hydrator;
 use Yiisoft\Hydrator\Result;
+use Yiisoft\Hydrator\Tests\Support\PrivateConstructorObject;
 use Yiisoft\Hydrator\Tests\Support\StringableObject;
 use Yiisoft\Hydrator\TypeCaster\HydratorTypeCaster;
 use Yiisoft\Hydrator\TypeCaster\TypeCastContext;
@@ -48,6 +49,11 @@ public function dataBase(): array
                 ['string' => 'hello'],
                 $this->createContext(static fn(int|StringableObject $object) => null),
             ],
+            'array to non-instantiable object' => [
+                Result::fail(),
+                ['string' => 'hello'],
+                $this->createContext(static fn(PrivateConstructorObject $object) => null),
+            ],
         ];
     }