Skip to content

Commit

Permalink
Make use of RectorConfig and ECSConfig (#2840)
Browse files Browse the repository at this point in the history 
* apply RectorConfig upgrade set

* rest fixes

* upgrade configs

* cleanup

* utils

* skip errors

* fix cs

* docs
  • Loading branch information
@TomasVotruba
TomasVotruba authored Apr 20, 2022
1 parent af3367c commit 7b11cdd
Show file tree
Hide file tree
Showing 313 changed files with 1,824 additions and 2,337 deletions.
14 changes: 9 additions & 5 deletions config/composer/move_extension_from_ter_to_packagist.php
View file

Large diffs are not rendered by default.

123 changes: 61 additions & 62 deletions config/composer/typo3-104-composer-packages-core.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
$containerConfigurator->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'),
]);
return static function (RectorConfig $rectorConfig): void {
$rectorConfig->import(__DIR__ . '/../config.php');

$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'),
]);
};
10 changes: 6 additions & 4 deletions config/composer/typo3-104-composer-packages-extensions.php
View file

Large diffs are not rendered by default.

99 changes: 49 additions & 50 deletions config/composer/typo3-110-composer-packages-core.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,55 +5,54 @@
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 {
$containerConfigurator->import(__DIR__ . '/../config.php');
$services = $containerConfigurator->services();
$services->set(RemovePackageComposerRector::class)
->configure([
'typo3/cms-context-help',
'typo3/cms-info-pagetsconfig',
'typo3/cms-wizard-crpages',
'typo3/cms-rsaauth',
]);
$services->set(ChangePackageVersionComposerRector::class)
->configure([
new PackageAndVersion('typo3/cms-about', '^11.0'),
new PackageAndVersion('typo3/cms-adminpanel', '^11.0'),
new PackageAndVersion('typo3/cms-backend', '^11.0'),
new PackageAndVersion('typo3/cms-belog', '^11.0'),
new PackageAndVersion('typo3/cms-beuser', '^11.0'),
new PackageAndVersion('typo3/cms-core', '^11.0'),
new PackageAndVersion('typo3/cms-dashboard', '^11.0'),
new PackageAndVersion('typo3/cms-extbase', '^11.0'),
new PackageAndVersion('typo3/cms-extensionmanager', '^11.0'),
new PackageAndVersion('typo3/cms-felogin', '^11.0'),
new PackageAndVersion('typo3/cms-filelist', '^11.0'),
new PackageAndVersion('typo3/cms-filemetadata', '^11.0'),
new PackageAndVersion('typo3/cms-fluid', '^11.0'),
new PackageAndVersion('typo3/cms-fluid-styled-content', '^11.0'),
new PackageAndVersion('typo3/cms-form', '^11.0'),
new PackageAndVersion('typo3/cms-frontend', '^11.0'),
new PackageAndVersion('typo3/cms-impexp', '^11.0'),
new PackageAndVersion('typo3/cms-indexed-search', '^11.0'),
new PackageAndVersion('typo3/cms-info', '^11.0'),
new PackageAndVersion('typo3/cms-install', '^11.0'),
new PackageAndVersion('typo3/cms-linkvalidator', '^11.0'),
new PackageAndVersion('typo3/cms-lowlevel', '^11.0'),
new PackageAndVersion('typo3/cms-opendocs', '^11.0'),
new PackageAndVersion('typo3/cms-recordlist', '^11.0'),
new PackageAndVersion('typo3/cms-recycler', '^11.0'),
new PackageAndVersion('typo3/cms-redirects', '^11.0'),
new PackageAndVersion('typo3/cms-reports', '^11.0'),
new PackageAndVersion('typo3/cms-rte-ckeditor', '^11.0'),
new PackageAndVersion('typo3/cms-scheduler', '^11.0'),
new PackageAndVersion('typo3/cms-seo', '^11.0'),
new PackageAndVersion('typo3/cms-setup', '^11.0'),
new PackageAndVersion('typo3/cms-sys-note', '^11.0'),
new PackageAndVersion('typo3/cms-t3editor', '^11.0'),
new PackageAndVersion('typo3/cms-tstemplate', '^11.0'),
new PackageAndVersion('typo3/cms-viewpage', '^11.0'),
new PackageAndVersion('typo3/cms-workspaces', '^11.0'),
]);
return static function (RectorConfig $rectorConfig): void {
$rectorConfig->import(__DIR__ . '/../config.php');

$rectorConfig->ruleWithConfiguration(RemovePackageComposerRector::class, [
'typo3/cms-context-help',
'typo3/cms-info-pagetsconfig',
'typo3/cms-wizard-crpages',
'typo3/cms-rsaauth',
]);

$rectorConfig->ruleWithConfiguration(ChangePackageVersionComposerRector::class, [
new PackageAndVersion('typo3/cms-about', '^11.0'),
new PackageAndVersion('typo3/cms-adminpanel', '^11.0'),
new PackageAndVersion('typo3/cms-backend', '^11.0'),
new PackageAndVersion('typo3/cms-belog', '^11.0'),
new PackageAndVersion('typo3/cms-beuser', '^11.0'),
new PackageAndVersion('typo3/cms-core', '^11.0'),
new PackageAndVersion('typo3/cms-dashboard', '^11.0'),
new PackageAndVersion('typo3/cms-extbase', '^11.0'),
new PackageAndVersion('typo3/cms-extensionmanager', '^11.0'),
new PackageAndVersion('typo3/cms-felogin', '^11.0'),
new PackageAndVersion('typo3/cms-filelist', '^11.0'),
new PackageAndVersion('typo3/cms-filemetadata', '^11.0'),
new PackageAndVersion('typo3/cms-fluid', '^11.0'),
new PackageAndVersion('typo3/cms-fluid-styled-content', '^11.0'),
new PackageAndVersion('typo3/cms-form', '^11.0'),
new PackageAndVersion('typo3/cms-frontend', '^11.0'),
new PackageAndVersion('typo3/cms-impexp', '^11.0'),
new PackageAndVersion('typo3/cms-indexed-search', '^11.0'),
new PackageAndVersion('typo3/cms-info', '^11.0'),
new PackageAndVersion('typo3/cms-install', '^11.0'),
new PackageAndVersion('typo3/cms-linkvalidator', '^11.0'),
new PackageAndVersion('typo3/cms-lowlevel', '^11.0'),
new PackageAndVersion('typo3/cms-opendocs', '^11.0'),
new PackageAndVersion('typo3/cms-recordlist', '^11.0'),
new PackageAndVersion('typo3/cms-recycler', '^11.0'),
new PackageAndVersion('typo3/cms-redirects', '^11.0'),
new PackageAndVersion('typo3/cms-reports', '^11.0'),
new PackageAndVersion('typo3/cms-rte-ckeditor', '^11.0'),
new PackageAndVersion('typo3/cms-scheduler', '^11.0'),
new PackageAndVersion('typo3/cms-seo', '^11.0'),
new PackageAndVersion('typo3/cms-setup', '^11.0'),
new PackageAndVersion('typo3/cms-sys-note', '^11.0'),
new PackageAndVersion('typo3/cms-t3editor', '^11.0'),
new PackageAndVersion('typo3/cms-tstemplate', '^11.0'),
new PackageAndVersion('typo3/cms-viewpage', '^11.0'),
new PackageAndVersion('typo3/cms-workspaces', '^11.0'),
]);
};
14 changes: 10 additions & 4 deletions config/composer/typo3-110-composer-packages-extensions.php
View file

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions config/composer/typo3-87-composer-packages-extensions.php
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 7b11cdd

Please sign in to comment.