simplify object instantiation

Author: mtarld

src/Symfony/Component/SerDes/Exception/InvalidConstructorArgumentException.php

@@ -11,8 +11,7 @@
 
 namespace Symfony\Component\SerDes\Instantiator;
 
-use Symfony\Component\SerDes\Exception\InvalidConstructorArgumentException;
-use Symfony\Component\SerDes\Exception\UnexpectedTypeException;
+use Symfony\Component\SerDes\Exception\UnexpectedValueException;
 
 /**
  * @author Mathias Arlaud <[email protected]>
@@ -30,8 +29,7 @@ interface InstantiatorInterface
      *
      * @return T
      *
-     * @throws InvalidConstructorArgumentException
-     * @throws UnexpectedTypeException
+     * @throws UnexpectedValueException
      */
     public function __invoke(\ReflectionClass $class, array $propertiesValues, array $context): object;
 }

src/Symfony/Component/SerDes/Exception/UnexpectedTypeException.php

@@ -14,7 +14,6 @@
 use Symfony\Component\SerDes\Exception\LogicException;
 use Symfony\Component\SerDes\Exception\UnexpectedValueException;
 use Symfony\Component\SerDes\Exception\UnsupportedTypeException;
-use Symfony\Component\SerDes\Instantiator\InstantiatorInterface;
 use Symfony\Component\SerDes\Internal\Type;
 use Symfony\Component\SerDes\Internal\TypeFactory;
 use Symfony\Component\SerDes\Internal\UnionType;
@@ -42,7 +41,6 @@ public function __construct(
         private readonly DecoderInterface $decoder,
         private readonly ListSplitterInterface $listSplitter,
         private readonly DictSplitterInterface $dictSplitter,
-        private readonly InstantiatorInterface $instantiator,
     ) {
     }
 
@@ -91,13 +89,17 @@ private function deserializeScalar(bool $lazy, mixed $resourceOrData, Type $type
             return null;
         }
 
-        return match ($type->name()) {
-            'int' => (int) $data,
-            'float' => (float) $data,
-            'string' => (string) $data,
-            'bool' => (bool) $data,
-            default => throw new LogicException(sprintf('Cannot cast scalar to "%s".', $type->name())),
-        };
+        try {
+            return match ($type->name()) {
+                'int' => (int) $data,
+                'float' => (float) $data,
+                'string' => (string) $data,
+                'bool' => (bool) $data,
+                default => throw new LogicException(sprintf('Unhandled "%s" scalar cast', $type->name())),
+            };
+        } catch (\Throwable) {
+            throw new UnexpectedValueException(sprintf('Cannot cast "%s" to "%s"', get_debug_type($data), (string) $type));
+        }
     }
 
     /**
@@ -279,6 +281,22 @@ function (string $type, array $context) use ($v, $resourceOrData, $lazy): mixed
             return $context['instantiator']($reflection, $propertiesValues, $context);
         }
 
-        return ($this->instantiator)($reflection, $propertiesValues, $context);
+        $object = new ($reflection->getName())();
+
+        foreach ($propertiesValues as $property => $value) {
+            try {
+                $object->{$property} = $value();
+            } catch (\TypeError|UnexpectedValueException $e) {
+                $exception = new UnexpectedValueException($e->getMessage(), previous: $e);
+
+                if (!($context['collect_errors'] ?? false)) {
+                    throw $exception;
+                }
+
+                $context['collected_errors'][] = $exception;
+            }
+        }
+
+        return $object;
     }
 }

src/Symfony/Component/SerDes/Instantiator/InstantiatorInterface.php

@@ -53,7 +53,6 @@ private static function json(bool $validate): Deserializer
             decoder: new JsonDecoder(),
             listSplitter: new JsonListSplitter($lexer),
             dictSplitter: new JsonDictSplitter($lexer),
-            instantiator: new Instantiator(),
         );
     }
 }

src/Symfony/Component/SerDes/Internal/Deserialize/Deserializer.php

@@ -12,13 +12,11 @@
 namespace Symfony\Component\SerDes\Tests\Internal\Deserialize;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\SerDes\Exception\InvalidConstructorArgumentException;
 use Symfony\Component\SerDes\Exception\InvalidResourceException;
 use Symfony\Component\SerDes\Exception\PartialDeserializationException;
-use Symfony\Component\SerDes\Exception\UnexpectedTypeException;
+use Symfony\Component\SerDes\Exception\UnexpectedValueException;
 use Symfony\Component\SerDes\Exception\UnsupportedFormatException;
 use Symfony\Component\SerDes\Tests\Fixtures\Dto\ClassicDummy;
-use Symfony\Component\SerDes\Tests\Fixtures\Dto\DummyWithConstructorWithRequiredValues;
 use Symfony\Component\SerDes\Tests\Fixtures\Enum\DummyBackedEnum;
 
 use function Symfony\Component\SerDes\deserialize;
@@ -100,9 +98,9 @@ public function testThrowOnUnknownFormat()
 
     public function testThrowWhenNotCollecting()
     {
-        $this->expectException(InvalidConstructorArgumentException::class);
+        $this->expectException(UnexpectedValueException::class);
 
-        $this->deserializeString('{}', DummyWithConstructorWithRequiredValues::class);
+        $this->deserializeString('{"name": {"foo": "bar"}}', ClassicDummy::class);
     }
 
     public function testThrowPartialWhenCollecting()
@@ -133,7 +131,7 @@ public function testThrowPartialWhenCollecting()
             $this->assertEquals([$okDummy, $koDummy, $okDummy, $koDummy], $e->deserialized);
 
             $this->assertCount(2, $e->errors);
-            $this->assertContainsOnlyInstancesOf(UnexpectedTypeException::class, $e->errors);
+            $this->assertContainsOnlyInstancesOf(UnexpectedValueException::class, $e->errors);
         }
     }