bump to php-parser 5.4

TomasVotruba · TomasVotruba · commit d7af94f81de0 · 2025-01-18T21:17:37.000Z
diff --git a/.github/workflows/code_analysis.yaml b/.github/workflows/code_analysis.yaml
@@ -44,7 +44,7 @@ jobs:
             # see https://github.com/shivammathur/setup-php
             -   uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 8.1
+                    php-version: 8.2
                     coverage: none
 
             # composer install cache - https://github.com/ramsey/composer-install
diff --git a/composer.json b/composer.json
@@ -3,20 +3,21 @@
     "description": "Print Symfony services array with configuration to to plain PHP file format thanks to this simple php-parser wrapper",
     "license": "MIT",
     "require": {
-        "php": ">=8.1",
+        "php": ">=8.2",
         "nette/utils": "^3.2",
-        "nikic/php-parser": "^4.18",
+        "nikic/php-parser": "^5.3",
         "symfony/yaml": "^6.4"
     },
     "require-dev": {
         "myclabs/php-enum": "^1.8",
-        "phpstan/extension-installer": "^1.3",
+        "phpstan/extension-installer": "^1.4",
+        "phpstan/phpstan": "^2.1",
         "phpunit/phpunit": "^10.5",
-        "rector/rector": "^0.18.12",
-        "symplify/easy-coding-standard": "^12.0",
+        "rector/rector": "^2.0",
+        "phpecs/phpecs": "^2.0",
         "symplify/easy-testing": "^11.1",
-        "symplify/phpstan-extensions": "^11.2",
-        "tomasvotruba/class-leak": "^0.2"
+        "symplify/phpstan-extensions": "^12.0",
+        "tomasvotruba/class-leak": "^2.0"
     },
     "autoload": {
         "psr-4": {
@@ -32,20 +33,14 @@
             "tests/Printer/SmartPhpConfigPrinter/Source/custom_inline_object_function.php"
         ]
     },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "11.2-dev"
