Merge pull request #13 from mrsuh/php-parser

nikic/PHP-Parser v5.0.2

Author: mrsuh

.github/workflows/tests.yml

@@ -22,7 +22,7 @@ jobs:
 
         steps:
             -   name: "Checkout"
-                uses: "actions/checkout@v2"
+                uses: "actions/checkout@v4"
 
             -   name: "Install PHP"
                 uses: "shivammathur/setup-php@v2"

bin/test.php

@@ -70,7 +70,8 @@
     }
 
     if ($outputFiles->count() !== count($result->getConcreteClasses())) {
-        $success = false;
+        $allTestsSuccess = false;
+        printf("%s - [skip failed]\n", $directory->getBasename());
         continue;
     }
 

composer.json

@@ -25,7 +25,7 @@
     "require": {
         "php": ">=7.4",
         "composer-plugin-api": "^1.0|^2.0",
-        "mrsuh/php-parser": "94.18.0",
+        "mrsuh/php-parser": "95.0.2",
         "symfony/console": "^4.0|^5.0|^6.0",
         "symfony/filesystem": "^4.0|^5.0|^6.0",
         "symfony/finder": "^4.0|^5.0|^6.0"

src/Compiler/Parser.php

@@ -3,7 +3,6 @@
 namespace Mrsuh\PhpGenerics\Compiler;
 
 use Mrsuh\PhpGenerics\Compiler\ClassFinder\ClassFinderInterface;
-use PhpParser\Lexer\Emulative;
 use PhpParser\Node;
 use PhpParser\Node\Expr\ClassConstFetch;
 use PhpParser\Node\Expr\Instanceof_;
@@ -23,10 +22,9 @@ class Parser
 {
     public static function parse(string $code): array
     {
-        $lexer  = new Emulative();
-        $parser = (new ParserFactory)->create(ParserFactory::PREFER_PHP7, $lexer);
-
-        return $parser->parse($code);
+        return (new ParserFactory)
+            ->createForNewestSupportedVersion()
+            ->parse($code);
     }
 
     /**
@@ -114,7 +112,7 @@ public static function setNodeName(Node &$node, string $type): void
                 if (self::isBuiltinType($type)) {
                     $node = new Node\Identifier($type);
                 } else {
-                    $node->parts = explode('\\', $type);
+                    $node->name = $type;
                 }
                 break;
             case $node instanceof Node\Identifier:
@@ -128,14 +126,20 @@ public static function setNodeName(Node &$node, string $type): void
     public static function isBuiltinType(string $type): bool
     {
         $builtinTypes = [
+            'array'    => true,
+            'callable' => true,
             'bool'     => true,
             'int'      => true,
             'float'    => true,
             'string'   => true,
             'iterable' => true,
+            'void'     => true,
             'object'   => true,
+            'null'     => true,
+            'false'    => true,
             'mixed'    => true,
-            'array'    => true,
+            'never'    => true,
+            'true'     => true,
         ];
 
         return isset($builtinTypes[strtolower($type)]);

tests/monomorphic/230-builtin-types/input/Command/Usage.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Test\Command;
+
+use Test\Generic\Box;
+use Test\Entity\Bird;
+use Test\Entity\Cat;
+
+class Usage extends Box<array,callable,bool,int,float,string,iterable,void,object,null,false,mixed,never,true,Bird,Cat>
+{
+
+}

tests/monomorphic/230-builtin-types/input/Entity/Bird.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Test\Entity;
+
+class Bird
+{
+
+}

tests/monomorphic/230-builtin-types/input/Entity/Cat.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Test\Entity;
+
+class Cat
+{
+
+}

tests/monomorphic/230-builtin-types/input/Generic/Box.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Test\Generic;
+
+use Test\Entity\Bird;
+use Test\Entity\Cat;
+
+class Box<A,B,C,D,E,F,G,H,I,G,K,L,M,N,O,P> {
+
+    public function test($obj): void {
+        var_dump(Container<A,B,C,D,E,F,G,H,I,G,K,L,M,N,O,P>::class);
+    }
+}

tests/monomorphic/230-builtin-types/input/Generic/Container.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Test\Generic;
+
+class Container<A,B,C,D,E,F,G,H,I,G,K,L,M,N,O,P>  {
+
+    private readonly A|B|C|D|E|F|G|H|I|G|K|L|M|N|O|P $content = null;
+
+    public function setContent(A|B|C|D|E|F|G|H|I|G|K|L|M|N|O|P $content): A|B|C|D|E|F|G|H|I|G|K|L|M|N|O|P {
+
+    }
+}

tests/monomorphic/230-builtin-types/output/Command/Usage.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Test\Command;
+
+use Test\Generic\Box;
+use Test\Entity\Bird;
+use Test\Entity\Cat;
+class Usage extends \Test\Generic\BoxForArrayAndCallableAndBoolAndIntAndFloatAndStringAndNullAndVoidAndObjectAndFalseAndMixedAndNeverAndTrueAndTestEntityBirdAndTestEntityCat
+{
+}