Merge pull request microsoft#350 from dantleech/mixed-reserved-word

roblourens · web-flow · commit a38e03b87ac8 · 2020-12-30T11:04:20.000-08:00
Add support for PHP 8.0 mixed type
diff --git a/phpstan.neon b/phpstan.neon
@@ -5,4 +5,3 @@ parameters:
     ignoreErrors:
         # phpstan issue, see: https://github.com/phpstan/phpstan/issues/1306
         - "/Variable .unaryExpression might not be defined./"
-        - "/Variable .prefix might not be defined./"
diff --git a/src/Parser.php b/src/Parser.php
@@ -142,7 +142,7 @@ public function __construct() {
             [TokenKind::ArrayKeyword, TokenKind::CallableKeyword, TokenKind::BoolReservedWord,
             TokenKind::FloatReservedWord, TokenKind::IntReservedWord, TokenKind::StringReservedWord,
             TokenKind::ObjectReservedWord, TokenKind::NullReservedWord, TokenKind::FalseReservedWord,
-            TokenKind::IterableKeyword]; // TODO update spec
+            TokenKind::IterableReservedWord, TokenKind::MixedReservedWord]; // TODO update spec
         $this->returnTypeDeclarationTokens = \array_merge([TokenKind::VoidReservedWord, TokenKind::NullReservedWord, TokenKind::FalseReservedWord, TokenKind::StaticKeyword], $this->parameterTypeDeclarationTokens);
     }
 
