Don't run filters when using spark. Closes #1519

codeigniter4 · Nov 23, 2018 · 2047b5a · 2047b5a
1 parent 90f6f37
commit 2047b5a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 11 deletions.
diff --git a/spark b/spark
@@ -12,6 +12,8 @@
  * this class mainly acts as a passthru to the framework itself.
  */
 
+define('SPARKED', true);
+
 /*
  *---------------------------------------------------------------
  * BOOTSTRAP THE APPLICATION

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
@@ -297,15 +297,19 @@ protected function handleRequest(RouteCollectionInterface $routes = null, $cache
 
 		$uri = $this->request instanceof CLIRequest ? $this->request->getPath() : $this->request->uri->getPath();
 
-		$possibleRedirect = $filters->run($uri, 'before');
-		if ($possibleRedirect instanceof RedirectResponse)
+		// Never run filters when running through Spark cli
+		if (! defined('SPARKED'))
 		{
-			return $possibleRedirect;
-		}
-		// If a Response instance is returned, the Response will be sent back to the client and script execution will stop
-		if ($possibleRedirect instanceof ResponseInterface)
-		{
-			return $possibleRedirect->send();
+			$possibleRedirect = $filters->run($uri, 'before');
+			if ($possibleRedirect instanceof RedirectResponse)
+			{
+				return $possibleRedirect;
+			}
+			// If a Response instance is returned, the Response will be sent back to the client and script execution will stop
+			if ($possibleRedirect instanceof ResponseInterface)
+			{
+				return $possibleRedirect->send();
+			}
 		}
 
 		$returned = $this->startController();
@@ -331,9 +335,17 @@ protected function handleRequest(RouteCollectionInterface $routes = null, $cache
 		// so it can be used with the output.
 		$this->gatherOutput($cacheConfig, $returned);
 
-		$filters->setResponse($this->response);
-		// Run "after" filters
-		$response = $filters->run($uri, 'after');
+		// Never run filters when running through Spark cli
+		if (! defined('SPARKED'))
+		{
+			$filters->setResponse($this->response);
+			// Run "after" filters
+			$response = $filters->run($uri, 'after');
+		}
+		else
+		{
+			$response = $this->response;
+		}
 
 		if ($response instanceof Response)
 		{