Merge pull request #1623 from nowackipawel/patch-30

Property was not cast if was defined as nullable.
codeigniter4 · Dec 30, 2018 · b5b4ad3 · b5b4ad3
2 parents 1c01ed6 + 327c41c
commit b5b4ad3
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/system/Entity.php b/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)