Merge branch 'develop' into unit-testing

Author: jim-parry

system/Entity.php

@@ -428,9 +428,13 @@ protected function mutateDate($value)
 
 	protected function castAs($value, string $type)
 	{
-		if (substr($type, 0, 1) === '?' && $value === null)
+		if(substr($type,0,1) === '?')
 		{
-			return null;
+			if($value === null)
+			{
+				return null;
+			}
+			$type = substr($type,1);
 		}
 
 		switch($type)

system/Model.php

@@ -1266,8 +1266,8 @@ public function validate($data): bool
 			// the value found in $data, if exists.
 			$rules = $this->fillPlaceholders($this->validationRules, $data);
 
-			$this->validation->setRules($rules, $this->validationMessages, $this->DBGroup);
-			$valid = $this->validation->run($data);
+			$this->validation->setRules($rules, $this->validationMessages);
+			$valid = $this->validation->run($data, null, $this->DBGroup);
 		}
 
 		return (bool) $valid;