fix(http): fix so referer header is resolved depending on request class in invalid response (#604)

Author: NeoIsRecursive

src/Tempest/Http/src/Responses/Invalid.php

@@ -21,12 +21,26 @@ public function __construct(
         /** @var \Tempest\Validation\Rule[][] $failingRules */
         array $failingRules = [],
     ) {
-        $referer = $request->getHeader('referer')[0] ?? throw new Exception("No referer found, could not redirect (this shouldn't happen, please create a bug report)");
+        $referer = $this->getReferer($request);
         $body = $request instanceof PsrRequest ? $request->getParsedBody() : $request->getBody();
 
         $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->getHeaders()['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)");
+        }
+
+        return $referer;
+    }
 }

tests/Integration/Http/Responses/InvalidTest.php

@@ -20,12 +20,40 @@
  */
 final class InvalidTest extends FrameworkIntegrationTestCase
 {
-    public function test_invalid(): void
+    public function test_invalid_with_psr_request(): void
     {
         /** @var PsrRequest $request */
         $request = map(new GenericRequest(Method::GET, '/original', ['foo' => 'bar']))->with(RequestToPsrRequestMapper::class);
         $request = $request->withHeader('Referer', '/original');
 
+        $response = new Invalid(
+            $request,
+            [
+                'foo' => [
+                    new NotEmpty(),
+                ],
+            ]
+        );
+
+        $this->assertSame(Status::FOUND, $response->getStatus());
+        $this->assertSame('/original', $response->getHeader('Location')->values[0]);
+
+        $session = $this->container->get(Session::class);
+
+        $this->assertArrayHasKey('foo', $session->get(Session::VALIDATION_ERRORS));
+        $this->assertArrayHasKey('foo', $session->get(Session::ORIGINAL_VALUES));
+    }
+
+    public function test_invalid_with_request()
+    {
+        $request = new GenericRequest(
+            method: Method::GET,
+            uri: '/original',
+            body: ['foo' => 'bar'],
+            headers: ['referer' => '/original']
+        );
+
+
         $response = new Invalid(
             $request,
             [