feat!: 404 override sets 404 status code by default

codeigniter4 · Feb 11, 2024 · da455d4 · da455d4
1 parent 75b5931
commit da455d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
@@ -938,6 +938,8 @@ protected function runController($class)
  */
  protected function display404errors(PageNotFoundException $e)
  {
+ $this->response->setStatusCode($e->getCode());
+
  // Is there a 404 Override available?
  if ($override = $this->router->get404Override()) {
  $returned = null;
@@ -966,9 +968,6 @@ protected function display404errors(PageNotFoundException $e)
  return $this->response;
  }
 
- // Display 404 Errors
- $this->response->setStatusCode($e->getCode());
-
  $this->outputBufferingEnd();
 
  // Throws new PageNotFoundException and remove exception message on production.

diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
@@ -138,6 +138,7 @@ public function testRun404Override(): void
  $output = ob_get_clean();
 
  $this->assertStringContainsString("Can't find a route for 'GET: pages/about'.", $output);
+ $this->assertSame(404, response()->getStatusCode());
  }
 
  public function testRun404OverrideControllerReturnsResponse(): void
@@ -194,6 +195,7 @@ public function testRun404OverrideByClosure(): void
  $output = ob_get_clean();
 
  $this->assertStringContainsString('404 Override by Closure.', $output);
+ $this->assertSame(404, response()->getStatusCode());
  }
 
  public function testControllersCanReturnString(): void