doppar · techmahedy · May 6, 2026 · May 6, 2026 · May 6, 2026
diff --git a/src/Phaseolies/Error/WebErrorRenderer.php b/src/Phaseolies/Error/WebErrorRenderer.php
@@ -190,13 +190,11 @@ public function renderProduction(Throwable $exception): Response
             $content = ob_get_clean() ?: '';
 
             return response($content, $statusCode)
-                ->setOriginal($content)
-                ->setStatusCode($statusCode);
+                ->setOriginal($exception);
         }
 
         return response($message, $statusCode)
-            ->setOriginal($message)
-            ->setStatusCode($statusCode);
+            ->setOriginal($exception);
     }
 
     /**

diff --git a/src/Phaseolies/Helpers/helpers.php b/src/Phaseolies/Helpers/helpers.php
@@ -189,7 +189,10 @@ function view($view, array $data = [], array $headers = []): Response
         $instance = app(Controller::class);
         $content = $instance->render($view, $data, true);
 
-        return response($content, 200, $headers)->setOriginal($content);
+        return response($content, 200, $headers)->setOriginal([
+            'view' => $view,
+            'data' => $data,
+        ]);
     }
 }
 
@@ -205,11 +208,13 @@ function view($view, array $data = [], array $headers = []): Response
      */
     function redirect($to = null, $status = 302, $headers = [], $secure = null)
     {
+        $redirect = new RedirectResponse();
+
         if (is_null($to)) {
-            return app('redirect');
+            return $redirect;
         }
 
-        return app('redirect')->to($to, $status, $headers, $secure);
+        return $redirect->to($to, $status, $headers, $secure);
     }
 }
 
@@ -224,7 +229,7 @@ function redirect($to = null, $status = 302, $headers = [], $secure = null)
      */
     function back($status = 302, $headers = [], $fallback = false)
     {
-        return app('redirect')->back($status, $headers, $fallback);
+        return redirect()->back($status, $headers, $fallback);
     }
 }
 

diff --git a/src/Phaseolies/Http/Response.php b/src/Phaseolies/Http/Response.php
@@ -192,7 +192,7 @@ public function setException($exception): static
      * Set the HTTP status code for the response.
      *
      * @param int $statusCode The HTTP status code.
-     * @return int The updated status code.
+     * @return static
      */
     public function setStatusCode(int $statusCode, ?string $text = null): static
     {

diff --git a/src/Phaseolies/Http/Response/RedirectResponse.php b/src/Phaseolies/Http/Response/RedirectResponse.php
@@ -40,6 +40,7 @@ public function setTargetUrl(string $url): static
             throw new \InvalidArgumentException('Cannot redirect to an empty URL.');
         }
 
+        $this->setOriginal($url);
         $this->setBody(
             sprintf('<!DOCTYPE html>
 <html>

diff --git a/tests/Error/JsonErrorRendererTest.php b/tests/Error/JsonErrorRendererTest.php
@@ -78,6 +78,7 @@ public function testRenderReturnsJsonResponseInstance(): void
 
         $payload = json_decode($response->getBody(), true);
 
+        $this->assertSame($payload, $response->getOriginal());
         $this->assertSame('Boom', $payload['message']);
         $this->assertIsArray($payload['errors']);
         $this->assertArrayHasKey('trace', $payload['errors']);
@@ -96,6 +97,7 @@ public function testRenderUsesValidationEnvelopeForKnownStatuses(): void
 
         $payload = json_decode($response->getBody(), true);
 
+        $this->assertSame($payload, $response->getOriginal());
         $this->assertSame($errors, $payload['errors']);
         $this->assertIsString($payload['message']);
         $this->assertNotSame('', $payload['message']);

diff --git a/tests/Error/WebErrorRendererTest.php b/tests/Error/WebErrorRendererTest.php
@@ -24,12 +24,14 @@ protected function setUp(): void
     public function testRenderProductionReturnsResponseForGenericException(): void
     {
         $renderer = new WebErrorRenderer();
+        $exception = new RuntimeException('Boom');
 
-        $response = $renderer->renderProduction(new RuntimeException('Boom'));
+        $response = $renderer->renderProduction($exception);
 
         $this->assertInstanceOf(Response::class, $response);
         $this->assertSame(500, $response->getStatusCode());
         $this->assertSame('Something went wrong', $response->getBody());
+        $this->assertSame($exception, $response->getOriginal());
     }
 
     public function testRenderProductionPreservesHttpExceptionStatus(): void
@@ -41,5 +43,6 @@ public function testRenderProductionPreservesHttpExceptionStatus(): void
 
         $this->assertSame(404, $response->getStatusCode());
         $this->assertSame('Not Found', $response->getBody());
+        $this->assertSame($exception, $response->getOriginal());
     }
 }
