Applying fix for callable reflection on type hints

Ocramius · Mar 30, 2013 · 29282fe · 29282fe
1 parent 7334a7c
commit 29282fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/library/Zend/Code/Generator/ParameterGenerator.php b/library/Zend/Code/Generator/ParameterGenerator.php
@@ -56,6 +56,8 @@ public static function fromReflection(ParameterReflection $reflectionParameter)
 
         if ($reflectionParameter->isArray()) {
             $param->setType('array');
+        } elseif (method_exists($reflectionParameter, 'isCallable') && $reflectionParameter->isCallable()) {
+            $param->setType('callable');
         } else {
             $typeClass = $reflectionParameter->getClass();
             if ($typeClass) {

diff --git a/library/Zend/Code/Reflection/ParameterReflection.php b/library/Zend/Code/Reflection/ParameterReflection.php
@@ -77,6 +77,8 @@ public function getType()
     {
         if ($this->isArray()) {
             return 'array';
+        } elseif (method_exists($this, 'isCallable') && $this->isCallable()) {
+            return 'callable';
         }
 
         if (($class = $this->getClass()) instanceof \ReflectionClass) {