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

codeigniter4 · Jun 25, 2024 · 9708c08 · 9708c08
2 parents 432e4e0 + dd39902
commit 9708c08
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
         "phpunit/phpcov": "^9.0.2",
         "phpunit/phpunit": "^10.5.16",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "1.1.0",
+        "rector/rector": "1.1.1",
         "vimeo/psalm": "^5.0"
     },
     "replace": {

diff --git a/system/Commands/Server/Serve.php b/system/Commands/Server/Serve.php
@@ -103,7 +103,7 @@ public function run(array $params)
         $docroot = escapeshellarg(FCPATH);
 
         // Mimic Apache's mod_rewrite functionality with user settings.
-        $rewrite = escapeshellarg(__DIR__ . '/rewrite.php');
+        $rewrite = escapeshellarg(SYSTEMPATH . 'rewrite.php');
 
         // Call PHP's built-in webserver, making sure to set our
         // base path to the public folder, and to use the rewrite file

diff --git a/system/Commands/Server/rewrite.php → system/rewrite.php b/system/Commands/Server/rewrite.php → system/rewrite.php
@@ -21,11 +21,6 @@
  */
 
 // @codeCoverageIgnoreStart
-// Avoid this file run when listing commands
-if (PHP_SAPI === 'cli') {
-    return;
-}
-
 $uri = urldecode(
     parse_url('https://codeigniter.com' . $_SERVER['REQUEST_URI'], PHP_URL_PATH) ?? ''
 );