Add support for the mixed type

nikic · May 28, 2020 · 32f8966 · 32f8966
1 parent f33f081
commit 32f8966
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,9 @@
 Version 4.4.1-dev
 -----------------
 
-Nothing yet.
+### Added
+
+* Added support for the mixed type
 
 Version 4.4.0 (2020-04-10)
 --------------------------

diff --git a/lib/PhpParser/BuilderHelpers.php b/lib/PhpParser/BuilderHelpers.php
@@ -183,7 +183,7 @@ public static function normalizeType($type) {
         }
 
         $builtinTypes = [
-            'array', 'callable', 'string', 'int', 'float', 'bool', 'iterable', 'void', 'object'
+            'array', 'callable', 'string', 'int', 'float', 'bool', 'iterable', 'void', 'object', 'mixed'
         ];
 
         $lowerType = strtolower($type);
@@ -197,6 +197,10 @@ public static function normalizeType($type) {
             throw new \LogicException('void type cannot be nullable');
         }
 
+        if ($nullable && (string) $type === 'mixed') {
+            throw new \LogicException('mixed type cannot be nullable');
+        }
+
         return $nullable ? new NullableType($type) : $type;
     }
 

diff --git a/lib/PhpParser/ParserAbstract.php b/lib/PhpParser/ParserAbstract.php
@@ -648,7 +648,7 @@ protected function fixupStartAttributes(Node $to, Node $from) {
     }
 
     protected function handleBuiltinTypes(Name $name) {
-        $scalarTypes = [
+        $builtinTypes = [
             'bool'     => true,
             'int'      => true,
             'float'    => true,
@@ -658,14 +658,15 @@ protected function handleBuiltinTypes(Name $name) {
             'object'   => true,
             'null'     => true,
             'false'    => true,
+            'mixed'    => true,
         ];
 
         if (!$name->isUnqualified()) {
             return $name;
         }
 
         $lowerName = $name->toLowerString();
-        if (!isset($scalarTypes[$lowerName])) {
+        if (!isset($builtinTypes[$lowerName])) {
             return $name;
         }
 

diff --git a/test/PhpParser/Builder/ParamTest.php b/test/PhpParser/Builder/ParamTest.php
@@ -113,6 +113,7 @@ public function provideTestTypes() {
             ['object', new Node\Identifier('object')],
             ['Array', new Node\Identifier('array')],
             ['CALLABLE', new Node\Identifier('callable')],
+            ['mixed', new Node\Identifier('mixed')],
             ['Some\Class', new Node\Name('Some\Class')],
             ['\Foo', new Node\Name\FullyQualified('Foo')],
             ['self', new Node\Name('self')],

diff --git a/test/code/parser/stmt/function/builtinTypeDeclarations.test b/test/code/parser/stmt/function/builtinTypeDeclarations.test
@@ -1,7 +1,7 @@
 Scalar type declarations
 -----
 <?php
-function test(bool $a, Int $b, FLOAT $c, StRiNg $d, iterable $e, object $f) : void {}
+function test(bool $a, Int $b, FLOAT $c, StRiNg $d, iterable $e, object $f, mixed $g) : void {}
 -----
 !!php7
 array(
@@ -77,6 +77,17 @@ array(
                 )
                 default: null
             )
+            6: Param(
+                type: Identifier(
+                    name: mixed
+                )
+                byRef: false
+                variadic: false
+                var: Expr_Variable(
+                    name: g
+                )
+                default: null
+            )
         )
         returnType: Identifier(
             name: void