Merge 6cbe833 into ef6b7e6

src/Parser/CommandInfo.php

@@ -639,7 +639,7 @@ protected function findExistingOption($optionName)
 
     /**
      * Examine the parameters of the method for this command, and
-     * build a list of commandline arguements for them.
+     * build a list of commandline arguments for them.
      *
      * @return array
      */
@@ -651,9 +651,9 @@ protected function determineAgumentClassifications()
         if ($this->lastParameterIsOptionsArray()) {
             array_pop($params);
         }
-        while (!empty($params) && ($params[0]->getClass() != null)) {
+        while (!empty($params) && ($params[0]->getType() != null) && !($params[0]->getType()->isBuiltin())) {
             $param = array_shift($params);
-            $injectedClass = $param->getClass()->getName();
+            $injectedClass = $param->getType()->getName();
             array_unshift($this->injectedClasses, $injectedClass);
         }
         foreach ($params as $param) {
@@ -670,8 +670,8 @@ protected function determineAgumentClassifications()
     protected function addParameterToResult($result, $param)
     {
         // Commandline arguments must be strings, so ignore any
-        // parameter that is typehinted to any non-primative class.
-        if ($param->getClass() != null) {
+        // parameter that is typehinted to any non-primitive class.
+        if ($param->getType() && !$param->getType()->isBuiltin()) {
             return;
         }
         $result->add($param->name);