Merge pull request #33 from neild3r/namespace-issues

Namespace issues
neild3r · Apr 20, 2017 · 4fc12c5 · 4fc12c5
2 parents 231ff54 + 4fea3e4
commit 4fc12c5
Show file tree

Hide file tree

Showing 5 changed files with 106 additions and 4 deletions.
diff --git a/src/block/function.ts b/src/block/function.ts
@@ -30,7 +30,7 @@ export default class FunctionBlock extends Block
             let args = argString.split(',');
             for (let index = 0; index < args.length; index++) {
                 let arg = args[index];
-                let parts = arg.match(/^\s*([A-Za-z0-9_]+)?\s*\&?((?:[.]{3})?\$[A-Za-z0-9_]+)\s*\=?\s*(.*)\s*/m);
+                let parts = arg.match(/^\s*([A-Za-z0-9_\\]+)?\s*\&?((?:[.]{3})?\$[A-Za-z0-9_]+)\s*\=?\s*(.*)\s*/m);
                 var type = '[type]';
 
                 if (parts[1] != null) {
@@ -43,7 +43,7 @@ export default class FunctionBlock extends Block
             }
         }
 
-        let returnType:Array<string> = this.signiture.match(/.*\)\s*\:\s*([a-zA-Z]+)\s*$/m);
+        let returnType:Array<string> = this.signiture.match(/.*\)\s*\:\s*([a-zA-Z\\]+)\s*$/m);
 
         if (returnType != null) {
             doc.return = returnType[1];

diff --git a/test/fixtures/classes.php b/test/fixtures/classes.php
@@ -52,8 +52,8 @@ class ImplementedSubClass extends ImplementedParentClass implements ClassInterfa
 ////=> multiline
 abstract class Multiline implements
     ImplementedClass1,
-    ImplementedClass2,
-    ImplementedClass3
+    App\Model\ImplementedClass2,
+    \ImplementedClass3
 {
 
 }
@@ -65,3 +65,21 @@ abstract class Complex extends MultilineParent implements
 {
 
 }
+
+////=> extends-namespace
+class SubClass extends \ParentClass
+{
+
+}
+
+////=> implements-namespace
+class ImplementedClass implements \ClassInterface
+{
+
+}
+
+////=> extends-implements-namespace
+class ImplementedSubClass extends App\Model\ImplementedParentClass implements App\Model\ClassInterface
+{
+
+}
diff --git a/test/fixtures/classes.php.json b/test/fixtures/classes.php.json
@@ -38,5 +38,17 @@
     {
         "key": "complex",
         "name": "Abstract extension with multline implementation"
+    },
+    {
+        "key": "extends-namespace",
+        "name": "Extend a class with a namespace"
+    },
+    {
+        "key": "implements-namespace",
+        "name": "Implement a class with a namespace"
+    },
+    {
+        "key": "extends-implements-namespace",
+        "name": "Implement and implmentes classes with a namespaces"
     }
 ]
diff --git a/test/fixtures/functions.php b/test/fixtures/functions.php
@@ -76,6 +76,16 @@ public function getParamTypes(
     ) {
     }
 
+    ////=> param-namespace
+    public function paramNamespaced(\TypeHint $hint, $test)
+    {
+    }
+
+    ////=> param-namespace-full
+    public function paramNamespacedFull(App\Model\TypeHint $hint, $test)
+    {
+    }
+
     ////=> args
     public function dotArgs(...$args) {
     }
@@ -106,6 +116,16 @@ public function getPHP7ReturnMultiline(
     ) : int {
     }
 
+    ////=> php7-return-namespace
+    public function getPHP7ReturnNamespace():\TypeHint
+    {
+    }
+
+    ////=> php7-return-namespace-full
+    public function getPHP7ReturnNamespaceFull():App\Model\TypeHint
+    {
+    }
+
     ////=> is
     public function isSomething()
     {

diff --git a/test/fixtures/functions.php.json b/test/fixtures/functions.php.json
@@ -188,6 +188,42 @@
             ]
         }
     },
+    {
+        "key": "param-namespace",
+        "name": "Param with namespaced typehint",
+        "result": {
+            "return": "void",
+            "params": [
+                {
+                    "name": "$hint",
+                    "type": "\\TypeHint"
+                },
+
+                {
+                    "name": "$test",
+                    "type": "[type]"
+                }
+            ]
+        }
+    },
+    {
+        "key": "param-namespace-full",
+        "name": "Param with fully namespaced typehint",
+        "result": {
+            "return": "void",
+            "params": [
+                {
+                    "name": "$hint",
+                    "type": "App\\Model\\TypeHint"
+                },
+
+                {
+                    "name": "$test",
+                    "type": "[type]"
+                }
+            ]
+        }
+    },
     {
         "key": "args",
         "name": "Argument with ...$args",
@@ -230,6 +266,22 @@
             "params": []
         }
     },
+    {
+        "key": "php7-return-namespace",
+        "name": "PHP7 return namespace type",
+        "result": {
+            "return": "\\TypeHint",
+            "params": []
+        }
+    },
+    {
+        "key": "php7-return-namespace-full",
+        "name": "PHP7 return namespace type",
+        "result": {
+            "return": "App\\Model\\TypeHint",
+            "params": []
+        }
+    },
     {
         "key": "php7-return-param",
         "name": "PHP7 return type with param",