Merge remote-tracking branch 'upstream/develop' into 4.5

codeigniter4 · Oct 8, 2023 · 70c400c · 70c400c
2 parents edfa0b5 + f277814
commit 70c400c
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
         "phpunit/phpcov": "^8.2",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "0.18.4",
+        "rector/rector": "0.18.5",
         "vimeo/psalm": "^5.0"
     },
     "suggest": {

diff --git a/rector.php b/rector.php
@@ -35,7 +35,6 @@
 use Rector\EarlyReturn\Rector\Return_\PreparedValueToEarlyReturnRector;
 use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
 use Rector\Php70\Rector\FuncCall\RandomFunctionRector;
-use Rector\Php71\Rector\FuncCall\CountOnNullRector;
 use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
 use Rector\PHPUnit\CodeQuality\Rector\Class_\YieldDataProviderRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
@@ -105,9 +104,6 @@
             __DIR__ . '/system/Session/Handlers',
         ],
 
-        // sometime too detail
-        CountOnNullRector::class,
-
         // use mt_rand instead of random_int on purpose on non-cryptographically random
         RandomFunctionRector::class,
 

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
@@ -971,8 +971,7 @@ protected function display404errors(PageNotFoundException $e)
         // Display 404 Errors
         $this->response->setStatusCode($e->getCode());
 
-        echo $this->outputBufferingEnd();
-        flush();
+        $this->outputBufferingEnd();
 
         // Throws new PageNotFoundException and remove exception message on production.
         throw PageNotFoundException::forPageNotFound(

diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
@@ -83,7 +83,7 @@ public function run(float $startTime, float $totalTime, RequestInterface $reques
         $data['isAJAX']          = $request->isAJAX();
         $data['startTime']       = $startTime;
         $data['totalTime']       = $totalTime * 1000;
-        $data['totalMemory']     = number_format((memory_get_peak_usage()) / 1024 / 1024, 3);
+        $data['totalMemory']     = number_format(memory_get_peak_usage() / 1024 / 1024, 3);
         $data['segmentDuration'] = $this->roundTo($data['totalTime'] / 7);
         $data['segmentCount']    = (int) ceil($data['totalTime'] / $data['segmentDuration']);
         $data['CI_VERSION']      = CodeIgniter::CI_VERSION;

diff --git a/user_guide_src/source/changelogs/v4.4.2.rst b/user_guide_src/source/changelogs/v4.4.2.rst
@@ -32,6 +32,9 @@ Deprecations
 Bugs Fixed
 **********
 
+- **CodeIgniter:** Fixed a bug that returned "200 OK" response status code when
+  Page Not Found.
+
 See the repo's
 `CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_
 for a complete list of bugs fixed.
diff --git a/user_guide_src/source/extending/core_classes/003.php b/user_guide_src/source/extending/core_classes/003.php
@@ -2,9 +2,9 @@
 
 namespace App\Libraries;
 
-use CodeIgniter\Router\RouteCollection;
+use CodeIgniter\Router\RouteCollection as BaseRouteCollection;
 
-class RouteCollection extends RouteCollection
+class RouteCollection extends BaseRouteCollection
 {
     // ...
 }