⬆️ Bump nikic/php-parser from 4.18.0 to 5.0.0

composer.json

@@ -8,7 +8,7 @@
         "php": "^8.1",
         "league/flysystem": "^3.0",
         "league/flysystem-memory": "^3.0",
-        "nikic/php-parser": "^4.15",
+        "nikic/php-parser": "^5.0",
         "psr/log": "^3.0",
         "symfony/console": "^6.2"
     },

phpunit-tests/StringTest.php

@@ -31,14 +31,15 @@ public function testDoubleQuotes(): void
 
     public function testDoubleQuotesWithEscapes(): void
     {
+        // We use `\\\\(\n)` because `\\(\n)` will be simplified to `\(\n)` by PhpParser
         $code = <<<'CODE'
             <?php
-            "\n\r\n\t\n\v\n\e\n\f\n\\\n\$\n\"\n\377\n\x26\n\u2665";
+            "\n\r\n\t\n\v\n\e\n\f\n\\\\\n\$\n\"\n\377\n\x26\n\u{2665}";
             CODE;
 
         $this->assertRepresentation(
             $code,
-            var_export("\n\r\n\t\n\v\n\e\n\f\n\\\n\$\n\"\n\377\n\x26\n\u2665", true) . ';',
+            var_export("\n\r\n\t\n\v\n\e\n\f\n\\\\\n\$\n\"\n\377\n\x26\n\u{2665}", true) . ';',
             '{}',
         );
     }

src/DirectoryRepresenter.php

@@ -62,7 +62,7 @@ public function represent(): Result
 
         return new Result(
             $filesRepresentation,
-            '{"version":1}',
+            '{"version":2}',
             $mapping->toJson(),
         );
     }

src/FilesRepresenter.php

@@ -28,7 +28,7 @@ public function __construct(
         private Mapping $mapping = new Mapping(),
         private LoggerInterface $logger = new NullLogger(),
     ) {
-        $this->parser = (new ParserFactory())->create(ParserFactory::PREFER_PHP7);
+        $this->parser = (new ParserFactory())->createForNewestSupportedVersion();
         $this->prettyPrinter = new Standard();
     }
 
@@ -52,9 +52,8 @@ public function represent(string $code): string
             static fn () => 'AST Before normalization: ' . (new NodeDumper())->dump($ast)
         ));
 
-        $visitor = new NodeVisitor($this->mapping);
-        $traverser = new NodeTraverser();
-        $traverser->addVisitor($visitor);
+        $visitor = new NormalizeNodeVisitor($this->mapping);
+        $traverser = new NodeTraverser($visitor);
         $ast = $traverser->traverse($ast);
 
         $this->logger->debug(LazyString::fromCallable(

src/NodeVisitor.php → src/NormalizeNodeVisitor.php

@@ -4,6 +4,7 @@
 
 namespace App;
 
+use PhpParser\Modifiers;
 use PhpParser\Node;
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\BinaryOp\Concat;
@@ -15,15 +16,15 @@
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Identifier;
+use PhpParser\Node\InterpolatedStringPart;
 use PhpParser\Node\Name;
-use PhpParser\Node\Scalar\Encapsed;
-use PhpParser\Node\Scalar\EncapsedStringPart;
+use PhpParser\Node\Scalar\InterpolatedString;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Function_;
 use PhpParser\Node\Stmt\InlineHTML;
-use PhpParser\NodeTraverser;
+use PhpParser\NodeVisitor;
 use PhpParser\NodeVisitorAbstract;
 
 use function array_map;
@@ -34,7 +35,7 @@
 /**
  * Apply transformations to normalize the AST
  */
-class NodeVisitor extends NodeVisitorAbstract
+class NormalizeNodeVisitor extends NodeVisitorAbstract
 {
     public function __construct(private Mapping $mapping)
     {
@@ -99,12 +100,12 @@
     private function replaceMethodName(ClassMethod $node): void
     {
         // TRANSFORM: Declare everything public
-        $node->flags |= Class_::MODIFIER_PUBLIC;
-        $node->flags &= ~Class_::MODIFIER_PRIVATE;
-        $node->flags &= ~Class_::MODIFIER_PROTECTED;
+        $node->flags |= Modifiers::PUBLIC;
+        $node->flags &= ~Modifiers::PRIVATE;
+        $node->flags &= ~Modifiers::PROTECTED;
         // TRANSFORM: Remove final and readonly modifiers
-        $node->flags &= ~Class_::MODIFIER_FINAL;
-        $node->flags &= ~Class_::MODIFIER_READONLY;
+        $node->flags &= ~Modifiers::FINAL;
+        $node->flags &= ~Modifiers::READONLY;
 
         $node->name = new Identifier($this->mapping->addMethod($node->name->toString()));
     }
@@ -147,17 +148,17 @@
     /**
      * TRANSFORM: All encapsed strings are single quotes concatenation
      */
-    private function normalizeEncapsedString(Encapsed $string): Node
+    private function normalizeInterpolatedString(InterpolatedString $string): Node
     {
         $parts = array_map(
-            static fn (Node $part) => $part instanceof EncapsedStringPart
+            static fn (Node $part) => $part instanceof InterpolatedStringPart
                 ? new String_($part->value, ['kind' => String_::KIND_SINGLE_QUOTED])
                 : $part,
             $string->parts,
         );
 
         $left = array_shift($parts);
-        assert($left !== null, 'Encapsed string had 0 part.');
+        assert($left !== null, 'Interpolated string had 0 part.');
         while ($right = array_shift($parts)) {
             $left = new Concat($left, $right);
         }
@@ -173,7 +174,7 @@
         if ($concat->left instanceof String_ && $concat->right instanceof String_) {
             return new String_(
                 $concat->left->value . $concat->right->value,
                 ['kind' => String_::KIND_SINGLE_QUOTED],
             );
         }
 
@@ -224,8 +225,8 @@
             $this->replaceNewClassName($node);
         } elseif ($node instanceof String_) {
             $this->normalizeString($node);
-        } elseif ($node instanceof Encapsed) {
-            return $this->normalizeEncapsedString($node);
+        } elseif ($node instanceof InterpolatedString) {
+            return $this->normalizeInterpolatedString($node);
         } elseif ($node instanceof Array_) {
             $this->normalizeArray($node);
         } elseif ($node instanceof Exit_) {
@@ -254,12 +255,12 @@
 
         // TRANSFORM: Remove empty statements from representation
         if ($node instanceof Node\Stmt\Nop) {
-            return NodeTraverser::REMOVE_NODE;
+            return NodeVisitor::REMOVE_NODE;
         }
 
         // TRANSFORM: Remove inline HTML from representation
         if ($node instanceof InlineHTML) {
-            return NodeTraverser::REMOVE_NODE;
+            return NodeVisitor::REMOVE_NODE;
         }
 
         return null;