diff --git a/.vortex/docs/content/development/composer.mdx b/.vortex/docs/content/development/composer.mdx index acc8ef57f..201c25520 100644 --- a/.vortex/docs/content/development/composer.mdx +++ b/.vortex/docs/content/development/composer.mdx @@ -572,7 +572,6 @@ where each module is installed. | [`drupal/testmode`](https://www.drupal.org/project/testmode) | Adjusts site behavior during automated tests, for example by filtering out generated content from listings. | [Testmode](modules/testmode.mdx), [Settings](settings.mdx#per-module-overrides) | | [`drupal/xmlsitemap`](https://www.drupal.org/project/xmlsitemap) | Generates a multilingual XML sitemap to help search engines index the site. | [Settings](settings.mdx#per-module-overrides) | | [`drush/drush`](https://github.com/drush-ops/drush) | A command-line shell and scripting interface for Drupal, providing a wide range of utilities to manage and interact with your Drupal sites. | [Drush](environment/drush.mdx) | -| [`webflo/drupal-finder`](https://github.com/webflo/drupal-finder) | Locates Drupal installations in a directory structure. | | #### `require-dev` @@ -586,7 +585,6 @@ environment keeps its full tooling. |---------|-------------|---------------| | [`behat/behat`](https://github.com/Behat/Behat) | A PHP framework for Behavior-Driven Development (BDD), running human-readable stories that describe the behavior of your application. It facilitates communication between developers, stakeholders and clients. | [Behat](testing/behat.mdx) | | [`dantleech/gherkin-lint`](https://github.com/dantleech/gherkin-lint) | Lints the Gherkin feature files used in Behat tests, checking syntax and formatting for consistency. | [Gherkin Lint](code-quality/gherkin-lint.mdx) | -| [`dealerdirect/phpcodesniffer-composer-installer`](https://github.com/Dealerdirect/phpcodesniffer-composer-installer) | Registers the coding standards installed through Composer with PHP_CodeSniffer, so they can be referenced by name. | [PHPCS](code-quality/phpcs.mdx) | | [`drevops/behat-format-progress-fail`](https://github.com/drevops/behat-format-progress-fail) | A Behat output formatter that prints compact progress and expands the detail only for failing scenarios. | [Behat](testing/behat.mdx) | | [`drevops/behat-screenshot`](https://github.com/drevops/behat-screenshot) | Automatically captures a screenshot when a Behat scenario fails, which helps to understand why a test failed. | [Behat](testing/behat.mdx) | | [`drevops/behat-steps`](https://github.com/drevops/behat-steps) | A collection of pre-defined Behat step definitions for Drupal, speeding up the process of writing new tests. | [Behat](testing/behat.mdx) | @@ -594,18 +592,15 @@ environment keeps its full tooling. | [`drupal/coder`](https://www.drupal.org/project/coder) | Provides the PHP_CodeSniffer rules for the Drupal coding standards. The 9.x line targets PHP_CodeSniffer 4.x. | [PHPCS](code-quality/phpcs.mdx) | | [`drupal/drupal-extension`](https://github.com/jhedstrom/drupalextension) | A Behat extension that integrates with Drupal, offering Drupal-specific step definitions and bootstrapping the site for testing. | [Behat](testing/behat.mdx) | | [`ergebnis/composer-normalize`](https://github.com/ergebnis/composer-normalize) | A Composer plugin that normalizes the formatting and key order of `composer.json`. | | -| [`lullabot/mink-selenium2-driver`](https://github.com/lullabot/mink-selenium2-driver) | A maintained fork of the Mink Selenium2 driver that lets Behat control real browsers through Selenium WebDriver. | [Behat](testing/behat.mdx) | -| [`lullabot/php-webdriver`](https://github.com/lullabot/php-webdriver) | A maintained fork of the PHP WebDriver client used by the Mink Selenium2 driver to communicate with browsers. | [Behat](testing/behat.mdx) | | [`mglaman/phpstan-drupal`](https://github.com/mglaman/phpstan-drupal) | Teaches PHPStan about Drupal APIs, so static analysis understands hooks, services and entities in modules and themes. | [PHPStan](code-quality/phpstan.mdx) | | [`mikey179/vfsstream`](https://github.com/bovigo/vfsStream) | A virtual file system for PHPUnit tests, allowing file operations to be exercised without touching the real file system. | [PHPUnit](testing/phpunit.mdx) | -| [`palantirnet/drupal-rector`](https://github.com/palantirnet/drupal-rector) | Rector rules that rewrite deprecated Drupal code, making core upgrades more efficient. | [Rector](code-quality/rector.mdx) | +| [`palantirnet/drupal-rector`](https://github.com/palantirnet/drupal-rector) | Rector rules that rewrite deprecated Drupal code, making core upgrades more efficient. It installs [`rector/rector`](https://github.com/rectorphp/rector) and constrains it to the versions its rule sets support. | [Rector](code-quality/rector.mdx) | | [`phpcompatibility/php-compatibility`](https://github.com/PHPCompatibility/PHPCompatibility) | PHP_CodeSniffer sniffs that check code for compatibility with specific PHP versions. The 10.x line targets PHP_CodeSniffer 4.x. | [PHPCS](code-quality/phpcs.mdx) | | [`phpspec/prophecy-phpunit`](https://github.com/phpspec/prophecy-phpunit) | Integrates the Prophecy mocking library with PHPUnit to provide advanced mocking capabilities in tests. | [PHPUnit](testing/phpunit.mdx) | | [`phpstan/extension-installer`](https://github.com/phpstan/extension-installer) | Automatically registers the installed PHPStan extensions, removing the need to wire them up by hand. | [PHPStan](code-quality/phpstan.mdx) | | [`phpstan/phpstan`](https://github.com/phpstan/phpstan) | A static analysis tool that finds type errors, incorrect method calls and other bugs without running the code. | [PHPStan](code-quality/phpstan.mdx) | | [`phpunit/phpunit`](https://github.com/sebastianbergmann/phpunit) | The PHP testing framework, used here for unit, kernel and functional tests. | [PHPUnit](testing/phpunit.mdx) | | [`pyrech/composer-changelogs`](https://github.com/pyrech/composer-changelogs) | Prints a summary of package additions, updates and removals after running `composer update`. | | -| [`rector/rector`](https://github.com/rectorphp/rector) | An automated refactoring tool that upgrades and modernizes PHP code. | [Rector](code-quality/rector.mdx) | | [`softcreatr/jsonpath`](https://github.com/SoftCreatR/JSONPath) | A JSONPath implementation required by the `drevops/behat-steps` JSON assertion steps. | [Behat](testing/behat.mdx) | | [`vincentlanglet/twig-cs-fixer`](https://github.com/VincentLanglet/Twig-CS-Fixer) | Checks and fixes Twig templates against a coding standard, keeping template files consistent and readable. | [Twig CS Fixer](code-quality/twig-cs-fixer.mdx) | diff --git a/.vortex/installer/tests/Fixtures/handler_process/_baseline/composer.json b/.vortex/installer/tests/Fixtures/handler_process/_baseline/composer.json index af8aa0472..72bcb955b 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/_baseline/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/_baseline/composer.json @@ -32,13 +32,11 @@ "drupal/stage_file_proxy": "__VERSION__", "drupal/testmode": "__VERSION__", "drupal/xmlsitemap": "__VERSION__", - "drush/drush": "__VERSION__", - "webflo/drupal-finder": "__VERSION__" + "drush/drush": "__VERSION__" }, "require-dev": { "behat/behat": "__VERSION__", "dantleech/gherkin-lint": "__VERSION__", - "dealerdirect/phpcodesniffer-composer-installer": "__VERSION__", "drevops/behat-format-progress-fail": "__VERSION__", "drevops/behat-screenshot": "__VERSION__", "drevops/behat-steps": "__VERSION__", @@ -46,8 +44,6 @@ "drupal/coder": "__VERSION__", "drupal/drupal-extension": "__VERSION__", "ergebnis/composer-normalize": "__VERSION__", - "lullabot/mink-selenium2-driver": "__VERSION__", - "lullabot/php-webdriver": "__VERSION__", "mglaman/phpstan-drupal": "__VERSION__", "mikey179/vfsstream": "__VERSION__", "palantirnet/drupal-rector": "__VERSION__", @@ -57,7 +53,6 @@ "phpstan/phpstan": "__VERSION__", "phpunit/phpunit": "__VERSION__", "pyrech/composer-changelogs": "__VERSION__", - "rector/rector": ">=__VERSION__ <__VERSION__", "softcreatr/jsonpath": "^0.10 || ^1.0", "vincentlanglet/twig-cs-fixer": "__VERSION__" }, diff --git a/.vortex/installer/tests/Fixtures/handler_process/_baseline/rector.php b/.vortex/installer/tests/Fixtures/handler_process/_baseline/rector.php index b8fb83a3f..5f7137301 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/_baseline/rector.php +++ b/.vortex/installer/tests/Fixtures/handler_process/_baseline/rector.php @@ -35,10 +35,12 @@ use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector; use Rector\Php80\Rector\Switch_\ChangeSwitchToMatchRector; use Rector\Php81\Rector\Array_\ArrayToFirstClassCallableRector; +use Rector\Php83\Rector\ClassMethod\AddOverrideAttributeToOverriddenMethodsRector; 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; +use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector; use Rector\TypeDeclaration\Rector\StmtsAwareInterface\DeclareStrictTypesRector; return RectorConfig::configure() @@ -51,10 +53,12 @@ ]) ->withSkip([ // Specific rules to skip based on project coding standards. + AddOverrideAttributeToOverriddenMethodsRector::class, ArrayToFirstClassCallableRector::class, CatchExceptionNameMatchingTypeRector::class, ChangeSwitchToMatchRector::class, CompleteDynamicPropertiesRector::class, + DisallowedEmptyRuleFixerRector::class, InlineArrayReturnAssignRector::class, NewlineAfterStatementRector::class, NewlineBeforeNewAssignSetRector::class, diff --git a/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/composer.json b/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/composer.json index 4e83c7483..d64a8c52c 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/composer.json @@ -1,4 +1,4 @@ -@@ -125,38 +125,38 @@ +@@ -120,38 +120,38 @@ "[web-root]/update.php": false }, "locations": { diff --git a/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/rector.php b/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/rector.php index f75f90052..3a7021d04 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/rector.php +++ b/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/rector.php @@ -1,4 +1,4 @@ -@@ -43,10 +43,10 @@ +@@ -45,10 +45,10 @@ return RectorConfig::configure() ->withPaths([ @@ -13,7 +13,7 @@ __DIR__ . '/tests', ]) ->withSkip([ -@@ -64,8 +64,8 @@ +@@ -68,8 +68,8 @@ PrivatizeLocalGetterToPropertyRector::class, RemoveAlwaysTrueIfConditionRector::class, RemoveUnusedPublicMethodParameterRector::class => [ @@ -24,7 +24,7 @@ ], RenameForeachValueVariableToMatchExprVariableRector::class, RenameForeachValueVariableToMatchMethodCallReturnTypeRector::class, -@@ -74,7 +74,7 @@ +@@ -78,7 +78,7 @@ RenameVariableToMatchNewTypeRector::class, SimplifyEmptyCheckOnEmptyArrayRector::class, StringClassNameToClassConstantRector::class => [ diff --git a/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/composer.json b/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/composer.json index 4e83c7483..d64a8c52c 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/composer.json @@ -1,4 +1,4 @@ -@@ -125,38 +125,38 @@ +@@ -120,38 +120,38 @@ "[web-root]/update.php": false }, "locations": { diff --git a/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/rector.php b/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/rector.php index f75f90052..3a7021d04 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/rector.php +++ b/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/rector.php @@ -1,4 +1,4 @@ -@@ -43,10 +43,10 @@ +@@ -45,10 +45,10 @@ return RectorConfig::configure() ->withPaths([ @@ -13,7 +13,7 @@ __DIR__ . '/tests', ]) ->withSkip([ -@@ -64,8 +64,8 @@ +@@ -68,8 +68,8 @@ PrivatizeLocalGetterToPropertyRector::class, RemoveAlwaysTrueIfConditionRector::class, RemoveUnusedPublicMethodParameterRector::class => [ @@ -24,7 +24,7 @@ ], RenameForeachValueVariableToMatchExprVariableRector::class, RenameForeachValueVariableToMatchMethodCallReturnTypeRector::class, -@@ -74,7 +74,7 @@ +@@ -78,7 +78,7 @@ RenameVariableToMatchNewTypeRector::class, SimplifyEmptyCheckOnEmptyArrayRector::class, StringClassNameToClassConstantRector::class => [ diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode/composer.json b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode/composer.json index 8db67c5f8..d185f9528 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode/composer.json @@ -21,5 +21,5 @@ "drupal/stage_file_proxy": "__VERSION__", - "drupal/testmode": "__VERSION__", "drupal/xmlsitemap": "__VERSION__", - "drush/drush": "__VERSION__", - "webflo/drupal-finder": "__VERSION__" + "drush/drush": "__VERSION__" + }, diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/composer.json b/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/composer.json index 408bbb0ad..3536ab6c6 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/composer.json @@ -7,4 +7,4 @@ - "drupal/stage_file_proxy": "__VERSION__", "drupal/testmode": "__VERSION__", "drupal/xmlsitemap": "__VERSION__", - "drush/drush": "__VERSION__", + "drush/drush": "__VERSION__" diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_stage_file_proxy/composer.json b/.vortex/installer/tests/Fixtures/handler_process/modules_no_stage_file_proxy/composer.json index 3922dcd9a..76e9c8e34 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_stage_file_proxy/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_stage_file_proxy/composer.json @@ -5,4 +5,4 @@ - "drupal/stage_file_proxy": "__VERSION__", "drupal/testmode": "__VERSION__", "drupal/xmlsitemap": "__VERSION__", - "drush/drush": "__VERSION__", + "drush/drush": "__VERSION__" diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_testmode/composer.json b/.vortex/installer/tests/Fixtures/handler_process/modules_no_testmode/composer.json index 5a75a044b..da730bd25 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_testmode/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_testmode/composer.json @@ -4,5 +4,5 @@ "drupal/stage_file_proxy": "__VERSION__", - "drupal/testmode": "__VERSION__", "drupal/xmlsitemap": "__VERSION__", - "drush/drush": "__VERSION__", - "webflo/drupal-finder": "__VERSION__" + "drush/drush": "__VERSION__" + }, diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_xmlsitemap/composer.json b/.vortex/installer/tests/Fixtures/handler_process/modules_no_xmlsitemap/composer.json index db83afe9d..81380780a 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_xmlsitemap/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_xmlsitemap/composer.json @@ -3,6 +3,6 @@ "drupal/stage_file_proxy": "__VERSION__", "drupal/testmode": "__VERSION__", - "drupal/xmlsitemap": "__VERSION__", - "drush/drush": "__VERSION__", - "webflo/drupal-finder": "__VERSION__" + "drush/drush": "__VERSION__" }, + "require-dev": { diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_none/composer.json b/.vortex/installer/tests/Fixtures/handler_process/modules_none/composer.json index 9a7b4faf0..31cc5c9bd 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_none/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_none/composer.json @@ -25,6 +25,6 @@ - "drupal/stage_file_proxy": "__VERSION__", - "drupal/testmode": "__VERSION__", - "drupal/xmlsitemap": "__VERSION__", - "drush/drush": "__VERSION__", - "webflo/drupal-finder": "__VERSION__" + "drush/drush": "__VERSION__" }, + "require-dev": { diff --git a/.vortex/installer/tests/Fixtures/handler_process/starter_drupal_cms_profile/composer.json b/.vortex/installer/tests/Fixtures/handler_process/starter_drupal_cms_profile/composer.json index 0614c997c..2a988a55c 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/starter_drupal_cms_profile/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/starter_drupal_cms_profile/composer.json @@ -6,18 +6,18 @@ "drupal/coffee": "__VERSION__", "drupal/config_split": "__VERSION__", "drupal/config_update": "__VERSION__", -@@ -33,7 +34,9 @@ +@@ -32,7 +33,9 @@ + "drupal/stage_file_proxy": "__VERSION__", "drupal/testmode": "__VERSION__", "drupal/xmlsitemap": "__VERSION__", - "drush/drush": "__VERSION__", -- "webflo/drupal-finder": "__VERSION__" +- "drush/drush": "__VERSION__" ++ "drush/drush": "__VERSION__", + "symfony/http-client": "^6.4 || ^7.0", -+ "webflo/drupal-finder": "__VERSION__", + "wikimedia/composer-merge-plugin": "__VERSION__" }, "require-dev": { "behat/behat": "__VERSION__", -@@ -70,7 +73,7 @@ +@@ -65,7 +68,7 @@ "url": "https://packages.drupal.org/8" } ], @@ -26,7 +26,7 @@ "prefer-stable": true, "autoload-dev": { "classmap": [ -@@ -88,7 +91,11 @@ +@@ -83,7 +86,11 @@ "phpstan/extension-installer": true, "pyrech/composer-changelogs": true, "symfony/runtime": true, @@ -39,7 +39,7 @@ }, "bump-after-update": true, "discard-changes": true, -@@ -163,6 +170,17 @@ +@@ -158,6 +165,17 @@ "patchLevel": { "drupal/core": "-p2" }, diff --git a/.vortex/installer/tests/Fixtures/handler_process/theme_claro/rector.php b/.vortex/installer/tests/Fixtures/handler_process/theme_claro/rector.php index c7a7ea853..863611976 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/theme_claro/rector.php +++ b/.vortex/installer/tests/Fixtures/handler_process/theme_claro/rector.php @@ -1,4 +1,4 @@ -@@ -44,7 +44,6 @@ +@@ -46,7 +46,6 @@ return RectorConfig::configure() ->withPaths([ __DIR__ . '/web/modules/custom', @@ -6,7 +6,7 @@ __DIR__ . '/web/sites/default/settings.php', __DIR__ . '/web/sites/default/includes', __DIR__ . '/tests', -@@ -65,7 +64,6 @@ +@@ -69,7 +68,6 @@ RemoveAlwaysTrueIfConditionRector::class, RemoveUnusedPublicMethodParameterRector::class => [ __DIR__ . '/web/modules/custom/*/src/Hook/*', diff --git a/.vortex/installer/tests/Fixtures/handler_process/theme_olivero/rector.php b/.vortex/installer/tests/Fixtures/handler_process/theme_olivero/rector.php index c7a7ea853..863611976 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/theme_olivero/rector.php +++ b/.vortex/installer/tests/Fixtures/handler_process/theme_olivero/rector.php @@ -1,4 +1,4 @@ -@@ -44,7 +44,6 @@ +@@ -46,7 +46,6 @@ return RectorConfig::configure() ->withPaths([ __DIR__ . '/web/modules/custom', @@ -6,7 +6,7 @@ __DIR__ . '/web/sites/default/settings.php', __DIR__ . '/web/sites/default/includes', __DIR__ . '/tests', -@@ -65,7 +64,6 @@ +@@ -69,7 +68,6 @@ RemoveAlwaysTrueIfConditionRector::class, RemoveUnusedPublicMethodParameterRector::class => [ __DIR__ . '/web/modules/custom/*/src/Hook/*', diff --git a/.vortex/installer/tests/Fixtures/handler_process/theme_stark/rector.php b/.vortex/installer/tests/Fixtures/handler_process/theme_stark/rector.php index c7a7ea853..863611976 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/theme_stark/rector.php +++ b/.vortex/installer/tests/Fixtures/handler_process/theme_stark/rector.php @@ -1,4 +1,4 @@ -@@ -44,7 +44,6 @@ +@@ -46,7 +46,6 @@ return RectorConfig::configure() ->withPaths([ __DIR__ . '/web/modules/custom', @@ -6,7 +6,7 @@ __DIR__ . '/web/sites/default/settings.php', __DIR__ . '/web/sites/default/includes', __DIR__ . '/tests', -@@ -65,7 +64,6 @@ +@@ -69,7 +68,6 @@ RemoveAlwaysTrueIfConditionRector::class, RemoveUnusedPublicMethodParameterRector::class => [ __DIR__ . '/web/modules/custom/*/src/Hook/*', diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_lint/composer.json b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_lint/composer.json index 3bde0b219..12091e89d 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_lint/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_lint/composer.json @@ -1,8 +1,4 @@ -@@ -38,26 +38,17 @@ - "require-dev": { - "behat/behat": "__VERSION__", - "dantleech/gherkin-lint": "__VERSION__", -- "dealerdirect/phpcodesniffer-composer-installer": "__VERSION__", +@@ -40,17 +40,10 @@ "drevops/behat-format-progress-fail": "__VERSION__", "drevops/behat-screenshot": "__VERSION__", "drevops/behat-steps": "__VERSION__", @@ -10,8 +6,6 @@ - "drupal/coder": "__VERSION__", "drupal/drupal-extension": "__VERSION__", "ergebnis/composer-normalize": "__VERSION__", - "lullabot/mink-selenium2-driver": "__VERSION__", - "lullabot/php-webdriver": "__VERSION__", - "mglaman/phpstan-drupal": "__VERSION__", "mikey179/vfsstream": "__VERSION__", - "palantirnet/drupal-rector": "__VERSION__", @@ -21,11 +15,8 @@ - "phpstan/phpstan": "__VERSION__", "phpunit/phpunit": "__VERSION__", "pyrech/composer-changelogs": "__VERSION__", -- "rector/rector": ">=__VERSION__ <__VERSION__", "softcreatr/jsonpath": "^0.10 || ^1.0", - "vincentlanglet/twig-cs-fixer": "__VERSION__" - }, -@@ -81,11 +72,9 @@ +@@ -76,11 +69,9 @@ "allow-plugins": { "composer/installers": true, "cweagans/composer-patches": true, diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_lint_circleci/composer.json b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_lint_circleci/composer.json index 3bde0b219..12091e89d 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_lint_circleci/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_lint_circleci/composer.json @@ -1,8 +1,4 @@ -@@ -38,26 +38,17 @@ - "require-dev": { - "behat/behat": "__VERSION__", - "dantleech/gherkin-lint": "__VERSION__", -- "dealerdirect/phpcodesniffer-composer-installer": "__VERSION__", +@@ -40,17 +40,10 @@ "drevops/behat-format-progress-fail": "__VERSION__", "drevops/behat-screenshot": "__VERSION__", "drevops/behat-steps": "__VERSION__", @@ -10,8 +6,6 @@ - "drupal/coder": "__VERSION__", "drupal/drupal-extension": "__VERSION__", "ergebnis/composer-normalize": "__VERSION__", - "lullabot/mink-selenium2-driver": "__VERSION__", - "lullabot/php-webdriver": "__VERSION__", - "mglaman/phpstan-drupal": "__VERSION__", "mikey179/vfsstream": "__VERSION__", - "palantirnet/drupal-rector": "__VERSION__", @@ -21,11 +15,8 @@ - "phpstan/phpstan": "__VERSION__", "phpunit/phpunit": "__VERSION__", "pyrech/composer-changelogs": "__VERSION__", -- "rector/rector": ">=__VERSION__ <__VERSION__", "softcreatr/jsonpath": "^0.10 || ^1.0", - "vincentlanglet/twig-cs-fixer": "__VERSION__" - }, -@@ -81,11 +72,9 @@ +@@ -76,11 +69,9 @@ "allow-plugins": { "composer/installers": true, "cweagans/composer-patches": true, diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_tests/composer.json b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_tests/composer.json index b769f649c..238bd9934 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_tests/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_tests/composer.json @@ -1,10 +1,9 @@ -@@ -36,15 +36,9 @@ - "webflo/drupal-finder": "__VERSION__" +@@ -35,23 +35,15 @@ + "drush/drush": "__VERSION__" }, "require-dev": { - "behat/behat": "__VERSION__", - "dantleech/gherkin-lint": "__VERSION__", - "dealerdirect/phpcodesniffer-composer-installer": "__VERSION__", - "drevops/behat-format-progress-fail": "__VERSION__", - "drevops/behat-screenshot": "__VERSION__", - "drevops/behat-steps": "__VERSION__", @@ -12,9 +11,7 @@ "drupal/coder": "__VERSION__", - "drupal/drupal-extension": "__VERSION__", "ergebnis/composer-normalize": "__VERSION__", - "lullabot/mink-selenium2-driver": "__VERSION__", - "lullabot/php-webdriver": "__VERSION__", -@@ -52,10 +46,8 @@ + "mglaman/phpstan-drupal": "__VERSION__", "mikey179/vfsstream": "__VERSION__", "palantirnet/drupal-rector": "__VERSION__", "phpcompatibility/php-compatibility": "__VERSION__", @@ -23,9 +20,9 @@ "phpstan/phpstan": "__VERSION__", - "phpunit/phpunit": "__VERSION__", "pyrech/composer-changelogs": "__VERSION__", - "rector/rector": ">=__VERSION__ <__VERSION__", "softcreatr/jsonpath": "^0.10 || ^1.0", -@@ -72,11 +64,6 @@ + "vincentlanglet/twig-cs-fixer": "__VERSION__" +@@ -67,11 +59,6 @@ ], "minimum-stability": "stable", "prefer-stable": true, diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_tests/rector.php b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_tests/rector.php index c8109937d..19dacf74b 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_tests/rector.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_tests/rector.php @@ -1,12 +1,12 @@ -@@ -35,7 +35,6 @@ - use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector; +@@ -36,7 +36,6 @@ use Rector\Php80\Rector\Switch_\ChangeSwitchToMatchRector; use Rector\Php81\Rector\Array_\ArrayToFirstClassCallableRector; + use Rector\Php83\Rector\ClassMethod\AddOverrideAttributeToOverriddenMethodsRector; -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; -@@ -83,8 +82,6 @@ +@@ -87,8 +86,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() @@ -15,7 +15,7 @@ // Code quality improvement sets. ->withPreparedSets( codeQuality: TRUE, -@@ -103,7 +100,6 @@ +@@ -107,7 +104,6 @@ // Additional rules. ->withRules([ DeclareStrictTypesRector::class, diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_tests_circleci/composer.json b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_tests_circleci/composer.json index b769f649c..238bd9934 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_tests_circleci/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_tests_circleci/composer.json @@ -1,10 +1,9 @@ -@@ -36,15 +36,9 @@ - "webflo/drupal-finder": "__VERSION__" +@@ -35,23 +35,15 @@ + "drush/drush": "__VERSION__" }, "require-dev": { - "behat/behat": "__VERSION__", - "dantleech/gherkin-lint": "__VERSION__", - "dealerdirect/phpcodesniffer-composer-installer": "__VERSION__", - "drevops/behat-format-progress-fail": "__VERSION__", - "drevops/behat-screenshot": "__VERSION__", - "drevops/behat-steps": "__VERSION__", @@ -12,9 +11,7 @@ "drupal/coder": "__VERSION__", - "drupal/drupal-extension": "__VERSION__", "ergebnis/composer-normalize": "__VERSION__", - "lullabot/mink-selenium2-driver": "__VERSION__", - "lullabot/php-webdriver": "__VERSION__", -@@ -52,10 +46,8 @@ + "mglaman/phpstan-drupal": "__VERSION__", "mikey179/vfsstream": "__VERSION__", "palantirnet/drupal-rector": "__VERSION__", "phpcompatibility/php-compatibility": "__VERSION__", @@ -23,9 +20,9 @@ "phpstan/phpstan": "__VERSION__", - "phpunit/phpunit": "__VERSION__", "pyrech/composer-changelogs": "__VERSION__", - "rector/rector": ">=__VERSION__ <__VERSION__", "softcreatr/jsonpath": "^0.10 || ^1.0", -@@ -72,11 +64,6 @@ + "vincentlanglet/twig-cs-fixer": "__VERSION__" +@@ -67,11 +59,6 @@ ], "minimum-stability": "stable", "prefer-stable": true, diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_tests_circleci/rector.php b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_tests_circleci/rector.php index c8109937d..19dacf74b 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_tests_circleci/rector.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_tests_circleci/rector.php @@ -1,12 +1,12 @@ -@@ -35,7 +35,6 @@ - use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector; +@@ -36,7 +36,6 @@ use Rector\Php80\Rector\Switch_\ChangeSwitchToMatchRector; use Rector\Php81\Rector\Array_\ArrayToFirstClassCallableRector; + use Rector\Php83\Rector\ClassMethod\AddOverrideAttributeToOverriddenMethodsRector; -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; -@@ -83,8 +82,6 @@ +@@ -87,8 +86,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() @@ -15,7 +15,7 @@ // Code quality improvement sets. ->withPreparedSets( codeQuality: TRUE, -@@ -103,7 +100,6 @@ +@@ -107,7 +104,6 @@ // Additional rules. ->withRules([ DeclareStrictTypesRector::class, diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_no_theme/rector.php b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_no_theme/rector.php index c7a7ea853..863611976 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_no_theme/rector.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_no_theme/rector.php @@ -1,4 +1,4 @@ -@@ -44,7 +44,6 @@ +@@ -46,7 +46,6 @@ return RectorConfig::configure() ->withPaths([ __DIR__ . '/web/modules/custom', @@ -6,7 +6,7 @@ __DIR__ . '/web/sites/default/settings.php', __DIR__ . '/web/sites/default/includes', __DIR__ . '/tests', -@@ -65,7 +64,6 @@ +@@ -69,7 +68,6 @@ RemoveAlwaysTrueIfConditionRector::class, RemoveUnusedPublicMethodParameterRector::class => [ __DIR__ . '/web/modules/custom/*/src/Hook/*', diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_no_theme_circleci/rector.php b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_no_theme_circleci/rector.php index c7a7ea853..863611976 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_no_theme_circleci/rector.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_no_theme_circleci/rector.php @@ -1,4 +1,4 @@ -@@ -44,7 +44,6 @@ +@@ -46,7 +46,6 @@ return RectorConfig::configure() ->withPaths([ __DIR__ . '/web/modules/custom', @@ -6,7 +6,7 @@ __DIR__ . '/web/sites/default/settings.php', __DIR__ . '/web/sites/default/includes', __DIR__ . '/tests', -@@ -65,7 +64,6 @@ +@@ -69,7 +68,6 @@ RemoveAlwaysTrueIfConditionRector::class, RemoveUnusedPublicMethodParameterRector::class => [ __DIR__ . '/web/modules/custom/*/src/Hook/*', diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat/composer.json b/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat/composer.json index 4c9aa262d..f275b2cda 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat/composer.json @@ -1,10 +1,9 @@ -@@ -36,15 +36,9 @@ - "webflo/drupal-finder": "__VERSION__" +@@ -35,14 +35,8 @@ + "drush/drush": "__VERSION__" }, "require-dev": { - "behat/behat": "__VERSION__", - "dantleech/gherkin-lint": "__VERSION__", - "dealerdirect/phpcodesniffer-composer-installer": "__VERSION__", - "drevops/behat-format-progress-fail": "__VERSION__", - "drevops/behat-screenshot": "__VERSION__", - "drevops/behat-steps": "__VERSION__", @@ -12,5 +11,5 @@ "drupal/coder": "__VERSION__", - "drupal/drupal-extension": "__VERSION__", "ergebnis/composer-normalize": "__VERSION__", - "lullabot/mink-selenium2-driver": "__VERSION__", - "lullabot/php-webdriver": "__VERSION__", + "mglaman/phpstan-drupal": "__VERSION__", + "mikey179/vfsstream": "__VERSION__", diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat/rector.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat/rector.php index b032c984e..f9623cd20 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat/rector.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat/rector.php @@ -1,4 +1,4 @@ -@@ -83,8 +83,6 @@ +@@ -87,8 +87,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() diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat_circleci/composer.json b/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat_circleci/composer.json index 4c9aa262d..f275b2cda 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat_circleci/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat_circleci/composer.json @@ -1,10 +1,9 @@ -@@ -36,15 +36,9 @@ - "webflo/drupal-finder": "__VERSION__" +@@ -35,14 +35,8 @@ + "drush/drush": "__VERSION__" }, "require-dev": { - "behat/behat": "__VERSION__", - "dantleech/gherkin-lint": "__VERSION__", - "dealerdirect/phpcodesniffer-composer-installer": "__VERSION__", - "drevops/behat-format-progress-fail": "__VERSION__", - "drevops/behat-screenshot": "__VERSION__", - "drevops/behat-steps": "__VERSION__", @@ -12,5 +11,5 @@ "drupal/coder": "__VERSION__", - "drupal/drupal-extension": "__VERSION__", "ergebnis/composer-normalize": "__VERSION__", - "lullabot/mink-selenium2-driver": "__VERSION__", - "lullabot/php-webdriver": "__VERSION__", + "mglaman/phpstan-drupal": "__VERSION__", + "mikey179/vfsstream": "__VERSION__", diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat_circleci/rector.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat_circleci/rector.php index b032c984e..f9623cd20 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat_circleci/rector.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat_circleci/rector.php @@ -1,4 +1,4 @@ -@@ -83,8 +83,6 @@ +@@ -87,8 +87,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() diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_eslint_no_theme/rector.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_eslint_no_theme/rector.php index c7a7ea853..863611976 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_eslint_no_theme/rector.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_eslint_no_theme/rector.php @@ -1,4 +1,4 @@ -@@ -44,7 +44,6 @@ +@@ -46,7 +46,6 @@ return RectorConfig::configure() ->withPaths([ __DIR__ . '/web/modules/custom', @@ -6,7 +6,7 @@ __DIR__ . '/web/sites/default/settings.php', __DIR__ . '/web/sites/default/includes', __DIR__ . '/tests', -@@ -65,7 +64,6 @@ +@@ -69,7 +68,6 @@ RemoveAlwaysTrueIfConditionRector::class, RemoveUnusedPublicMethodParameterRector::class => [ __DIR__ . '/web/modules/custom/*/src/Hook/*', diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpcs/composer.json b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpcs/composer.json index 573636779..dc2f44412 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpcs/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpcs/composer.json @@ -1,8 +1,4 @@ -@@ -38,12 +38,9 @@ - "require-dev": { - "behat/behat": "__VERSION__", - "dantleech/gherkin-lint": "__VERSION__", -- "dealerdirect/phpcodesniffer-composer-installer": "__VERSION__", +@@ -40,14 +40,11 @@ "drevops/behat-format-progress-fail": "__VERSION__", "drevops/behat-screenshot": "__VERSION__", "drevops/behat-steps": "__VERSION__", @@ -10,8 +6,6 @@ - "drupal/coder": "__VERSION__", "drupal/drupal-extension": "__VERSION__", "ergebnis/composer-normalize": "__VERSION__", - "lullabot/mink-selenium2-driver": "__VERSION__", -@@ -51,7 +48,6 @@ "mglaman/phpstan-drupal": "__VERSION__", "mikey179/vfsstream": "__VERSION__", "palantirnet/drupal-rector": "__VERSION__", @@ -19,7 +13,7 @@ "phpspec/prophecy-phpunit": "__VERSION__", "phpstan/extension-installer": "__VERSION__", "phpstan/phpstan": "__VERSION__", -@@ -81,7 +77,6 @@ +@@ -76,7 +73,6 @@ "allow-plugins": { "composer/installers": true, "cweagans/composer-patches": true, diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpcs_circleci/composer.json b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpcs_circleci/composer.json index 573636779..dc2f44412 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpcs_circleci/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpcs_circleci/composer.json @@ -1,8 +1,4 @@ -@@ -38,12 +38,9 @@ - "require-dev": { - "behat/behat": "__VERSION__", - "dantleech/gherkin-lint": "__VERSION__", -- "dealerdirect/phpcodesniffer-composer-installer": "__VERSION__", +@@ -40,14 +40,11 @@ "drevops/behat-format-progress-fail": "__VERSION__", "drevops/behat-screenshot": "__VERSION__", "drevops/behat-steps": "__VERSION__", @@ -10,8 +6,6 @@ - "drupal/coder": "__VERSION__", "drupal/drupal-extension": "__VERSION__", "ergebnis/composer-normalize": "__VERSION__", - "lullabot/mink-selenium2-driver": "__VERSION__", -@@ -51,7 +48,6 @@ "mglaman/phpstan-drupal": "__VERSION__", "mikey179/vfsstream": "__VERSION__", "palantirnet/drupal-rector": "__VERSION__", @@ -19,7 +13,7 @@ "phpspec/prophecy-phpunit": "__VERSION__", "phpstan/extension-installer": "__VERSION__", "phpstan/phpstan": "__VERSION__", -@@ -81,7 +77,6 @@ +@@ -76,7 +73,6 @@ "allow-plugins": { "composer/installers": true, "cweagans/composer-patches": true, diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpstan/composer.json b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpstan/composer.json index 17bfb5b10..81333b6fd 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpstan/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpstan/composer.json @@ -1,7 +1,7 @@ -@@ -48,13 +48,10 @@ +@@ -44,13 +44,10 @@ + "drupal/coder": "__VERSION__", + "drupal/drupal-extension": "__VERSION__", "ergebnis/composer-normalize": "__VERSION__", - "lullabot/mink-selenium2-driver": "__VERSION__", - "lullabot/php-webdriver": "__VERSION__", - "mglaman/phpstan-drupal": "__VERSION__", "mikey179/vfsstream": "__VERSION__", "palantirnet/drupal-rector": "__VERSION__", @@ -11,8 +11,8 @@ - "phpstan/phpstan": "__VERSION__", "phpunit/phpunit": "__VERSION__", "pyrech/composer-changelogs": "__VERSION__", - "rector/rector": ">=__VERSION__ <__VERSION__", -@@ -85,7 +82,6 @@ + "softcreatr/jsonpath": "^0.10 || ^1.0", +@@ -80,7 +77,6 @@ "drupal/core-composer-scaffold": true, "ergebnis/composer-normalize": true, "php-http/discovery": true, diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpstan_circleci/composer.json b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpstan_circleci/composer.json index 17bfb5b10..81333b6fd 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpstan_circleci/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpstan_circleci/composer.json @@ -1,7 +1,7 @@ -@@ -48,13 +48,10 @@ +@@ -44,13 +44,10 @@ + "drupal/coder": "__VERSION__", + "drupal/drupal-extension": "__VERSION__", "ergebnis/composer-normalize": "__VERSION__", - "lullabot/mink-selenium2-driver": "__VERSION__", - "lullabot/php-webdriver": "__VERSION__", - "mglaman/phpstan-drupal": "__VERSION__", "mikey179/vfsstream": "__VERSION__", "palantirnet/drupal-rector": "__VERSION__", @@ -11,8 +11,8 @@ - "phpstan/phpstan": "__VERSION__", "phpunit/phpunit": "__VERSION__", "pyrech/composer-changelogs": "__VERSION__", - "rector/rector": ">=__VERSION__ <__VERSION__", -@@ -85,7 +82,6 @@ + "softcreatr/jsonpath": "^0.10 || ^1.0", +@@ -80,7 +77,6 @@ "drupal/core-composer-scaffold": true, "ergebnis/composer-normalize": true, "php-http/discovery": true, diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpunit/composer.json b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpunit/composer.json index 31709efbe..b6640d2d6 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpunit/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpunit/composer.json @@ -1,4 +1,4 @@ -@@ -52,10 +52,8 @@ +@@ -48,10 +48,8 @@ "mikey179/vfsstream": "__VERSION__", "palantirnet/drupal-rector": "__VERSION__", "phpcompatibility/php-compatibility": "__VERSION__", @@ -7,9 +7,9 @@ "phpstan/phpstan": "__VERSION__", - "phpunit/phpunit": "__VERSION__", "pyrech/composer-changelogs": "__VERSION__", - "rector/rector": ">=__VERSION__ <__VERSION__", "softcreatr/jsonpath": "^0.10 || ^1.0", -@@ -72,11 +70,6 @@ + "vincentlanglet/twig-cs-fixer": "__VERSION__" +@@ -67,11 +65,6 @@ ], "minimum-stability": "stable", "prefer-stable": true, diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpunit/rector.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpunit/rector.php index 09dd85457..fbb8c6525 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpunit/rector.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpunit/rector.php @@ -1,12 +1,12 @@ -@@ -35,7 +35,6 @@ - use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector; +@@ -36,7 +36,6 @@ use Rector\Php80\Rector\Switch_\ChangeSwitchToMatchRector; use Rector\Php81\Rector\Array_\ArrayToFirstClassCallableRector; + use Rector\Php83\Rector\ClassMethod\AddOverrideAttributeToOverriddenMethodsRector; -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; -@@ -103,7 +102,6 @@ +@@ -107,7 +106,6 @@ // Additional rules. ->withRules([ DeclareStrictTypesRector::class, diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpunit_circleci/composer.json b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpunit_circleci/composer.json index 31709efbe..b6640d2d6 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpunit_circleci/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpunit_circleci/composer.json @@ -1,4 +1,4 @@ -@@ -52,10 +52,8 @@ +@@ -48,10 +48,8 @@ "mikey179/vfsstream": "__VERSION__", "palantirnet/drupal-rector": "__VERSION__", "phpcompatibility/php-compatibility": "__VERSION__", @@ -7,9 +7,9 @@ "phpstan/phpstan": "__VERSION__", - "phpunit/phpunit": "__VERSION__", "pyrech/composer-changelogs": "__VERSION__", - "rector/rector": ">=__VERSION__ <__VERSION__", "softcreatr/jsonpath": "^0.10 || ^1.0", -@@ -72,11 +70,6 @@ + "vincentlanglet/twig-cs-fixer": "__VERSION__" +@@ -67,11 +65,6 @@ ], "minimum-stability": "stable", "prefer-stable": true, diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpunit_circleci/rector.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpunit_circleci/rector.php index 09dd85457..fbb8c6525 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpunit_circleci/rector.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpunit_circleci/rector.php @@ -1,12 +1,12 @@ -@@ -35,7 +35,6 @@ - use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector; +@@ -36,7 +36,6 @@ use Rector\Php80\Rector\Switch_\ChangeSwitchToMatchRector; use Rector\Php81\Rector\Array_\ArrayToFirstClassCallableRector; + use Rector\Php83\Rector\ClassMethod\AddOverrideAttributeToOverriddenMethodsRector; -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; -@@ -103,7 +102,6 @@ +@@ -107,7 +106,6 @@ // Additional rules. ->withRules([ DeclareStrictTypesRector::class, diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_rector/composer.json b/.vortex/installer/tests/Fixtures/handler_process/tools_no_rector/composer.json index 97ac61cdc..8521d5fe5 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_rector/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_rector/composer.json @@ -1,16 +1,8 @@ -@@ -50,7 +50,6 @@ - "lullabot/php-webdriver": "__VERSION__", +@@ -46,7 +46,6 @@ + "ergebnis/composer-normalize": "__VERSION__", "mglaman/phpstan-drupal": "__VERSION__", "mikey179/vfsstream": "__VERSION__", - "palantirnet/drupal-rector": "__VERSION__", "phpcompatibility/php-compatibility": "__VERSION__", "phpspec/prophecy-phpunit": "__VERSION__", "phpstan/extension-installer": "__VERSION__", -@@ -57,7 +56,6 @@ - "phpstan/phpstan": "__VERSION__", - "phpunit/phpunit": "__VERSION__", - "pyrech/composer-changelogs": "__VERSION__", -- "rector/rector": ">=__VERSION__ <__VERSION__", - "softcreatr/jsonpath": "^0.10 || ^1.0", - "vincentlanglet/twig-cs-fixer": "__VERSION__" - }, diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_rector_circleci/composer.json b/.vortex/installer/tests/Fixtures/handler_process/tools_no_rector_circleci/composer.json index 97ac61cdc..8521d5fe5 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_rector_circleci/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_rector_circleci/composer.json @@ -1,16 +1,8 @@ -@@ -50,7 +50,6 @@ - "lullabot/php-webdriver": "__VERSION__", +@@ -46,7 +46,6 @@ + "ergebnis/composer-normalize": "__VERSION__", "mglaman/phpstan-drupal": "__VERSION__", "mikey179/vfsstream": "__VERSION__", - "palantirnet/drupal-rector": "__VERSION__", "phpcompatibility/php-compatibility": "__VERSION__", "phpspec/prophecy-phpunit": "__VERSION__", "phpstan/extension-installer": "__VERSION__", -@@ -57,7 +56,6 @@ - "phpstan/phpstan": "__VERSION__", - "phpunit/phpunit": "__VERSION__", - "pyrech/composer-changelogs": "__VERSION__", -- "rector/rector": ">=__VERSION__ <__VERSION__", - "softcreatr/jsonpath": "^0.10 || ^1.0", - "vincentlanglet/twig-cs-fixer": "__VERSION__" - }, diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_stylelint_no_theme/rector.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_stylelint_no_theme/rector.php index c7a7ea853..863611976 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_stylelint_no_theme/rector.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_stylelint_no_theme/rector.php @@ -1,4 +1,4 @@ -@@ -44,7 +44,6 @@ +@@ -46,7 +46,6 @@ return RectorConfig::configure() ->withPaths([ __DIR__ . '/web/modules/custom', @@ -6,7 +6,7 @@ __DIR__ . '/web/sites/default/settings.php', __DIR__ . '/web/sites/default/includes', __DIR__ . '/tests', -@@ -65,7 +64,6 @@ +@@ -69,7 +68,6 @@ RemoveAlwaysTrueIfConditionRector::class, RemoveUnusedPublicMethodParameterRector::class => [ __DIR__ . '/web/modules/custom/*/src/Hook/*', diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_twig/composer.json b/.vortex/installer/tests/Fixtures/handler_process/tools_no_twig/composer.json index 762618e52..68844dc9d 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_twig/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_twig/composer.json @@ -1,7 +1,7 @@ -@@ -58,8 +58,7 @@ +@@ -53,8 +53,7 @@ + "phpstan/phpstan": "__VERSION__", "phpunit/phpunit": "__VERSION__", "pyrech/composer-changelogs": "__VERSION__", - "rector/rector": ">=__VERSION__ <__VERSION__", - "softcreatr/jsonpath": "^0.10 || ^1.0", - "vincentlanglet/twig-cs-fixer": "__VERSION__" + "softcreatr/jsonpath": "^0.10 || ^1.0" diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_twig_circleci/composer.json b/.vortex/installer/tests/Fixtures/handler_process/tools_no_twig_circleci/composer.json index 762618e52..68844dc9d 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_twig_circleci/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_twig_circleci/composer.json @@ -1,7 +1,7 @@ -@@ -58,8 +58,7 @@ +@@ -53,8 +53,7 @@ + "phpstan/phpstan": "__VERSION__", "phpunit/phpunit": "__VERSION__", "pyrech/composer-changelogs": "__VERSION__", - "rector/rector": ">=__VERSION__ <__VERSION__", - "softcreatr/jsonpath": "^0.10 || ^1.0", - "vincentlanglet/twig-cs-fixer": "__VERSION__" + "softcreatr/jsonpath": "^0.10 || ^1.0" diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_none/composer.json b/.vortex/installer/tests/Fixtures/handler_process/tools_none/composer.json index 98fc28279..c3e6547b4 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_none/composer.json +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_none/composer.json @@ -1,10 +1,9 @@ -@@ -36,30 +36,12 @@ - "webflo/drupal-finder": "__VERSION__" +@@ -35,26 +35,10 @@ + "drush/drush": "__VERSION__" }, "require-dev": { - "behat/behat": "__VERSION__", - "dantleech/gherkin-lint": "__VERSION__", -- "dealerdirect/phpcodesniffer-composer-installer": "__VERSION__", - "drevops/behat-format-progress-fail": "__VERSION__", - "drevops/behat-screenshot": "__VERSION__", - "drevops/behat-steps": "__VERSION__", @@ -12,8 +11,6 @@ - "drupal/coder": "__VERSION__", - "drupal/drupal-extension": "__VERSION__", "ergebnis/composer-normalize": "__VERSION__", - "lullabot/mink-selenium2-driver": "__VERSION__", - "lullabot/php-webdriver": "__VERSION__", - "mglaman/phpstan-drupal": "__VERSION__", "mikey179/vfsstream": "__VERSION__", - "palantirnet/drupal-rector": "__VERSION__", @@ -23,14 +20,13 @@ - "phpstan/phpstan": "__VERSION__", - "phpunit/phpunit": "__VERSION__", "pyrech/composer-changelogs": "__VERSION__", -- "rector/rector": ">=__VERSION__ <__VERSION__", - "softcreatr/jsonpath": "^0.10 || ^1.0", - "vincentlanglet/twig-cs-fixer": "__VERSION__" + "softcreatr/jsonpath": "^0.10 || ^1.0" }, "conflict": { "drupal/drupal": "*" -@@ -72,20 +54,13 @@ +@@ -67,20 +51,13 @@ ], "minimum-stability": "stable", "prefer-stable": true, diff --git a/composer.json b/composer.json index da27da00b..ef5b5ec2e 100644 --- a/composer.json +++ b/composer.json @@ -34,13 +34,11 @@ "drupal/stage_file_proxy": "^4.0.0", "drupal/testmode": "^2.7.2", "drupal/xmlsitemap": "^2.0", - "drush/drush": "^13.7.6", - "webflo/drupal-finder": "^1.3.1" + "drush/drush": "^13.7.6" }, "require-dev": { "behat/behat": "^3.32.0", "dantleech/gherkin-lint": "^0.2.4", - "dealerdirect/phpcodesniffer-composer-installer": "^1.2.1", "drevops/behat-format-progress-fail": "^1.5.1", "drevops/behat-screenshot": "^2.6.0", "drevops/behat-steps": "^3.14.2", @@ -48,18 +46,15 @@ "drupal/coder": "^9.0.1", "drupal/drupal-extension": "^6.1", "ergebnis/composer-normalize": "^2.52.0", - "lullabot/mink-selenium2-driver": "^1.7.4", - "lullabot/php-webdriver": "^2.0.7", "mglaman/phpstan-drupal": "^2.1.2", "mikey179/vfsstream": "^1.6.12", - "palantirnet/drupal-rector": "^1.1.2", + "palantirnet/drupal-rector": "^1.1.3", "phpcompatibility/php-compatibility": "^10.0@alpha", "phpspec/prophecy-phpunit": "^2.5", "phpstan/extension-installer": "^1.4.3", "phpstan/phpstan": "^2.2.10", "phpunit/phpunit": "^11.5.56", "pyrech/composer-changelogs": "^2.2", - "rector/rector": ">=2.6.4 <2.6.5", "softcreatr/jsonpath": "^0.10 || ^1.0", "vincentlanglet/twig-cs-fixer": "^4.1.0" }, diff --git a/rector.php b/rector.php index cd506a9b8..814a07710 100644 --- a/rector.php +++ b/rector.php @@ -35,10 +35,12 @@ use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector; use Rector\Php80\Rector\Switch_\ChangeSwitchToMatchRector; use Rector\Php81\Rector\Array_\ArrayToFirstClassCallableRector; +use Rector\Php83\Rector\ClassMethod\AddOverrideAttributeToOverriddenMethodsRector; 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; +use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector; use Rector\TypeDeclaration\Rector\StmtsAwareInterface\DeclareStrictTypesRector; return RectorConfig::configure() @@ -51,10 +53,12 @@ ]) ->withSkip([ // Specific rules to skip based on project coding standards. + AddOverrideAttributeToOverriddenMethodsRector::class, ArrayToFirstClassCallableRector::class, CatchExceptionNameMatchingTypeRector::class, ChangeSwitchToMatchRector::class, CompleteDynamicPropertiesRector::class, + DisallowedEmptyRuleFixerRector::class, InlineArrayReturnAssignRector::class, NewlineAfterStatementRector::class, NewlineBeforeNewAssignSetRector::class,