Merge branch 'hotfix/#301-fix-null-object-return-types' into 2.0.x

Close #301
Ocramius · May 27, 2016 · b3cd3bf · b3cd3bf
2 parents b88926c + 5143737
commit b3cd3bf
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/src/ProxyManager/ProxyGenerator/NullObjectGenerator.php b/src/ProxyManager/ProxyGenerator/NullObjectGenerator.php
@@ -51,11 +51,13 @@ public function generate(ReflectionClass $originalClass, ClassGenerator $classGe
 
         if ($originalClass->isInterface()) {
             $interfaces[] = $originalClass->getName();
+        } else {
+            $classGenerator->setExtendedClass($originalClass->getName());
         }
 
         $classGenerator->setImplementedInterfaces($interfaces);
 
-        foreach (ProxiedMethodsFilter::getProxiedMethods($originalClass) as $method) {
+        foreach (ProxiedMethodsFilter::getProxiedMethods($originalClass, []) as $method) {
             $classGenerator->addMethodFromGenerator(
                 NullObjectMethodInterceptor::generateMethod(
                     new MethodReflection($method->getDeclaringClass()->getName(), $method->getName())

diff --git a/tests/ProxyManagerTest/ProxyGenerator/NullObjectGeneratorTest.php b/tests/ProxyManagerTest/ProxyGenerator/NullObjectGeneratorTest.php
@@ -77,15 +77,17 @@ public function testGeneratesValidCode(string $className)
             $this->assertTrue($generatedReflection->implementsInterface($interface));
         }
 
-        $proxyGenerated = $generatedClassName::staticProxyConstructor();
+        $proxy = $generatedClassName::staticProxyConstructor();
+
+        self::assertInstanceOf($className, $proxy);
 
         foreach (Properties::fromReflectionClass($generatedReflection)->getPublicProperties() as $property) {
-            $this->assertNull($proxyGenerated->$property);
+            $this->assertNull($proxy->{$property->getName()});
         }
 
         foreach ($generatedReflection->getMethods(ReflectionMethod::IS_PUBLIC) as $method) {
             if (! ($method->getNumberOfParameters() || $method->isStatic())) {
-                $this->assertNull(call_user_func([$proxyGenerated, $method->getName()]));
+                $this->assertNull(call_user_func([$proxy, $method->getName()]));
             }
         }
     }

diff --git a/tests/language-feature-scripts/null-object-satisfies-return-type-declaration.phpt b/tests/language-feature-scripts/null-object-satisfies-return-type-declaration.phpt
@@ -0,0 +1,25 @@
+--TEST--
+Verifies that generated null object satisfies return type declarations
+--FILE--
+<?php
+
+declare (strict_types = 1);
+
+require_once __DIR__ . '/init.php';
+
+class Kitchen
+{
+    public function foo()
+    {
+        return 'bar';
+    }
+}
+
+$factory = new \ProxyManager\Factory\NullObjectFactory($configuration);
+
+$proxy = $factory->createProxy(Kitchen::class);
+
+var_dump($proxy instanceof Kitchen);
+?>
+--EXPECT--
+bool(true)