Merge pull request #2289 from codeigniter4/modelgetfix

lonnieezell · web-flow · commit 2e448a53332e · 2019-09-29T23:35:40.000-05:00
Don't restrict model's access to properties in a read-only manner
diff --git a/system/Model.php b/system/Model.php
@@ -1618,7 +1618,7 @@ protected function trigger(string $event, array $data)
 	 */
 	public function __get(string $name)
 	{
-		if (in_array($name, ['primaryKey', 'table', 'returnType', 'DBGroup']))
+		if (property_exists($this, $name))
 		{
 			return $this->{$name};
 		}
@@ -1639,7 +1639,7 @@ public function __get(string $name)
 	 *
 	 * @param string $name
 	 *
-	 * @return bool
+	 * @return boolean
 	 */
 	public function __isset(string $name): bool
 	{

Original file line number	Diff line number	Diff line change
`@@ -1618,7 +1618,7 @@ protected function trigger(string $event, array $data)`
`1618`	`1618`	`*/`
`1619`	`1619`	`public function __get(string $name)`
`1620`	`1620`	`{`
`1621`		`- if (in_array($name, ['primaryKey', 'table', 'returnType', 'DBGroup']))`
	`1621`	`+ if (property_exists($this, $name))`
`1622`	`1622`	`{`
`1623`	`1623`	`return $this->{$name};`
`1624`	`1624`	`}`
`@@ -1639,7 +1639,7 @@ public function __get(string $name)`
`1639`	`1639`	`*`
`1640`	`1640`	`* @param string $name`
`1641`	`1641`	`*`
`1642`		`- * @return bool`
	`1642`	`+ * @return boolean`
`1643`	`1643`	`*/`
`1644`	`1644`	`public function __isset(string $name): bool`
`1645`	`1645`	`{`