Merge pull request #1623 from nowackipawel/patch-30

lonnieezell · web-flow · commit b5b4ad3cb220 · 2018-12-29T23:08:29.000-06:00
Property was not cast if was defined as nullable.
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)

Original file line number	Diff line number	Diff line change
`@@ -428,9 +428,13 @@ protected function mutateDate($value)`
`428`	`428`
`429`	`429`	`protected function castAs($value, string $type)`
`430`	`430`	`{`
`431`		`- if (substr($type, 0, 1) === '?' && $value === null)`
	`431`	`+ if(substr($type,0,1) === '?')`
`432`	`432`	`{`
`433`		`- return null;`
	`433`	`+ if($value === null)`
	`434`	`+ {`
	`435`	`+ return null;`
	`436`	`+ }`
	`437`	`+ $type = substr($type,1);`
`434`	`438`	`}`
`435`	`439`
`436`	`440`	`switch($type)`