Merge branch 'develop' into enhance/testing

Author: jim-parry

public/index.php

@@ -1,5 +1,13 @@
 <?php
 
+// Valid PHP Version?
+$minPHPVersion = '7.1';
+if (phpversion() < $minPHPVersion)
+{
+	die("You PHP version must be {$minPHPVersion} or higher to run CodeIgniter. Current version: ". phpversion());
+}
+unset($minPHPVersion);
+
 // Path to the front controller (this file)
 define('FCPATH', __DIR__.DIRECTORY_SEPARATOR);
 

system/CodeIgniter.php

@@ -35,6 +35,7 @@
  * @since	Version 3.0.0
  * @filesource
  */
+use CodeIgniter\HTTP\DownloadResponse;
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\Request;
 use CodeIgniter\HTTP\ResponseInterface;
@@ -93,7 +94,7 @@ class CodeIgniter
 
 	/**
 	 * Current response.
-	 * @var HTTP\Response
+	 * @var HTTP\ResponseInterface
 	 */
 	protected $response;
 
@@ -326,6 +327,7 @@ 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');
 
@@ -890,6 +892,10 @@ protected function gatherOutput($cacheConfig = null, $returned = null)
 			ob_end_clean();
 		}
 
+		if ($returned instanceof DownloadResponse) {
+			$this->response = $returned;
+			return;
+		}
 		// If the controller returned a response object,
 		// we need to grab the body from it so it can
 		// be added to anything else that might have been

system/Commands/Server/Serve.php

@@ -41,12 +41,13 @@
 
 /**
  * Launch the PHP development server
- * 
+ *
  * Not testable, as it throws phpunit for a loop :-/
  * @codeCoverageIgnore
  */
 class Serve extends BaseCommand
 {
+	protected $minPHPVersion = '7.1';
 
 	protected $group = 'CodeIgniter';
 	protected $name = 'serve';
@@ -61,6 +62,12 @@ class Serve extends BaseCommand
 
 	public function run(array $params)
 	{
+		// Valid PHP Version?
+		if (phpversion() < $this->minPHPVersion)
+		{
+			die("You PHP version must be {$this->minPHPVersion} or higher to run CodeIgniter. Current version: ". phpversion());
+		}
+
 		// Collect any user-supplied options and apply them
 		$php = CLI::getOption('php') ?? PHP_BINARY;
 		$host = CLI::getOption('host') ?? 'localhost';

system/Entity.php

@@ -64,13 +64,36 @@ class Entity
 		'casts' => []
 	];
 
+	/**
+	 * Holds original copies of all class vars so
+	 * we can determine what's actually been changed
+	 * and not accidentally write nulls where we shouldn't.
+	 *
+	 * @var array
+	 */
+	protected $_original = [];
+
 	/**
 	 * Allows filling in Entity parameters during construction.
 	 *
 	 * @param array|null $data
 	 */
 	public function __construct(array $data = null)
 	{
+		// Collect any original values of things
+		// so we can compare later to see what's changed
+		$properties = get_object_vars($this);
+
+		foreach ($properties as $key => $value)
+		{
+			if (substr($key, 0, 1) == '_')
+			{
+				unset($properties[$key]);
+			}
+		}
+
+		$this->_original = $properties;
+
 		if (is_array($data))
 		{
 			$this->fill($data);
@@ -108,8 +131,12 @@ public function fill(array $data)
 	 * values of this entity as an array. All values are accessed
 	 * through the __get() magic method so will have any casts, etc
 	 * applied to them.
+	 *
+	 * @param bool $onlyChanged     If true, only return values that have changed since object creation
+	 *
+	 * @return array
 	 */
-	public function toArray(): array
+	public function toArray(bool $onlyChanged = false): array
 	{
 		$return = [];
 
@@ -119,7 +146,12 @@ public function toArray(): array
 
 		foreach ($properties as $key => $value)
 		{
-			if ($key == '_options') continue;
+			if (substr($key, 0, 1) == '_') continue;
+
+			if ($onlyChanged && $this->_original[$key] === null && $value === null)
+			{
+				continue;
+			}
 
 			$return[$key] = $this->__get($key);
 		}
@@ -368,7 +400,7 @@ protected function mutateDate($value)
 	 *
 	 * @return mixed
 	 */
-	
+
 	protected function castAs($value, string $type)
 	{
 		switch($type)
@@ -422,7 +454,7 @@ protected function castAs($value, string $type)
 	 * Cast as JSON
 	 *
 	 * @param mixed $value
-	 * @param bool $asArray 
+	 * @param bool $asArray
 	 *
 	 * @return mixed
 	 */

system/Exceptions/DownloadException.php

@@ -0,0 +1,35 @@
+<?php namespace CodeIgniter\Exceptions;
+
+/**
+ * Class DownloadException
+ *
+ * @package CodeIgniter\Exceptions
+ */
+class DownloadException extends \RuntimeException implements ExceptionInterface
+{
+
+	public static function forCannotSetFilePath(string $path)
+	{
+		return new static(lang('HTTP.cannotSetFilePath', [$path]));
+	}
+
+	public static function forCannotSetBinary()
+	{
+		return new static(lang('HTTP.cannotSetBinary'));
+	}
+
+	public static function forNotFoundDownloadSource()
+	{
+		return new static(lang('HTTP.notFoundDownloadSource'));
+	}
+
+	public static function forCannotSetCache()
+	{
+		return new static(lang('HTTP.cannotSetCache'));
+	}
+
+	public static function forCannotSetStatusCode(int $code, string $reason)
+	{
+		return new static(lang('HTTP.cannotSetStatusCode', [$code, $reason]));
+	}
+}

system/Exceptions/FrameworkException.php

@@ -11,11 +11,6 @@
 class FrameworkException extends \RuntimeException implements ExceptionInterface
 {
 
-	public static function forEmptyBaseURL(): self
-	{
-		return new static('You have an empty or invalid base URL. The baseURL value must be set in Config\App.php, or through the .env file.');
-	}
-
 	public static function forInvalidFile(string $path)
 	{
 		return new static(lang('Core.invalidFile', [$path]));

system/Filters/Filters.php

@@ -91,6 +91,11 @@ public function __construct($config, RequestInterface $request, ResponseInterfac
 	{
 		$this->config = $config;
 		$this->request = & $request;
+		$this->setResponse($response);
+	}
+
+	public function setResponse(ResponseInterface $response)
+	{
 		$this->response = & $response;
 	}