Merge pull request #45 from Ocramius/hotfix/issue-#44-hydrator-interf…

…ace-compliance Hotfix/issue #44 hydrator interface compliance
Ocramius · May 13, 2013 · 1363695 · 1363695
2 parents 37daee1 + 2d4f589
commit 1363695
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/ProxyManager/ProxyGenerator/Hydrator/MethodGenerator/Hydrate.php b/src/ProxyManager/ProxyGenerator/Hydrator/MethodGenerator/Hydrate.php
@@ -60,6 +60,8 @@ public function __construct(array $accessibleProperties, array $propertyAccessor
                 . "]);\n";
         }
 
+        $body .= "\nreturn \$object;";
+
         $this->setBody($body);
     }
 }
diff --git a/tests/ProxyManagerTest/Functional/HydratorFunctionalTest.php b/tests/ProxyManagerTest/Functional/HydratorFunctionalTest.php
@@ -49,7 +49,7 @@ class HydratorFunctionalTest extends PHPUnit_Framework_TestCase
      *
      * @param object $instance
      */
-    public function testHydrate($instance)
+    public function testHydrator($instance)
     {
         $reflection  = new ReflectionClass($instance);
         $properties  = $reflection->getProperties();
@@ -67,7 +67,7 @@ public function testHydrate($instance)
         $proxy = $this->generateProxy($instance);
 
         $this->assertSame($initialData, $proxy->extract($instance));
-        $proxy->hydrate($newData, $instance);
+        $this->assertSame($instance, $proxy->hydrate($newData, $instance));
 
         $inspectionData = array();
 

diff --git a/tests/ProxyManagerTest/ProxyGenerator/Hydrator/MethodGenerator/HydrateTest.php b/tests/ProxyManagerTest/ProxyGenerator/Hydrator/MethodGenerator/HydrateTest.php
@@ -55,7 +55,7 @@ public function testGeneratedStructure()
         $this->assertSame('hydrate', $hydrate->getName());
         $this->assertSame(
             "\$object->publicProperty = \$data['publicProperty'];\n"
-            . "\$this->foo->setValue(\$object, \$data['privateProperty']);\n",
+            . "\$this->foo->setValue(\$object, \$data['privateProperty']);\n\nreturn \$object;",
             $hydrate->getBody()
         );