diff --git a/.vortex/docs/content/drupal/composer.mdx b/.vortex/docs/content/drupal/composer.mdx index 7ef1a50d3..e1f850e2d 100644 --- a/.vortex/docs/content/drupal/composer.mdx +++ b/.vortex/docs/content/drupal/composer.mdx @@ -141,6 +141,10 @@ effective development environment. Behavior-Driven Development (BDD), allowing you to write human-readable stories that describe the behavior of your application. It facilitates communication between developers, stakeholders, and clients. +- [`dantleech/gherkin-lint`](https://github.com/dantleech/gherkin-lint): A + linting tool for Gherkin feature files used in Behat tests. Ensures + consistency and quality in BDD test scenarios by checking syntax and + formatting. - [`dealerdirect/phpcodesniffer-composer-installer`](https://github.com/Dealerdirect/phpcodesniffer-composer-installer): This tool automatically configures PHP_CodeSniffer to use the coding standards (like PSR-2 or Drupal coding standards) installed in a project. @@ -154,10 +158,12 @@ effective development environment. collection of pre-defined step definitions for Behat. This package speeds up the process of writing new Behat tests by providing common step implementations. -- [`drupal/core-dev`](https://www.drupal.org/project/drupal): Includes - development-specific dependencies and tools primarily for testing and code - analysis, including PHPUnit, PHP_CodeSniffer with rules ( - via [Coder](https://www.drupal.org/project/coder) module). +- [`drevops/phpcs-standard`](https://github.com/drevops/phpcs-standard): A + custom PHP_CodeSniffer coding standard that extends Drupal coding standards + with additional rules and best practices specific to DrevOps projects. +- [`drupal/coder`](https://www.drupal.org/project/coder): Provides + PHP_CodeSniffer rules for Drupal coding standards. Version 9.x supports + PHP_CodeSniffer 4.x and includes updated rules for modern Drupal development. - [`drupal/drupal-extension`](https://github.com/jhedstrom/drupalextension): A Behat extension that provides integration with Drupal, offering step definitions specific to Drupal functionality. It facilitates the creation and @@ -173,7 +179,7 @@ effective development environment. - [`phpcompatibility/php-compatibility`](https://github.com/PHPCompatibility/PHPCompatibility): Provides a collection of sniffs for PHP_CodeSniffer to check PHP code for compatibility with different PHP versions, crucial for ensuring long-term - maintainability. + maintainability. Version 10.x supports PHP_CodeSniffer 4.x. - [`phpmd/phpmd`](https://github.com/phpmd/phpmd): PHP Mess Detector is a user-friendly tool that helps you detect several potential problems in your PHP code, including possible bugs, suboptimal code, and overcomplicated @@ -184,10 +190,22 @@ effective development environment. - [`phpstan/extension-installer`](https://github.com/phpstan/extension-installer): This package automatically installs and enables PHPStan extensions, streamlining the setup process for PHPStan in your project. +- [`phpstan/phpstan`](https://github.com/phpstan/phpstan): A static analysis + tool for PHP that focuses on finding bugs in code without running it. Helps + catch type errors, incorrect method calls, and other potential issues during + development. +- [`phpunit/phpunit`](https://github.com/sebastianbergmann/phpunit): The + industry-standard testing framework for PHP. Provides a comprehensive set of + tools for writing and running unit tests, integration tests, and functional + tests. - [`pyrech/composer-changelogs`](https://github.com/pyrech/composer-changelogs): Provides a summary of package changes (like updates, removals, and additions) after running `composer update`, improving the visibility of package changes and updates in your project. +- [`rector/rector`](https://github.com/rectorphp/rector): An automated + refactoring tool that instantly upgrades and refactors PHP code. Helps with + code modernization, framework migrations, and automated application of coding + standards. - [`vincentlanglet/twig-cs-fixer`](https://github.com/VincentLanglet/Twig-CS-Fixer): This tool ensures that Twig templates adhere to a set coding standard, helping maintain consistency and readability in template files. diff --git a/.vortex/docs/cspell.json b/.vortex/docs/cspell.json index a3bbeb6a0..1c4853e87 100644 --- a/.vortex/docs/cspell.json +++ b/.vortex/docs/cspell.json @@ -29,6 +29,7 @@ "containerisation", "customisations", "cweagans", + "dantleech", "dclint", "ddev", "dealerdirect", diff --git a/.vortex/installer/composer.json b/.vortex/installer/composer.json index 612d13afa..a20e9765d 100644 --- a/.vortex/installer/composer.json +++ b/.vortex/installer/composer.json @@ -37,7 +37,7 @@ "bamarni/composer-bin-plugin": "^1.8.2", "dealerdirect/phpcodesniffer-composer-installer": "^1.2.0", "drevops/phpcs-standard": "^0.6", - "drupal/coder": "^8.3.31", + "drupal/coder": "^9@alpha", "ergebnis/composer-normalize": "^2.48.2", "laravel/serializable-closure": "^2.0.6", "mockery/mockery": "^1.6.12", diff --git a/.vortex/installer/composer.lock b/.vortex/installer/composer.lock index c63a656dd..bf96b6fac 100644 --- a/.vortex/installer/composer.lock +++ b/.vortex/installer/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9a54918fdedb0672eb01a67375ef1c48", + "content-hash": "6497c1e1d3894ddb90fecf9eba3e7ba4", "packages": [ { "name": "alexskrypnyk/file", @@ -3811,30 +3811,30 @@ }, { "name": "drupal/coder", - "version": "8.3.31", + "version": "9.0.0-alpha2", "source": { "type": "git", "url": "https://github.com/pfrenssen/coder.git", - "reference": "07c14cf2217c2b53cc4469e2ed360141e6bb18ea" + "reference": "1e0bfdd0d273bbb71dd35b76df5cacaafde9f9bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pfrenssen/coder/zipball/07c14cf2217c2b53cc4469e2ed360141e6bb18ea", - "reference": "07c14cf2217c2b53cc4469e2ed360141e6bb18ea", + "url": "https://api.github.com/repos/pfrenssen/coder/zipball/1e0bfdd0d273bbb71dd35b76df5cacaafde9f9bd", + "reference": "1e0bfdd0d273bbb71dd35b76df5cacaafde9f9bd", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1 || ^1.0.0", "ext-mbstring": "*", - "php": ">=7.2", - "sirbrillig/phpcs-variable-analysis": "^2.11.7", - "slevomat/coding-standard": "^8.11", - "squizlabs/php_codesniffer": "^3.13", + "php": ">=7.4", + "sirbrillig/phpcs-variable-analysis": "^2.13", + "slevomat/coding-standard": "^8.24", + "squizlabs/php_codesniffer": "^4.0.1", "symfony/yaml": ">=3.4.0" }, "require-dev": { "phpstan/phpstan": "^1.7.12", - "phpunit/phpunit": "^8.0" + "phpunit/phpunit": "^9.0" }, "type": "phpcodesniffer-standard", "autoload": { @@ -3858,7 +3858,7 @@ "issues": "https://www.drupal.org/project/issues/coder", "source": "https://www.drupal.org/project/coder" }, - "time": "2025-10-16T12:23:49+00:00" + "time": "2025-11-23T17:29:29+00:00" }, { "name": "ergebnis/composer-normalize", @@ -6297,32 +6297,32 @@ }, { "name": "slevomat/coding-standard", - "version": "8.22.1", + "version": "8.25.1", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "1dd80bf3b93692bedb21a6623c496887fad05fec" + "reference": "4caa5ec5a30b84b2305e80159c710d437f40cc40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/1dd80bf3b93692bedb21a6623c496887fad05fec", - "reference": "1dd80bf3b93692bedb21a6623c496887fad05fec", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/4caa5ec5a30b84b2305e80159c710d437f40cc40", + "reference": "4caa5ec5a30b84b2305e80159c710d437f40cc40", "shasum": "" }, "require": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.1.2", + "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.2.0", "php": "^7.4 || ^8.0", "phpstan/phpdoc-parser": "^2.3.0", - "squizlabs/php_codesniffer": "^3.13.4" + "squizlabs/php_codesniffer": "^4.0.1" }, "require-dev": { "phing/phing": "3.0.1|3.1.0", "php-parallel-lint/php-parallel-lint": "1.4.0", - "phpstan/phpstan": "2.1.24", + "phpstan/phpstan": "2.1.32", "phpstan/phpstan-deprecation-rules": "2.0.3", - "phpstan/phpstan-phpunit": "2.0.7", - "phpstan/phpstan-strict-rules": "2.0.6", - "phpunit/phpunit": "9.6.8|10.5.48|11.4.4|11.5.36|12.3.10" + "phpstan/phpstan-phpunit": "2.0.8", + "phpstan/phpstan-strict-rules": "2.0.7", + "phpunit/phpunit": "9.6.8|10.5.48|11.4.4|11.5.36|12.4.4" }, "type": "phpcodesniffer-standard", "extra": { @@ -6346,7 +6346,7 @@ ], "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/8.22.1" + "source": "https://github.com/slevomat/coding-standard/tree/8.25.1" }, "funding": [ { @@ -6358,30 +6358,30 @@ "type": "tidelift" } ], - "time": "2025-09-13T08:53:30+00:00" + "time": "2025-11-25T18:01:43+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.13.5", + "version": "4.0.1", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "0ca86845ce43291e8f5692c7356fccf3bcf02bf4" + "reference": "0525c73950de35ded110cffafb9892946d7771b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/0ca86845ce43291e8f5692c7356fccf3bcf02bf4", - "reference": "0ca86845ce43291e8f5692c7356fccf3bcf02bf4", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/0525c73950de35ded110cffafb9892946d7771b5", + "reference": "0525c73950de35ded110cffafb9892946d7771b5", "shasum": "" }, "require": { "ext-simplexml": "*", "ext-tokenizer": "*", "ext-xmlwriter": "*", - "php": ">=5.4.0" + "php": ">=7.2.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" + "phpunit/phpunit": "^8.4.0 || ^9.3.4 || ^10.5.32 || 11.3.3 - 11.5.28 || ^11.5.31" }, "bin": [ "bin/phpcbf", @@ -6406,7 +6406,7 @@ "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors" } ], - "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "description": "PHP_CodeSniffer tokenizes PHP files and detects violations of a defined set of coding standards.", "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer", "keywords": [ "phpcs", @@ -6437,7 +6437,7 @@ "type": "thanks_dev" } ], - "time": "2025-11-04T16:30:35+00:00" + "time": "2025-11-10T16:43:36+00:00" }, { "name": "staabm/side-effects-detector", @@ -6544,7 +6544,9 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": {}, + "stability-flags": { + "drupal/coder": 15 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { diff --git a/.vortex/installer/src/Prompts/Handlers/Tools.php b/.vortex/installer/src/Prompts/Handlers/Tools.php index d9d1ef74d..a751f8bf8 100644 --- a/.vortex/installer/src/Prompts/Handlers/Tools.php +++ b/.vortex/installer/src/Prompts/Handlers/Tools.php @@ -181,12 +181,16 @@ public static function getToolDefinitions(string $filter = 'all'): array { 'present' => fn(): mixed => File::contains($this->dstDir . '/composer.json', 'dealerdirect/phpcodesniffer-composer-installer') || File::contains($this->dstDir . '/composer.json', 'drupal/coder') || File::contains($this->dstDir . '/composer.json', 'squizlabs/php_codesniffer') || + File::contains($this->dstDir . '/composer.json', 'phpcompatibility/php-compatibility') || + File::contains($this->dstDir . '/composer.json', 'drevops/phpcs-standard') || File::exists($this->dstDir . '/phpcs.xml'), 'composer.json' => function (JsonManipulator $cj): void { $cj->removeSubNode('require-dev', 'dealerdirect/phpcodesniffer-composer-installer'); $cj->removeConfigSetting('allow-plugins.dealerdirect/phpcodesniffer-composer-installer'); $cj->removeSubNode('require-dev', 'drupal/coder'); $cj->removeSubNode('require-dev', 'squizlabs/php_codesniffer'); + $cj->removeSubNode('require-dev', 'phpcompatibility/php-compatibility'); + $cj->removeSubNode('require-dev', 'drevops/phpcs-standard'); }, 'files' => ['phpcs.xml'], 'strings' => [ @@ -200,10 +204,13 @@ public static function getToolDefinitions(string $filter = 'all'): array { 'title' => 'PHPStan', 'present' => fn(): mixed => File::contains($this->dstDir . '/composer.json', 'phpstan/phpstan') || File::contains($this->dstDir . '/composer.json', 'mglaman/phpstan-drupal') || + File::contains($this->dstDir . '/composer.json', 'phpstan/extension-installer') || File::exists($this->dstDir . '/phpstan.neon'), 'composer.json' => function (JsonManipulator $cj): void { $cj->removeSubNode('require-dev', 'phpstan/phpstan'); $cj->removeSubNode('require-dev', 'mglaman/phpstan-drupal'); + $cj->removeSubNode('require-dev', 'phpstan/extension-installer'); + $cj->removeConfigSetting('allow-plugins.phpstan/extension-installer'); }, 'files' => ['phpstan.neon'], 'strings' => [ @@ -220,6 +227,7 @@ public static function getToolDefinitions(string $filter = 'all'): array { File::exists($this->dstDir . '/rector.php'), 'composer.json' => function (JsonManipulator $cj): void { $cj->removeSubNode('require-dev', 'rector/rector'); + $cj->removeSubNode('require-dev', 'palantirnet/drupal-rector'); }, 'files' => ['rector.php'], 'strings' => ['/^.*\brector\b.*\n?/m'], @@ -244,9 +252,11 @@ public static function getToolDefinitions(string $filter = 'all'): array { self::PHPUNIT => [ 'title' => 'PHPUnit', 'present' => fn(): mixed => File::contains($this->dstDir . '/composer.json', 'phpunit/phpunit') || + File::contains($this->dstDir . '/composer.json', 'phpspec/prophecy-phpunit') || File::exists($this->dstDir . '/phpunit.xml'), 'composer.json' => function (JsonManipulator $cj): void { $cj->removeSubNode('require-dev', 'phpunit/phpunit'); + $cj->removeSubNode('require-dev', 'phpspec/prophecy-phpunit'); $cj->removeProperty('autoload-dev.classmap'); $cj->removeMainKeyIfEmpty('autoload-dev'); }, @@ -273,11 +283,17 @@ public static function getToolDefinitions(string $filter = 'all'): array { 'title' => 'Behat', 'present' => fn(): mixed => File::contains($this->dstDir . '/composer.json', 'behat/behat') || File::contains($this->dstDir . '/composer.json', 'drupal/drupal-extension') || + File::contains($this->dstDir . '/composer.json', 'drevops/behat-format-progress-fail') || + File::contains($this->dstDir . '/composer.json', 'drevops/behat-screenshot') || + File::contains($this->dstDir . '/composer.json', 'drevops/behat-steps') || File::exists($this->dstDir . '/behat.yml'), 'composer.json' => function (JsonManipulator $cj): void { $cj->removeSubNode('require-dev', 'behat/behat'); $cj->removeSubNode('require-dev', 'drupal/drupal-extension'); $cj->removeSubNode('require-dev', 'dantleech/gherkin-lint'); + $cj->removeSubNode('require-dev', 'drevops/behat-format-progress-fail'); + $cj->removeSubNode('require-dev', 'drevops/behat-screenshot'); + $cj->removeSubNode('require-dev', 'drevops/behat-steps'); }, 'files' => [ 'behat.yml', diff --git a/.vortex/installer/tests/Fixtures/install/_baseline/composer.json b/.vortex/installer/tests/Fixtures/install/_baseline/composer.json index 54f3a9bbc..f5da9ebe0 100644 --- a/.vortex/installer/tests/Fixtures/install/_baseline/composer.json +++ b/.vortex/installer/tests/Fixtures/install/_baseline/composer.json @@ -36,16 +36,20 @@ "drevops/behat-screenshot": "__VERSION__", "drevops/behat-steps": "__VERSION__", "drevops/phpcs-standard": "__VERSION__", - "drupal/core-dev": "__VERSION__", + "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__", "phpcompatibility/php-compatibility": "__VERSION__", "phpmd/phpmd": "__VERSION__", "phpspec/prophecy-phpunit": "__VERSION__", "phpstan/extension-installer": "__VERSION__", "phpstan/phpstan": "__VERSION__", + "phpunit/phpunit": "__VERSION__", "pyrech/composer-changelogs": "__VERSION__", "rector/rector": "__VERSION__", "vincentlanglet/twig-cs-fixer": "__VERSION__" diff --git a/.vortex/installer/tests/Fixtures/install/_baseline/web/sites/default/settings.php b/.vortex/installer/tests/Fixtures/install/_baseline/web/sites/default/settings.php index f46942cca..86da65cbc 100644 --- a/.vortex/installer/tests/Fixtures/install/_baseline/web/sites/default/settings.php +++ b/.vortex/installer/tests/Fixtures/install/_baseline/web/sites/default/settings.php @@ -52,6 +52,7 @@ $app_root ??= DRUPAL_ROOT; $site_path ??= 'sites/default'; +// @phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable $contrib_path = $app_root . '/' . (is_dir($app_root . '/modules/contrib') ? 'modules/contrib' : 'modules'); // Public files directory relative to the Drupal root. diff --git a/.vortex/installer/tests/Fixtures/install/ciprovider_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/install/ciprovider_circleci/tests/phpunit/CircleCiConfigTest.php index d07086d21..5beaafefe 100644 --- a/.vortex/installer/tests/Fixtures/install/ciprovider_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/install/ciprovider_circleci/tests/phpunit/CircleCiConfigTest.php @@ -12,7 +12,7 @@ * * Tests for CircleCI configurations. * - * @SuppressWarnings(PHPMD) + * @SuppressWarnings(\PHPMD) * * phpcs:disable Drupal.NamingConventions.ValidVariableName.LowerCamelName * phpcs:disable Drupal.NamingConventions.ValidGlobal.GlobalUnderScore diff --git a/.vortex/installer/tests/Fixtures/install/deploy_types_all_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/install/deploy_types_all_circleci/tests/phpunit/CircleCiConfigTest.php index d07086d21..5beaafefe 100644 --- a/.vortex/installer/tests/Fixtures/install/deploy_types_all_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/install/deploy_types_all_circleci/tests/phpunit/CircleCiConfigTest.php @@ -12,7 +12,7 @@ * * Tests for CircleCI configurations. * - * @SuppressWarnings(PHPMD) + * @SuppressWarnings(\PHPMD) * * phpcs:disable Drupal.NamingConventions.ValidVariableName.LowerCamelName * phpcs:disable Drupal.NamingConventions.ValidGlobal.GlobalUnderScore diff --git a/.vortex/installer/tests/Fixtures/install/deploy_types_none_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/install/deploy_types_none_circleci/tests/phpunit/CircleCiConfigTest.php index d07086d21..5beaafefe 100644 --- a/.vortex/installer/tests/Fixtures/install/deploy_types_none_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/install/deploy_types_none_circleci/tests/phpunit/CircleCiConfigTest.php @@ -12,7 +12,7 @@ * * Tests for CircleCI configurations. * - * @SuppressWarnings(PHPMD) + * @SuppressWarnings(\PHPMD) * * phpcs:disable Drupal.NamingConventions.ValidVariableName.LowerCamelName * phpcs:disable Drupal.NamingConventions.ValidGlobal.GlobalUnderScore diff --git a/.vortex/installer/tests/Fixtures/install/deps_updates_provider_ci_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/install/deps_updates_provider_ci_circleci/tests/phpunit/CircleCiConfigTest.php index d07086d21..5beaafefe 100644 --- a/.vortex/installer/tests/Fixtures/install/deps_updates_provider_ci_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/install/deps_updates_provider_ci_circleci/tests/phpunit/CircleCiConfigTest.php @@ -12,7 +12,7 @@ * * Tests for CircleCI configurations. * - * @SuppressWarnings(PHPMD) + * @SuppressWarnings(\PHPMD) * * phpcs:disable Drupal.NamingConventions.ValidVariableName.LowerCamelName * phpcs:disable Drupal.NamingConventions.ValidGlobal.GlobalUnderScore diff --git a/.vortex/installer/tests/Fixtures/install/hosting_acquia/composer.json b/.vortex/installer/tests/Fixtures/install/hosting_acquia/composer.json index c4b40fc67..3ebe0fe56 100644 --- a/.vortex/installer/tests/Fixtures/install/hosting_acquia/composer.json +++ b/.vortex/installer/tests/Fixtures/install/hosting_acquia/composer.json @@ -1,4 +1,4 @@ -@@ -117,40 +117,40 @@ +@@ -121,40 +121,40 @@ "[web-root]/web.config": false }, "locations": { diff --git a/.vortex/installer/tests/Fixtures/install/hosting_acquia/docroot/sites/default/settings.php b/.vortex/installer/tests/Fixtures/install/hosting_acquia/docroot/sites/default/settings.php index f46942cca..86da65cbc 100644 --- a/.vortex/installer/tests/Fixtures/install/hosting_acquia/docroot/sites/default/settings.php +++ b/.vortex/installer/tests/Fixtures/install/hosting_acquia/docroot/sites/default/settings.php @@ -52,6 +52,7 @@ $app_root ??= DRUPAL_ROOT; $site_path ??= 'sites/default'; +// @phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable $contrib_path = $app_root . '/' . (is_dir($app_root . '/modules/contrib') ? 'modules/contrib' : 'modules'); // Public files directory relative to the Drupal root. diff --git a/.vortex/installer/tests/Fixtures/install/hosting_project_name___acquia/composer.json b/.vortex/installer/tests/Fixtures/install/hosting_project_name___acquia/composer.json index c4b40fc67..3ebe0fe56 100644 --- a/.vortex/installer/tests/Fixtures/install/hosting_project_name___acquia/composer.json +++ b/.vortex/installer/tests/Fixtures/install/hosting_project_name___acquia/composer.json @@ -1,4 +1,4 @@ -@@ -117,40 +117,40 @@ +@@ -121,40 +121,40 @@ "[web-root]/web.config": false }, "locations": { diff --git a/.vortex/installer/tests/Fixtures/install/hosting_project_name___acquia/docroot/sites/default/settings.php b/.vortex/installer/tests/Fixtures/install/hosting_project_name___acquia/docroot/sites/default/settings.php index f46942cca..86da65cbc 100644 --- a/.vortex/installer/tests/Fixtures/install/hosting_project_name___acquia/docroot/sites/default/settings.php +++ b/.vortex/installer/tests/Fixtures/install/hosting_project_name___acquia/docroot/sites/default/settings.php @@ -52,6 +52,7 @@ $app_root ??= DRUPAL_ROOT; $site_path ??= 'sites/default'; +// @phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable $contrib_path = $app_root . '/' . (is_dir($app_root . '/modules/contrib') ? 'modules/contrib' : 'modules'); // Public files directory relative to the Drupal root. diff --git a/.vortex/installer/tests/Fixtures/install/starter_drupal_cms_profile/composer.json b/.vortex/installer/tests/Fixtures/install/starter_drupal_cms_profile/composer.json index fea2aa4ad..47fd72c98 100644 --- a/.vortex/installer/tests/Fixtures/install/starter_drupal_cms_profile/composer.json +++ b/.vortex/installer/tests/Fixtures/install/starter_drupal_cms_profile/composer.json @@ -17,7 +17,7 @@ }, "require-dev": { "behat/behat": "__VERSION__", -@@ -59,7 +62,7 @@ +@@ -63,7 +66,7 @@ "url": "https://packages.drupal.org/8" } ], @@ -26,7 +26,7 @@ "prefer-stable": true, "autoload": { "classmap": [ -@@ -82,7 +85,11 @@ +@@ -86,7 +89,11 @@ "php-http/discovery": true, "phpstan/extension-installer": true, "pyrech/composer-changelogs": true, @@ -39,7 +39,7 @@ }, "audit": { "abandoned": "report", -@@ -162,7 +169,20 @@ +@@ -166,7 +173,20 @@ "patchLevel": { "drupal/core": "-p2" }, diff --git a/.vortex/installer/tests/Fixtures/install/timezone_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/install/timezone_circleci/tests/phpunit/CircleCiConfigTest.php index d07086d21..5beaafefe 100644 --- a/.vortex/installer/tests/Fixtures/install/timezone_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/install/timezone_circleci/tests/phpunit/CircleCiConfigTest.php @@ -12,7 +12,7 @@ * * Tests for CircleCI configurations. * - * @SuppressWarnings(PHPMD) + * @SuppressWarnings(\PHPMD) * * phpcs:disable Drupal.NamingConventions.ValidVariableName.LowerCamelName * phpcs:disable Drupal.NamingConventions.ValidGlobal.GlobalUnderScore diff --git a/.vortex/installer/tests/Fixtures/install/tools_groups_no_be_lint/composer.json b/.vortex/installer/tests/Fixtures/install/tools_groups_no_be_lint/composer.json index d9f843949..0feec5046 100644 --- a/.vortex/installer/tests/Fixtures/install/tools_groups_no_be_lint/composer.json +++ b/.vortex/installer/tests/Fixtures/install/tools_groups_no_be_lint/composer.json @@ -1,4 +1,4 @@ -@@ -31,23 +31,15 @@ +@@ -31,27 +31,17 @@ "require-dev": { "behat/behat": "__VERSION__", "dantleech/gherkin-lint": "__VERSION__", @@ -7,22 +7,26 @@ "drevops/behat-screenshot": "__VERSION__", "drevops/behat-steps": "__VERSION__", - "drevops/phpcs-standard": "__VERSION__", - "drupal/core-dev": "__VERSION__", +- "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__", - "phpcompatibility/php-compatibility": "__VERSION__", +- "phpcompatibility/php-compatibility": "__VERSION__", - "phpmd/phpmd": "__VERSION__", "phpspec/prophecy-phpunit": "__VERSION__", - "phpstan/extension-installer": "__VERSION__", - "phpstan/phpstan": "__VERSION__", + "phpunit/phpunit": "__VERSION__", "pyrech/composer-changelogs": "__VERSION__", - "rector/rector": "__VERSION__", "vincentlanglet/twig-cs-fixer": "__VERSION__" }, "conflict": { -@@ -75,12 +67,10 @@ +@@ -79,12 +69,10 @@ "allow-plugins": { "composer/installers": true, "cweagans/composer-patches": true, diff --git a/.vortex/installer/tests/Fixtures/install/tools_groups_no_be_lint/web/sites/default/settings.php b/.vortex/installer/tests/Fixtures/install/tools_groups_no_be_lint/web/sites/default/settings.php index 6c05abc0f..74bc25974 100644 --- a/.vortex/installer/tests/Fixtures/install/tools_groups_no_be_lint/web/sites/default/settings.php +++ b/.vortex/installer/tests/Fixtures/install/tools_groups_no_be_lint/web/sites/default/settings.php @@ -9,3 +9,11 @@ */ declare(strict_types=1); +@@ -52,7 +48,6 @@ + + $app_root ??= DRUPAL_ROOT; + $site_path ??= 'sites/default'; +-// @phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable + $contrib_path = $app_root . '/' . (is_dir($app_root . '/modules/contrib') ? 'modules/contrib' : 'modules'); + + // Public files directory relative to the Drupal root. diff --git a/.vortex/installer/tests/Fixtures/install/tools_groups_no_be_lint_circleci/composer.json b/.vortex/installer/tests/Fixtures/install/tools_groups_no_be_lint_circleci/composer.json index d9f843949..0feec5046 100644 --- a/.vortex/installer/tests/Fixtures/install/tools_groups_no_be_lint_circleci/composer.json +++ b/.vortex/installer/tests/Fixtures/install/tools_groups_no_be_lint_circleci/composer.json @@ -1,4 +1,4 @@ -@@ -31,23 +31,15 @@ +@@ -31,27 +31,17 @@ "require-dev": { "behat/behat": "__VERSION__", "dantleech/gherkin-lint": "__VERSION__", @@ -7,22 +7,26 @@ "drevops/behat-screenshot": "__VERSION__", "drevops/behat-steps": "__VERSION__", - "drevops/phpcs-standard": "__VERSION__", - "drupal/core-dev": "__VERSION__", +- "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__", - "phpcompatibility/php-compatibility": "__VERSION__", +- "phpcompatibility/php-compatibility": "__VERSION__", - "phpmd/phpmd": "__VERSION__", "phpspec/prophecy-phpunit": "__VERSION__", - "phpstan/extension-installer": "__VERSION__", - "phpstan/phpstan": "__VERSION__", + "phpunit/phpunit": "__VERSION__", "pyrech/composer-changelogs": "__VERSION__", - "rector/rector": "__VERSION__", "vincentlanglet/twig-cs-fixer": "__VERSION__" }, "conflict": { -@@ -75,12 +67,10 @@ +@@ -79,12 +69,10 @@ "allow-plugins": { "composer/installers": true, "cweagans/composer-patches": true, diff --git a/.vortex/installer/tests/Fixtures/install/tools_groups_no_be_lint_circleci/web/sites/default/settings.php b/.vortex/installer/tests/Fixtures/install/tools_groups_no_be_lint_circleci/web/sites/default/settings.php index 6c05abc0f..74bc25974 100644 --- a/.vortex/installer/tests/Fixtures/install/tools_groups_no_be_lint_circleci/web/sites/default/settings.php +++ b/.vortex/installer/tests/Fixtures/install/tools_groups_no_be_lint_circleci/web/sites/default/settings.php @@ -9,3 +9,11 @@ */ declare(strict_types=1); +@@ -52,7 +48,6 @@ + + $app_root ??= DRUPAL_ROOT; + $site_path ??= 'sites/default'; +-// @phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable + $contrib_path = $app_root . '/' . (is_dir($app_root . '/modules/contrib') ? 'modules/contrib' : 'modules'); + + // Public files directory relative to the Drupal root. diff --git a/.vortex/installer/tests/Fixtures/install/tools_groups_no_be_tests/composer.json b/.vortex/installer/tests/Fixtures/install/tools_groups_no_be_tests/composer.json index 5ddfced7c..3d4412cda 100644 --- a/.vortex/installer/tests/Fixtures/install/tools_groups_no_be_tests/composer.json +++ b/.vortex/installer/tests/Fixtures/install/tools_groups_no_be_tests/composer.json @@ -1,4 +1,4 @@ -@@ -29,21 +29,14 @@ +@@ -29,15 +29,9 @@ "webflo/drupal-finder": "__VERSION__" }, "require-dev": { @@ -9,18 +9,23 @@ - "drevops/behat-screenshot": "__VERSION__", - "drevops/behat-steps": "__VERSION__", "drevops/phpcs-standard": "__VERSION__", - "drupal/core-dev": "__VERSION__", + "drupal/coder": "__VERSION__", - "drupal/drupal-extension": "__VERSION__", "ergebnis/composer-normalize": "__VERSION__", - "mglaman/phpstan-drupal": "__VERSION__", + "lullabot/mink-selenium2-driver": "__VERSION__", + "lullabot/php-webdriver": "__VERSION__", +@@ -46,10 +40,8 @@ "palantirnet/drupal-rector": "__VERSION__", "phpcompatibility/php-compatibility": "__VERSION__", "phpmd/phpmd": "__VERSION__", - "phpspec/prophecy-phpunit": "__VERSION__", "phpstan/extension-installer": "__VERSION__", "phpstan/phpstan": "__VERSION__", +- "phpunit/phpunit": "__VERSION__", "pyrech/composer-changelogs": "__VERSION__", -@@ -64,11 +57,6 @@ + "rector/rector": "__VERSION__", + "vincentlanglet/twig-cs-fixer": "__VERSION__" +@@ -68,11 +60,6 @@ "autoload": { "classmap": [ "scripts/composer/ScriptHandler.php" diff --git a/.vortex/installer/tests/Fixtures/install/tools_groups_no_be_tests_circleci/composer.json b/.vortex/installer/tests/Fixtures/install/tools_groups_no_be_tests_circleci/composer.json index 5ddfced7c..3d4412cda 100644 --- a/.vortex/installer/tests/Fixtures/install/tools_groups_no_be_tests_circleci/composer.json +++ b/.vortex/installer/tests/Fixtures/install/tools_groups_no_be_tests_circleci/composer.json @@ -1,4 +1,4 @@ -@@ -29,21 +29,14 @@ +@@ -29,15 +29,9 @@ "webflo/drupal-finder": "__VERSION__" }, "require-dev": { @@ -9,18 +9,23 @@ - "drevops/behat-screenshot": "__VERSION__", - "drevops/behat-steps": "__VERSION__", "drevops/phpcs-standard": "__VERSION__", - "drupal/core-dev": "__VERSION__", + "drupal/coder": "__VERSION__", - "drupal/drupal-extension": "__VERSION__", "ergebnis/composer-normalize": "__VERSION__", - "mglaman/phpstan-drupal": "__VERSION__", + "lullabot/mink-selenium2-driver": "__VERSION__", + "lullabot/php-webdriver": "__VERSION__", +@@ -46,10 +40,8 @@ "palantirnet/drupal-rector": "__VERSION__", "phpcompatibility/php-compatibility": "__VERSION__", "phpmd/phpmd": "__VERSION__", - "phpspec/prophecy-phpunit": "__VERSION__", "phpstan/extension-installer": "__VERSION__", "phpstan/phpstan": "__VERSION__", +- "phpunit/phpunit": "__VERSION__", "pyrech/composer-changelogs": "__VERSION__", -@@ -64,11 +57,6 @@ + "rector/rector": "__VERSION__", + "vincentlanglet/twig-cs-fixer": "__VERSION__" +@@ -68,11 +60,6 @@ "autoload": { "classmap": [ "scripts/composer/ScriptHandler.php" diff --git a/.vortex/installer/tests/Fixtures/install/tools_no_behat/composer.json b/.vortex/installer/tests/Fixtures/install/tools_no_behat/composer.json index 5873a6764..32836756d 100644 --- a/.vortex/installer/tests/Fixtures/install/tools_no_behat/composer.json +++ b/.vortex/installer/tests/Fixtures/install/tools_no_behat/composer.json @@ -9,8 +9,8 @@ - "drevops/behat-screenshot": "__VERSION__", - "drevops/behat-steps": "__VERSION__", "drevops/phpcs-standard": "__VERSION__", - "drupal/core-dev": "__VERSION__", + "drupal/coder": "__VERSION__", - "drupal/drupal-extension": "__VERSION__", "ergebnis/composer-normalize": "__VERSION__", - "mglaman/phpstan-drupal": "__VERSION__", - "palantirnet/drupal-rector": "__VERSION__", + "lullabot/mink-selenium2-driver": "__VERSION__", + "lullabot/php-webdriver": "__VERSION__", diff --git a/.vortex/installer/tests/Fixtures/install/tools_no_behat_circleci/composer.json b/.vortex/installer/tests/Fixtures/install/tools_no_behat_circleci/composer.json index 5873a6764..32836756d 100644 --- a/.vortex/installer/tests/Fixtures/install/tools_no_behat_circleci/composer.json +++ b/.vortex/installer/tests/Fixtures/install/tools_no_behat_circleci/composer.json @@ -9,8 +9,8 @@ - "drevops/behat-screenshot": "__VERSION__", - "drevops/behat-steps": "__VERSION__", "drevops/phpcs-standard": "__VERSION__", - "drupal/core-dev": "__VERSION__", + "drupal/coder": "__VERSION__", - "drupal/drupal-extension": "__VERSION__", "ergebnis/composer-normalize": "__VERSION__", - "mglaman/phpstan-drupal": "__VERSION__", - "palantirnet/drupal-rector": "__VERSION__", + "lullabot/mink-selenium2-driver": "__VERSION__", + "lullabot/php-webdriver": "__VERSION__", diff --git a/.vortex/installer/tests/Fixtures/install/tools_no_behat_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/install/tools_no_behat_circleci/tests/phpunit/CircleCiConfigTest.php index d07086d21..5beaafefe 100644 --- a/.vortex/installer/tests/Fixtures/install/tools_no_behat_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/install/tools_no_behat_circleci/tests/phpunit/CircleCiConfigTest.php @@ -12,7 +12,7 @@ * * Tests for CircleCI configurations. * - * @SuppressWarnings(PHPMD) + * @SuppressWarnings(\PHPMD) * * phpcs:disable Drupal.NamingConventions.ValidVariableName.LowerCamelName * phpcs:disable Drupal.NamingConventions.ValidGlobal.GlobalUnderScore diff --git a/.vortex/installer/tests/Fixtures/install/tools_no_phpcs/composer.json b/.vortex/installer/tests/Fixtures/install/tools_no_phpcs/composer.json index 83efa2ba5..5ac89e6ba 100644 --- a/.vortex/installer/tests/Fixtures/install/tools_no_phpcs/composer.json +++ b/.vortex/installer/tests/Fixtures/install/tools_no_phpcs/composer.json @@ -1,4 +1,4 @@ -@@ -31,11 +31,9 @@ +@@ -31,12 +31,9 @@ "require-dev": { "behat/behat": "__VERSION__", "dantleech/gherkin-lint": "__VERSION__", @@ -7,10 +7,19 @@ "drevops/behat-screenshot": "__VERSION__", "drevops/behat-steps": "__VERSION__", - "drevops/phpcs-standard": "__VERSION__", - "drupal/core-dev": "__VERSION__", +- "drupal/coder": "__VERSION__", "drupal/drupal-extension": "__VERSION__", "ergebnis/composer-normalize": "__VERSION__", -@@ -75,7 +73,6 @@ + "lullabot/mink-selenium2-driver": "__VERSION__", +@@ -44,7 +41,6 @@ + "mglaman/phpstan-drupal": "__VERSION__", + "mikey179/vfsstream": "__VERSION__", + "palantirnet/drupal-rector": "__VERSION__", +- "phpcompatibility/php-compatibility": "__VERSION__", + "phpmd/phpmd": "__VERSION__", + "phpspec/prophecy-phpunit": "__VERSION__", + "phpstan/extension-installer": "__VERSION__", +@@ -79,7 +75,6 @@ "allow-plugins": { "composer/installers": true, "cweagans/composer-patches": true, diff --git a/.vortex/installer/tests/Fixtures/install/tools_no_phpcs/web/sites/default/settings.php b/.vortex/installer/tests/Fixtures/install/tools_no_phpcs/web/sites/default/settings.php index 6c05abc0f..74bc25974 100644 --- a/.vortex/installer/tests/Fixtures/install/tools_no_phpcs/web/sites/default/settings.php +++ b/.vortex/installer/tests/Fixtures/install/tools_no_phpcs/web/sites/default/settings.php @@ -9,3 +9,11 @@ */ declare(strict_types=1); +@@ -52,7 +48,6 @@ + + $app_root ??= DRUPAL_ROOT; + $site_path ??= 'sites/default'; +-// @phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable + $contrib_path = $app_root . '/' . (is_dir($app_root . '/modules/contrib') ? 'modules/contrib' : 'modules'); + + // Public files directory relative to the Drupal root. diff --git a/.vortex/installer/tests/Fixtures/install/tools_no_phpcs_circleci/composer.json b/.vortex/installer/tests/Fixtures/install/tools_no_phpcs_circleci/composer.json index 83efa2ba5..5ac89e6ba 100644 --- a/.vortex/installer/tests/Fixtures/install/tools_no_phpcs_circleci/composer.json +++ b/.vortex/installer/tests/Fixtures/install/tools_no_phpcs_circleci/composer.json @@ -1,4 +1,4 @@ -@@ -31,11 +31,9 @@ +@@ -31,12 +31,9 @@ "require-dev": { "behat/behat": "__VERSION__", "dantleech/gherkin-lint": "__VERSION__", @@ -7,10 +7,19 @@ "drevops/behat-screenshot": "__VERSION__", "drevops/behat-steps": "__VERSION__", - "drevops/phpcs-standard": "__VERSION__", - "drupal/core-dev": "__VERSION__", +- "drupal/coder": "__VERSION__", "drupal/drupal-extension": "__VERSION__", "ergebnis/composer-normalize": "__VERSION__", -@@ -75,7 +73,6 @@ + "lullabot/mink-selenium2-driver": "__VERSION__", +@@ -44,7 +41,6 @@ + "mglaman/phpstan-drupal": "__VERSION__", + "mikey179/vfsstream": "__VERSION__", + "palantirnet/drupal-rector": "__VERSION__", +- "phpcompatibility/php-compatibility": "__VERSION__", + "phpmd/phpmd": "__VERSION__", + "phpspec/prophecy-phpunit": "__VERSION__", + "phpstan/extension-installer": "__VERSION__", +@@ -79,7 +75,6 @@ "allow-plugins": { "composer/installers": true, "cweagans/composer-patches": true, diff --git a/.vortex/installer/tests/Fixtures/install/tools_no_phpcs_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/install/tools_no_phpcs_circleci/tests/phpunit/CircleCiConfigTest.php index 96fa2d640..15ed22587 100644 --- a/.vortex/installer/tests/Fixtures/install/tools_no_phpcs_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/install/tools_no_phpcs_circleci/tests/phpunit/CircleCiConfigTest.php @@ -12,7 +12,7 @@ * * Tests for CircleCI configurations. * - * @SuppressWarnings(PHPMD) + * @SuppressWarnings(\PHPMD) * */ #[Group('ci')] diff --git a/.vortex/installer/tests/Fixtures/install/tools_no_phpcs_circleci/web/sites/default/settings.php b/.vortex/installer/tests/Fixtures/install/tools_no_phpcs_circleci/web/sites/default/settings.php index 6c05abc0f..74bc25974 100644 --- a/.vortex/installer/tests/Fixtures/install/tools_no_phpcs_circleci/web/sites/default/settings.php +++ b/.vortex/installer/tests/Fixtures/install/tools_no_phpcs_circleci/web/sites/default/settings.php @@ -9,3 +9,11 @@ */ declare(strict_types=1); +@@ -52,7 +48,6 @@ + + $app_root ??= DRUPAL_ROOT; + $site_path ??= 'sites/default'; +-// @phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable + $contrib_path = $app_root . '/' . (is_dir($app_root . '/modules/contrib') ? 'modules/contrib' : 'modules'); + + // Public files directory relative to the Drupal root. diff --git a/.vortex/installer/tests/Fixtures/install/tools_no_phpmd/composer.json b/.vortex/installer/tests/Fixtures/install/tools_no_phpmd/composer.json index dfd792cc8..21284ebc1 100644 --- a/.vortex/installer/tests/Fixtures/install/tools_no_phpmd/composer.json +++ b/.vortex/installer/tests/Fixtures/install/tools_no_phpmd/composer.json @@ -1,5 +1,5 @@ -@@ -42,7 +42,6 @@ - "mglaman/phpstan-drupal": "__VERSION__", +@@ -45,7 +45,6 @@ + "mikey179/vfsstream": "__VERSION__", "palantirnet/drupal-rector": "__VERSION__", "phpcompatibility/php-compatibility": "__VERSION__", - "phpmd/phpmd": "__VERSION__", diff --git a/.vortex/installer/tests/Fixtures/install/tools_no_phpmd_circleci/composer.json b/.vortex/installer/tests/Fixtures/install/tools_no_phpmd_circleci/composer.json index dfd792cc8..21284ebc1 100644 --- a/.vortex/installer/tests/Fixtures/install/tools_no_phpmd_circleci/composer.json +++ b/.vortex/installer/tests/Fixtures/install/tools_no_phpmd_circleci/composer.json @@ -1,5 +1,5 @@ -@@ -42,7 +42,6 @@ - "mglaman/phpstan-drupal": "__VERSION__", +@@ -45,7 +45,6 @@ + "mikey179/vfsstream": "__VERSION__", "palantirnet/drupal-rector": "__VERSION__", "phpcompatibility/php-compatibility": "__VERSION__", - "phpmd/phpmd": "__VERSION__", diff --git a/.vortex/installer/tests/Fixtures/install/tools_no_phpstan/composer.json b/.vortex/installer/tests/Fixtures/install/tools_no_phpstan/composer.json index 8770693f7..a9ea19954 100644 --- a/.vortex/installer/tests/Fixtures/install/tools_no_phpstan/composer.json +++ b/.vortex/installer/tests/Fixtures/install/tools_no_phpstan/composer.json @@ -1,18 +1,19 @@ -@@ -39,13 +39,10 @@ - "drupal/core-dev": "__VERSION__", - "drupal/drupal-extension": "__VERSION__", +@@ -41,14 +41,11 @@ "ergebnis/composer-normalize": "__VERSION__", + "lullabot/mink-selenium2-driver": "__VERSION__", + "lullabot/php-webdriver": "__VERSION__", - "mglaman/phpstan-drupal": "__VERSION__", + "mikey179/vfsstream": "__VERSION__", "palantirnet/drupal-rector": "__VERSION__", "phpcompatibility/php-compatibility": "__VERSION__", "phpmd/phpmd": "__VERSION__", "phpspec/prophecy-phpunit": "__VERSION__", - "phpstan/extension-installer": "__VERSION__", - "phpstan/phpstan": "__VERSION__", + "phpunit/phpunit": "__VERSION__", "pyrech/composer-changelogs": "__VERSION__", "rector/rector": "__VERSION__", - "vincentlanglet/twig-cs-fixer": "__VERSION__" -@@ -80,7 +77,6 @@ +@@ -84,7 +81,6 @@ "ergebnis/composer-normalize": true, "oomphinc/composer-installers-extender": true, "php-http/discovery": true, diff --git a/.vortex/installer/tests/Fixtures/install/tools_no_phpstan_circleci/composer.json b/.vortex/installer/tests/Fixtures/install/tools_no_phpstan_circleci/composer.json index 8770693f7..a9ea19954 100644 --- a/.vortex/installer/tests/Fixtures/install/tools_no_phpstan_circleci/composer.json +++ b/.vortex/installer/tests/Fixtures/install/tools_no_phpstan_circleci/composer.json @@ -1,18 +1,19 @@ -@@ -39,13 +39,10 @@ - "drupal/core-dev": "__VERSION__", - "drupal/drupal-extension": "__VERSION__", +@@ -41,14 +41,11 @@ "ergebnis/composer-normalize": "__VERSION__", + "lullabot/mink-selenium2-driver": "__VERSION__", + "lullabot/php-webdriver": "__VERSION__", - "mglaman/phpstan-drupal": "__VERSION__", + "mikey179/vfsstream": "__VERSION__", "palantirnet/drupal-rector": "__VERSION__", "phpcompatibility/php-compatibility": "__VERSION__", "phpmd/phpmd": "__VERSION__", "phpspec/prophecy-phpunit": "__VERSION__", - "phpstan/extension-installer": "__VERSION__", - "phpstan/phpstan": "__VERSION__", + "phpunit/phpunit": "__VERSION__", "pyrech/composer-changelogs": "__VERSION__", "rector/rector": "__VERSION__", - "vincentlanglet/twig-cs-fixer": "__VERSION__" -@@ -80,7 +77,6 @@ +@@ -84,7 +81,6 @@ "ergebnis/composer-normalize": true, "oomphinc/composer-installers-extender": true, "php-http/discovery": true, diff --git a/.vortex/installer/tests/Fixtures/install/tools_no_phpstan_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/install/tools_no_phpstan_circleci/tests/phpunit/CircleCiConfigTest.php index d07086d21..5beaafefe 100644 --- a/.vortex/installer/tests/Fixtures/install/tools_no_phpstan_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/install/tools_no_phpstan_circleci/tests/phpunit/CircleCiConfigTest.php @@ -12,7 +12,7 @@ * * Tests for CircleCI configurations. * - * @SuppressWarnings(PHPMD) + * @SuppressWarnings(\PHPMD) * * phpcs:disable Drupal.NamingConventions.ValidVariableName.LowerCamelName * phpcs:disable Drupal.NamingConventions.ValidGlobal.GlobalUnderScore diff --git a/.vortex/installer/tests/Fixtures/install/tools_no_phpunit/composer.json b/.vortex/installer/tests/Fixtures/install/tools_no_phpunit/composer.json index 9219632b3..6146f1a8f 100644 --- a/.vortex/installer/tests/Fixtures/install/tools_no_phpunit/composer.json +++ b/.vortex/installer/tests/Fixtures/install/tools_no_phpunit/composer.json @@ -1,12 +1,15 @@ -@@ -43,7 +43,6 @@ +@@ -46,10 +46,8 @@ "palantirnet/drupal-rector": "__VERSION__", "phpcompatibility/php-compatibility": "__VERSION__", "phpmd/phpmd": "__VERSION__", - "phpspec/prophecy-phpunit": "__VERSION__", "phpstan/extension-installer": "__VERSION__", "phpstan/phpstan": "__VERSION__", +- "phpunit/phpunit": "__VERSION__", "pyrech/composer-changelogs": "__VERSION__", -@@ -64,11 +63,6 @@ + "rector/rector": "__VERSION__", + "vincentlanglet/twig-cs-fixer": "__VERSION__" +@@ -68,11 +66,6 @@ "autoload": { "classmap": [ "scripts/composer/ScriptHandler.php" diff --git a/.vortex/installer/tests/Fixtures/install/tools_no_phpunit_circleci/composer.json b/.vortex/installer/tests/Fixtures/install/tools_no_phpunit_circleci/composer.json index 9219632b3..6146f1a8f 100644 --- a/.vortex/installer/tests/Fixtures/install/tools_no_phpunit_circleci/composer.json +++ b/.vortex/installer/tests/Fixtures/install/tools_no_phpunit_circleci/composer.json @@ -1,12 +1,15 @@ -@@ -43,7 +43,6 @@ +@@ -46,10 +46,8 @@ "palantirnet/drupal-rector": "__VERSION__", "phpcompatibility/php-compatibility": "__VERSION__", "phpmd/phpmd": "__VERSION__", - "phpspec/prophecy-phpunit": "__VERSION__", "phpstan/extension-installer": "__VERSION__", "phpstan/phpstan": "__VERSION__", +- "phpunit/phpunit": "__VERSION__", "pyrech/composer-changelogs": "__VERSION__", -@@ -64,11 +63,6 @@ + "rector/rector": "__VERSION__", + "vincentlanglet/twig-cs-fixer": "__VERSION__" +@@ -68,11 +66,6 @@ "autoload": { "classmap": [ "scripts/composer/ScriptHandler.php" diff --git a/.vortex/installer/tests/Fixtures/install/tools_no_rector/composer.json b/.vortex/installer/tests/Fixtures/install/tools_no_rector/composer.json index 5c1583bfd..c2a9ed327 100644 --- a/.vortex/installer/tests/Fixtures/install/tools_no_rector/composer.json +++ b/.vortex/installer/tests/Fixtures/install/tools_no_rector/composer.json @@ -1,14 +1,14 @@ -@@ -40,7 +40,6 @@ - "drupal/drupal-extension": "__VERSION__", - "ergebnis/composer-normalize": "__VERSION__", +@@ -43,7 +43,6 @@ + "lullabot/php-webdriver": "__VERSION__", "mglaman/phpstan-drupal": "__VERSION__", + "mikey179/vfsstream": "__VERSION__", - "palantirnet/drupal-rector": "__VERSION__", "phpcompatibility/php-compatibility": "__VERSION__", "phpmd/phpmd": "__VERSION__", "phpspec/prophecy-phpunit": "__VERSION__", -@@ -47,7 +46,6 @@ - "phpstan/extension-installer": "__VERSION__", +@@ -51,7 +50,6 @@ "phpstan/phpstan": "__VERSION__", + "phpunit/phpunit": "__VERSION__", "pyrech/composer-changelogs": "__VERSION__", - "rector/rector": "__VERSION__", "vincentlanglet/twig-cs-fixer": "__VERSION__" diff --git a/.vortex/installer/tests/Fixtures/install/tools_no_rector_circleci/composer.json b/.vortex/installer/tests/Fixtures/install/tools_no_rector_circleci/composer.json index 5c1583bfd..c2a9ed327 100644 --- a/.vortex/installer/tests/Fixtures/install/tools_no_rector_circleci/composer.json +++ b/.vortex/installer/tests/Fixtures/install/tools_no_rector_circleci/composer.json @@ -1,14 +1,14 @@ -@@ -40,7 +40,6 @@ - "drupal/drupal-extension": "__VERSION__", - "ergebnis/composer-normalize": "__VERSION__", +@@ -43,7 +43,6 @@ + "lullabot/php-webdriver": "__VERSION__", "mglaman/phpstan-drupal": "__VERSION__", + "mikey179/vfsstream": "__VERSION__", - "palantirnet/drupal-rector": "__VERSION__", "phpcompatibility/php-compatibility": "__VERSION__", "phpmd/phpmd": "__VERSION__", "phpspec/prophecy-phpunit": "__VERSION__", -@@ -47,7 +46,6 @@ - "phpstan/extension-installer": "__VERSION__", +@@ -51,7 +50,6 @@ "phpstan/phpstan": "__VERSION__", + "phpunit/phpunit": "__VERSION__", "pyrech/composer-changelogs": "__VERSION__", - "rector/rector": "__VERSION__", "vincentlanglet/twig-cs-fixer": "__VERSION__" diff --git a/.vortex/installer/tests/Fixtures/install/tools_no_rector_circleci/tests/phpunit/CircleCiConfigTest.php b/.vortex/installer/tests/Fixtures/install/tools_no_rector_circleci/tests/phpunit/CircleCiConfigTest.php index d07086d21..5beaafefe 100644 --- a/.vortex/installer/tests/Fixtures/install/tools_no_rector_circleci/tests/phpunit/CircleCiConfigTest.php +++ b/.vortex/installer/tests/Fixtures/install/tools_no_rector_circleci/tests/phpunit/CircleCiConfigTest.php @@ -12,7 +12,7 @@ * * Tests for CircleCI configurations. * - * @SuppressWarnings(PHPMD) + * @SuppressWarnings(\PHPMD) * * phpcs:disable Drupal.NamingConventions.ValidVariableName.LowerCamelName * phpcs:disable Drupal.NamingConventions.ValidGlobal.GlobalUnderScore diff --git a/.vortex/installer/tests/Fixtures/install/tools_none/composer.json b/.vortex/installer/tests/Fixtures/install/tools_none/composer.json index 85a8db23a..82f6e0beb 100644 --- a/.vortex/installer/tests/Fixtures/install/tools_none/composer.json +++ b/.vortex/installer/tests/Fixtures/install/tools_none/composer.json @@ -1,4 +1,4 @@ -@@ -29,25 +29,10 @@ +@@ -29,29 +29,11 @@ "webflo/drupal-finder": "__VERSION__" }, "require-dev": { @@ -9,22 +9,26 @@ - "drevops/behat-screenshot": "__VERSION__", - "drevops/behat-steps": "__VERSION__", - "drevops/phpcs-standard": "__VERSION__", - "drupal/core-dev": "__VERSION__", +- "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__", - "phpcompatibility/php-compatibility": "__VERSION__", +- "phpcompatibility/php-compatibility": "__VERSION__", - "phpmd/phpmd": "__VERSION__", - "phpspec/prophecy-phpunit": "__VERSION__", - "phpstan/extension-installer": "__VERSION__", - "phpstan/phpstan": "__VERSION__", +- "phpunit/phpunit": "__VERSION__", "pyrech/composer-changelogs": "__VERSION__", - "rector/rector": "__VERSION__", "vincentlanglet/twig-cs-fixer": "__VERSION__" }, "conflict": { -@@ -66,21 +51,14 @@ +@@ -70,21 +52,14 @@ "scripts/composer/ScriptHandler.php" ] }, diff --git a/.vortex/installer/tests/Fixtures/install/tools_none/web/sites/default/settings.php b/.vortex/installer/tests/Fixtures/install/tools_none/web/sites/default/settings.php index 6c05abc0f..74bc25974 100644 --- a/.vortex/installer/tests/Fixtures/install/tools_none/web/sites/default/settings.php +++ b/.vortex/installer/tests/Fixtures/install/tools_none/web/sites/default/settings.php @@ -9,3 +9,11 @@ */ declare(strict_types=1); +@@ -52,7 +48,6 @@ + + $app_root ??= DRUPAL_ROOT; + $site_path ??= 'sites/default'; +-// @phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable + $contrib_path = $app_root . '/' . (is_dir($app_root . '/modules/contrib') ? 'modules/contrib' : 'modules'); + + // Public files directory relative to the Drupal root. diff --git a/.vortex/installer/tests/Unit/Downloader/DownloaderTest.php b/.vortex/installer/tests/Unit/Downloader/DownloaderTest.php index fa182ec88..2fe5649ce 100644 --- a/.vortex/installer/tests/Unit/Downloader/DownloaderTest.php +++ b/.vortex/installer/tests/Unit/Downloader/DownloaderTest.php @@ -38,7 +38,7 @@ public function testParseUri(string $src, ?string $expected_repo = NULL, ?string public function testDownloadWithMockedArchiver(): void { $mock_http_client = $this->createMockHttpClient(); - /** @var \PHPUnit\Framework\MockObject\MockObject&ArchiverInterface $mock_archiver */ + /** @var \PHPUnit\Framework\MockObject\MockObject&\DrevOps\VortexInstaller\Downloader\ArchiverInterface $mock_archiver */ $mock_archiver = $this->createMockArchiver(); $mock_archiver->expects($this->once())->method('validate'); $mock_archiver->expects($this->once())->method('extract'); @@ -222,7 +222,7 @@ public function testDownloadFromLocal(string $ref, string $expectedVersion): voi $expectedVersion = $ref; } - /** @var \PHPUnit\Framework\MockObject\MockObject&ArchiverInterface $mock_archiver */ + /** @var \PHPUnit\Framework\MockObject\MockObject&\DrevOps\VortexInstaller\Downloader\ArchiverInterface $mock_archiver */ $mock_archiver = $this->createMockArchiverWithExtract(); $downloader = new Downloader(NULL, $mock_archiver); $version = $downloader->download($temp_repo_dir, $ref, $destination); diff --git a/.vortex/installer/tests/Unit/GitTest.php b/.vortex/installer/tests/Unit/GitTest.php index eac1123e5..267fec266 100644 --- a/.vortex/installer/tests/Unit/GitTest.php +++ b/.vortex/installer/tests/Unit/GitTest.php @@ -26,7 +26,7 @@ class GitTest extends UnitTestCase { * @param bool $with_commits * Whether to add commits to the repository. * - * @return array{string, Git} + * @return array{string, \DrevOps\VortexInstaller\Utils\Git} * Array with temp directory path and Git object. */ protected function createTempGitRepo(bool $with_remote = FALSE, bool $with_commits = FALSE): array { @@ -123,7 +123,8 @@ public function testRun(): void { // Test with another command. $result = $repo->run('log', '--oneline', '--max-count=1'); $this->assertInstanceOf(RunnerResult::class, $result); - } finally { + } + finally { $this->cleanupTempGitRepo($temp_dir); } } @@ -134,7 +135,8 @@ public function testListRemotesEmpty(): void { try { $remotes = $repo->listRemotes(); $this->assertEmpty($remotes); - } finally { + } + finally { $this->cleanupTempGitRepo($temp_dir); } } @@ -148,7 +150,8 @@ public function testListRemotesWithRemotes(): void { $this->assertArrayHasKey('upstream', $remotes); $this->assertEquals('https://github.com/owner/repo.git', $remotes['origin']); $this->assertEquals('https://github.com/upstream/repo.git', $remotes['upstream']); - } finally { + } + finally { $this->cleanupTempGitRepo($temp_dir); } } @@ -162,7 +165,8 @@ public function testGetTrackedFilesNonGitDirectory(): void { try { Git::getTrackedFiles($temp_dir); - } finally { + } + finally { rmdir($temp_dir); } } @@ -173,7 +177,8 @@ public function testGetTrackedFilesEmptyRepo(): void { try { $tracked = Git::getTrackedFiles($temp_dir); $this->assertEmpty($tracked); - } finally { + } + finally { $this->cleanupTempGitRepo($temp_dir); } } @@ -186,7 +191,8 @@ public function testGetTrackedFilesWithFiles(): void { $this->assertCount(2, $tracked); $this->assertContains($temp_dir . DIRECTORY_SEPARATOR . 'test.txt', $tracked); $this->assertContains($temp_dir . DIRECTORY_SEPARATOR . 'another.txt', $tracked); - } finally { + } + finally { $this->cleanupTempGitRepo($temp_dir); } } @@ -198,7 +204,8 @@ public function testGetLastShortCommitId(): void { $short_id = $repo->getLastShortCommitId(); $this->assertEquals(7, strlen($short_id)); $this->assertMatchesRegularExpression('/^[0-9a-f]{7}$/', $short_id); - } finally { + } + finally { $this->cleanupTempGitRepo($temp_dir); } } diff --git a/.vortex/installer/tests/Unit/TuiTest.php b/.vortex/installer/tests/Unit/TuiTest.php index c60c6a1a5..58caf8b7a 100644 --- a/.vortex/installer/tests/Unit/TuiTest.php +++ b/.vortex/installer/tests/Unit/TuiTest.php @@ -189,7 +189,8 @@ public function testBox( $this->assertSame($expected_clean, $actual_clean); - } finally { + } + finally { // Restore environment. if ($original_columns !== FALSE) { putenv('COLUMNS=' . $original_columns); @@ -571,7 +572,8 @@ public function testUtfPadding( $result = $method->invoke(NULL, $char); $this->assertSame($expected_padding, $result); - } finally { + } + finally { // Restore original environment variables. if ($original_terminal_emulator !== FALSE) { putenv('TERMINAL_EMULATOR=' . $original_terminal_emulator); diff --git a/.vortex/installer/update-fixtures.sh b/.vortex/installer/update-fixtures.sh index c4fd5a2fa..a3be00a36 100755 --- a/.vortex/installer/update-fixtures.sh +++ b/.vortex/installer/update-fixtures.sh @@ -21,6 +21,7 @@ set -eu DATASET="${1:-}" TIMEOUT=30 MAX_RETRIES=3 +START_TIME=$(date +%s) # Trap to handle Ctrl+C and cleanup. trap 'printf "\nInterrupted by user\n"; exit 130' INT TERM @@ -201,6 +202,58 @@ done <<< "${datasets}" # Summary. printf "Total: %s | Succeeded: %s | Failed: %s | Timed out: %s\n" "${total_datasets}" "${succeeded}" "${failed}" "${timedout}" +# If there were failures or timeouts, check for additional uncommitted fixture changes and amend the baseline commit. if [ "${failed}" -gt 0 ] || [ "${timedout}" -gt 0 ]; then + # Navigate to git root (two levels up from installer directory). + cd ../.. || exit 1 + + # Check if there are uncommitted changes in fixtures directory. + fixtures_path=".vortex/installer/tests/Fixtures/install" + has_changes=0 + + # Check for modified files (unstaged). + if ! git diff --quiet "${fixtures_path}" 2>/dev/null; then + has_changes=1 + fi + + # Check for staged files. + if ! git diff --cached --quiet "${fixtures_path}" 2>/dev/null; then + has_changes=1 + fi + + # Check for untracked files. + if [ -n "$(git ls-files --others --exclude-standard "${fixtures_path}" 2>/dev/null)" ]; then + has_changes=1 + fi + + if [ "${has_changes}" -eq 1 ]; then + # Stage all fixture changes. + if git add "${fixtures_path}"; then + # Amend the baseline commit with all fixture changes. + if git commit --amend -m "Updated fixtures."; then + printf "Note: Amended previous commit to include all fixture updates.\n" + else + printf "Failed to amend commit with fixture changes.\n" + fi + else + printf "Failed to stage fixture changes.\n" + fi + fi + + # Navigate back to installer directory. + cd .vortex/installer || exit 1 + + # Calculate and display execution time. + ELAPSED=$(($(date +%s) - START_TIME)) + MINUTES=$((ELAPSED / 60)) + SECONDS=$((ELAPSED % 60)) + printf "Total execution time: %d minutes %d seconds\n" "${MINUTES}" "${SECONDS}" + exit 1 fi + +# Calculate and display execution time. +ELAPSED=$(($(date +%s) - START_TIME)) +MINUTES=$((ELAPSED / 60)) +SECONDS=$((ELAPSED % 60)) +printf "Total execution time: %d minutes %d seconds\n" "${MINUTES}" "${SECONDS}" diff --git a/.vortex/tests/composer.json b/.vortex/tests/composer.json index 23c225ffb..38e2a8b97 100644 --- a/.vortex/tests/composer.json +++ b/.vortex/tests/composer.json @@ -27,12 +27,12 @@ "czproject/git-php": "^4.5", "dealerdirect/phpcodesniffer-composer-installer": "^1.1.2", "drevops/phpcs-standard": "^0.6", - "drupal/coder": "^8.3.31", + "drupal/coder": "^9@alpha", "ergebnis/composer-normalize": "^2.48.2", "phpstan/phpstan": "^2.1.31", "phpunit/phpunit": "^12.4.2", "rector/rector": "^2.2.7", - "squizlabs/php_codesniffer": "^3.13.4" + "squizlabs/php_codesniffer": "^4.0" }, "minimum-stability": "alpha", "prefer-stable": true, diff --git a/.vortex/tests/composer.lock b/.vortex/tests/composer.lock index ac8508871..78ce7da87 100644 --- a/.vortex/tests/composer.lock +++ b/.vortex/tests/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e79f4558d399e620c4207a81a9d9dca6", + "content-hash": "5d07f0fa0a62f9d6fe847936922a0750", "packages": [ { "name": "cweagans/composer-configurable-plugin", @@ -447,29 +447,29 @@ }, { "name": "dealerdirect/phpcodesniffer-composer-installer", - "version": "v1.1.2", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/composer-installer.git", - "reference": "e9cf5e4bbf7eeaf9ef5db34938942602838fc2b1" + "reference": "845eb62303d2ca9b289ef216356568ccc075ffd1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/e9cf5e4bbf7eeaf9ef5db34938942602838fc2b1", - "reference": "e9cf5e4bbf7eeaf9ef5db34938942602838fc2b1", + "url": "https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/845eb62303d2ca9b289ef216356568ccc075ffd1", + "reference": "845eb62303d2ca9b289ef216356568ccc075ffd1", "shasum": "" }, "require": { "composer-plugin-api": "^2.2", "php": ">=5.4", - "squizlabs/php_codesniffer": "^2.0 || ^3.1.0 || ^4.0" + "squizlabs/php_codesniffer": "^3.1.0 || ^4.0" }, "require-dev": { "composer/composer": "^2.2", "ext-json": "*", "ext-zip": "*", "php-parallel-lint/php-parallel-lint": "^1.4.0", - "phpcompatibility/php-compatibility": "^9.0", + "phpcompatibility/php-compatibility": "^9.0 || ^10.0.0@dev", "yoast/phpunit-polyfills": "^1.0" }, "type": "composer-plugin", @@ -539,7 +539,7 @@ "type": "thanks_dev" } ], - "time": "2025-07-17T20:45:56+00:00" + "time": "2025-11-11T04:32:07+00:00" }, { "name": "drevops/phpcs-standard", @@ -622,30 +622,30 @@ }, { "name": "drupal/coder", - "version": "8.3.31", + "version": "9.0.0-alpha2", "source": { "type": "git", "url": "https://github.com/pfrenssen/coder.git", - "reference": "07c14cf2217c2b53cc4469e2ed360141e6bb18ea" + "reference": "1e0bfdd0d273bbb71dd35b76df5cacaafde9f9bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pfrenssen/coder/zipball/07c14cf2217c2b53cc4469e2ed360141e6bb18ea", - "reference": "07c14cf2217c2b53cc4469e2ed360141e6bb18ea", + "url": "https://api.github.com/repos/pfrenssen/coder/zipball/1e0bfdd0d273bbb71dd35b76df5cacaafde9f9bd", + "reference": "1e0bfdd0d273bbb71dd35b76df5cacaafde9f9bd", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1 || ^1.0.0", "ext-mbstring": "*", - "php": ">=7.2", - "sirbrillig/phpcs-variable-analysis": "^2.11.7", - "slevomat/coding-standard": "^8.11", - "squizlabs/php_codesniffer": "^3.13", + "php": ">=7.4", + "sirbrillig/phpcs-variable-analysis": "^2.13", + "slevomat/coding-standard": "^8.24", + "squizlabs/php_codesniffer": "^4.0.1", "symfony/yaml": ">=3.4.0" }, "require-dev": { "phpstan/phpstan": "^1.7.12", - "phpunit/phpunit": "^8.0" + "phpunit/phpunit": "^9.0" }, "type": "phpcodesniffer-standard", "autoload": { @@ -669,7 +669,7 @@ "issues": "https://www.drupal.org/project/issues/coder", "source": "https://www.drupal.org/project/coder" }, - "time": "2025-10-16T12:23:49+00:00" + "time": "2025-11-23T17:29:29+00:00" }, { "name": "ergebnis/composer-normalize", @@ -3181,32 +3181,32 @@ }, { "name": "slevomat/coding-standard", - "version": "8.22.1", + "version": "8.25.1", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "1dd80bf3b93692bedb21a6623c496887fad05fec" + "reference": "4caa5ec5a30b84b2305e80159c710d437f40cc40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/1dd80bf3b93692bedb21a6623c496887fad05fec", - "reference": "1dd80bf3b93692bedb21a6623c496887fad05fec", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/4caa5ec5a30b84b2305e80159c710d437f40cc40", + "reference": "4caa5ec5a30b84b2305e80159c710d437f40cc40", "shasum": "" }, "require": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.1.2", + "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.2.0", "php": "^7.4 || ^8.0", "phpstan/phpdoc-parser": "^2.3.0", - "squizlabs/php_codesniffer": "^3.13.4" + "squizlabs/php_codesniffer": "^4.0.1" }, "require-dev": { "phing/phing": "3.0.1|3.1.0", "php-parallel-lint/php-parallel-lint": "1.4.0", - "phpstan/phpstan": "2.1.24", + "phpstan/phpstan": "2.1.32", "phpstan/phpstan-deprecation-rules": "2.0.3", - "phpstan/phpstan-phpunit": "2.0.7", - "phpstan/phpstan-strict-rules": "2.0.6", - "phpunit/phpunit": "9.6.8|10.5.48|11.4.4|11.5.36|12.3.10" + "phpstan/phpstan-phpunit": "2.0.8", + "phpstan/phpstan-strict-rules": "2.0.7", + "phpunit/phpunit": "9.6.8|10.5.48|11.4.4|11.5.36|12.4.4" }, "type": "phpcodesniffer-standard", "extra": { @@ -3230,7 +3230,7 @@ ], "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/8.22.1" + "source": "https://github.com/slevomat/coding-standard/tree/8.25.1" }, "funding": [ { @@ -3242,41 +3242,36 @@ "type": "tidelift" } ], - "time": "2025-09-13T08:53:30+00:00" + "time": "2025-11-25T18:01:43+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.13.4", + "version": "4.0.1", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "ad545ea9c1b7d270ce0fc9cbfb884161cd706119" + "reference": "0525c73950de35ded110cffafb9892946d7771b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/ad545ea9c1b7d270ce0fc9cbfb884161cd706119", - "reference": "ad545ea9c1b7d270ce0fc9cbfb884161cd706119", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/0525c73950de35ded110cffafb9892946d7771b5", + "reference": "0525c73950de35ded110cffafb9892946d7771b5", "shasum": "" }, "require": { "ext-simplexml": "*", "ext-tokenizer": "*", "ext-xmlwriter": "*", - "php": ">=5.4.0" + "php": ">=7.2.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" + "phpunit/phpunit": "^8.4.0 || ^9.3.4 || ^10.5.32 || 11.3.3 - 11.5.28 || ^11.5.31" }, "bin": [ "bin/phpcbf", "bin/phpcs" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - } - }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" @@ -3295,7 +3290,7 @@ "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors" } ], - "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "description": "PHP_CodeSniffer tokenizes PHP files and detects violations of a defined set of coding standards.", "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer", "keywords": [ "phpcs", @@ -3326,7 +3321,7 @@ "type": "thanks_dev" } ], - "time": "2025-09-05T05:47:09+00:00" + "time": "2025-11-10T16:43:36+00:00" }, { "name": "staabm/side-effects-detector", @@ -4385,7 +4380,9 @@ ], "aliases": [], "minimum-stability": "alpha", - "stability-flags": {}, + "stability-flags": { + "drupal/coder": 15 + }, "prefer-stable": true, "prefer-lowest": false, "platform": { diff --git a/composer.json b/composer.json index c27abf6d8..4b2818183 100644 --- a/composer.json +++ b/composer.json @@ -36,16 +36,20 @@ "drevops/behat-screenshot": "^2.2", "drevops/behat-steps": "^3.4.0", "drevops/phpcs-standard": "^0.6", - "drupal/core-dev": "~11.2.8", + "drupal/coder": "^9@alpha", "drupal/drupal-extension": "^5.1", "ergebnis/composer-normalize": "^2.48.2", + "lullabot/mink-selenium2-driver": "^1.7", + "lullabot/php-webdriver": "^2.0", "mglaman/phpstan-drupal": "^2.0.10", + "mikey179/vfsstream": "^1.6", "palantirnet/drupal-rector": "^0.21.1", - "phpcompatibility/php-compatibility": "^9.3.5", + "phpcompatibility/php-compatibility": "^10.0@alpha", "phpmd/phpmd": "^2.15", "phpspec/prophecy-phpunit": "^2.4", "phpstan/extension-installer": "^1.4.3", "phpstan/phpstan": "^2.1.32", + "phpunit/phpunit": "^11.5", "pyrech/composer-changelogs": "^2.1", "rector/rector": "^2.2.8", "vincentlanglet/twig-cs-fixer": "^3.11" diff --git a/tests/phpunit/CircleCiConfigTest.php b/tests/phpunit/CircleCiConfigTest.php index d07086d21..5beaafefe 100644 --- a/tests/phpunit/CircleCiConfigTest.php +++ b/tests/phpunit/CircleCiConfigTest.php @@ -12,7 +12,7 @@ * * Tests for CircleCI configurations. * - * @SuppressWarnings(PHPMD) + * @SuppressWarnings(\PHPMD) * * phpcs:disable Drupal.NamingConventions.ValidVariableName.LowerCamelName * phpcs:disable Drupal.NamingConventions.ValidGlobal.GlobalUnderScore diff --git a/web/sites/default/settings.php b/web/sites/default/settings.php index f46942cca..86da65cbc 100644 --- a/web/sites/default/settings.php +++ b/web/sites/default/settings.php @@ -52,6 +52,7 @@ $app_root ??= DRUPAL_ROOT; $site_path ??= 'sites/default'; +// @phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable $contrib_path = $app_root . '/' . (is_dir($app_root . '/modules/contrib') ? 'modules/contrib' : 'modules'); // Public files directory relative to the Drupal root.