Merge pull request #8995 from kenjis/fix-command-loads-rewrite.php

fix: `command()` may execute `rewrite.php`
codeigniter4 · Jun 25, 2024 · dd39902 · dd39902
2 parents e0e8f83 + 9f6bf3f
commit dd39902
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
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) ?? ''
 );