diff --git a/src/TokenKind.php b/src/TokenKind.php
@@ -87,7 +87,8 @@ class TokenKind {
     const YieldFromKeyword = 167;
     const FnKeyword = 168;
     const MatchKeyword = 169;
-    const IterableKeyword = 170;
+    /** @deprecated use IterableReservedWord */
+    const IterableKeyword = self::IterableReservedWord;
 
     const OpenBracketToken = 201;
     const CloseBracketToken = 202;
@@ -170,6 +171,8 @@ class TokenKind {
     const StringReservedWord = 320;
     const BoolReservedWord = 321;
     const NullReservedWord = 322;
+    const MixedReservedWord = 340;
+    const IterableReservedWord = 170;
 
     const ScriptSectionStartTag = 323;
     const ScriptSectionEndTag = 324;
diff --git a/src/TokenStringMaps.php b/src/TokenStringMaps.php
@@ -104,7 +104,8 @@ class TokenStringMaps {
         "object" => TokenKind::ObjectReservedWord,
         "real" => TokenKind::RealReservedWord,
         "void" => TokenKind::VoidReservedWord,
-        "iterable" => TokenKind::IterableKeyword,
+        "iterable" => TokenKind::IterableReservedWord,
+        "mixed" => TokenKind::MixedReservedWord,
     ];
 
     const OPERATORS_AND_PUNCTUATORS = array(
diff --git a/tests/cases/parser74/arrowFunctionUnionTypes.php.tree b/tests/cases/parser74/arrowFunctionUnionTypes.php.tree
@@ -241,7 +241,7 @@
                                                 "visibilityToken": null,
                                                 "questionToken": null,
                                                 "typeDeclaration": {
-                                                    "kind": "IterableKeyword",
+                                                    "kind": "IterableReservedWord",
                                                     "textLength": 8
                                                 },
                                                 "otherTypeDeclarations": {
@@ -398,7 +398,7 @@
                                                 "visibilityToken": null,
                                                 "questionToken": null,
                                                 "typeDeclaration": {
-                                                    "kind": "IterableKeyword",
+                                                    "kind": "IterableReservedWord",
                                                     "textLength": 8
                                                 },
                                                 "otherTypeDeclarations": {
@@ -573,7 +573,7 @@
                                             "textLength": 1
                                         },
                                         {
-                                            "kind": "IterableKeyword",
+                                            "kind": "IterableReservedWord",
                                             "textLength": 8
                                         }
                                     ]
diff --git a/tests/cases/parser80/mixedType1.php b/tests/cases/parser80/mixedType1.php
@@ -0,0 +1,5 @@
+<?php
+
+function foobar(mixed $bar): mixed
+{
+}
diff --git a/tests/cases/parser80/mixedType1.php.diag b/tests/cases/parser80/mixedType1.php.diag
@@ -0,0 +1 @@
+[]
diff --git a/tests/cases/parser80/mixedType1.php.tree b/tests/cases/parser80/mixedType1.php.tree
@@ -0,0 +1,91 @@
+{
+    "SourceFileNode": {
+        "statementList": [
+            {
+                "InlineHtml": {
+                    "scriptSectionEndTag": null,
+                    "text": null,
+                    "scriptSectionStartTag": {
+                        "kind": "ScriptSectionStartTag",
+                        "textLength": 6
+                    }
+                }
+            },
+            {
+                "FunctionDeclaration": {
+                    "attributes": null,
+                    "functionKeyword": {
+                        "kind": "FunctionKeyword",
+                        "textLength": 8
+                    },
+                    "byRefToken": null,
+                    "name": {
+                        "kind": "Name",
+                        "textLength": 6
+                    },
+                    "openParen": {
+                        "kind": "OpenParenToken",
+                        "textLength": 1
+                    },
+                    "parameters": {
+                        "ParameterDeclarationList": {
+                            "children": [
+                                {
+                                    "Parameter": {
+                                        "attributes": null,
+                                        "visibilityToken": null,
+                                        "questionToken": null,
+                                        "typeDeclaration": {
+                                            "kind": "MixedReservedWord",
+                                            "textLength": 5
+                                        },
+                                        "otherTypeDeclarations": null,
+                                        "byRefToken": null,
+                                        "dotDotDotToken": null,
+                                        "variableName": {
+                                            "kind": "VariableName",
+                                            "textLength": 4
+                                        },
+                                        "equalsToken": null,
+                                        "default": null
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "closeParen": {
+                        "kind": "CloseParenToken",
+                        "textLength": 1
+                    },
+                    "colonToken": {
+                        "kind": "ColonToken",
+                        "textLength": 1
+                    },
+                    "questionToken": null,
+                    "returnType": {
+                        "kind": "MixedReservedWord",
+                        "textLength": 5
+                    },
+                    "otherReturnTypes": null,
+                    "compoundStatementOrSemicolon": {
+                        "CompoundStatementNode": {
+                            "openBrace": {
+                                "kind": "OpenBraceToken",
+                                "textLength": 1
+                            },
+                            "statements": [],
+                            "closeBrace": {
+                                "kind": "CloseBraceToken",
+                                "textLength": 1
+                            }
+                        }
+                    }
+                }
+            }
+        ],
+        "endOfFileToken": {
+            "kind": "EndOfFileToken",
+            "textLength": 0
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ public function __construct() {`
`142`	`142`	`[TokenKind::ArrayKeyword, TokenKind::CallableKeyword, TokenKind::BoolReservedWord,`
`143`	`143`	`TokenKind::FloatReservedWord, TokenKind::IntReservedWord, TokenKind::StringReservedWord,`
`144`	`144`	`TokenKind::ObjectReservedWord, TokenKind::NullReservedWord, TokenKind::FalseReservedWord,`
`145`		`- TokenKind::IterableKeyword]; // TODO update spec`
	`145`	`+ TokenKind::IterableReservedWord, TokenKind::MixedReservedWord]; // TODO update spec`
`146`	`146`	`$this->returnTypeDeclarationTokens = \array_merge([TokenKind::VoidReservedWord, TokenKind::NullReservedWord, TokenKind::FalseReservedWord, TokenKind::StaticKeyword], $this->parameterTypeDeclarationTokens);`
`147`	`147`	`}`
`148`	`148`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +<?php
++
 +function foobar(mixed $bar): mixed
 +{
 +}