diff --git a/tests/RedirectResponseTest.php b/tests/RedirectResponseTest.php
@@ -67,6 +67,11 @@ public function set($key, $value)
             }
         };
     }
+
+    public function except(...$keys): array
+    {
+        return [];
+    }
 }
 
 class MockMessageBag
@@ -125,6 +130,8 @@ protected function setUp(): void
         MockRouter::$namedRoutes = [];
 
         $this->setupGlobalMocks();
+        $container->instance('session', $this->session);
+        $container->instance('request', $this->request);
 
         $this->replaceMessageBag();
     }
@@ -198,6 +205,7 @@ public function testSetTargetUrlWithValidUrl()
         $result = $this->redirect->setTargetUrl($url);
 
         $this->assertSame($this->redirect, $result);
+        $this->assertSame($url, $this->redirect->getOriginal());
         $this->assertEquals($url, $this->redirect->headers->get('Location'));
         $this->assertEquals('text/html; charset=utf-8', $this->redirect->headers->get('Content-Type'));
         $this->assertStringContainsString('Redirecting to', $this->redirect->getBody());
@@ -222,6 +230,7 @@ public function testToMethod()
 
         $this->assertSame($this->redirect, $result);
         $this->assertEquals($statusCode, $this->redirect->getStatusCode());
+        $this->assertSame($url, $this->redirect->getOriginal());
         $this->assertEquals($url, $this->redirect->headers->get('Location'));
         $this->assertEquals('value', $this->redirect->headers->get('X-Custom'));
     }
@@ -259,6 +268,8 @@ public function testBackMethodWithReferer()
 
         $this->assertSame($this->redirect, $result);
         $this->assertEquals(301, $this->redirect->getStatusCode());
+        $this->assertSame($referer, $this->redirect->getOriginal());
+        $this->assertEquals($referer, $this->redirect->headers->get('Location'));
         $this->assertEquals('value', $this->redirect->headers->get('X-Test'));
     }
 
@@ -268,6 +279,7 @@ public function testBackMethodWithoutReferer()
 
         $result = $this->redirect->back();
 
+        $this->assertSame('/', $this->redirect->getOriginal());
         $this->assertEquals('/', $this->redirect->headers->get('Location'));
     }
 
@@ -278,14 +290,17 @@ public function testIntendedMethodWithStoredUrl()
 
         $result = $this->redirect->intended('/default');
 
-        $this->assertEquals($intendedUrl, $this->session->get('url.intended'));
+        $this->assertSame($intendedUrl, $this->redirect->getOriginal());
+        $this->assertEquals($intendedUrl, $this->redirect->headers->get('Location'));
+        $this->assertNull($this->session->get('url.intended'));
     }
 
     public function testIntendedMethodWithoutStoredUrl()
     {
         $defaultUrl = '/dashboard';
         $result = $this->redirect->intended($defaultUrl, 301);
 
+        $this->assertSame($defaultUrl, $this->redirect->getOriginal());
         $this->assertEquals($defaultUrl, $this->redirect->headers->get('Location'));
         $this->assertEquals(301, $this->redirect->getStatusCode());
     }
@@ -297,6 +312,7 @@ public function testAwayMethod()
         $result = $this->redirect->away($externalUrl, 301);
 
         $this->assertSame($this->redirect, $result);
+        $this->assertSame($externalUrl, $this->redirect->getOriginal());
         $this->assertEquals($externalUrl, $this->redirect->headers->get('Location'));
         $this->assertEquals(301, $this->redirect->getStatusCode());
     }