Merge branch 'hotfix/5609'

Close zendframework/zendframework#5609

src/Definition/RuntimeDefinition.php

@@ -89,7 +89,7 @@ public function setExplicitClasses(array $explicitClasses)
      */
     public function forceLoadClass($class)
     {
-        $this->processClass($class);
+        $this->processClass($class, true);
     }
 
     /**
@@ -117,10 +117,7 @@ public function hasClass($class)
      */
     public function getClassSupertypes($class)
     {
-        if (!array_key_exists($class, $this->classes)) {
-            $this->processClass($class);
-        }
-
+        $this->processClass($class);
         return $this->classes[$class]['supertypes'];
     }
 
@@ -129,10 +126,7 @@ public function getClassSupertypes($class)
      */
     public function getInstantiator($class)
     {
-        if (!array_key_exists($class, $this->classes)) {
-            $this->processClass($class);
-        }
-
+        $this->processClass($class);
         return $this->classes[$class]['instantiator'];
     }
 
@@ -141,10 +135,7 @@ public function getInstantiator($class)
      */
     public function hasMethods($class)
     {
-        if (!array_key_exists($class, $this->classes)) {
-            $this->processClass($class);
-        }
-
+        $this->processClass($class);
         return (count($this->classes[$class]['methods']) > 0);
     }
 
@@ -153,10 +144,7 @@ public function hasMethods($class)
      */
     public function hasMethod($class, $method)
     {
-        if (!array_key_exists($class, $this->classes)) {
-            $this->processClass($class);
-        }
-
+        $this->processClass($class);
         return isset($this->classes[$class]['methods'][$method]);
     }
 
@@ -165,10 +153,7 @@ public function hasMethod($class, $method)
      */
     public function getMethods($class)
     {
-        if (!array_key_exists($class, $this->classes)) {
-            $this->processClass($class);
-        }
-
+        $this->processClass($class);
         return $this->classes[$class]['methods'];
     }
 
@@ -177,10 +162,7 @@ public function getMethods($class)
      */
     public function hasMethodParameters($class, $method)
     {
-        if (!isset($this->classes[$class])) {
-            return false;
-        }
-
+        $this->processClass($class);
         return (array_key_exists($method, $this->classes[$class]['parameters']));
     }
 
@@ -189,18 +171,27 @@ public function hasMethodParameters($class, $method)
      */
     public function getMethodParameters($class, $method)
     {
-        if (!is_array($this->classes[$class])) {
-            $this->processClass($class);
-        }
-
+        $this->processClass($class);
         return $this->classes[$class]['parameters'][$method];
     }
 
     /**
      * @param string $class
      */
-    protected function processClass($class)
+    protected function hasProcessedClass($class)
     {
+        return array_key_exists($class, $this->classes) && is_array($this->classes[$class]);
+    }
+
+    /**
+     * @param string $class
+     * @param bool $forceLoad
+     */
+    protected function processClass($class, $forceLoad = false)
+    {
+        if (!$forceLoad && $this->hasProcessedClass($class)) {
+            return;
+        }
         $strategy = $this->introspectionStrategy; // localize for readability
 
         /** @var $rClass \Zend\Code\Reflection\ClassReflection */

test/Definition/RuntimeDefinitionTest.php

@@ -102,4 +102,17 @@ public function testExcludeAwareMethodsWithoutParameters()
         $this->assertTrue($definition->hasMethod('ZendTest\Di\TestAsset\AwareClasses\B', 'setSomething'));
         $this->assertFalse($definition->hasMethod('ZendTest\Di\TestAsset\AwareClasses\B', 'getSomething'));
     }
+
+    /**
+     * Test to see if we can introspect explicit classes
+     */
+    public function testExplicitClassesStillGetProccessedByIntrospectionStrategy()
+    {
+        $className = 'ZendTest\Di\TestAsset\ConstructorInjection\OptionalParameters';
+        $explicitClasses = array($className => true);
+        $definition = new RuntimeDefinition(null, $explicitClasses);
+
+        $this->assertTrue($definition->hasClass($className));
+        $this->assertSame(array("__construct"=> 3), $definition->getMethods($className));
+    }
 }