Add support for PhpParser v5 for PHP 7.4+

.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+block_comment_start = /*
+block_comment = *
+block_comment_end = */

.gitignore

@@ -2,5 +2,4 @@
 /vendor/
 
 # Cache files
-.php_cs.cache
-.phpunit.result.cache
+*.cache

.php_cs → .php-cs-fixer.php

@@ -1,12 +1,12 @@
 <?php
-// http://cs.sensiolabs.org/#usage
-$finder = PhpCsFixer\Finder::create()
+// https://cs.symfony.com/doc/usage.html
+$finder = (new PhpCsFixer\Finder())
     ->in(__DIR__ . '/src')
     ->in(__DIR__ . '/test')
     ->in(__DIR__ . '/bin')
 ;
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules([
         // If you're curious what these do, use `php-cs-fixer describe <key>`
         '@PSR1' => true,
@@ -19,9 +19,9 @@
         'function_typehint_space' => true,
         'include' => true,
         'linebreak_after_opening_tag' => true,
-        // 'list_syntax' => ['syntax' => 'short'], Requires PHP 7.1
+        'list_syntax' => ['syntax' => 'short'],
         'magic_constant_casing' => true,
-        'method_separation' => true,
+        'class_attributes_separation' => ['elements' => ['method' => 'one']],
         'native_function_casing' => true,
         'new_with_braces' => true,
         'no_blank_lines_after_class_opening' => true,
@@ -34,7 +34,7 @@
         'no_unused_imports' => true,
         'normalize_index_brace' => true,
         'not_operator_with_successor_space' => false,
-        'ordered_imports' => ['sortAlgorithm' => 'alpha'],
+        'ordered_imports' => ['sort_algorithm' => 'alpha'],
         'phpdoc_indent' => true,
         'phpdoc_order' => true,
         'phpdoc_scalar' => true,
@@ -49,5 +49,4 @@
         'whitespace_after_comma_in_array' => true,
     ])
     ->setFinder($finder)
-    ->setCacheFile(__DIR__ . '/.php_cs.cache')
 ;

composer.json

@@ -24,17 +24,23 @@
     ],
     "require": {
         "php": "^7.3 || ^8.0",
-        "nikic/php-parser": "^4.10",
-        "symfony/console": "^5.1 || ^6.0",
-        "symfony/filesystem": "^5.0 || ^6.0",
-        "symfony/finder": "^5.0 || ^6.0"
+        "nikic/php-parser": "^4.10 || ^5.1",
+        "symfony/console": "^5.1 || ^6.0 || ^7.0",
+        "symfony/filesystem": "^5.0 || ^6.0 || ^7.0",
+        "symfony/finder": "^5.0 || ^6.0 || ^7.0"
     },
     "require-dev": {
-        "vimeo/psalm": "^4.1",
-        "phpunit/phpunit": "^9.4",
-        "friendsofphp/php-cs-fixer": "^2.16 || ^3.12"
+        "friendsofphp/php-cs-fixer": "3.4.0 || ^3.12",
+        "phpstan/phpstan": "^1.0 || ^2.0",
+        "phpunit/phpunit": "^9.4"
     },
     "scripts": {
-        "test": "phpunit --verbose"
+        "test": "phpunit --verbose",
+        "cs:check": "php-cs-fixer check",
+        "cs:fix": "php-cs-fixer fix",
+        "phpstan": "phpstan analyse"
+    },
+    "config": {
+        "sort-packages": true
     }
 }

phpstan.neon

@@ -0,0 +1,4 @@
+parameters:
+    level: max
+    paths:
+        - src

phpunit.xml

@@ -1,16 +1,16 @@
 <!--bootstrap="tests/bootstrap.php" -->
 <phpunit
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.4/phpunit.xsd"
-	backupGlobals="false"
-	beStrictAboutChangesToGlobalState="true"
-	beStrictAboutCoversAnnotation="true"
-	beStrictAboutOutputDuringTests="true"
-	beStrictAboutTestsThatDoNotTestAnything="true"
-	colors="true"
-	convertErrorsToExceptions="true"
-	convertNoticesToExceptions="true"
-	convertWarningsToExceptions="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.4/phpunit.xsd"
+    backupGlobals="false"
+    beStrictAboutChangesToGlobalState="true"
+    beStrictAboutCoversAnnotation="true"
+    beStrictAboutOutputDuringTests="true"
+    beStrictAboutTestsThatDoNotTestAnything="true"
+    colors="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
 >
     <testsuites>
         <testsuite name="Stub Generator Tests">

src/NodeVisitor.php

@@ -172,7 +172,7 @@ public function enterNode(Node $node)
             $node instanceof Expression &&
             $node->expr instanceof FuncCall &&
             $node->expr->name instanceof Name &&
-            $node->expr->name->parts[0] === 'define'
+            $node->expr->name->getFirst() === 'define'
         ) {
             $this->isInDeclaration = true;
         } elseif ($node instanceof If_) {
@@ -207,7 +207,7 @@ public function leaveNode(Node $node, bool $preserveStack = false)
                 $node instanceof Expression &&
                 $node->expr instanceof FuncCall &&
                 $node->expr->name instanceof Name &&
-                $node->expr->name->parts[0] === 'define'
+                $node->expr->name->getFirst() === 'define'
             )
         ) {
             // We're leaving one of these.
@@ -388,7 +388,7 @@ function (\PhpParser\Node\Const_ $const) {
                 $node instanceof Expression &&
                 $node->expr instanceof FuncCall &&
                 $node->expr->name instanceof Name &&
-                $node->expr->name->parts[0] === 'define'
+                $node->expr->name->getFirst() === 'define'
             ) {
                 $fullyQualifiedName = $node->expr->args[0]->value->value;
 

src/StubsGenerator.php

@@ -112,10 +112,10 @@ public function __construct(int $symbols = self::DEFAULT, array $config = [])
      */
     public function generate(Finder $finder, NodeVisitor $visitor = null): Result
     {
-        $parser = (new ParserFactory())->create(ParserFactory::PREFER_PHP7);
+        $parser = (new ParserFactory())->createForNewestSupportedVersion();
 
         if (!($visitor instanceof NodeVisitor)) {
-            $visitor = new NodeVisitor;
+            $visitor = new NodeVisitor();
         }
 
         $visitor->init($this->symbols, $this->config);

test/NodeVisitorTest.php

@@ -12,7 +12,7 @@ class NodeVisitorTest extends TestCase
 {
     private function parse(string $php, int $symbols, array $config): NodeVisitor
     {
-        $parser = (new ParserFactory())->create(ParserFactory::PREFER_PHP7);
+        $parser = (new ParserFactory())->createForNewestSupportedVersion();
 
         $traverser = new NodeTraverser();
         $traverser->addVisitor(new NameResolver());