Merge branch '6.3' into 6.4

* 6.3: add support for nikic/php-parser 5.0
symfony · Jan 8, 2024 · 9644cf6 · 9644cf6
2 parents 4c3e80e + 817e8f7
commit 9644cf6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/Extractor/PhpAstExtractor.php b/Extractor/PhpAstExtractor.php
@@ -39,7 +39,11 @@ public function __construct(
             throw new \LogicException(sprintf('You cannot use "%s" as the "nikic/php-parser" package is not installed. Try running "composer require nikic/php-parser".', static::class));
         }
 
-        $this->parser = (new ParserFactory())->create(ParserFactory::PREFER_PHP7);
+        if (method_exists(ParserFactory::class, 'createForHostVersion')) {
+            $this->parser = (new ParserFactory())->createForHostVersion();
+        } else {
+            $this->parser = (new ParserFactory())->create(ParserFactory::PREFER_PHP7);
+        }
     }
 
     public function extract(iterable|string $resource, MessageCatalogue $catalogue): void

diff --git a/Extractor/Visitor/ConstraintVisitor.php b/Extractor/Visitor/ConstraintVisitor.php
@@ -42,7 +42,7 @@ public function enterNode(Node $node): ?Node
             return null;
         }
 
-        $parts = $className->parts;
+        $parts = $className->getParts();
         $isConstraintClass = false;
 
         foreach ($parts as $part) {

diff --git a/Extractor/Visitor/TranslatableMessageVisitor.php b/Extractor/Visitor/TranslatableMessageVisitor.php
@@ -34,7 +34,7 @@ public function enterNode(Node $node): ?Node
             return null;
         }
 
-        if (!\in_array('TranslatableMessage', $className->parts, true)) {
+        if (!\in_array('TranslatableMessage', $className->getParts(), true)) {
             return null;
         }
 

diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         "symfony/translation-contracts": "^2.5|^3.0"
     },
     "require-dev": {
-        "nikic/php-parser": "^4.13",
+        "nikic/php-parser": "^4.16|^5.0",
         "symfony/config": "^5.4|^6.0|^7.0",
         "symfony/console": "^5.4|^6.0|^7.0",
         "symfony/dependency-injection": "^5.4|^6.0|^7.0",