Skip to content

Commit 2dda4fb

Browse files
committed
Merge branch '6.3' into 6.4
* 6.3: fix Redis proxies tests [VarDumper] Fix missing colors initialization in CliDumper [Process] Fix executable finder when the command starts with a dash [Validator] added reviewed Lithuanian and Dutch translations simplify the parser factory creation
2 parents 9644cf6 + 38c9027 commit 2dda4fb

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

Extractor/PhpAstExtractor.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,7 @@ public function __construct(
3939
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));
4040
}
4141

42-
if (method_exists(ParserFactory::class, 'createForHostVersion')) {
43-
$this->parser = (new ParserFactory())->createForHostVersion();
44-
} else {
45-
$this->parser = (new ParserFactory())->create(ParserFactory::PREFER_PHP7);
46-
}
42+
$this->parser = (new ParserFactory())->createForHostVersion();
4743
}
4844

4945
public function extract(iterable|string $resource, MessageCatalogue $catalogue): void

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"symfony/translation-contracts": "^2.5|^3.0"
2323
},
2424
"require-dev": {
25-
"nikic/php-parser": "^4.16|^5.0",
25+
"nikic/php-parser": "^4.18|^5.0",
2626
"symfony/config": "^5.4|^6.0|^7.0",
2727
"symfony/console": "^5.4|^6.0|^7.0",
2828
"symfony/dependency-injection": "^5.4|^6.0|^7.0",

0 commit comments

Comments
 (0)