add support for nikic/php-parser 5.0

xabbuh · xabbuh · commit e2dc20401d65 · 2024-01-08T09:57:08.000+01:00
diff --git a/composer.json b/composer.json
@@ -140,6 +140,7 @@
         "league/uri": "^6.5|^7.0",
         "masterminds/html5": "^2.7.2",
         "monolog/monolog": "^1.25.1|^2",
+        "nikic/php-parser": "^4.16|^5.0",
         "nyholm/psr7": "^1.0",
         "pda/pheanstalk": "^4.0",
         "php-http/discovery": "^1.15",
diff --git a/src/Symfony/Component/Translation/Extractor/PhpAstExtractor.php b/src/Symfony/Component/Translation/Extractor/PhpAstExtractor.php
@@ -15,6 +15,7 @@
 use PhpParser\NodeVisitor;
 use PhpParser\Parser;
 use PhpParser\ParserFactory;
+use PhpParser\PhpVersion;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Translation\Extractor\Visitor\AbstractVisitor;
 use Symfony\Component\Translation\MessageCatalogue;
@@ -39,7 +40,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, 'createForVersion')) {
+            $this->parser = (new ParserFactory())->createForVersion(PhpVersion::fromString('8.2'));
+        } else {
+            $this->parser = (new ParserFactory())->create(ParserFactory::PREFER_PHP7);
+        }
     }
 
     public function extract(iterable|string $resource, MessageCatalogue $catalogue): void
diff --git a/src/Symfony/Component/Translation/Extractor/Visitor/ConstraintVisitor.php b/src/Symfony/Component/Translation/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/src/Symfony/Component/Translation/Extractor/Visitor/TranslatableMessageVisitor.php b/src/Symfony/Component/Translation/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/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json
@@ -22,7 +22,7 @@
         "symfony/translation-contracts": "^2.5|^3.0"
     },
     "require-dev": {
-        "nikic/php-parser": "^4.13",
+        "nikic/php-parser": "^4.13|^5.0",
         "symfony/config": "^5.4|^6.0",
         "symfony/console": "^5.4|^6.0",
         "symfony/dependency-injection": "^5.4|^6.0",

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function enterNode(Node $node): ?Node`
`42`	`42`	`return null;`
`43`	`43`	`}`
`44`	`44`
`45`		`- $parts = $className->parts;`
	`45`	`+ $parts = $className->getParts();`
`46`	`46`	`$isConstraintClass = false;`
`47`	`47`
`48`	`48`	`foreach ($parts as $part) {`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function enterNode(Node $node): ?Node`
`34`	`34`	`return null;`
`35`	`35`	`}`
`36`	`36`
`37`		`- if (!\in_array('TranslatableMessage', $className->parts, true)) {`
	`37`	`+ if (!\in_array('TranslatableMessage', $className->getParts(), true)) {`
`38`	`38`	`return null;`
`39`	`39`	`}`
`40`	`40`