Merge pull request #6 from symplify/tv-bump-deps

bump to php-parser 5.4

Author: TomasVotruba

.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

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

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);

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#'

rector.php

@@ -4,32 +4,16 @@
 
 use Rector\Config\RectorConfig;
 use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
-use Rector\PHPUnit\Set\PHPUnitSetList;
-use Rector\Set\ValueObject\LevelSetList;
-use Rector\Set\ValueObject\SetList;
 
-return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->sets([
-        PHPUnitSetList::PHPUNIT_100,
-        SetList::CODE_QUALITY,
-        SetList::DEAD_CODE,
-        LevelSetList::UP_TO_PHP_81,
-        SetList::CODING_STYLE,
-        SetList::TYPE_DECLARATION,
-        SetList::NAMING,
-        SetList::PRIVATIZATION,
-        SetList::EARLY_RETURN,
-        PHPUnitSetList::PHPUNIT_CODE_QUALITY,
-    ]);
-
-    $rectorConfig->paths([
+return RectorConfig::configure()
+    ->withPreparedSets(deadCode: true, codeQuality: true, codingStyle: true, typeDeclarations: true, naming: true, privatization: true)
+    ->withRootFiles()
+    ->withPhpSets()
+    ->withPaths([
         __DIR__ . '/src',
         __DIR__ . '/tests',
-    ]);
-
-    $rectorConfig->importNames();
-
-    $rectorConfig->skip([
+    ])
+    ->withSkip([
         '*/Source/*',
         '*/Fixture/*',
         // keep prefix
@@ -38,7 +22,7 @@
             __DIR__ . '/src/NodeFactory/ContainerConfiguratorReturnClosureFactory.php',
         ],
 
-        // preference
-        \Rector\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector::class,
+        // old value is needed
+        \Rector\Php81\Rector\MethodCall\MyCLabsMethodCallToEnumConstRector::class,
+
     ]);
-};

src/CaseConverter/AliasCaseConverter.php

@@ -21,7 +21,7 @@
 use Symplify\PhpConfigPrinter\ValueObject\VariableName;
 use Symplify\PhpConfigPrinter\ValueObject\YamlKey;
 
-final class AliasCaseConverter implements CaseConverterInterface
+final readonly class AliasCaseConverter implements CaseConverterInterface
 {
     /**
      * @see https://regex101.com/r/BwXkfO/2/
@@ -36,9 +36,9 @@ final class AliasCaseConverter implements CaseConverterInterface
     private const NAMED_ALIAS_REGEX = '#\w+\s+\$\w+#';
 
     public function __construct(
-        private readonly CommonNodeFactory $commonNodeFactory,
-        private readonly ArgsNodeFactory $argsNodeFactory,
-        private readonly ServiceOptionNodeFactory $serviceOptionNodeFactory,
+        private CommonNodeFactory $commonNodeFactory,
+        private ArgsNodeFactory $argsNodeFactory,
+        private ServiceOptionNodeFactory $serviceOptionNodeFactory,
     ) {
     }
 

src/CaseConverter/ClassServiceCaseConverter.php

@@ -15,11 +15,11 @@
 use Symplify\PhpConfigPrinter\ValueObject\VariableName;
 use Symplify\PhpConfigPrinter\ValueObject\YamlKey;
 
-final class ClassServiceCaseConverter implements CaseConverterInterface
+final readonly class ClassServiceCaseConverter implements CaseConverterInterface
 {
     public function __construct(
-        private readonly ArgsNodeFactory $argsNodeFactory,
-        private readonly ServiceOptionNodeFactory $serviceOptionNodeFactory
+        private ArgsNodeFactory $argsNodeFactory,
+        private ServiceOptionNodeFactory $serviceOptionNodeFactory
     ) {
     }
 

src/CaseConverter/ConfiguredServiceCaseConverter.php

@@ -15,11 +15,11 @@
 use Symplify\PhpConfigPrinter\ValueObject\VariableName;
 use Symplify\PhpConfigPrinter\ValueObject\YamlKey;
 
-final class ConfiguredServiceCaseConverter implements CaseConverterInterface
+final readonly class ConfiguredServiceCaseConverter implements CaseConverterInterface
 {
     public function __construct(
-        private readonly ArgsNodeFactory $argsNodeFactory,
-        private readonly ServiceOptionNodeFactory $serviceOptionNodeFactory
+        private ArgsNodeFactory $argsNodeFactory,
+        private ServiceOptionNodeFactory $serviceOptionNodeFactory
     ) {
     }
 

src/CaseConverter/ImportCaseConverter.php

@@ -27,7 +27,7 @@
  *
  * imports: <---
  */
-final class ImportCaseConverter implements CaseConverterInterface
+final readonly class ImportCaseConverter implements CaseConverterInterface
 {
     /**
      * @see https://regex101.com/r/hOTdIE/1
@@ -36,8 +36,8 @@ final class ImportCaseConverter implements CaseConverterInterface
     private const INPUT_SUFFIX_REGEX = '#\.(yml|yaml|xml)$#';
 
     public function __construct(
-        private readonly YamlArgumentSorter $yamlArgumentSorter,
-        private readonly CommonNodeFactory $commonNodeFactory
+        private YamlArgumentSorter $yamlArgumentSorter,
+        private CommonNodeFactory $commonNodeFactory
     ) {
     }
 

src/CaseConverter/NameOnlyServiceCaseConverter.php

@@ -14,10 +14,10 @@
 use Symplify\PhpConfigPrinter\ValueObject\VariableName;
 use Symplify\PhpConfigPrinter\ValueObject\YamlKey;
 
-final class NameOnlyServiceCaseConverter implements CaseConverterInterface
+final readonly class NameOnlyServiceCaseConverter implements CaseConverterInterface
 {
     public function __construct(
-        private readonly CommonNodeFactory $commonNodeFactory
+        private CommonNodeFactory $commonNodeFactory
     ) {
     }