fix(router): use correct input stream (#1005)

brendt · web-flow · commit 768c6fbf640a · 2025-03-13T13:37:51.000+01:00
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -100,7 +100,7 @@ jobs:
         run: php ./tempest discovery:status
 
       - name: Execute tests
-        run: vendor/bin/phpunit --coverage-clover build/reports/clover.xml
+        run: php -d"error_reporting = E_ALL & ~E_DEPRECATED" vendor/bin/phpunit --coverage-clover build/reports/clover.xml
 
       # Only upload coverage once.
       - if: matrix.php == '8.3' && matrix.database == 'sqlite' && matrix.os == 'ubuntu-latest' && matrix.stability == 'prefer-stable'
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -33,8 +33,6 @@
     <env name="BASE_URI" value="" />
     <env name="CACHE" value="null" />
     <env name="DISCOVERY_CACHE" value="true" />
-    <env name="DEBUG_LOG_PATH" value="log/debug.test.log" />
-    <env name="SERVER_LOG_PATH" value="log/server.test.log" />
     <ini name="memory_limit" value="256M" />
   </php>
 </phpunit>
diff --git a/src/Tempest/Console/src/ConsoleApplication.php b/src/Tempest/Console/src/ConsoleApplication.php
@@ -40,13 +40,6 @@ public static function boot(
         $consoleConfig = $container->get(ConsoleConfig::class);
         $consoleConfig->name = $name;
 
-        $logConfig = $container->get(LogConfig::class);
-
-        if ($logConfig->debugLogPath === null && $logConfig->channels === []) {
-            $logConfig->debugLogPath = path($container->get(Kernel::class)->root, '/log/debug.log')->toString();
-            $logConfig->channels[] = new AppendLogChannel(path($container->get(Kernel::class)->root, '/log/tempest.log')->toString());
-        }
-
         return $application;
     }
 
diff --git a/src/Tempest/Log/src/LogConfig.php b/src/Tempest/Log/src/LogConfig.php
@@ -4,6 +4,10 @@
 
 namespace Tempest\Log;
 
+use Tempest\Log\Channels\AppendLogChannel;
+
+use function Tempest\root_path;
+
 final class LogConfig
 {
     public function __construct(
@@ -13,5 +17,10 @@ public function __construct(
         public ?string $debugLogPath = null,
         public ?string $serverLogPath = null,
     ) {
+        $this->debugLogPath ??= root_path('/log/debug.log');
+
+        if ($this->channels === []) {
+            $this->channels[] = new AppendLogChannel(root_path('/log/tempest.log'));
+        }
     }
 }
diff --git a/src/Tempest/Router/src/GenericRouter.php b/src/Tempest/Router/src/GenericRouter.php
@@ -77,7 +77,7 @@ public function dispatch(Request|PsrRequest $request): Response
             } catch (NotFoundException) {
                 return new NotFound();
             } catch (ValidationException $validationException) {
-                return new Invalid($request, $validationException->failingRules);
+                return new Invalid($validationException->object, $validationException->failingRules);
             }
         } else {
             $request = $this->resolveRequest($request, $matchedRoute);
diff --git a/src/Tempest/Router/src/Input/InputStream.php b/src/Tempest/Router/src/Input/InputStream.php
@@ -2,7 +2,7 @@
 
 namespace Tempest\Router\Input;
 
-interface PostInputStream
+interface InputStream
 {
     public function parse(): array;
 }
diff --git a/src/Tempest/Router/src/Input/InputStreamInitializer.php b/src/Tempest/Router/src/Input/InputStreamInitializer.php
@@ -6,11 +6,11 @@
 use Tempest\Container\Initializer;
 use Tempest\Container\Singleton;
 
-final class PostInputStreamInitializer implements Initializer
+final class InputStreamInitializer implements Initializer
 {
     #[Singleton]
-    public function initialize(Container $container): PostInputStream
+    public function initialize(Container $container): InputStream
     {
-        return new StdinPostInputStream();
+        return new StdinInputStream();
     }
 }
diff --git a/src/Tempest/Router/src/Input/StdinInputStream.php b/src/Tempest/Router/src/Input/StdinInputStream.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Tempest\Router\Input;
+
+use function Tempest\Support\str;
+
+final class StdinInputStream implements InputStream
+{
+    public function parse(): array
+    {
+        $input = file_get_contents('php://input');
+
+        if (json_validate($input)) {
+            return json_decode($input, true);
+        }
+
+        $inputStreamData = str($input)
+            ->explode('&')
+            ->mapWithKeys(function (string $item) {
+                $parts = explode('=', $item, 2);
+
+                $key = $parts[0];
+
+                $value = $_POST[str_replace('.', '_', $key)] ?? $parts[1] ?? '';
+
+                yield $key => $value;
+            })
+            ->toArray();
+
+        return $_POST + $inputStreamData;
+    }
+}
diff --git a/src/Tempest/Router/src/Input/StdinPostInputStream.php b/src/Tempest/Router/src/Input/StdinPostInputStream.php
diff --git a/src/Tempest/Router/src/Mappers/RequestToObjectMapper.php b/src/Tempest/Router/src/Mappers/RequestToObjectMapper.php
@@ -7,12 +7,10 @@
 use Tempest\Mapper\Mapper;
 use Tempest\Mapper\Mappers\ArrayToObjectMapper;
 use Tempest\Router\Request;
-use Tempest\Validation\Exceptions\PropertyValidationException;
 use Tempest\Validation\Exceptions\ValidationException;
 use Tempest\Validation\Validator;
 
 use function Tempest\map;
-use function Tempest\reflect;
 
 final readonly class RequestToObjectMapper implements Mapper
 {
diff --git a/src/Tempest/Router/src/RequestFactory.php b/src/Tempest/Router/src/RequestFactory.php
@@ -6,12 +6,12 @@
 
 use Laminas\Diactoros\ServerRequestFactory;
 use Psr\Http\Message\ServerRequestInterface as PsrRequest;
-use Tempest\Router\Input\PostInputStream;
+use Tempest\Router\Input\InputStream;
 
 final readonly class RequestFactory
 {
     public function __construct(
-        private PostInputStream $inputStream,
+        private InputStream $inputStream,
     ) {
     }
 
diff --git a/src/Tempest/Router/src/Responses/Invalid.php b/src/Tempest/Router/src/Responses/Invalid.php
@@ -4,43 +4,44 @@
 
 namespace Tempest\Router\Responses;
 
-use Exception;
-use Psr\Http\Message\ServerRequestInterface as PsrRequest;
 use Tempest\Http\Status;
 use Tempest\Router\IsResponse;
 use Tempest\Router\Request;
 use Tempest\Router\Response;
 use Tempest\Router\Session\Session;
+use Tempest\Validation\Rule;
+
+use function Tempest\Support\arr;
 
 final class Invalid implements Response
 {
     use IsResponse;
 
     public function __construct(
-        PsrRequest|Request $request,
+        Request $request,
         /** @var \Tempest\Validation\Rule[][] $failingRules */
         array $failingRules = [],
     ) {
-        $referer = $this->getReferer($request);
-        $body = ($request instanceof PsrRequest) ? $request->getParsedBody() : $request->body;
-
-        $this->addHeader('Location', $referer);
-        $this->status = Status::FOUND;
-        $this->flash(Session::VALIDATION_ERRORS, $failingRules);
-        $this->flash(Session::ORIGINAL_VALUES, $body);
-    }
-
-    private function getReferer(PsrRequest|Request $request): string
-    {
-        $referer = match (true) {
-            $request instanceof Request => $request->headers['referer'] ?? null,
-            $request instanceof PsrRequest => $request->getHeader('referer')[0] ?? null,
-        };
-
-        if (! $referer) {
-            throw new Exception("No referer found, could not redirect (this shouldn't happen, please create a bug report)");
+        if ($referer = $request->headers['referer'] ?? null) {
+            $this->addHeader('Location', $referer);
+            $this->status = Status::FOUND;
+        } else {
+            $this->status = Status::BAD_REQUEST;
         }
 
-        return $referer;
+        $this->flash(Session::VALIDATION_ERRORS, $failingRules);
+        $this->flash(Session::ORIGINAL_VALUES, $request->body);
+        $this->addHeader(
+            'x-validation',
+            json_encode(
+                arr($failingRules)
+                    ->map(
+                        fn (array $failingRulesForField) => arr($failingRulesForField)->map(
+                            fn (Rule $rule) => $rule->message(),
+                        )->toArray(),
+                    )
+                    ->toArray(),
+            ),
+        );
     }
 }
diff --git a/src/Tempest/Validation/src/Exceptions/ValidationException.php b/src/Tempest/Validation/src/Exceptions/ValidationException.php
@@ -12,7 +12,7 @@
 final class ValidationException extends Exception
 {
     public function __construct(
-        object $object,
+        public readonly object $object,
         public readonly array $failingRules,
     ) {
         $messages = [];
diff --git a/tests/Fixtures/Controllers/RequestTestController.php b/tests/Fixtures/Controllers/RequestTestController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Tests\Tempest\Fixtures\Controllers;
+
+use Tempest\Router\Post;
+use Tempest\Router\Response;
+use Tempest\Router\Responses\Ok;
+use Tests\Tempest\Fixtures\Requests\FormRequestA;
+
+final class RequestTestController
+{
+    #[Post('/request-test/form')]
+    public function formAction(FormRequestA $request): Response
+    {
+        return new Ok()
+            ->addHeader('name', $request->name)
+            ->addHeader('b.name', $request->b->name);
+    }
+}
diff --git a/tests/Fixtures/Requests/FormRequestA.php b/tests/Fixtures/Requests/FormRequestA.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Tests\Tempest\Fixtures\Requests;
+
+use Tempest\Router\IsRequest;
+use Tempest\Router\Request;
+
+final class FormRequestA implements Request
+{
+    use IsRequest;
+
+    public string $name;
+
+    public FormRequestB $b;
+}
diff --git a/tests/Fixtures/Requests/FormRequestB.php b/tests/Fixtures/Requests/FormRequestB.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Tests\Tempest\Fixtures\Requests;
+
+use Tempest\Router\IsRequest;
+use Tempest\Router\Request;
+
+final class FormRequestB
+{
+    public string $name;
+}
diff --git a/tests/Integration/Http/Responses/InvalidTest.php b/tests/Integration/Http/Responses/InvalidTest.php
@@ -22,9 +22,7 @@ final class InvalidTest extends FrameworkIntegrationTestCase
 {
     public function test_invalid_with_psr_request(): void
     {
-        /** @var PsrRequest $request */
-        $request = map(new GenericRequest(Method::GET, '/original', ['foo' => 'bar']))->with(RequestToPsrRequestMapper::class)->do();
-        $request = $request->withHeader('Referer', '/original');
+        $request = new GenericRequest(Method::GET, '/original', ['foo' => 'bar'], ['referer' => '/original']);
 
         $response = new Invalid(
             $request,
diff --git a/tests/Integration/Http/ValidationResponseTest.php b/tests/Integration/Http/ValidationResponseTest.php
@@ -20,7 +20,7 @@ public function test_validation_errors_are_listed_in_the_response_body(): void
             ->post(
                 uri: uri([ValidationController::class, 'store']),
                 body: ['number' => 11, 'item.number' => 11],
-                headers: ['Referer' => uri([ValidationController::class, 'store'])],
+                headers: ['referer' => uri([ValidationController::class, 'store'])],
             )
             ->assertRedirect(uri([ValidationController::class, 'store']))
             ->assertHasValidationError('number');
@@ -34,7 +34,7 @@ public function test_original_values(): void
             ->post(
                 uri: uri([ValidationController::class, 'store']),
                 body: $values,
-                headers: ['Referer' => uri([ValidationController::class, 'store'])],
+                headers: ['referer' => uri([ValidationController::class, 'store'])],
             )
             ->assertRedirect(uri([ValidationController::class, 'store']))
             ->assertHasValidationError('number')
diff --git a/tests/Integration/Log/LogConfigTest.php b/tests/Integration/Log/LogConfigTest.php
@@ -4,25 +4,19 @@
 
 namespace Log;
 
-use Tempest\Core\Kernel\LoadConfig;
 use Tempest\Log\LogConfig;
 use Tests\Tempest\Integration\FrameworkIntegrationTestCase;
+use function Tempest\root_path;
 
 /**
  * @internal
  */
 final class LogConfigTest extends FrameworkIntegrationTestCase
 {
-    public function test_log_path_by_env(): void
+    public function test_log_path_defaults(): void
     {
-        $expectedDebugLogPath = 'log/debug.test.log';
-        $expectedServerLogPath = 'log/server.test.log';
-
-        $this->container->invoke(LoadConfig::class);
-
         $logConfig = $this->container->get(LogConfig::class);
 
-        $this->assertSame($expectedDebugLogPath, $logConfig->debugLogPath);
-        $this->assertSame($expectedServerLogPath, $logConfig->serverLogPath);
+        $this->assertSame(root_path('log/debug.log'), $logConfig->debugLogPath);
     }
 }
diff --git a/tests/Integration/Mapper/MapperTest.php b/tests/Integration/Mapper/MapperTest.php
@@ -21,7 +21,6 @@
 use Tests\Tempest\Integration\Mapper\Fixtures\ObjectWithMapToCollisions;
 use Tests\Tempest\Integration\Mapper\Fixtures\ObjectWithMapToCollisionsJsonSerializable;
 use Tests\Tempest\Integration\Mapper\Fixtures\ObjectWithMultipleMapFrom;
-use Tests\Tempest\Integration\Mapper\Fixtures\ObjectWithNotNullInferenceA;
 use Tests\Tempest\Integration\Mapper\Fixtures\ObjectWithStrictOnClass;
 use Tests\Tempest\Integration\Mapper\Fixtures\ObjectWithStrictProperty;
 use Tests\Tempest\Integration\Mapper\Fixtures\Person;
diff --git a/tests/Integration/Route/ClientTest.php b/tests/Integration/Route/ClientTest.php
diff --git a/tests/Integration/Route/Fixtures/MemoryInputStream.php b/tests/Integration/Route/Fixtures/MemoryInputStream.php
diff --git a/tests/Integration/Route/RequestTest.php b/tests/Integration/Route/RequestTest.php

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,10 @@`
`4`	`4`
`5`	`5`	`namespace Tempest\Log;`
`6`	`6`
	`7`	`+use Tempest\Log\Channels\AppendLogChannel;`
	`8`	`+`
	`9`	`+use function Tempest\root_path;`
	`10`	`+`
`7`	`11`	`final class LogConfig`
`8`	`12`	`{`
`9`	`13`	`public function __construct(`
`@@ -13,5 +17,10 @@ public function __construct(`
`13`	`17`	`public ?string $debugLogPath = null,`
`14`	`18`	`public ?string $serverLogPath = null,`
`15`	`19`	`) {`
	`20`	`+ $this->debugLogPath ??= root_path('/log/debug.log');`
	`21`	`+`
	`22`	`+ if ($this->channels === []) {`
	`23`	`+ $this->channels[] = new AppendLogChannel(root_path('/log/tempest.log'));`
	`24`	`+ }`
`16`	`25`	`}`
`17`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public function dispatch(Request\|PsrRequest $request): Response`
`77`	`77`	`} catch (NotFoundException) {`
`78`	`78`	`return new NotFound();`
`79`	`79`	`} catch (ValidationException $validationException) {`
`80`		`- return new Invalid($request, $validationException->failingRules);`
	`80`	`+ return new Invalid($validationException->object, $validationException->failingRules);`
`81`	`81`	`}`
`82`	`82`	`} else {`
`83`	`83`	`$request = $this->resolveRequest($request, $matchedRoute);`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Tempest\Router\Input;`
`4`	`4`
`5`		`-interface PostInputStream`
	`5`	`+interface InputStream`
`6`	`6`	`{`
`7`	`7`	`public function parse(): array;`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,11 @@`
`6`	`6`	`use Tempest\Container\Initializer;`
`7`	`7`	`use Tempest\Container\Singleton;`
`8`	`8`
`9`		`-final class PostInputStreamInitializer implements Initializer`
	`9`	`+final class InputStreamInitializer implements Initializer`
`10`	`10`	`{`
`11`	`11`	`#[Singleton]`
`12`		`- public function initialize(Container $container): PostInputStream`
	`12`	`+ public function initialize(Container $container): InputStream`
`13`	`13`	`{`
`14`		`- return new StdinPostInputStream();`
	`14`	`+ return new StdinInputStream();`
`15`	`15`	`}`
`16`	`16`	`}`