Merge pull request #743 from Majkl578/proxygenerator-fix-interface-ty…

…pehints Fix parameter/return type validation for interfaces (introduced in #734)
doctrine · Oct 6, 2016 · f74f44d · f74f44d
2 parents 5086700 + f1cdfa1
commit f74f44d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/lib/Doctrine/Common/Proxy/ProxyGenerator.php b/lib/Doctrine/Common/Proxy/ProxyGenerator.php
@@ -1063,7 +1063,7 @@ private function formatType(
             $name = $method->getDeclaringClass()->getParentClass()->getName();
         }
 
-        if ( ! $type->isBuiltin() && ! class_exists($name)) {
+        if ( ! $type->isBuiltin() && ! class_exists($name) && ! interface_exists($name)) {
             if (null !== $parameter) {
                 throw UnexpectedValueException::invalidParameterTypeHint(
                     $method->getDeclaringClass()->getName(),

diff --git a/tests/Doctrine/Tests/Common/Proxy/ProxyGeneratorTest.php b/tests/Doctrine/Tests/Common/Proxy/ProxyGeneratorTest.php
@@ -201,7 +201,7 @@ public function testClassWithScalarTypeHintsOnProxiedMethods()
 
         $this->assertEquals(1, substr_count($classCode, 'function singleTypeHint(string $param)'));
         $this->assertEquals(1, substr_count($classCode, 'function multipleTypeHints(int $a, float $b, bool $c, string $d)'));
-        $this->assertEquals(1, substr_count($classCode, 'function combinationOfTypeHintsAndNormal(\stdClass $a, $b, int $c)'));
+        $this->assertEquals(1, substr_count($classCode, 'function combinationOfTypeHintsAndNormal(\stdClass $a, \Countable $b, $c, int $d)'));
         $this->assertEquals(1, substr_count($classCode, 'function typeHintsWithVariadic(int ...$foo)'));
         $this->assertEquals(1, substr_count($classCode, 'function withDefaultValue(int $foo = 123)'));
         $this->assertEquals(1, substr_count($classCode, 'function withDefaultValueNull(int $foo = NULL)'));
@@ -229,6 +229,7 @@ public function testClassWithReturnTypesOnProxiedMethods()
         $this->assertEquals(1, substr_count($classCode, 'function returnsCallable(): callable'));
         $this->assertEquals(1, substr_count($classCode, 'function returnsSelf(): \\' . $className));
         $this->assertEquals(1, substr_count($classCode, 'function returnsParent(): \stdClass'));
+        $this->assertEquals(1, substr_count($classCode, 'function returnsInterface(): \Countable'));
     }
 
     public function testClassWithNullableTypeHintsOnProxiedMethods()

diff --git a/tests/Doctrine/Tests/Common/Proxy/ReturnTypesClass.php b/tests/Doctrine/Tests/Common/Proxy/ReturnTypesClass.php
@@ -30,4 +30,8 @@ public function returnsSelf(): self
     public function returnsParent(): parent
     {
     }
+
+    public function returnsInterface() : \Countable
+    {
+    }
 }
diff --git a/tests/Doctrine/Tests/Common/Proxy/ScalarTypeHintsClass.php b/tests/Doctrine/Tests/Common/Proxy/ScalarTypeHintsClass.php
@@ -15,7 +15,7 @@ public function multipleTypeHints(int $a, float $b, bool $c, string $d)
     {
     }
 
-    public function combinationOfTypeHintsAndNormal(\stdClass $a, $b, int $c)
+    public function combinationOfTypeHintsAndNormal(\stdClass $a, \Countable $b, $c, int $d)
     {
     }