Update Entity.php

nowackipawel · web-flow · commit e81f80669841 · 2019-04-09T08:35:23.000+02:00
diff --git a/system/Entity.php b/system/Entity.php
@@ -294,8 +294,14 @@ public function __get(string $key)
 		{
 			$result = $this->castAs($result, $this->_options['casts'][$key]);
 		}
+		
+		if(isset($result) && $result !== null)
+		{
+			return $result;
+		}
+
+		throw EntityException::forTryingToAccessNonExistentProperty($key, __CLASS__);
 
-		return $result;
 	}
 
 	//--------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -294,8 +294,14 @@ public function __get(string $key)`
`294`	`294`	`{`
`295`	`295`	`$result = $this->castAs($result, $this->_options['casts'][$key]);`
`296`	`296`	`}`
	`297`	`+`
	`298`	`+ if(isset($result) && $result !== null)`
	`299`	`+ {`
	`300`	`+ return $result;`
	`301`	`+ }`
	`302`	`+`
	`303`	`+ throw EntityException::forTryingToAccessNonExistentProperty($key, __CLASS__);`
`297`	`304`
`298`		`- return $result;`
`299`	`305`	`}`
`300`	`306`
`301`	`307`	`//--------------------------------------------------------------------`