try errors

chevere · Dec 22, 2023 · b4c82e1 · b4c82e1
1 parent 9f95da6
commit b4c82e1
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 144 deletions.
diff --git a/src/UnionParameter.php b/src/UnionParameter.php
@@ -20,6 +20,9 @@
 use Chevere\Parameter\Traits\ArrayParameterTrait;
 use Chevere\Parameter\Traits\ParameterAssertArrayTypeTrait;
 use Chevere\Parameter\Traits\ParameterTrait;
+use Throwable;
+use TypeError;
+use function Chevere\Message\message;
 
 final class UnionParameter implements UnionParameterInterface
 {
@@ -42,7 +45,28 @@ final public function __construct(
 
     public function __invoke(mixed $value): mixed
     {
-        return assertUnion($this, $value);
+        $types = [];
+        $errors = [];
+        foreach ($this->parameters() as $item) {
+            try {
+                assertNamedArgument('', $item, $value);
+
+                return $value;
+            } catch (Throwable $e) {
+                $types[] = $item::class;
+                $errors[] = $e->getMessage();
+            }
+        }
+        $types = implode('|', $types);
+        $errors = implode('; ', $errors);
+
+        throw new TypeError(
+            (string) message(
+                "Argument provided doesn't match the union type `%types%`. Error(s): %errors%",
+                types: $types,
+                errors: $errors,
+            )
+        );
     }
 
     public function withAdded(ParameterInterface ...$parameter): static

diff --git a/src/functions.php b/src/functions.php
@@ -35,7 +35,6 @@
 use ReflectionMethod;
 use ReflectionParameter;
 use Throwable;
-use TypeError;
 use function Chevere\Message\message;
 
 function cast(mixed $argument): CastInterface
@@ -92,29 +91,6 @@ function arguments(
     return new Arguments($parameters, $arguments);
 }
 
-function assertUnion(
-    UnionParameterInterface $parameter,
-    mixed $argument,
-): mixed {
-    $types = [];
-    foreach ($parameter->parameters() as $item) {
-        try {
-            assertNamedArgument('', $item, $argument);
-
-            return $argument;
-        } catch (Throwable $e) {
-            $types[] = $item::class;
-        }
-    }
-
-    throw new TypeError(
-        (string) message(
-            "Argument provided doesn't match the union type `%type%`",
-            type: implode('|', $types)
-        )
-    );
-}
-
 function assertNamedArgument(
     string $name,
     ParameterInterface $parameter,

diff --git a/tests/FunctionsTest.php b/tests/FunctionsTest.php
@@ -24,7 +24,6 @@
 use function Chevere\Parameter\arrayp;
 use function Chevere\Parameter\assertArray;
 use function Chevere\Parameter\assertNamedArgument;
-use function Chevere\Parameter\assertUnion;
 use function Chevere\Parameter\bool;
 use function Chevere\Parameter\float;
 use function Chevere\Parameter\generic;
@@ -37,7 +36,6 @@
 use function Chevere\Parameter\string;
 use function Chevere\Parameter\takeFrom;
 use function Chevere\Parameter\takeKeys;
-use function Chevere\Parameter\union;
 
 final class FunctionsTest extends TestCase
 {
@@ -211,18 +209,6 @@ public function testFunctionGenericParameter(): void
         $this->assertSame('foo', $parameter->description());
     }
 
-    public function testFunctionUnionParameter(): void
-    {
-        $parameter = union(
-            int(),
-            string(),
-        );
-        assertUnion($parameter, 'foo');
-        assertUnion($parameter, 123);
-        $this->expectException(TypeError::class);
-        assertUnion($parameter, []);
-    }
-
     public function testAssertArrayExtraArguments(): void
     {
         $parameter = arrayp(

diff --git a/tests/FunctionsUnionTest.php b/tests/FunctionsUnionTest.php