Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"phpstan/phpstan": "__VERSION__",
"phpunit/phpunit": "__VERSION__",
"pyrech/composer-changelogs": "__VERSION__",
"rector/rector": "__VERSION__",
"rector/rector": ">=__VERSION__ <__VERSION__",
"softcreatr/jsonpath": "^0.10 || ^1.0",
"vincentlanglet/twig-cs-fixer": "__VERSION__"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

declare(strict_types=1);

use DrupalFinder\DrupalFinderComposerRuntime;
use DrupalRector\Set\DrupalSetProvider;
use Rector\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector;
use Rector\CodeQuality\Rector\ClassMethod\InlineArrayReturnAssignRector;
Expand Down Expand Up @@ -81,9 +80,9 @@
'*/vendor/*',
'*/node_modules/*',
])
// PHP version upgrade sets - modernizes syntax to PHP 8.4.
// Includes all rules from PHP 5.3 through 8.4.
->withPhpSets(php84: TRUE)
// PHP version upgrade sets. Called without an argument, the target version
// comes from `composer.json`, so the sets follow the project's PHP version.
->withPhpSets()
// Behat attribute sets - converts annotations to PHP 8 attributes.
->withAttributesSets(behat: TRUE)
// Code quality improvement sets.
Expand All @@ -95,39 +94,16 @@
privatization: TRUE,
typeDeclarations: TRUE,
)
// Drupal-specific deprecation fixes. The provider binds each set to a
// `drupal/core` version and only the sets the installed core satisfies are
// loaded, so the set tracks core upgrades without changing this
// configuration. Both calls are required: the provider supplies the sets,
// `withComposerBased()` enables the group.
// Drupal deprecation fixes for the installed `drupal/core` version. Both
// calls are required: the provider supplies the sets, `withComposerBased()`
// enables the group. The sets carry the autoload paths and the file
// extensions Drupal executes PHP from, so this file declares neither.
->withSetProviders(DrupalSetProvider::class)
->withComposerBased(drupal: TRUE)
// Additional rules.
->withRules([
DeclareStrictTypesRector::class,
YieldDataProviderRector::class,
])
// Configure Drupal autoloading.
->withAutoloadPaths((function (): array {
$drupalFinder = new DrupalFinderComposerRuntime();
$drupalRoot = $drupalFinder->getDrupalRoot();

return [
$drupalRoot . '/core',
$drupalRoot . '/modules',
$drupalRoot . '/themes',
$drupalRoot . '/profiles',
];
})())
// Drupal file extensions.
->withFileExtensions([
'php',
'module',
'install',
'profile',
'theme',
'inc',
'engine',
])
// Import configuration.
->withImportNames(importNames: FALSE, importDocBlockNames: FALSE);
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@@ -44,10 +44,10 @@
@@ -43,10 +43,10 @@

