Mutators included in array conversion

analogueorm · Mar 21, 2015 · f4bc1c5 · thasmo · Jun 10, 2015 · f4bc1c5
1 parent b5a4c81
commit f4bc1c5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/Entity.php b/src/Entity.php
@@ -54,7 +54,7 @@ public function __set($key, $value)
     	if($this->hasSetMutator($key))
     	{
     		$method = 'set'.$this->getMutatorMethod($key);
-    		
+
     		$this->$method($value);
     	}
         else $this->attributes[$key] = $value;
@@ -105,6 +105,11 @@ public function toArray()
 			{
 				unset($attributes[$key]);
 			}
+			if($this->hasGetMutator($key))
+			{
+				$method = 'get'.$this->getMutatorMethod($key);
+				$attributes[$key] = $this->$method($attribute);
+			}
 		}
 		return $attributes;
 	}

diff --git a/tests/AnalogueTest/EntityTest.php b/tests/AnalogueTest/EntityTest.php
@@ -49,9 +49,14 @@ public function testMutators()
         $this->assertEquals('mutated_momo_mutated', $res->string);
     }
 
-    public function testSetMutators()
+    public function testMutatorsToArray()
     {
+        $res = new Resource('name');
+        $res->string = 'momo';
 
+        $array = $res->toArray();
+
+        $this->assertEquals('mutated_momo_mutated', $array['string']);
     }
 
     public function testParsingLazyLoadedCollections()