fix body

Author: rodber

src/Controller.php

@@ -29,6 +29,7 @@
 use Chevere\Parameter\Interfaces\ParameterInterface;
 use Chevere\Parameter\Interfaces\ParametersAccessInterface;
 use Chevere\Parameter\Interfaces\TypedInterface;
+use Chevere\Parameter\Interfaces\UnionParameterInterface;
 use LogicException;
 use PhpParser\Builder\Param;
 use Psr\Http\Message\ResponseInterface;
@@ -40,6 +41,7 @@
 use function Chevere\Parameter\arrayp;
 use function Chevere\Parameter\arrayString;
 use function Chevere\Parameter\mixed;
+use function Chevere\Parameter\parameters;
 use function Chevere\Parameter\typed;
 
 abstract class Controller extends BaseController implements ControllerInterface
@@ -123,26 +125,31 @@ final public function withServerRequest(ServerRequestInterface $serverRequest):
                 $parsedBody = (array) $parsedBody;
             }
             $new->_body = $parsedBody ?? null;
-            if (! $new->_body && $serverRequest->getHeaderLine('Content-Type') === 'application/json') {
-                $streamed = $new->_bodyStream->__toString();
-                $new->_body = json_decode($streamed, true);
-                if ($new->_body === null && $streamed !== '') {
-                    $new->_body = $streamed;
+            if ($serverRequest->getHeaderLine('Content-Type') === 'application/json') {
+                if (! $new->_body) {
+                    $streamed = $new->_bodyStream->__toString();
+                    $new->_body = json_decode($streamed, true);
+                    if ($new->_body === null && $streamed !== '') {
+                        $new->_body = $streamed;
+                    }
                 }
-            }
-            if ($new->_body === null) {
-                $new->_body = $streamed ?? $new->_bodyStream->__toString();
+            } elseif ($new->_body === null) {
+                $new->_body = $new->_bodyStream->__toString();
             }
             $acceptBody = $new::acceptBody();
-            $acceptBody = $acceptBody instanceof ParametersAccessInterface
-                ? $acceptBody->parameters()
-                : arrayp();
-            $new->_bodyParsed = arguments(
-                $acceptBody,
-                is_array($new->_body)
-                    ? $new->_body
-                    : ($parsedBody ?? [])
-            );
+            $new->_bodyParsed = arguments(parameters(), []);
+            if ($acceptBody instanceof UnionParameterInterface) {
+                $acceptBody->__invoke($new->_body);
+            } else {
+                if ($acceptBody instanceof ParametersAccessInterface) {
+                    $new->_bodyParsed = arguments(
+                        $acceptBody,
+                        is_array($new->_body)
+                            ? $new->_body
+                            : ($parsedBody ?? [])
+                    );
+                }
+            }
         } catch (Throwable $e) {
             throw new ControllerException(
                 '[HTTP body] ' . $e->getMessage(),

tests/ControllerTest.php

@@ -20,6 +20,7 @@
 use Chevere\Http\Status;
 use Chevere\Parameter\Interfaces\ArrayStringParameterInterface;
 use Chevere\Tests\src\AcceptBodyController;
+use Chevere\Tests\src\AcceptBodyUnionController;
 use Chevere\Tests\src\AcceptController;
 use Chevere\Tests\src\AcceptHeadersController;
 use Chevere\Tests\src\AcceptOptionalController;
@@ -31,6 +32,7 @@
 use Error;
 use Nyholm\Psr7\Response;
 use Nyholm\Psr7\ServerRequest;
+use Nyholm\Psr7\Stream;
 use Nyholm\Psr7\UploadedFile;
 use OutOfBoundsException;
 use PHPUnit\Framework\TestCase;
@@ -231,6 +233,25 @@ public function testAcceptBody(): void
         );
     }
 
+    public function testAcceptBodyUnion(): void
+    {
+        $serverRequest = new ServerRequest('GET', '/', [
+            'Content-Type' => 'application/json',
+        ]);
+        $controller = new AcceptBodyUnionController();
+        $controller->withServerRequest(
+            $serverRequest
+        );
+        $streamString = (new Stream(fopen('php://temp', 'r+')));
+        $streamString->write(json_encode('123'));
+        $with = $controller->withServerRequest(
+            $serverRequest
+                ->withBody($streamString)
+        );
+        $this->assertCount(0, $with->bodyParsed()->parameters());
+        $this->assertSame('123', $with->body()->string());
+    }
+
     public function testAcceptQueryBodyFiles(): void
     {
         $serverRequest = new ServerRequest('GET', '/');

tests/src/AcceptBodyUnionController.php

@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of Chevere.
+ *
+ * (c) Rodolfo Berrios <rodolfo@chevere.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chevere\Tests\src;
+
+use Chevere\Http\Attributes\Request;
+use Chevere\Http\Controller;
+use Chevere\Http\Header;
+use Chevere\Parameter\Interfaces\UnionParameterInterface;
+use function Chevere\Parameter\string;
+use function Chevere\Parameter\unionNull;
+
+#[Request(
+    new Header('Content-Type', 'application/json')
+)]
+final class AcceptBodyUnionController extends Controller
+{
+    public function __invoke(): void
+    {
+    }
+
+    public static function acceptBody(): UnionParameterInterface
+    {
+        return unionNull(string());
+    }
+}