cleanup

sabbelasichon · Apr 20, 2022 · 71402b5 · 71402b5
1 parent c741894
commit 71402b5
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 76 deletions.
diff --git a/config/composer/typo3-104-composer-packages-core.php b/config/composer/typo3-104-composer-packages-core.php
@@ -5,67 +5,66 @@
 use Rector\Composer\Rector\ChangePackageVersionComposerRector;
 use Rector\Composer\Rector\RemovePackageComposerRector;
 use Rector\Composer\ValueObject\PackageAndVersion;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Rector\Config\RectorConfig;
 
-return static function (ContainerConfigurator $containerConfigurator): void {
+return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->import(__DIR__ . '/../config.php');
-    $services = $containerConfigurator->services();
-    $services->set(RemovePackageComposerRector::class)
-        ->configure([
-            'typo3/cms-rsaauth',
-            'typo3/cms',
-            'typo3/cms-context-help',
-            'typo3/cms-info-pagetsconfig',
-            'typo3/cms-wizard-crpages',
-            'typo3/cms-wizard-sortpages',
-            'typo3/cms-cshmanual',
-            'typo3/cms-func',
-            'typo3/cms-documentation',
-            'dmitryd/typo3-realurl',
-            'typo3-ter/typo3-realurl',
-        ]);
-    $services->set(ChangePackageVersionComposerRector::class)
-        ->configure([
-            new PackageAndVersion('typo3/cms-about', '^10.4'),
-            new PackageAndVersion('typo3/cms-adminpanel', '^10.4'),
-            new PackageAndVersion('typo3/cms-backend', '^10.4'),
-            new PackageAndVersion('typo3/cms-belog', '^10.4'),
-            new PackageAndVersion('typo3/cms-beuser', '^10.4'),
-            new PackageAndVersion('typo3/cms-core', '^10.4'),
-            new PackageAndVersion('typo3/cms-dashboard', '^10.4'),
-            new PackageAndVersion('typo3/cms-extbase', '^10.4'),
-            new PackageAndVersion('typo3/cms-extensionmanager', '^10.4'),
-            new PackageAndVersion('typo3/cms-felogin', '^10.4'),
-            new PackageAndVersion('typo3/cms-filelist', '^10.4'),
-            new PackageAndVersion('typo3/cms-filemetadata', '^10.4'),
-            new PackageAndVersion('typo3/cms-fluid', '^10.4'),
-            new PackageAndVersion('typo3/cms-fluid-styled-content', '^10.4'),
-            new PackageAndVersion('typo3/cms-form', '^10.4'),
-            new PackageAndVersion('typo3/cms-frontend', '^10.4'),
-            new PackageAndVersion('typo3/cms-impexp', '^10.4'),
-            new PackageAndVersion('typo3/cms-indexed-search', '^10.4'),
-            new PackageAndVersion('typo3/cms-info', '^10.4'),
-            new PackageAndVersion('typo3/cms-install', '^10.4'),
-            new PackageAndVersion('typo3/cms-linkvalidator', '^10.4'),
-            new PackageAndVersion('typo3/cms-lowlevel', '^10.4'),
-            new PackageAndVersion('typo3/cms-opendocs', '^10.4'),
-            new PackageAndVersion('typo3/cms-recordlist', '^10.4'),
-            new PackageAndVersion('typo3/cms-recycler', '^10.4'),
-            new PackageAndVersion('typo3/cms-redirects', '^10.4'),
-            new PackageAndVersion('typo3/cms-reports', '^10.4'),
-            new PackageAndVersion('typo3/cms-rte-ckeditor', '^10.4'),
-            new PackageAndVersion('typo3/cms-scheduler', '^10.4'),
-            new PackageAndVersion('typo3/cms-seo', '^10.4'),
-            new PackageAndVersion('typo3/cms-setup', '^10.4'),
-            new PackageAndVersion('typo3/cms-sys-note', '^10.4'),
-            new PackageAndVersion('typo3/cms-t3editor', '^10.4'),
-            new PackageAndVersion('typo3/cms-tstemplate', '^10.4'),
-            new PackageAndVersion('typo3/cms-viewpage', '^10.4'),
-            new PackageAndVersion('typo3/cms-workspaces', '^10.4'),
-            new PackageAndVersion('typo3-console/composer-auto-commands', '^0.4.0'),
-            new PackageAndVersion('helhum/typo3-console', '^6.0'),
-            new PackageAndVersion('helhum/dotenv-connector', '^3.0'),
-            new PackageAndVersion('helhum/typo3-secure-web', '^0.3.0'),
-            new PackageAndVersion('typo3-console/composer-typo3-auto-install', '^0.4.0'),
-        ]);
+
+    $rectorConfig->ruleWithConfiguration(RemovePackageComposerRector::class, [
+        'typo3/cms-rsaauth',
+        'typo3/cms',
+        'typo3/cms-context-help',
+        'typo3/cms-info-pagetsconfig',
+        'typo3/cms-wizard-crpages',
+        'typo3/cms-wizard-sortpages',
+        'typo3/cms-cshmanual',
+        'typo3/cms-func',
+        'typo3/cms-documentation',
+        'dmitryd/typo3-realurl',
+        'typo3-ter/typo3-realurl',
+    ]);
+
+    $rectorConfig->ruleWithConfiguration(ChangePackageVersionComposerRector::class, [
+        new PackageAndVersion('typo3/cms-about', '^10.4'),
+        new PackageAndVersion('typo3/cms-adminpanel', '^10.4'),
+        new PackageAndVersion('typo3/cms-backend', '^10.4'),
+        new PackageAndVersion('typo3/cms-belog', '^10.4'),
+        new PackageAndVersion('typo3/cms-beuser', '^10.4'),
+        new PackageAndVersion('typo3/cms-core', '^10.4'),
+        new PackageAndVersion('typo3/cms-dashboard', '^10.4'),
+        new PackageAndVersion('typo3/cms-extbase', '^10.4'),
+        new PackageAndVersion('typo3/cms-extensionmanager', '^10.4'),
+        new PackageAndVersion('typo3/cms-felogin', '^10.4'),
+        new PackageAndVersion('typo3/cms-filelist', '^10.4'),
+        new PackageAndVersion('typo3/cms-filemetadata', '^10.4'),
+        new PackageAndVersion('typo3/cms-fluid', '^10.4'),
+        new PackageAndVersion('typo3/cms-fluid-styled-content', '^10.4'),
+        new PackageAndVersion('typo3/cms-form', '^10.4'),
+        new PackageAndVersion('typo3/cms-frontend', '^10.4'),
+        new PackageAndVersion('typo3/cms-impexp', '^10.4'),
+        new PackageAndVersion('typo3/cms-indexed-search', '^10.4'),
+        new PackageAndVersion('typo3/cms-info', '^10.4'),
+        new PackageAndVersion('typo3/cms-install', '^10.4'),
+        new PackageAndVersion('typo3/cms-linkvalidator', '^10.4'),
+        new PackageAndVersion('typo3/cms-lowlevel', '^10.4'),
+        new PackageAndVersion('typo3/cms-opendocs', '^10.4'),
+        new PackageAndVersion('typo3/cms-recordlist', '^10.4'),
+        new PackageAndVersion('typo3/cms-recycler', '^10.4'),
+        new PackageAndVersion('typo3/cms-redirects', '^10.4'),
+        new PackageAndVersion('typo3/cms-reports', '^10.4'),
+        new PackageAndVersion('typo3/cms-rte-ckeditor', '^10.4'),
+        new PackageAndVersion('typo3/cms-scheduler', '^10.4'),
+        new PackageAndVersion('typo3/cms-seo', '^10.4'),
+        new PackageAndVersion('typo3/cms-setup', '^10.4'),
+        new PackageAndVersion('typo3/cms-sys-note', '^10.4'),
+        new PackageAndVersion('typo3/cms-t3editor', '^10.4'),
+        new PackageAndVersion('typo3/cms-tstemplate', '^10.4'),
+        new PackageAndVersion('typo3/cms-viewpage', '^10.4'),
+        new PackageAndVersion('typo3/cms-workspaces', '^10.4'),
+        new PackageAndVersion('typo3-console/composer-auto-commands', '^0.4.0'),
+        new PackageAndVersion('helhum/typo3-console', '^6.0'),
+        new PackageAndVersion('helhum/dotenv-connector', '^3.0'),
+        new PackageAndVersion('helhum/typo3-secure-web', '^0.3.0'),
+        new PackageAndVersion('typo3-console/composer-typo3-auto-install', '^0.4.0'),
+    ]);
 };
