Initial work on new feature testing features.

Author: lonnieezell

system/CodeIgniter.php

@@ -36,6 +36,7 @@
  * @filesource
  */
 use CodeIgniter\HTTP\RedirectResponse;
+use CodeIgniter\HTTP\Request;
 use Config\Services;
 use Config\Cache;
 use CodeIgniter\HTTP\URI;
@@ -180,8 +181,12 @@ public function initialize()
 	 * makes all of the pieces work together.
 	 *
 	 * @param \CodeIgniter\Router\RouteCollectionInterface $routes
+	 * @param bool                                         $returnResponse
+	 *
+	 * @throws \CodeIgniter\HTTP\RedirectException
+	 * @throws \Exception
 	 */
-	public function run(RouteCollectionInterface $routes = null)
+	public function run(RouteCollectionInterface $routes = null, bool $returnResponse = false)
 	{
 		$this->startBenchmark();
 
@@ -201,7 +206,7 @@ public function run(RouteCollectionInterface $routes = null)
 
 		try
 		{
-			$this->handleRequest($routes, $cacheConfig);
+			return $this->handleRequest($routes, $cacheConfig, $returnResponse);
 		} catch (Router\RedirectException $e)
 		{
 			$logger = Services::logger();
@@ -225,8 +230,11 @@ public function run(RouteCollectionInterface $routes = null)
 	 *
 	 * @param \CodeIgniter\Router\RouteCollectionInterface $routes
 	 * @param                                              $cacheConfig
+	 * @param bool                                         $returnResponse
+	 *
+	 * @throws \CodeIgniter\Filters\Exceptions\FilterException
 	 */
-	protected function handleRequest(RouteCollectionInterface $routes = null, $cacheConfig)
+	protected function handleRequest(RouteCollectionInterface $routes = null, $cacheConfig, bool $returnResponse = false)
 	{
 		$this->tryToRouteIt($routes);
 
@@ -257,6 +265,11 @@ protected function handleRequest(RouteCollectionInterface $routes = null, $cache
 		// Handle any redirects
 		if ($returned instanceof RedirectResponse)
 		{
+			if ($returnResponse)
+			{
+				return $returned;
+			}
+
 			$this->callExit(EXIT_SUCCESS);
 		}
 
@@ -279,12 +292,17 @@ protected function handleRequest(RouteCollectionInterface $routes = null, $cache
 
 		unset($uri);
 
-		$this->sendResponse();
+		if (! $returnResponse)
+		{
+			$this->sendResponse();
+		}
 
 		//--------------------------------------------------------------------
 		// Is there a post-system event?
 		//--------------------------------------------------------------------
 		Events::trigger('post_system');
+
+		return $this->response;
 	}
 
 	//--------------------------------------------------------------------
@@ -358,13 +376,35 @@ protected function startBenchmark()
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Sets a Request object to be used for this request.
+	 * Used when running certain tests.
+	 *
+	 * @param \CodeIgniter\HTTP\Request $request
+	 *
+	 * @return \CodeIgniter\CodeIgniter
+	 */
+	public function setRequest(Request $request)
+	{
+		$this->request = $request;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * Get our Request object, (either IncomingRequest or CLIRequest)
 	 * and set the server protocol based on the information provided
 	 * by the server.
 	 */
 	protected function getRequestObject()
 	{
+		if ($this->request instanceof Request)
+		{
+			return;
+		}
+
 		if (is_cli() && ! (ENVIRONMENT == 'testing'))
 		{
 			$this->request = Services::clirequest($this->config);

system/Config/Services.php

@@ -37,6 +37,7 @@
  */
 use CodeIgniter\Database\ConnectionInterface;
 use CodeIgniter\Database\MigrationRunner;
+use CodeIgniter\HTTP\URI;
 use CodeIgniter\View\RendererInterface;
 
 /**

system/HTTP/IncomingRequest.php

@@ -616,7 +616,7 @@ public function detectPath($protocol)
 				break;
 			case 'PATH_INFO':
 			default:
-				$path = $_SERVER[$protocol] ?? $this->parseRequestURI();
+				$path = $this->fetchGlobal('server', $protocol) ?? $this->parseRequestURI();
 				break;
 		}
 

system/HTTP/Request.php

@@ -64,6 +64,13 @@ class Request extends Message implements RequestInterface
 	 */
 	protected $method;
 
+	/**
+	 * Stores values we've retrieved from
+	 * PHP globals.
+	 * @var array
+	 */
+	protected $globals = [];
+
 	//--------------------------------------------------------------------
 
 	/**
@@ -302,6 +309,23 @@ public function getEnv($index = null, $filter = null, $flags = null)
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Allows manually setting the value of PHP global, like $_GET, $_POST, etc.
+	 *
+	 * @param string $method
+	 * @param        $value
+	 *
+	 * @return $this
+	 */
+	public function setGlobal(string $method, $value)
+	{
+		$this->globals[$method] = $value;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * Fetches one or more items from a global, like cookies, get, post, etc.
 	 * Can optionally filter the input when you retrieve it by passing in
@@ -312,45 +336,37 @@ public function getEnv($index = null, $filter = null, $flags = null)
 	 *
 	 * http://php.net/manual/en/filter.filters.sanitize.php
 	 *
-	 * @param int          $type   Input filter constant
+	 * @param int          $method Input filter constant
 	 * @param string|array $index
 	 * @param int          $filter Filter constant
 	 * @param null         $flags
 	 *
 	 * @return mixed
 	 */
-	protected function fetchGlobal($type, $index = null, $filter = null, $flags = null )
+	public function fetchGlobal($method, $index = null, $filter = null, $flags = null )
 	{
-		// Null filters cause null values to return.
-		if (is_null($filter))
+		$method = strtolower($method);
+
+		if (! isset($this->globals[$method]))
 		{
-			$filter = FILTER_DEFAULT;
+			$this->populateGlobals($method);
 		}
 
-		$loopThrough = [];
-		switch ($type)
+		// Null filters cause null values to return.
+		if (is_null($filter))
 		{
-			case INPUT_GET : $loopThrough = $_GET;
-				break;
-			case INPUT_POST : $loopThrough = $_POST;
-				break;
-			case INPUT_COOKIE : $loopThrough = $_COOKIE;
-				break;
-			case INPUT_SERVER : $loopThrough = $_SERVER;
-				break;
-			case INPUT_ENV : $loopThrough = $_ENV;
-				break;
-			case INPUT_REQUEST : $loopThrough = $_REQUEST;
-				break;
+			$filter = FILTER_DEFAULT;
 		}
 
-		// If $index is null, it means that the whole input type array is requested
+		// Return all values when $index is null
 		if (is_null($index))
 		{
 			$values = [];
-			foreach ($loopThrough as $key => $value)
+			foreach ($this->globals[$method] as $key => $value)
 			{
-				$values[$key] = is_array($value) ? $this->fetchGlobal($type, $key, $filter, $flags) : filter_var($value, $filter, $flags);
+				$values[$key] = is_array($value)
+					? $this->fetchGlobal($method, $key, $filter, $flags)
+					: filter_var($value, $filter, $flags);
 			}
 
 			return $values;
@@ -363,7 +379,7 @@ protected function fetchGlobal($type, $index = null, $filter = null, $flags = nu
 
 			foreach ($index as $key)
 			{
-				$output[$key] = $this->fetchGlobal($type, $key, $filter, $flags);
+				$output[$key] = $this->fetchGlobal($method, $key, $filter, $flags);
 			}
 
 			return $output;
@@ -372,7 +388,7 @@ protected function fetchGlobal($type, $index = null, $filter = null, $flags = nu
 		// Does the index contain array notation?
 		if (($count = preg_match_all('/(?:^[^\[]+)|\[[^]]*\]/', $index, $matches)) > 1)
 		{
-			$value = $loopThrough;
+			$value = $this->globals[$method];
 			for ($i = 0; $i < $count; $i++)
 			{
 				$key = trim($matches[0][$i], '[]');
@@ -393,14 +409,12 @@ protected function fetchGlobal($type, $index = null, $filter = null, $flags = nu
 			}
 		}
 
-		// Due to issues with FastCGI and testing,
-		// we need to do these all manually instead
-		// of the simpler filter_input();
 		if (empty($value))
 		{
-			$value = $loopThrough[$index] ?? null;
+			$value = $this->globals[$method][$index] ?? null;
 		}
 
+		// Cannot filter these types of data automatically...
 		if (is_array($value) || is_object($value) || is_null($value))
 		{
 			return $value;
@@ -410,4 +424,39 @@ protected function fetchGlobal($type, $index = null, $filter = null, $flags = nu
 	}
 
 	//--------------------------------------------------------------------
+
+	/**
+	 * Saves a copy of the current state of one of several PHP globals
+	 * so we can retrieve them later.
+	 *
+	 * @param string $method
+	 */
+	protected function populateGlobals(string $method)
+	{
+		if (! isset($this->globals[$method]))
+		{
+			$this->globals[$method] = [];
+		}
+
+		// Don't populate ENV as it might contain
+		// sensitive data that we don't want to get logged.
+		switch($method)
+		{
+			case 'get':
+				$this->globals['get'] = $_GET;
+				break;
+			case 'post':
+				$this->globals['post'] = $_POST;
+				break;
+			case 'request':
+				$this->globals['request'] = $_REQUEST;
+				break;
+			case 'cookie':
+				$this->globals['cookie'] = $_COOKIE;
+				break;
+			case 'server':
+				$this->globals['server'] = $_SERVER;
+				break;
+		}
+	}
 }