return RectorConfig::configure()
->withPaths([
Expand All @@ -13,7 +13,7 @@
__DIR__ . '/tests',
])
->withSkip([
@@ -65,8 +65,8 @@
@@ -64,8 +64,8 @@
PrivatizeLocalGetterToPropertyRector::class,
RemoveAlwaysTrueIfConditionRector::class,
RemoveUnusedPublicMethodParameterRector::class => [
Expand All @@ -24,7 +24,7 @@
],
RenameForeachValueVariableToMatchExprVariableRector::class,
RenameForeachValueVariableToMatchMethodCallReturnTypeRector::class,
@@ -75,7 +75,7 @@
@@ -74,7 +74,7 @@
RenameVariableToMatchNewTypeRector::class,
SimplifyEmptyCheckOnEmptyArrayRector::class,
StringClassNameToClassConstantRector::class => [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@@ -44,10 +44,10 @@
@@ -43,10 +43,10 @@

return RectorConfig::configure()
->withPaths([
Expand All @@ -13,7 +13,7 @@
__DIR__ . '/tests',
])
->withSkip([
@@ -65,8 +65,8 @@
@@ -64,8 +64,8 @@
PrivatizeLocalGetterToPropertyRector::class,
RemoveAlwaysTrueIfConditionRector::class,
RemoveUnusedPublicMethodParameterRector::class => [
Expand All @@ -24,7 +24,7 @@
],
RenameForeachValueVariableToMatchExprVariableRector::class,
RenameForeachValueVariableToMatchMethodCallReturnTypeRector::class,
@@ -75,7 +75,7 @@
@@ -74,7 +74,7 @@
RenameVariableToMatchNewTypeRector::class,
SimplifyEmptyCheckOnEmptyArrayRector::class,
StringClassNameToClassConstantRector::class => [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
@@ -45,7 +45,6 @@
@@ -44,7 +44,6 @@
return RectorConfig::configure()
->withPaths([
__DIR__ . '/web/modules/custom',
- __DIR__ . '/web/themes/custom',
__DIR__ . '/web/sites/default/settings.php',
__DIR__ . '/web/sites/default/includes',
__DIR__ . '/tests',
@@ -66,7 +65,6 @@
@@ -65,7 +64,6 @@
RemoveAlwaysTrueIfConditionRector::class,
RemoveUnusedPublicMethodParameterRector::class => [
__DIR__ . '/web/modules/custom/*/src/Hook/*',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
@@ -45,7 +45,6 @@
@@ -44,7 +44,6 @@
return RectorConfig::configure()
->withPaths([
__DIR__ . '/web/modules/custom',
- __DIR__ . '/web/themes/custom',
__DIR__ . '/web/sites/default/settings.php',
__DIR__ . '/web/sites/default/includes',
__DIR__ . '/tests',
@@ -66,7 +65,6 @@
@@ -65,7 +64,6 @@
RemoveAlwaysTrueIfConditionRector::class,
RemoveUnusedPublicMethodParameterRector::class => [
__DIR__ . '/web/modules/custom/*/src/Hook/*',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
@@ -45,7 +45,6 @@
@@ -44,7 +44,6 @@
return RectorConfig::configure()
->withPaths([
__DIR__ . '/web/modules/custom',
- __DIR__ . '/web/themes/custom',
__DIR__ . '/web/sites/default/settings.php',
__DIR__ . '/web/sites/default/includes',
__DIR__ . '/tests',
@@ -66,7 +65,6 @@
@@ -65,7 +64,6 @@
RemoveAlwaysTrueIfConditionRector::class,
RemoveUnusedPublicMethodParameterRector::class => [
__DIR__ . '/web/modules/custom/*/src/Hook/*',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
- "phpstan/phpstan": "__VERSION__",
"phpunit/phpunit": "__VERSION__",
"pyrech/composer-changelogs": "__VERSION__",
- "rector/rector": "__VERSION__",
- "rector/rector": ">=__VERSION__ <__VERSION__",
"softcreatr/jsonpath": "^0.10 || ^1.0",
"vincentlanglet/twig-cs-fixer": "__VERSION__"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
- "phpstan/phpstan": "__VERSION__",
"phpunit/phpunit": "__VERSION__",
"pyrech/composer-changelogs": "__VERSION__",
- "rector/rector": "__VERSION__",
- "rector/rector": ">=__VERSION__ <__VERSION__",
"softcreatr/jsonpath": "^0.10 || ^1.0",
"vincentlanglet/twig-cs-fixer": "__VERSION__"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"phpstan/phpstan": "__VERSION__",
- "phpunit/phpunit": "__VERSION__",
"pyrech/composer-changelogs": "__VERSION__",
"rector/rector": "__VERSION__",
"rector/rector": ">=__VERSION__ <__VERSION__",
"softcreatr/jsonpath": "^0.10 || ^1.0",
@@ -72,11 +64,6 @@
],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
@@ -36,7 +36,6 @@
@@ -35,7 +35,6 @@
use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
use Rector\Php80\Rector\Switch_\ChangeSwitchToMatchRector;
use Rector\Php81\Rector\Array_\ArrayToFirstClassCallableRector;
-use Rector\PHPUnit\CodeQuality\Rector\Class_\YieldDataProviderRector;
use Rector\Privatization\Rector\ClassMethod\PrivatizeFinalClassMethodRector;
use Rector\Privatization\Rector\MethodCall\PrivatizeLocalGetterToPropertyRector;
use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
@@ -84,8 +83,6 @@
// PHP version upgrade sets - modernizes syntax to PHP 8.4.
// Includes all rules from PHP 5.3 through 8.4.
->withPhpSets(php84: TRUE)
@@ -83,8 +82,6 @@
// PHP version upgrade sets. Called without an argument, the target version
// comes from `composer.json`, so the sets follow the project's PHP version.
->withPhpSets()
- // Behat attribute sets - converts annotations to PHP 8 attributes.
- ->withAttributesSets(behat: TRUE)
// Code quality improvement sets.
->withPreparedSets(
codeQuality: TRUE,
@@ -105,7 +102,6 @@
@@ -103,7 +100,6 @@
// Additional rules.
->withRules([
DeclareStrictTypesRector::class,
- YieldDataProviderRector::class,
])
// Configure Drupal autoloading.
->withAutoloadPaths((function (): array {
// Import configuration.
->withImportNames(importNames: FALSE, importDocBlockNames: FALSE);
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"phpstan/phpstan": "__VERSION__",
- "phpunit/phpunit": "__VERSION__",
"pyrech/composer-changelogs": "__VERSION__",
"rector/rector": "__VERSION__",
"rector/rector": ">=__VERSION__ <__VERSION__",
"softcreatr/jsonpath": "^0.10 || ^1.0",
@@ -72,11 +64,6 @@
],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
@@ -36,7 +36,6 @@
@@ -35,7 +35,6 @@
use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
use Rector\Php80\Rector\Switch_\ChangeSwitchToMatchRector;
use Rector\Php81\Rector\Array_\ArrayToFirstClassCallableRector;
-use Rector\PHPUnit\CodeQuality\Rector\Class_\YieldDataProviderRector;
use Rector\Privatization\Rector\ClassMethod\PrivatizeFinalClassMethodRector;
use Rector\Privatization\Rector\MethodCall\PrivatizeLocalGetterToPropertyRector;
use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
@@ -84,8 +83,6 @@
// PHP version upgrade sets - modernizes syntax to PHP 8.4.
// Includes all rules from PHP 5.3 through 8.4.
->withPhpSets(php84: TRUE)
@@ -83,8 +82,6 @@
// PHP version upgrade sets. Called without an argument, the target version
// comes from `composer.json`, so the sets follow the project's PHP version.
->withPhpSets()
- // Behat attribute sets - converts annotations to PHP 8 attributes.
- ->withAttributesSets(behat: TRUE)
// Code quality improvement sets.
->withPreparedSets(
codeQuality: TRUE,
@@ -105,7 +102,6 @@
@@ -103,7 +100,6 @@
// Additional rules.
->withRules([
DeclareStrictTypesRector::class,
- YieldDataProviderRector::class,
])
// Configure Drupal autoloading.
->withAutoloadPaths((function (): array {
// Import configuration.
->withImportNames(importNames: FALSE, importDocBlockNames: FALSE);
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
@@ -45,7 +45,6 @@
@@ -44,7 +44,6 @@
return RectorConfig::configure()
->withPaths([
__DIR__ . '/web/modules/custom',
- __DIR__ . '/web/themes/custom',
__DIR__ . '/web/sites/default/settings.php',
__DIR__ . '/web/sites/default/includes',
__DIR__ . '/tests',
@@ -66,7 +65,6 @@
@@ -65,7 +64,6 @@
RemoveAlwaysTrueIfConditionRector::class,
RemoveUnusedPublicMethodParameterRector::class => [
__DIR__ . '/web/modules/custom/*/src/Hook/*',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
@@ -45,7 +45,6 @@
@@ -44,7 +44,6 @@
return RectorConfig::configure()
->withPaths([
__DIR__ . '/web/modules/custom',
- __DIR__ . '/web/themes/custom',
__DIR__ . '/web/sites/default/settings.php',
__DIR__ . '/web/sites/default/includes',
__DIR__ . '/tests',
@@ -66,7 +65,6 @@
@@ -65,7 +64,6 @@
RemoveAlwaysTrueIfConditionRector::class,
RemoveUnusedPublicMethodParameterRector::class => [
__DIR__ . '/web/modules/custom/*/src/Hook/*',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@@ -84,8 +84,6 @@
// PHP version upgrade sets - modernizes syntax to PHP 8.4.
// Includes all rules from PHP 5.3 through 8.4.
->withPhpSets(php84: TRUE)
@@ -83,8 +83,6 @@
// PHP version upgrade sets. Called without an argument, the target version
// comes from `composer.json`, so the sets follow the project's PHP version.
->withPhpSets()
- // Behat attribute sets - converts annotations to PHP 8 attributes.
- ->withAttributesSets(behat: TRUE)
// Code quality improvement sets.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@@ -84,8 +84,6 @@
// PHP version upgrade sets - modernizes syntax to PHP 8.4.
// Includes all rules from PHP 5.3 through 8.4.
->withPhpSets(php84: TRUE)
@@ -83,8 +83,6 @@
// PHP version upgrade sets. Called without an argument, the target version
// comes from `composer.json`, so the sets follow the project's PHP version.
->withPhpSets()
- // Behat attribute sets - converts annotations to PHP 8 attributes.
- ->withAttributesSets(behat: TRUE)
// Code quality improvement sets.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
@@ -45,7 +45,6 @@
@@ -44,7 +44,6 @@
return RectorConfig::configure()
->withPaths([
__DIR__ . '/web/modules/custom',
- __DIR__ . '/web/themes/custom',
__DIR__ . '/web/sites/default/settings.php',
__DIR__ . '/web/sites/default/includes',
__DIR__ . '/tests',
@@ -66,7 +65,6 @@
@@ -65,7 +64,6 @@
RemoveAlwaysTrueIfConditionRector::class,
RemoveUnusedPublicMethodParameterRector::class => [
__DIR__ . '/web/modules/custom/*/src/Hook/*',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
- "phpstan/phpstan": "__VERSION__",
"phpunit/phpunit": "__VERSION__",
"pyrech/composer-changelogs": "__VERSION__",
"rector/rector": "__VERSION__",
"rector/rector": ">=__VERSION__ <__VERSION__",
@@ -85,7 +82,6 @@
"drupal/core-composer-scaffold": true,
"ergebnis/composer-normalize": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
- "phpstan/phpstan": "__VERSION__",
"phpunit/phpunit": "__VERSION__",
"pyrech/composer-changelogs": "__VERSION__",
"rector/rector": "__VERSION__",
"rector/rector": ">=__VERSION__ <__VERSION__",
@@ -85,7 +82,6 @@
"drupal/core-composer-scaffold": true,
"ergebnis/composer-normalize": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"phpstan/phpstan": "__VERSION__",
- "phpunit/phpunit": "__VERSION__",
"pyrech/composer-changelogs": "__VERSION__",
"rector/rector": "__VERSION__",
"rector/rector": ">=__VERSION__ <__VERSION__",
"softcreatr/jsonpath": "^0.10 || ^1.0",
@@ -72,11 +70,6 @@
],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
@@ -36,7 +36,6 @@
@@ -35,7 +35,6 @@
use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
use Rector\Php80\Rector\Switch_\ChangeSwitchToMatchRector;
use Rector\Php81\Rector\Array_\ArrayToFirstClassCallableRector;
-use Rector\PHPUnit\CodeQuality\Rector\Class_\YieldDataProviderRector;
use Rector\Privatization\Rector\ClassMethod\PrivatizeFinalClassMethodRector;
use Rector\Privatization\Rector\MethodCall\PrivatizeLocalGetterToPropertyRector;
use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
@@ -105,7 +104,6 @@
@@ -103,7 +102,6 @@
// Additional rules.
->withRules([
DeclareStrictTypesRector::class,
- YieldDataProviderRector::class,
])
// Configure Drupal autoloading.
->withAutoloadPaths((function (): array {
// Import configuration.
->withImportNames(importNames: FALSE, importDocBlockNames: FALSE);
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"phpstan/phpstan": "__VERSION__",
- "phpunit/phpunit": "__VERSION__",
"pyrech/composer-changelogs": "__VERSION__",
"rector/rector": "__VERSION__",
"rector/rector": ">=__VERSION__ <__VERSION__",
"softcreatr/jsonpath": "^0.10 || ^1.0",
@@ -72,11 +70,6 @@
],
Expand Down
Loading