Merge pull request #782 from jails/bug/entity-magic-call

Fix infinite loop that occurs when an `data\Entity` class is used as `data\Entity::_model`.

data/Entity.php

@@ -187,7 +187,7 @@ public function __isset($name) {
 	 * @return mixed
 	 */
 	public function __call($method, $params) {
-		if ($model = $this->_model) {
+		if (($model = $this->_model) && method_exists($model, '_object')) {
 			array_unshift($params, $this);
 			$class = $model::invokeMethod('_object');
 			return call_user_func_array(array(&$class, $method), $params);

tests/cases/data/EntityTest.php

@@ -102,6 +102,14 @@ public function testMethodDispatchWithNoModel() {
 		$entity->foo();
 	}
 
+	public function testMethodDispatchWithEntityAsModel() {
+		$data = array('foo' => true);
+		$model = 'lithium\data\Entity';
+		$entity = new Entity(compact('model', 'data'));
+		$this->expectException("/^No model bound to call `foo`.$/");
+		$entity->foo();
+	}
+
 	public function testErrors() {
 		$entity = new Entity();
 		$errors = array('foo' => 'Something bad happened.');