Recotr+ECS configs updated

Author: Spomky

composer.json

@@ -88,7 +88,7 @@
         "phpstan/phpstan-phpunit": "^1.0",
         "phpstan/phpstan-strict-rules": "^1.0",
         "phpunit/phpunit": "^8.0|^9.0",
-        "rector/rector": "^0.12.5",
+        "rector/rector": "^0.13",
         "roave/security-advisories": "dev-latest",
         "symfony/browser-kit": "^5.4|^6.0",
         "symfony/finder": "^5.4|^6.0",

ecs.php

@@ -27,31 +27,27 @@
 use PhpCsFixer\Fixer\Strict\StrictParamFixer;
 use PhpCsFixer\Fixer\Whitespace\ArrayIndentationFixer;
 use PhpCsFixer\Fixer\Whitespace\CompactNullableTypehintFixer;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-use Symplify\EasyCodingStandard\ValueObject\Option;
+use Symplify\EasyCodingStandard\Config\ECSConfig;
 use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
 
 $header = '';
 
-return static function (ContainerConfigurator $containerConfigurator) use ($header): void {
-    $containerConfigurator->import(SetList::PSR_12);
-    $containerConfigurator->import(SetList::PHP_CS_FIXER);
-    $containerConfigurator->import(SetList::PHP_CS_FIXER_RISKY);
-    $containerConfigurator->import(SetList::CLEAN_CODE);
-    $containerConfigurator->import(SetList::SYMFONY);
-    $containerConfigurator->import(SetList::DOCTRINE_ANNOTATIONS);
-    $containerConfigurator->import(SetList::SPACES);
-    $containerConfigurator->import(SetList::PHPUNIT);
-    $containerConfigurator->import(SetList::SYMPLIFY);
-    $containerConfigurator->import(SetList::ARRAY);
-    $containerConfigurator->import(SetList::COMMON);
-    $containerConfigurator->import(SetList::COMMENTS);
-    $containerConfigurator->import(SetList::CONTROL_STRUCTURES);
-    $containerConfigurator->import(SetList::DOCBLOCK);
-    $containerConfigurator->import(SetList::NAMESPACES);
-    $containerConfigurator->import(SetList::STRICT);
+return static function (ECSConfig $config) use ($header): void {
+    $config->import(SetList::PSR_12);
+    $config->import(SetList::CLEAN_CODE);
+    $config->import(SetList::DOCTRINE_ANNOTATIONS);
+    $config->import(SetList::SPACES);
+    $config->import(SetList::PHPUNIT);
+    $config->import(SetList::SYMPLIFY);
+    $config->import(SetList::ARRAY);
+    $config->import(SetList::COMMON);
+    $config->import(SetList::COMMENTS);
+    $config->import(SetList::CONTROL_STRUCTURES);
+    $config->import(SetList::DOCBLOCK);
+    $config->import(SetList::NAMESPACES);
+    $config->import(SetList::STRICT);
 
-    $services = $containerConfigurator->services();
+    $services = $config->services();
     $services->set(StrictParamFixer::class);
     $services->set(StrictComparisonFixer::class);
     $services->set(ArraySyntaxFixer::class)
@@ -106,11 +102,7 @@
     ;
 
     $services->remove(PhpUnitTestClassRequiresCoversFixer::class);
-
-    $parameters = $containerConfigurator->parameters();
-    $parameters
-        ->set(Option::PARALLEL, true)
-        ->set(Option::PATHS, [__DIR__])
-        ->set(Option::SKIP, [__DIR__ . '/.github', __DIR__ . '/var', __DIR__ . '/vendor'])
-    ;
+    $config->parallel();
+    $config->paths([__DIR__]);
+    $config->skip([__DIR__ . '/.github', __DIR__ . '/var', __DIR__ . '/vendor']);
 };

rector.php

@@ -2,30 +2,29 @@
 
 declare(strict_types=1);
 
-use Rector\Core\Configuration\Option;
+use Rector\Config\RectorConfig;
 use Rector\Core\ValueObject\PhpVersion;
 use Rector\Php74\Rector\Property\TypedPropertyRector;
+use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
+use Rector\Symfony\Set\SymfonyLevelSetList;
 use Rector\Symfony\Set\SymfonySetList;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
-return static function (ContainerConfigurator $containerConfigurator): void {
-    $containerConfigurator->import(SetList::DEAD_CODE);
-    $containerConfigurator->import(SetList::PHP_80);
-    $containerConfigurator->import(SymfonySetList::SYMFONY_50);
-    $containerConfigurator->import(SymfonySetList::SYMFONY_50_TYPES);
-    $containerConfigurator->import(SymfonySetList::SYMFONY_51);
-    $containerConfigurator->import(SymfonySetList::SYMFONY_52);
-    $containerConfigurator->import(SymfonySetList::SYMFONY_53);
-    $containerConfigurator->import(SymfonySetList::SYMFONY_54);
-    $containerConfigurator->import(SymfonySetList::SYMFONY_CODE_QUALITY);
-    $parameters = $containerConfigurator->parameters();
-    $parameters->set(Option::PATHS, [__DIR__ . '/src', __DIR__ . '/performance', __DIR__ . '/tests']);
-    $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_80);
-    $parameters->set(Option::AUTO_IMPORT_NAMES, true);
-    $parameters->set(Option::PARALLEL, true);
-    $parameters->set(Option::IMPORT_SHORT_CLASSES, false);
+return static function (RectorConfig $config): void {
+    $config->import(SetList::DEAD_CODE);
+    $config->import(LevelSetList::UP_TO_PHP_81);
+    $config->import(SymfonyLevelSetList::UP_TO_SYMFONY_54);
+    $config->import(SymfonySetList::SYMFONY_CODE_QUALITY);
+    $config->parallel();
+    $config->paths([__DIR__ . '/src', __DIR__ . '/performance', __DIR__ . '/tests']);
+    $config->skip([
+        __DIR__ . '/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKSource.php',
+        __DIR__ . '/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKSetSource.php',
+    ]);
+    $config->phpVersion(PhpVersion::PHP_81);
+    $config->importNames();
+    $config->importShortClasses();
 
-    $services = $containerConfigurator->services();
+    $services = $config->services();
     $services->set(TypedPropertyRector::class);
 };

src/Bundle/JoseFramework/Controller/JWKSetController.php

@@ -9,7 +9,7 @@
 class JWKSetController
 {
     public function __construct(
-        private string $jwkset
+        private readonly string $jwkset
     ) {
     }
 

src/Bundle/JoseFramework/DataCollector/AlgorithmCollector.php

@@ -19,7 +19,7 @@
 final class AlgorithmCollector implements Collector
 {
     public function __construct(
-        private AlgorithmManagerFactory $algorithmManagerFactory
+        private readonly AlgorithmManagerFactory $algorithmManagerFactory
     ) {
     }
 

src/Bundle/JoseFramework/DataCollector/CheckerCollector.php

@@ -39,8 +39,8 @@ class CheckerCollector implements Collector, EventSubscriberInterface
     private array $claimCheckerManagers = [];
 
     public function __construct(
-        private ?ClaimCheckerManagerFactory $claimCheckerManagerFactory = null,
-        private ?HeaderCheckerManagerFactory $headerCheckerManagerFactory = null
+        private readonly ?ClaimCheckerManagerFactory $claimCheckerManagerFactory = null,
+        private readonly ?HeaderCheckerManagerFactory $headerCheckerManagerFactory = null
     ) {
     }
 

src/Bundle/JoseFramework/DataCollector/JWECollector.php

@@ -45,8 +45,8 @@ class JWECollector implements Collector, EventSubscriberInterface
     private array $jweLoaders = [];
 
     public function __construct(
-        private ?CompressionMethodManagerFactory $compressionMethodManagerFactory = null,
-        private ?JWESerializerManagerFactory $jweSerializerManagerFactory = null
+        private readonly ?CompressionMethodManagerFactory $compressionMethodManagerFactory = null,
+        private readonly ?JWESerializerManagerFactory $jweSerializerManagerFactory = null
     ) {
     }
 

src/Bundle/JoseFramework/DataCollector/JWSCollector.php

@@ -44,7 +44,7 @@ class JWSCollector implements Collector, EventSubscriberInterface
     private array $jwsBuiltFailures = [];
 
     public function __construct(
-        private ?JWSSerializerManagerFactory $jwsSerializerManagerFactory = null
+        private readonly ?JWSSerializerManagerFactory $jwsSerializerManagerFactory = null
     ) {
     }
 

src/Bundle/JoseFramework/DataCollector/KeyCollector.php

@@ -27,8 +27,8 @@ class KeyCollector implements Collector
     private array $jwksets = [];
 
     public function __construct(
-        private ?KeyAnalyzerManager $jwkAnalyzerManager = null,
-        private ?KeysetAnalyzerManager $jwksetAnalyzerManager = null
+        private readonly ?KeyAnalyzerManager $jwkAnalyzerManager = null,
+        private readonly ?KeysetAnalyzerManager $jwksetAnalyzerManager = null
     ) {
     }
 

src/Bundle/JoseFramework/DependencyInjection/Compiler/SymfonySerializerCompilerPass.php

@@ -12,12 +12,13 @@
 use Jose\Component\Signature\Serializer\JWSSerializerManagerFactory;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\Serializer\Serializer;
 
 class SymfonySerializerCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container): void
     {
-        if (! class_exists('Symfony\\Component\\Serializer\\Serializer')) {
+        if (! class_exists(Serializer::class)) {
             return;
         }
         if ($container->hasDefinition(JWSSerializerManagerFactory::class)) {

src/Bundle/JoseFramework/DependencyInjection/Configuration.php

@@ -14,8 +14,8 @@ final class Configuration implements ConfigurationInterface
      * @param Source[] $sources
      */
     public function __construct(
-        private string $alias,
-        private array $sources
+        private readonly string $alias,
+        private readonly array $sources
     ) {
     }
 

src/Bundle/JoseFramework/DependencyInjection/JoseFrameworkExtension.php

@@ -17,8 +17,8 @@ final class JoseFrameworkExtension extends Extension implements PrependExtension
      * @param Source[] $sources
      */
     public function __construct(
-        private string $alias,
-        private array $sources
+        private readonly string $alias,
+        private readonly array $sources
     ) {
     }
 

src/Bundle/JoseFramework/DependencyInjection/Source/Checker/CheckerSource.php

@@ -24,7 +24,7 @@ class CheckerSource implements SourceWithCompilerPasses
     /**
      * @var Source[]
      */
-    private array $sources;
+    private readonly array $sources;
 
     public function __construct()
     {

src/Bundle/JoseFramework/DependencyInjection/Source/Encryption/EncryptionSource.php

@@ -35,7 +35,7 @@ class EncryptionSource implements SourceWithCompilerPasses
     /**
      * @var Source[]
      */
-    private array $sources;
+    private readonly array $sources;
 
     public function __construct()
     {

src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/KeyManagementSource.php

@@ -24,7 +24,7 @@ class KeyManagementSource implements SourceWithCompilerPasses
     /**
      * @var Source[]
      */
-    private array $sources;
+    private readonly array $sources;
 
     public function __construct()
     {

src/Bundle/JoseFramework/DependencyInjection/Source/NestedToken/NestedToken.php

@@ -19,7 +19,7 @@ class NestedToken implements Source
     /**
      * @var Source[]
      */
-    private array $sources;
+    private readonly array $sources;
 
     public function __construct()
     {

src/Bundle/JoseFramework/DependencyInjection/Source/Signature/SignatureSource.php

@@ -29,7 +29,7 @@ class SignatureSource implements SourceWithCompilerPasses
     /**
      * @var Source[]
      */
-    private array $sources;
+    private readonly array $sources;
 
     public function __construct()
     {

src/Bundle/JoseFramework/Event/ClaimCheckedFailureEvent.php

@@ -10,9 +10,9 @@
 final class ClaimCheckedFailureEvent extends Event
 {
     public function __construct(
-        private array $claims,
-        private array $mandatoryClaims,
-        private Throwable $throwable
+        private readonly array $claims,
+        private readonly array $mandatoryClaims,
+        private readonly Throwable $throwable
     ) {
     }
 

src/Bundle/JoseFramework/Event/ClaimCheckedSuccessEvent.php

@@ -9,9 +9,9 @@
 final class ClaimCheckedSuccessEvent extends Event
 {
     public function __construct(
-        private array $claims,
-        private array $mandatoryClaims,
-        private array $checkedClaims
+        private readonly array $claims,
+        private readonly array $mandatoryClaims,
+        private readonly array $checkedClaims
     ) {
     }
 

src/Bundle/JoseFramework/Event/HeaderCheckedFailureEvent.php

@@ -11,10 +11,10 @@
 final class HeaderCheckedFailureEvent extends Event
 {
     public function __construct(
-        private JWT $jwt,
-        private int $index,
-        private array $mandatoryHeaderParameters,
-        private Throwable $throwable
+        private readonly JWT $jwt,
+        private readonly int $index,
+        private readonly array $mandatoryHeaderParameters,
+        private readonly Throwable $throwable
     ) {
     }
 

src/Bundle/JoseFramework/Event/HeaderCheckedSuccessEvent.php

@@ -10,9 +10,9 @@
 final class HeaderCheckedSuccessEvent extends Event
 {
     public function __construct(
-        private JWT $jwt,
-        private int $index,
-        private array $mandatoryHeaderParameters
+        private readonly JWT $jwt,
+        private readonly int $index,
+        private readonly array $mandatoryHeaderParameters
     ) {
     }
 

src/Bundle/JoseFramework/Event/JWEBuiltFailureEvent.php

@@ -10,12 +10,12 @@
 final class JWEBuiltFailureEvent extends Event
 {
     public function __construct(
-        private ?string $payload,
-        private array $recipients,
-        private array $sharedProtectedHeader,
-        private array $sharedHeader,
-        private ?string $aad,
-        private Throwable $throwable
+        private readonly ?string $payload,
+        private readonly array $recipients,
+        private readonly array $sharedProtectedHeader,
+        private readonly array $sharedHeader,
+        private readonly ?string $aad,
+        private readonly Throwable $throwable
     ) {
     }
 

src/Bundle/JoseFramework/Event/JWEBuiltSuccessEvent.php

@@ -10,7 +10,7 @@
 final class JWEBuiltSuccessEvent extends Event
 {
     public function __construct(
-        private JWE $jwe
+        private readonly JWE $jwe
     ) {
     }
 

src/Bundle/JoseFramework/Event/JWEDecryptionFailureEvent.php

@@ -11,8 +11,8 @@
 final class JWEDecryptionFailureEvent extends Event
 {
     public function __construct(
-        private JWE $jwe,
-        private JWKSet $JWKSet
+        private readonly JWE $jwe,
+        private readonly JWKSet $JWKSet
     ) {
     }
 

src/Bundle/JoseFramework/Event/JWEDecryptionSuccessEvent.php

@@ -12,10 +12,10 @@
 final class JWEDecryptionSuccessEvent extends Event
 {
     public function __construct(
-        private JWE $jwe,
-        private JWKSet $JWKSet,
-        private JWK $JWK,
-        private int $recipient
+        private readonly JWE $jwe,
+        private readonly JWKSet $JWKSet,
+        private readonly JWK $JWK,
+        private readonly int $recipient
     ) {
     }
 

src/Bundle/JoseFramework/Event/JWELoadingFailureEvent.php

@@ -11,9 +11,9 @@
 final class JWELoadingFailureEvent extends Event
 {
     public function __construct(
-        private string $token,
-        private JWKSet $JWKSet,
-        private Throwable $throwable
+        private readonly string $token,
+        private readonly JWKSet $JWKSet,
+        private readonly Throwable $throwable
     ) {
     }
 

src/Bundle/JoseFramework/Event/JWELoadingSuccessEvent.php

@@ -11,10 +11,10 @@
 final class JWELoadingSuccessEvent extends Event
 {
     public function __construct(
-        private string $token,
-        private JWE $jwe,
-        private JWKSet $JWKSet,
-        private int $recipient
+        private readonly string $token,
+        private readonly JWE $jwe,
+        private readonly JWKSet $JWKSet,
+        private readonly int $recipient
     ) {
     }