Move spark serve command files

system/Commands/Serve.php → system/Commands/Server/Serve.php

@@ -1,4 +1,4 @@
-<?php namespace CodeIgniter\Commands;
+<?php namespace CodeIgniter\Commands\Server;
 
 use CodeIgniter\CLI\BaseCommand;
 use CodeIgniter\CLI\CLI;
@@ -31,7 +31,7 @@ public function run(array $params)
 		$docroot = FCPATH;
 
 		// Mimic Apache's mod_rewrite functionality with user settings
-		$rewrite = APPPATH . 'Config/Rewrite.php';
+		$rewrite = __DIR__ . '/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

application/Config/Rewrite.php → system/Commands/Server/rewrite.php

@@ -8,14 +8,22 @@
  * functionality so the site will operate as normal.
  */
 
+// Avoid this file run when listing commands
+if (php_sapi_name() === 'cli')
+{
+	return;
+}
+
 // If we're serving the site locally, then we need
 // to let the application know that we're in development mode
 $_SERVER['CI_ENVIRONMENT'] = 'development';
 
 $uri = urldecode(parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
 
-$fcpath = __DIR__ . '/../../public/';
+// Front Controller path - expected to be in the default folder
+$fcpath = realpath(__DIR__ . '/../../../public') . DIRECTORY_SEPARATOR;
 
+// Full path
 $path = $fcpath . ltrim($uri, '/');
 
 // If $path is an existing file or folder within the public folder