PHP8 union properties

neild3r · Aug 17, 2021 · 94b7d50 · 94b7d50
1 parent aa8ac94
commit 94b7d50
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 3 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -20,6 +20,7 @@
 				"--extensionDevelopmentPath=${workspaceFolder}",
 				"--extensionTestsPath=${workspaceFolder}/out/test/index"
 			],
+			"stopOnEntry": false,
 			"outFiles": ["${workspaceFolder}/out/test/**/*.js"],
 			"preLaunchTask": "npm: watch"
 		}

diff --git a/src/block/property.ts b/src/block/property.ts
@@ -32,7 +32,7 @@ export default class Property extends Block
                 head = this.getClassHead();
             }
 
-            let varType = TypeUtil.instance.getFullyQualifiedType(parts[2], head);
+            let varType = TypeUtil.instance.getResolvedTypeHints(parts[2], head);
             varType = TypeUtil.instance.getFormattedTypeByName(varType);
 
             if (parts[1] === '?') {

diff --git a/test/fixtures/properties.php b/test/fixtures/properties.php
@@ -47,11 +47,9 @@ abstract class Test
     ////=> default-float
     public $defaultFloat = -124124.50;
 
-
     ////=> default-int
     public $defaultInt = -214221;
 
-
     ////=> default-null
     public $defaultNull = null;
 
@@ -81,4 +79,16 @@ abstract class Test
 
     ////=> typed-namespace-nullable
     public ?\App\Type\Test $typedNamespaceNullable;
+
+    ////=> union-type-simple
+    public string|array $unionTypeSimple;
+
+    ////=> union-type-namespace
+    public string|\DateTimeInterface $unionTypeNamespace;
+
+    ////=> union-type-full-namespace
+    public string|\App\Type\Test $unionTypeFullNamespace;
+
+    ////=> union-type-nullable
+    public string|array|null $unionTypeNullable;
 }
diff --git a/test/fixtures/properties.php.json b/test/fixtures/properties.php.json
@@ -121,5 +121,25 @@
         "config": {
             "qualifyClassNames": true
         }
+    },
+    {
+        "key": "union-type-simple",
+        "name": "Simple PHP8 union type",
+        "var": "string|array"
+    },
+    {
+        "key": "union-type-namespace",
+        "name": "PHP8 union type with one namespace",
+        "var": "string|\\DateTimeInterface"
+    },
+    {
+        "key": "union-type-full-namespace",
+        "name": "PHP8 union type with one namespace",
+        "var": "string|\\App\\Type\\Test"
+    },
+    {
+        "key": "union-type-nullable",
+        "name": "PHP8 union type that can be null",
+        "var": "string|array|null"
     }
 ]