Merge pull request #60 from Evertt/get-attribute-change

change __get method to also return mutators on non-existing attributes

src/Entity.php

@@ -24,15 +24,20 @@ class Entity extends ValueObject implements Mappable, ArrayAccess, Jsonable, Jso
 	 */
 	public function __get($key)
 	{
-		if (! array_key_exists($key, $this->attributes))
-		{
-			return null;
-		}
 		if ($this->hasGetMutator($key))
 		{
 			$method = 'get'.$this->getMutatorMethod($key);
 
-			return $this->$method($this->attributes[$key]);
+			$attribute = null;
+
+			if (isset($this->attributes[$key]))
+				$attribute = $this->attributes[$key];
+
+			return $this->$method($attribute);
+		}
+		if (! array_key_exists($key, $this->attributes))
+		{
+			return null;
 		}
 		if ($this->attributes[$key] instanceof EntityProxy)
 		{

tests/AnalogueTest/App/Avatar.php

@@ -9,4 +9,9 @@ public function __construct($name, User $user)
         $this->name = $name;
         $this->user = $user;
     }
+
+    public function getPathAttribute()
+    {
+        return $this->image->path;
+    }
 }

tests/AnalogueTest/EntityTest.php

@@ -83,4 +83,14 @@ public function testSimpleEntityToArray()
         $rm->store($role);
         $role->toArray();
     }
+
+    public function testGetMethodsForNonExistingAttributes()
+    {
+        $user = new User('John', new Role('Admin'));
+        $avatar = new Avatar('Picture', $user);
+        $image = new Image('my-picture.jpg');
+        $avatar->image = $image;
+
+        $this->assertEquals($avatar->path, 'my-picture.jpg');
+    }
 }