Merge branch 'develop' into admin/scripts

Author: jim-parry

composer.json

@@ -8,6 +8,7 @@
         "php": ">=7.1",
         "ext-curl": "*",
         "ext-intl": "*",
+        "ext-json": "*",
         "kint-php/kint": "^2.1",
         "zendframework/zend-escaper": "^2.5"
     },

spark

@@ -12,6 +12,8 @@
  * this class mainly acts as a passthru to the framework itself.
  */
 
+define('SPARKED', true);
+
 /*
  *---------------------------------------------------------------
  * BOOTSTRAP THE APPLICATION

system/Autoloader/Autoloader.php

@@ -326,7 +326,7 @@ protected function requireFile(string $file)
 	{
 		$file = $this->sanitizeFilename($file);
 
-		if (file_exists($file))
+		if (is_file($file))
 		{
 			require_once $file;
 

system/Autoloader/FileLocator.php

@@ -233,7 +233,7 @@ public function search(string $path, string $ext = 'php'): array
 		{
 			$folder = rtrim($folder, '/') . '/';
 
-			if (file_exists($folder . $path))
+			if (is_file($folder . $path) === true)
 			{
 				$foundPaths[] = $folder . $path;
 			}
@@ -369,7 +369,7 @@ protected function legacyLocate(string $file, string $folder = null): string
 	 */
 	protected function requireFile(string $path): bool
 	{
-		return file_exists($path);
+		return is_file($path);
 	}
 
 	//--------------------------------------------------------------------

system/Cache/Handlers/FileHandler.php

@@ -137,7 +137,7 @@ public function delete(string $key)
 	{
 		$key = $this->prefix . $key;
 
-		return file_exists($this->path . $key) ? unlink($this->path . $key) : false;
+		return is_file($this->path . $key) ? unlink($this->path . $key) : false;
 	}
 
 	//--------------------------------------------------------------------
@@ -246,7 +246,7 @@ public function getMetaData(string $key)
 	{
 		$key = $this->prefix . $key;
 
-		if (! file_exists($this->path . $key))
+		if (! is_file($this->path . $key))
 		{
 			return false;
 		}
@@ -473,7 +473,7 @@ protected function getDirFileInfo($source_dir, $top_level_only = true, $_recursi
 	 */
 	protected function getFileInfo(string $file, array $returned_values = ['name', 'server_path', 'size', 'date'])
 	{
-		if (! file_exists($file))
+		if (! is_file($file))
 		{
 			return false;
 		}

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)
 		{
@@ -399,7 +411,7 @@ protected function detectEnvironment()
 	 */
 	protected function bootstrapEnvironment()
 	{
-		if (file_exists(APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php'))
+		if (is_file(APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php'))
 		{
 			require_once APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php';
 		}

system/ComposerScripts.php

@@ -142,7 +142,7 @@ protected static function removeDir($dir)
 	 */
 	public static function moveEscaper()
 	{
-		if (class_exists('\\Zend\\Escaper\\Escaper') && file_exists(static::getClassFilePath('\\Zend\\Escaper\\Escaper')))
+		if (class_exists('\\Zend\\Escaper\\Escaper') && is_file(static::getClassFilePath('\\Zend\\Escaper\\Escaper')))
 		{
 			$base = static::$basePath . 'ZendEscaper';
 
@@ -181,7 +181,7 @@ public static function moveKint()
 	{
 		$filename = 'vendor/kint-php/kint/build/kint-aante-light.php';
 
-		if (file_exists($filename))
+		if (is_file($filename))
 		{
 			$base = static::$basePath . 'Kint';
 

system/Database/BaseBuilder.php

@@ -233,7 +233,10 @@ public function __construct($tableName, ConnectionInterface &$db, array $options
 		{
 			foreach ($options as $key => $value)
 			{
-				$this->$key = $value;
+				if (property_exists($this, $key))
+				{
+					$this->$key = $value;
+				}
 			}
 		}
 	}

system/Database/BaseConnection.php

@@ -338,7 +338,10 @@ public function __construct(array $params)
 	{
 		foreach ($params as $key => $value)
 		{
-			$this->$key = $value;
+			if (property_exists($this, $key))
+			{
+				$this->$key = $value;
+			}
 		}
 	}
 
@@ -382,7 +385,10 @@ public function initialize()
 					// Replace the current settings with those of the failover
 					foreach ($failover as $key => $val)
 					{
-						$this->$key = $val;
+						if (property_exists($this, $key))
+						{
+							$this->$key = $val;
+						}
 					}
 
 					// Try to connect

system/Database/Forge.php

@@ -852,10 +852,10 @@ protected function _alterTable($alter_type, $table, $field)
 		$sql .= ($alter_type === 'ADD') ? 'ADD ' : $alter_type . ' COLUMN ';
 
 		$sqls = [];
-		for ($i = 0, $c = count($field); $i < $c; $i++)
+		foreach ($field as $data)
 		{
 			$sqls[] = $sql
-					  . ($field[$i]['_literal'] !== false ? $field[$i]['_literal'] : $this->_processColumn($field[$i]));
+					  . ($data['_literal'] !== false ? $data['_literal'] : $this->_processColumn($data));
 		}
 
 		return $sqls;