-        }
-    },
     "scripts": {
         "check-cs": "vendor/bin/ecs check --ansi",
         "fix-cs": "vendor/bin/ecs check --fix --ansi",
-        "phpstan": "vendor/bin/phpstan analyse --ansi  --error-format symplify",
+        "phpstan": "vendor/bin/phpstan analyse --ansi",
         "rector": "vendor/bin/rector process --dry-run --ansi"
     },
     "config": {
         "sort-packages": true,
-        "platform-check": false,
         "allow-plugins": {
             "cweagans/composer-patches": true,
             "phpstan/extension-installer": true
diff --git a/ecs.php b/ecs.php
@@ -3,18 +3,11 @@
 declare(strict_types=1);
 
 use Symplify\EasyCodingStandard\Config\ECSConfig;
-use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
 
-return static function (ECSConfig $ecsConfig): void {
-    $ecsConfig->paths([
-        __DIR__ . '/ecs.php',
-        __DIR__ . '/rector.php',
+return ECSConfig::configure()
+    ->withPaths([
         __DIR__ . '/src',
         __DIR__ . '/tests',
-    ]);
-
-    $ecsConfig->sets([
-        SetList::COMMON,
-        SetList::PSR_12,
-    ]);
-};
+    ])
+    ->withRootFiles()
+    ->withPreparedSets(common: true, psr12: true);
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,5 +1,8 @@
 parameters:
-    level: 6
+    level: 8
+
+    errorFormat: symplify
+    treatPhpDocTypesAsCertain: false
 
     paths:
         - src
@@ -11,4 +14,11 @@ parameters:
         - '*/tests/**/data/*'
 
     ignoreErrors:
-        - '#Parameter \#1 \$items of class PhpParser\\Node\\Expr\\Array_ constructor expects array<PhpParser\\Node\\Expr\\ArrayItem\|null>, array<PhpParser\\Node\\Arg> given#'
+
+        # php version depends on runtime
+        -
+            message: '#Comparison operation ">=" between int<(.*?), 80499> and 80000 is always true#'
+            path: src/NodeFactory/ArgsNodeFactory.php
+
+        # unclear what to do
+        - '#Parameter \#1 \$items of class PhpParser\\Node\\Expr\\Array_ constructor expects array<PhpParser\\Node\\ArrayItem>, array<PhpParser\\Node\\Arg> given#'
diff --git a/src/ExprResolver/TaggedReturnsCloneResolver.php b/src/ExprResolver/TaggedReturnsCloneResolver.php
@@ -4,8 +4,8 @@
 
 namespace Symplify\PhpConfigPrinter\ExprResolver;
 
+use PhpParser\Node\ArrayItem;
 use PhpParser\Node\Expr\Array_;
-use PhpParser\Node\Expr\ArrayItem;
 use Symfony\Component\Yaml\Tag\TaggedValue;
 use Symplify\PhpConfigPrinter\ValueObject\FunctionName;
 
diff --git a/src/NodeFactory/ArgsNodeFactory.php b/src/NodeFactory/ArgsNodeFactory.php
@@ -7,9 +7,9 @@
 use PhpParser\BuilderHelpers;
 use PhpParser\Node;
 use PhpParser\Node\Arg;
+use PhpParser\Node\ArrayItem;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Array_;
-use PhpParser\Node\Expr\ArrayItem;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
@@ -171,7 +171,7 @@ private function resolveArgs(array $args, mixed $key, Expr $expr, bool $isForCon
     {
         if (is_string($key) && $isForConfig) {
             $key = $this->resolveExpr($key);
-            $args[] = new Arg(new ArrayItem($expr, $key));
+            $args[] = new Arg(new Array_([new ArrayItem($expr, $key)]));
 
             return $args;
         }
diff --git a/src/NodeFactory/ContainerConfiguratorReturnClosureFactory.php b/src/NodeFactory/ContainerConfiguratorReturnClosureFactory.php
@@ -6,9 +6,9 @@
 
 use Nette\Utils\Json;
 use PhpParser\Node\Arg;
+use PhpParser\Node\ArrayItem;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Array_;
-use PhpParser\Node\Expr\ArrayItem;
 use PhpParser\Node\Expr\Assign;
 use PhpParser\Node\Expr\BinaryOp\Identical;
 use PhpParser\Node\Expr\MethodCall;
@@ -66,7 +66,7 @@ private function createClosureStmts(array $yamlData): array
     }
 
     /**
-     * @param array<string, mixed[]> $yamlData
+     * @param array<string|int, mixed[]> $yamlData
      * @return Stmt[]
      */
     private function createStmtsFromCaseConverters(array $yamlData): array
diff --git a/src/NodeFactory/NewValueObjectFactory.php b/src/NodeFactory/NewValueObjectFactory.php
@@ -31,6 +31,7 @@ public function create(object $valueObject): New_ | StaticCall
     }
 
     /**
+     * @param class-string $valueObjectClass
      * @return mixed[]
      */
     private function resolvePropertyValuesFromValueObject(string $valueObjectClass, object $valueObject): array
diff --git a/src/NodeModifier/SingleFactoryReferenceNodeModifier.php b/src/NodeModifier/SingleFactoryReferenceNodeModifier.php
@@ -6,8 +6,8 @@
 
 use Nette\Utils\Strings;
 use PhpParser\Node\Arg;
+use PhpParser\Node\ArrayItem;
 use PhpParser\Node\Expr\Array_;
-use PhpParser\Node\Expr\ArrayItem;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Scalar\String_;
@@ -47,10 +47,6 @@ public function modifyArgs(array $args): void
         }
 
         $singleArrayItem = $singleArgValue->items[0];
-        if (! $singleArrayItem instanceof ArrayItem) {
-            return;
-        }
-
         if (! $singleArrayItem->value instanceof String_) {
             return;
         }
diff --git a/src/PhpParser/NodeFactory/ConfiguratorClosureNodeFactory.php b/src/PhpParser/NodeFactory/ConfiguratorClosureNodeFactory.php
@@ -5,9 +5,9 @@
 namespace Symplify\PhpConfigPrinter\PhpParser\NodeFactory;
 
 use PhpParser\Node\Arg;
+use PhpParser\Node\ArrayItem;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Array_;
-use PhpParser\Node\Expr\ArrayItem;
 use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\Variable;
@@ -167,7 +167,7 @@ private function replaceArrayArgWithMergedArrayItems(array $extensionNodesByExte
 
     /**
      * @param Expr[][] $extensionExprs
-     * @return array<ArrayItem|null>
+     * @return array<ArrayItem>
      */
     private function resolveMergedArrayItems(array $extensionExprs): array
     {
diff --git a/src/Printer/ArrayDecorator/ServiceConfigurationDecorator.php b/src/Printer/ArrayDecorator/ServiceConfigurationDecorator.php
@@ -13,6 +13,9 @@ public function __construct(
     ) {
     }
 
+    /**
+     * @param class-string $class
+     */
     public function decorate(mixed $configuration, string $class): mixed
     {
         if (! is_array($configuration)) {
@@ -24,6 +27,8 @@ public function decorate(mixed $configuration, string $class): mixed
 
     /**
      * @param array<string|int, mixed> $configuration
+     * @param class-string $class
+     *
      * @return mixed[]
      */
     private function decorateClassConstantKeys(array $configuration, string $class): array
diff --git a/src/Printer/SmartPhpConfigPrinter.php b/src/Printer/SmartPhpConfigPrinter.php
@@ -22,7 +22,7 @@ public function __construct(
     }
 
     /**
-     * @param array<string, mixed> $configuredServices
+     * @param array<class-string, mixed> $configuredServices
      */
     public function printConfiguredServices(array $configuredServices): string
     {
@@ -44,6 +44,8 @@ public function printConfiguredServices(array $configuredServices): string
 
     /**
      * @param mixed[] $configuration
+     * @param class-string $class
+     *
      * @return array{calls: mixed[]}
      */
     private function createServiceConfiguration(array $configuration, string $class): array
diff --git a/src/Reflection/ConstantNameFromValueResolver.php b/src/Reflection/ConstantNameFromValueResolver.php
@@ -8,6 +8,9 @@
 
 final class ConstantNameFromValueResolver
 {
+    /**
+     * @param class-string $class
+     */
     public function resolveFromValueAndClass(int|string $constantValue, string $class): ?string
     {
         $reflectionClass = new ReflectionClass($class);
diff --git a/src/RoutingCaseConverter/PathRoutingCaseConverter.php b/src/RoutingCaseConverter/PathRoutingCaseConverter.php
@@ -62,7 +62,7 @@ public function convertToMethodCall(string $key, mixed $values): Stmt
                 unset($nestedValues[RouteDefaults::CONTROLLER]);
             }
 
-            if (! is_array($nestedValues) || (is_array($nestedValues) && $nestedValues !== [])) {
+            if (! is_array($nestedValues) || ($nestedValues !== [])) {
                 $args = $this->argsNodeFactory->createFromValues([$nestedValues]);
                 $methodCall = new MethodCall($methodCall, $nestedKey, $args);
             }
diff --git a/tests/Printer/SmartPhpConfigPrinter/SmartPhpConfigPrinterTest.php b/tests/Printer/SmartPhpConfigPrinter/SmartPhpConfigPrinterTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     }
 
     /**
-     * @param array<string, mixed[]> $services
+     * @param array<class-string, mixed[]> $services
      */
     #[DataProvider('provideData')]
     public function test(array $services, string $expectedContentFilePath): void

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ public function create(object $valueObject): New_ \| StaticCall`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`/**`
	`34`	`+ * @param class-string $valueObjectClass`
`34`	`35`	`* @return mixed[]`
`35`	`36`	`*/`
`36`	`37`	`private function resolvePropertyValuesFromValueObject(string $valueObjectClass, object $valueObject): array`