Merge pull request #10 from RobertBoes/add-type-hinting

Add type hinting and return types

Author: KristofMorva

src/Console/MacrosCommand.php

@@ -102,12 +102,12 @@ public function handle()
                             $this->writeLine($comment, $this->indent);
 
                             if (strpos($comment, '@instantiated') !== false) {
-                                $this->generateFunction($name, $function->getParameters(), "public");
+                                $this->generateFunction($name, $function->getParameters(), "public", $function->getReturnType());
                                 continue;
                             }
                         }
 
-                        $this->generateFunction($name, $function->getParameters(), "public static");
+                        $this->generateFunction($name, $function->getParameters(), "public static", $function->getReturnType());
                     }
                 });
             });
@@ -154,11 +154,13 @@ protected function generateClass($name, $callback = null)
 
     /**
      * @param string $name
-     * @param array $parameters
+     * @param \ReflectionParameter[] $parameters
      * @param string $type
+     * @param null|string $returnType
      * @param null|Callable $callback
+     * @throws \ReflectionException
      */
-    protected function generateFunction($name, $parameters, $type = '', $callback = null)
+    protected function generateFunction($name, $parameters, $type = '', $returnType = null, $callback = null)
     {
         $this->write(($type ? "$type " : '') . "function $name(", $this->indent);
 
@@ -172,6 +174,10 @@ protected function generateFunction($name, $parameters, $type = '', $callback =
                 $this->write('...');
             }
 
+            if ($parameter->hasType()) {
+                $this->write($parameter->getType() . " ");
+            }
+
             $this->write("$" . $parameter->getName());
             if ($parameter->isOptional() && !$parameter->isVariadic()) {
                 $this->write(" = " . var_export($parameter->getDefaultValue(), true));
@@ -180,7 +186,11 @@ protected function generateFunction($name, $parameters, $type = '', $callback =
             $index++;
         }
 
-        $this->writeLine(") {");
+        $this->write(")");
+        if ($returnType) {
+            $this->write(": $returnType");
+        }
+        $this->writeLine(" {");
 
         if ($callback) {
             $callback();