Merge pull request #3 from norzechowicz/avoid-unwrapping

Avoid unwrapping object when proxied object method returns

Author: Norbert Orzechowicz

src/Isolate/LazyObjects/Proxy/Adapter/OcramiusProxyManager/MethodGenerator/MethodProxy.php

@@ -37,7 +37,11 @@ public static function generateMethod(
             . 'if ($this->hasMethodReplacement("' . $method->getName() . '")) {' . "\n"
             . '    return $this->getMethodReplacement("' . $method->getName() .'")->getReplacement()->execute($this, "' . $method->getName() . '", ' . $paramsString . ');' . "\n"
             . '}' . "\n\n"
-            . 'return $this->' . $wrappedObjectProperty->getName() . '->' . $method->getName() .  '(' . implode(', ', $forwardedParams) . ');';
+            . '$result = $this->' . $wrappedObjectProperty->getName() . '->' . $method->getName() .  '(' . implode(', ', $forwardedParams) . ');' . "\n"
+            . 'if ($result === $this->' . $wrappedObjectProperty->getName() . ') {' ."\n"
+            . '    return $this;' . "\n"
+            . "}\n\n"
+            . 'return $result;';
 
 
         $method->setDocblock('{@inheritDoc}');

tests/Isolate/LazyObjects/Tests/Double/EntityFake.php

@@ -28,6 +28,11 @@ public function removeItem($item)
         }
     }
 
+    public function getThis()
+    {
+        return $this;
+    }
+
     public function __sleep()
     {
         return ['items'];

tests/Isolate/LazyObjects/Tests/WrapperTest.php

@@ -162,6 +162,17 @@ function test_lazy_objects_serialization()
         $this->assertSame($replacementResult, $unserialized->getItems());
     }
 
+    function test_not_unwrapping_object_when_method_returns_this()
+    {
+        $entity = new EntityFake();
+
+        $entityProxyDefinition = new Definition(new ClassName(get_class($entity)), [], []);
+
+        $wrapper = $this->createWrapper($entityProxyDefinition);
+        $proxy = $wrapper->wrap($entity);
+
+        $this->assertSame($proxy, $proxy->getThis());
+    }
 
     /**
      * @param $entityProxyDefinition