Apply feedback changes

spatie · Dec 13, 2024 · 66d580c · 66d580c
1 parent cb03eb6
commit 66d580c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/Exceptions/CannotCreateData.php b/src/Exceptions/CannotCreateData.php
@@ -24,6 +24,7 @@ public static function noNormalizerFound(string $dataClass, mixed $value): self
     public static function constructorMissingParameters(
         DataClass $dataClass,
         array $parameters,
+        Throwable $previous,
     ): self {
         $parameters = collect($parameters);
 
@@ -41,6 +42,6 @@ public static function constructorMissingParameters(
                 ->map(fn (DataProperty|DataParameter $parameter) => $parameter->name)
                 ->join(', ')}.";
 
-        return new self($message);
+        return new self($message, previous: $previous);
     }
 }
diff --git a/src/Resolvers/DataFromArrayResolver.php b/src/Resolvers/DataFromArrayResolver.php
@@ -93,14 +93,19 @@ protected function createData(
             }
         }
 
-        if ($this->isAnyParameterMissing($dataClass, array_keys($parameters))) {
-            throw CannotCreateData::constructorMissingParameters(
-                $dataClass,
-                $parameters,
-            );
+        try {
+            return new $dataClass->name(...$parameters);
+        } catch (ArgumentCountError $error) {
+            if ($this->isAnyParameterMissing($dataClass, array_keys($parameters))) {
+                throw CannotCreateData::constructorMissingParameters(
+                    $dataClass,
+                    $parameters,
+                    $error
+                );
+            } else {
+                throw $error;
+            }
         }
-
-        return new $dataClass->name(...$parameters);
     }
 
     protected function isAnyParameterMissing(DataClass $dataClass, array $parameters): bool