andreypostal · andreypostal · Aug 5, 2025 · Aug 5, 2025
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,6 +8,8 @@
     processIsolation= "false"
     stopOnFailure="false"
     bootstrap = "tests/bootstrap.php"
+
+    displayDetailsOnTestsThatTriggerWarnings="true"
  >
     <testsuites>
         <testsuite name="Test Suite">

diff --git a/src/Exceptions/InvalidEnumValueException.php b/src/Exceptions/InvalidEnumValueException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Andrey\PancakeObject\Exceptions;
+
+use InvalidArgumentException;
+
+class InvalidEnumValueException extends InvalidArgumentException
+{ }
diff --git a/src/SimpleHydrator.php b/src/SimpleHydrator.php
@@ -4,6 +4,7 @@
 use Andrey\PancakeObject\Attributes\Item;
 use Andrey\PancakeObject\Attributes\SkipItem;
 use Andrey\PancakeObject\Attributes\ValueObject;
+use Andrey\PancakeObject\Exceptions\InvalidEnumValueException;
 use Andrey\PancakeObject\KeyMapping\KeyMappingStrategy;
 use Andrey\PancakeObject\KeyMapping\KeyMappingUnderscore;
 use InvalidArgumentException;
@@ -141,11 +142,16 @@ private function handleBuiltin(array $data, string $key, ReflectionProperty $pro
     /**
      * @throws ReflectionException
      */
-    private function handleCustomType(mixed $value, string $type): mixed
+    private function handleCustomType(mixed $value, string $type): Payload
     {
         $typeReflection = new ReflectionClass($type);
         if ($typeReflection->isEnum()) {
-            return new Payload(data: call_user_func($type.'::tryFrom', $value));
+            $data = call_user_func($type.'::tryFrom', $value);
+            $error = null;
+            if ($data === null) {
+                $error = new InvalidEnumValueException("Invalid enum value '{$value}' for type '{$type}'");
+            }
+            return new Payload(data: $data, error: $error);
         }
 
         // Recursively hydrate child/internal value objects

diff --git a/tests/HydratorTest.php b/tests/HydratorTest.php
@@ -3,6 +3,7 @@
 use Andrey\PancakeObject\Attributes\SkipItem;
 use Andrey\PancakeObject\Attributes\ValueObject;
 use Andrey\PancakeObject\Attributes\Item;
+use Andrey\PancakeObject\Exceptions\InvalidEnumValueException;
 use Andrey\PancakeObject\Payload;
 use Andrey\PancakeObject\SimpleHydrator;
 use PHPUnit\Framework\Attributes\CoversClass;
@@ -63,7 +64,6 @@ public function testSimpleHydrate(): void
         $this->assertFalse($obj->bool);
         $this->assertNull($obj->nullableInt);
 
-        $this->assertInstanceOf(ChildObject::class, $obj->singleChild);
         $this->assertIsArray($obj->singleChild->andImAnArrayOfInt);
         $this->assertSame($data['single_child']['and_im_an_array_of_int'], $obj->singleChild->andImAnArrayOfInt);
 
@@ -177,4 +177,20 @@ public function testDefaultValueFromItem(): void
         $this->assertCount(0, $object->singleChild->andImAnArrayOfInt);
         $this->assertEquals('default child name', $object->singleChild->iHaveAName);
     }
+
+    /**
+     * @throws ReflectionException
+     */
+    public function testInvalidEnumValue(): void
+    {
+        $data = [
+            'enum' => 'C',
+        ];
+
+
+        $this->expectException(InvalidEnumValueException::class);
+
+        $hydrator = new SimpleHydrator();
+        $hydrator->hydrate($data, TestObject::class);
+    }
 }
diff --git a/tests/SerializerTest.php b/tests/SerializerTest.php
@@ -50,8 +50,6 @@ public function testSimpleSerialize(): void
         $this->assertIsArray($data["single_child"]["and_im_an_array_of_int"]);
         $this->assertSame([4, 5, 6], $data["single_child"]["and_im_an_array_of_int"]);
 
-        $this->assertNull($data["nullable_int"]);
-
         $this->assertIsArray($data["array_of_children"]);
         $this->assertCount(2, $data["array_of_children"]);