Merge pull request #22 from mortenscheel/fix-namespacing-return-types

Don't move zend types to the global namespace

Author: KristofMorva

src/Console/MacrosCommand.php

@@ -180,6 +180,9 @@ protected function generateFunction($name, $parameters, $type = '', $returnType
  } else {
  $paramType = $parameter->getType();
  if ($paramType instanceof \ReflectionNamedType) {
+ if ($paramType->allowsNull()) {
+ $this->write("?");
+ }
  $this->write($paramType->getName() . " ");
  }
  }
@@ -196,10 +199,21 @@ protected function generateFunction($name, $parameters, $type = '', $returnType
  $this->write(")");
  if (version_compare(PHP_VERSION, '7.1', '<')) {
  if ($returnType) {
- $this->write(": \\$returnType");
+ if (class_exists($returnType)) {
+ $this->write(": \\$returnType");
+ } else {
+ $this->write(": $returnType");
+ }
  }
  } elseif ($returnType instanceof \ReflectionNamedType) {
- $this->write(": \\" . $returnType->getName());
+ $this->write(": ");
+ if ($returnType->allowsNull()) {
+ $this->write("?");
+ }
+ if (class_exists($returnType->getName())) {
+ $this->write("\\");
+ }
+ $this->write($returnType->getName());
  }
  $this->writeLine(" {");