diff --git a/config/solr/v9/solr_php_client_to_solarium.php b/config/solr/v9/solr_php_client_to_solarium.php
@@ -2,18 +2,16 @@
 
 declare(strict_types=1);
 
+use Rector\Config\RectorConfig;
 use Rector\Renaming\Rector\Name\RenameClassRector;
 use Ssch\TYPO3Rector\Rector\Extensions\solr\v9\ApacheSolrDocumentToSolariumDocumentRector;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
-return static function (ContainerConfigurator $containerConfigurator): void {
+return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->import(__DIR__ . '/../../config.php');
 
-    $services = $containerConfigurator->services();
-    $services->set(ApacheSolrDocumentToSolariumDocumentRector::class);
-    $services->set(RenameClassRector::class)
-        ->configure([
-            'Apache_Solr_Document' => 'ApacheSolrForTypo3\Solr\System\Solr\Document\Document',
-            'Apache_Solr_Response' => 'ApacheSolrForTypo3\Solr\System\Solr\ResponseAdapter',
-        ]);
+    $rectorConfig->rule(ApacheSolrDocumentToSolariumDocumentRector::class);
+    $rectorConfig->ruleWithConfiguration(RenameClassRector::class, [
+        'Apache_Solr_Document' => 'ApacheSolrForTypo3\Solr\System\Solr\Document\Document',
+        'Apache_Solr_Response' => 'ApacheSolrForTypo3\Solr\System\Solr\ResponseAdapter',
+    ]);
 };
diff --git a/config/underscore-to-namespace.php b/config/underscore-to-namespace.php
@@ -2,14 +2,13 @@
 
 declare(strict_types=1);
 
+use Rector\Config\RectorConfig;
 use Ssch\TYPO3Rector\Rector\Migrations\RenameClassMapAliasRector;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
-return static function (ContainerConfigurator $containerConfigurator): void {
+return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->import(__DIR__ . '/config.php');
 
-    $services = $containerConfigurator->services();
-
-    $services->set(RenameClassMapAliasRector::class)
-        ->configure([__DIR__ . '/../Migrations/Code/ClassAliasMap.php']);
+    $rectorConfig->ruleWithConfiguration(RenameClassMapAliasRector::class, [
+        __DIR__ . '/../Migrations/Code/ClassAliasMap.php'
+    ]);
 };