Merge branch 'develop' into feature/resource

Author: jim-parry

app/Common.php

@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * The goal of this file is to allow developers a location
+ * where they can overwrite core procedural functions and
+ * replace them with their own. This file is loaded during
+ * the bootstrap process and is called during the frameworks
+ * execution.
+ *
+ * This can be looked at as a `master helper` file that is
+ * loaded early on, and may also contain additional functions
+ * that you'd like to use throughout your entire application
+ *
+ * @link: https://codeigniter4.github.io/CodeIgniter4/
+ */

spark

@@ -53,5 +53,9 @@ ini_set('display_errors', 1);
 // Show basic information before we do anything else.
 $console->showHeader();
 
-// fire off the command the main framework.
-$console->run();
+// fire off the command in the main framework.
+$response = $console->run();
+if ($response->getStatusCode() >= 300)
+{
+	exit($response->getStatusCode());
+}

system/CLI/CommandRunner.php

@@ -71,6 +71,7 @@ class CommandRunner extends Controller
 	 * @param string $method
 	 * @param array  ...$params
 	 *
+	 * @return mixed
 	 * @throws \ReflectionException
 	 */
 	public function _remap($method, ...$params)
@@ -81,7 +82,7 @@ public function _remap($method, ...$params)
 			array_shift($params);
 		}
 
-		$this->index($params);
+		return $this->index($params);
 	}
 
 	//--------------------------------------------------------------------

system/CodeIgniter.php

@@ -355,6 +355,12 @@ protected function handleRequest(RouteCollectionInterface $routes = null, $cache
 		else
 		{
 			$response = $this->response;
+			
+			// Set response code for CLI command failures
+			if (is_numeric($returned) || $returned === false)
+			{
+				$response->setStatusCode(400);
+			}
 		}
 
 		if ($response instanceof Response)

system/Entity.php

@@ -182,9 +182,12 @@ public function toArray(bool $onlyChanged = false, bool $cast = true): array
 		{
 			foreach ($this->datamap as $from => $to)
 			{
-				$return[$from] = $this->__get($to);
+				if (array_key_exists($to, $return)) {
+					$return[$from] = $this->__get($to);
+				}
 			}
 		}
+
 		$this->_cast = true;
 		return $return;
 	}
@@ -424,6 +427,15 @@ public function __unset(string $key)
 	 */
 	public function __isset(string $key): bool
 	{
+		$key = $this->mapProperty($key);
+
+		$method = 'get' . str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $key)));
+
+		if (method_exists($this, $method))
+		{
+			return true;
+		}
+
 		return isset($this->attributes[$key]);
 	}
 

system/HTTP/Response.php

@@ -689,8 +689,8 @@ public function send()
 		}
 
 		$this->sendHeaders();
-		$this->sendBody();
 		$this->sendCookies();
+		$this->sendBody();
 
 		return $this;
 	}

system/Images/Handlers/ImageMagickHandler.php

@@ -232,9 +232,10 @@ public function getVersion(): string
 	 * @param string  $action
 	 * @param integer $quality
 	 *
-	 * @return ImageMagickHandler|boolean
+	 * @return array  Lines of output from shell command
+	 * @throws \Exception
 	 */
-	protected function process(string $action, int $quality = 100)
+	protected function process(string $action, int $quality = 100): array
 	{
 		// Do we have a vaild library path?
 		if (empty($this->config->libraryPath))
@@ -303,8 +304,8 @@ public function save(string $target = null, int $quality = 90): bool
 		$result = $this->process($action, $quality);
 
 		unlink($this->resource);
-
-		return $result;
+		
+		return true;
 	}
 
 	//--------------------------------------------------------------------

system/Test/FeatureTestCase.php

@@ -53,7 +53,7 @@
  *
  * @package CodeIgniter\Test
  */
-class FeatureTestCase extends CIDatabaseTestCase
+class FeatureTestCase extends CIUnitTestCase
 {
 
 	/**

system/bootstrap.php

@@ -96,6 +96,13 @@
 	require_once APPPATH . 'Config/Constants.php';
 }
 
+// Let's see if an app/Common.php file exists
+if (file_exists(APPPATH . 'Common.php'))
+{
+	require_once APPPATH . 'Common.php';
+}
+
+// Require system/Common.php
 require_once SYSTEMPATH . 'Common.php';
 
 /*

tests/system/EntityTest.php

@@ -548,6 +548,7 @@ public function testAsArray()
 			'bar'        => ':bar',
 			'default'    => 'sumfin',
 			'created_at' => null,
+			'createdAt'  => null,
 		]);
 	}
 
@@ -673,6 +674,17 @@ public function testHasChangedWholeEntity()
 		$this->assertTrue($entity->hasChanged());
 	}
 
+	public function testIssetKeyMap()
+	{
+		$entity = $this->getEntity();
+
+		$entity->created_at = '12345678';
+		$this->assertTrue(isset($entity->createdAt));
+
+		$entity->bar = 'foo';
+		$this->assertTrue(isset($entity->FakeBar));
+	}
+
 	protected function getEntity()
 	{
 		return new class extends Entity
@@ -691,6 +703,10 @@ protected function getEntity()
 				'created_at' => null,
 			];
 
+			protected $datamap = [
+				'createdAt' => 'created_at',
+			];
+
 			public function setBar($value)
 			{
 				$this->attributes['bar'] = "bar:{$value}";
@@ -703,6 +719,10 @@ public function getBar()
 				return "{$this->attributes['bar']}:bar";
 			}
 
+			public function getFakeBar()
+			{
+				return "{$this->attributes['bar']}:bar";
+			}
 		};
 	}