From b6bd1681815720957380503524938cd1c40b667b Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Tue, 8 Sep 2026 10:14:22 +1000 Subject: [PATCH 1/4] [#3098] Enabled email rerouting in every cloud environment and moved 'reroute_email' to the development modules script. --- .../content/development/modules/README.mdx | 4 +- .../modules/contributed-modules.mdx | 17 +++--- .../docs/content/development/provision.mdx | 20 ++++--- .../src/Prompts/Handlers/Modules.php | 8 +-- .../Handlers/ModulesHandlerProcessTest.php | 20 ++++++- .vortex/tooling/tests/unit/provision.bats | 52 ++++++++++++++----- scripts/provision-00-enable-demo-modules.sh | 2 +- scripts/provision-10-enable-dev-modules.sh | 6 +++ .../Drupal/EnvironmentSettingsTest.php | 52 ++++++++++++++++++- .../phpunit/Drupal/SwitchableSettingsTest.php | 15 +++++- .../modules/settings.reroute_email.php | 13 +++-- 11 files changed, 166 insertions(+), 43 deletions(-) diff --git a/.vortex/docs/content/development/modules/README.mdx b/.vortex/docs/content/development/modules/README.mdx index e8690197c..71e255308 100644 --- a/.vortex/docs/content/development/modules/README.mdx +++ b/.vortex/docs/content/development/modules/README.mdx @@ -23,9 +23,9 @@ assertions in a single pass. |-----------|----------|--------| | Composer requirement | `require` in [`composer.json`](https://github.com/drevops/vortex/blob/main/composer.json) | Makes the module available to the site. ➡️ See [composer.json](../composer.mdx#require) | | Settings override | `web/sites/default/includes/modules/settings..php` | Applies configuration conditioned on the detected environment, reading values from environment variables. ➡️ See [Settings](../settings.mdx#per-module-overrides) | -| Config export exclusion | `$settings['config_exclude_modules']` in a settings override | Keeps a development-only module out of the exported configuration, so enabling it locally never dirties the config. ➡️ See [Settings](../settings.mdx#per-module-overrides) | +| Config export exclusion | `$settings['config_exclude_modules']` in a settings override | Keeps a module that never reaches production out of the exported configuration, so enabling it locally never dirties the config. ➡️ See [Settings](../settings.mdx#per-module-overrides) | | Provisioning | [`scripts/provision-00-enable-demo-modules.sh`](https://github.com/drevops/vortex/blob/main/scripts/provision-00-enable-demo-modules.sh) | Stands up the demo site in the `local`, `ci`, `dev` and `stage` environments: applies the `recipes/page` content model, sets the site name, installs the contrib, service and custom site modules (including core's `media` and `navigation`), and runs their deploy hooks. ➡️ See [Provision](../provision.mdx#demo-modules) | -| Development provisioning | [`scripts/provision-10-enable-dev-modules.sh`](https://github.com/drevops/vortex/blob/main/scripts/provision-10-enable-dev-modules.sh) | Installs the development-only modules in the same four environments. ➡️ See [Provision](../provision.mdx#development-modules) | +| Development provisioning | [`scripts/provision-10-enable-dev-modules.sh`](https://github.com/drevops/vortex/blob/main/scripts/provision-10-enable-dev-modules.sh) | Installs the modules that never reach production - the development tools and the email rerouting safety net - in the same four environments. ➡️ See [Provision](../provision.mdx#development-modules) | | Module dependency | [`ys_demo.info.yml`](https://github.com/drevops/vortex/blob/main/web/modules/custom/ys_demo/ys_demo.info.yml) | Installs the module as a dependency of the demo module. ➡️ See [Demo module](module-scaffold.mdx#demo-module) | A module can be required without being installed anywhere: the settings diff --git a/.vortex/docs/content/development/modules/contributed-modules.mdx b/.vortex/docs/content/development/modules/contributed-modules.mdx index a55b32c08..78e82c763 100644 --- a/.vortex/docs/content/development/modules/contributed-modules.mdx +++ b/.vortex/docs/content/development/modules/contributed-modules.mdx @@ -166,9 +166,11 @@ intended recipients. This prevents accidental email delivery to real users in non-production environments while still allowing email functionality to be tested. +- **Installed:** During development provisioning by [`scripts/provision-10-enable-dev-modules.sh`](https://github.com/drevops/vortex/blob/main/scripts/provision-10-enable-dev-modules.sh), so the safety net survives the demo script being adapted or removed. + ### Configuration -[`settings.reroute_email.php`](https://github.com/drevops/vortex/blob/main/web/sites/default/includes/modules/settings.reroute_email.php) enables rerouting in every environment except `local`, `ci`, `stage` and `prod`. +[`settings.reroute_email.php`](https://github.com/drevops/vortex/blob/main/web/sites/default/includes/modules/settings.reroute_email.php) excludes the module from the exported configuration and enables rerouting in every environment except `local`, `ci` and `prod`. Rerouting replaces the recipient of an outgoing message with the configured address, unless that recipient matches `DRUPAL_REROUTE_EMAIL_ALLOWED`. With rerouting disabled, every message reaches its intended recipient. Rerouting is therefore disabled only where that delivery is either wanted or already intercepted by other means. @@ -179,15 +181,17 @@ Rerouting replaces the recipient of an outgoing message with the configured addr | Local | No | [Pygmy](../environment/pygmy.mdx) already catches outgoing mail | | CI | No | The [mail collector](../testing/behat.mdx#email) stores messages instead of sending them | | Dev | **Yes** | Prevents accidental delivery to real users | -| Stage | No | Stage may require real email delivery for UAT | +| Stage | **Yes** | Stage runs a copy of production content, so any address that survives sanitisation is a real one | | Prod | No | Production emails must reach actual recipients | -Rerouting is also enabled in any custom environments (e.g., PR environments) -that do not match the standard environment types listed above. +Rerouting is the fall-through default, so it is also enabled in any custom +environments (e.g., PR environments) that do not match the standard environment +types listed above. Those environments install the module only if their +environment type is added to the provisioning scripts. ➡️ See [Provision](../provision.mdx#development-modules) Rerouting is off in `ci` so that tests can assert on the address a message was sent to. With rerouting on, every message would carry the rerouting address instead of the intended one. -A site that deselects this module during [installation](../../installation.mdx) still sends no mail from `ci`, because the mail collector stores messages there regardless. That site does send mail to real recipients in `dev` and in custom environments. +A site that deselects this module during [installation](../../installation.mdx) still sends no mail from `ci`, because the mail collector stores messages there regardless. That site does send mail to real recipients in `dev`, `stage` and custom environments. **Environment variables:** @@ -199,7 +203,8 @@ A site that deselects this module during [installation](../../installation.mdx) **Overriding default behavior:** Set `DRUPAL_REROUTE_EMAIL_DISABLED` to any non-empty value to completely disable -email rerouting in an environment where it would otherwise be enabled. +email rerouting in an environment where it would otherwise be enabled. This is +the supported way for a `stage` environment to send real mail during UAT.
Example of the `Reroute Email` module `settings.reroute_email.php` file diff --git a/.vortex/docs/content/development/provision.mdx b/.vortex/docs/content/development/provision.mdx index f2d53f3d6..983307bb6 100644 --- a/.vortex/docs/content/development/provision.mdx +++ b/.vortex/docs/content/development/provision.mdx @@ -353,7 +353,7 @@ e.g., `provision-50-custom.sh`, `provision-60-another-custom.sh`. | Script | Purpose | Present when | |---------------------------------------|----------------------------------------------------------|------------------------------------------------------------------------------------------------------------| | `provision-00-enable-demo-modules.sh` | Enables the modules and content model the demo site uses | Always; the installer trims its operations to the selected modules | -| `provision-10-enable-dev-modules.sh` | Enables the development modules and generates content | Any of `devel`, `sdc_devel`, `generated_content` or `testmode` is selected; removed by the installer otherwise | +| `provision-10-enable-dev-modules.sh` | Enables the development modules and generates content | Any of `devel`, `sdc_devel`, `generated_content`, `testmode` or `reroute_email` is selected; removed by the installer otherwise | | `provision-20-migration.sh` | Runs the content migration | The migration feature is selected; removed by the installer otherwise | | `provision-30-search-index.sh` | Rebuilds the search index | The Solr service is selected; removed by the installer otherwise | | `provision-40-example.sh` | A runnable example that performs no operations | Always; copy it as a starting point or remove it | @@ -413,15 +413,21 @@ relying on the demo content. **Vortex** ships a `scripts/provision-10-enable-dev-modules.sh` custom script that installs the development modules - [Devel](https://www.drupal.org/project/devel), [SDC Devel](https://www.drupal.org/project/sdc_devel) and -[Testmode](https://www.drupal.org/project/testmode). +[Testmode](https://www.drupal.org/project/testmode) - and the +[Reroute Email](https://www.drupal.org/project/reroute_email) safety net. -Development modules live in their own script so that they stay enabled after the -demo and example scripts are adapted or removed. They are also the modules kept -out of the exported configuration, so provisioning is the only place that can +These modules live in their own script so that they stay enabled after the demo +and example scripts are adapted or removed. They are also the modules kept out +of the exported configuration, so provisioning is the only place that can install them. -Both scripts run only in the `local`, `ci`, `dev` and `stage` environments. To -opt out of either set of modules, remove the corresponding script. +Both scripts run only in the `local`, `ci`, `dev` and `stage` environments, and +skip every other environment type. A project that introduces a custom +environment type has to add it to both scripts to have these modules installed +there, including the email rerouting that +[the settings file](modules/contributed-modules.mdx#reroute-email) enables for +every environment outside `local`, `ci` and `prod`. To opt out of either set of +modules, remove the corresponding script. ### Generated content diff --git a/.vortex/installer/src/Prompts/Handlers/Modules.php b/.vortex/installer/src/Prompts/Handlers/Modules.php index 1e5cb50ac..053508946 100644 --- a/.vortex/installer/src/Prompts/Handlers/Modules.php +++ b/.vortex/installer/src/Prompts/Handlers/Modules.php @@ -13,16 +13,16 @@ class Modules extends AbstractHandler { /** * Modules driven by the development modules provision script. * - * These modules are development and testing tools that are deliberately kept - * out of the exported configuration, so the provision script is the only - * place that can install them. Adding a module here also requires a fenced + * These modules are not installed in production and are deliberately kept out + * of the exported configuration, so the provision script is the only place + * that can install them. Adding a module here also requires a fenced * 'MODULE_' block in the script. * * The script has operations to perform while any one of these is selected. * * @var string[] */ - protected const DEV_MODULES = ['devel', 'sdc_devel', 'generated_content', 'testmode']; + protected const DEV_MODULES = ['devel', 'sdc_devel', 'generated_content', 'testmode', 'reroute_email']; /** * {@inheritdoc} diff --git a/.vortex/installer/tests/Functional/Prompts/Handlers/ModulesHandlerProcessTest.php b/.vortex/installer/tests/Functional/Prompts/Handlers/ModulesHandlerProcessTest.php index c5c13335a..8411bdd96 100644 --- a/.vortex/installer/tests/Functional/Prompts/Handlers/ModulesHandlerProcessTest.php +++ b/.vortex/installer/tests/Functional/Prompts/Handlers/ModulesHandlerProcessTest.php @@ -85,7 +85,13 @@ public static function dataProviderHandlerProcess(): \Iterator { static::cw(function ($test): void { $test->prompts[Modules::id()] = static::getModulesExcept('reroute_email'); }), - static::cw(fn(FunctionalTestCase $test) => $test->assertSutNotContains('drupal/reroute_email')), + static::cw(function (AbstractHandlerProcessTestCase $test): void { + $test->assertSutNotContains('drupal/reroute_email'); + // The development modules still install from the script, so it survives + // with only the email rerouting install removed. + $test->assertFileExists(static::$sut . '/scripts/provision-10-enable-dev-modules.sh'); + $test->assertFileNotContainsString(static::$sut . '/scripts/provision-10-enable-dev-modules.sh', 'pm:install reroute_email'); + }), ]; yield 'modules_no_robotstxt' => [ static::cw(function ($test): void { @@ -178,6 +184,18 @@ public static function dataProviderHandlerProcess(): \Iterator { }), static::cw(function (AbstractHandlerProcessTestCase $test): void { $test->assertSutNotContains(['drupal/devel', 'drupal/sdc_devel', 'drupal/generated_content', 'testmode']); + // Reroute Email still installs from the script, so it survives with + // only the development module installs removed. + $test->assertFileExists(static::$sut . '/scripts/provision-10-enable-dev-modules.sh'); + $test->assertFileContainsString(static::$sut . '/scripts/provision-10-enable-dev-modules.sh', 'pm:install reroute_email'); + }), + ]; + yield 'modules_no_devel_sdc_devel_generated_content_testmode_reroute_email' => [ + static::cw(function ($test): void { + $test->prompts[Modules::id()] = static::getModulesExcept(['devel', 'sdc_devel', 'generated_content', 'testmode', 'reroute_email']); + }), + static::cw(function (AbstractHandlerProcessTestCase $test): void { + $test->assertSutNotContains(['drupal/devel', 'drupal/sdc_devel', 'drupal/generated_content', 'testmode', 'drupal/reroute_email']); $test->assertFileDoesNotExist(static::$sut . '/scripts/provision-10-enable-dev-modules.sh'); }), ]; diff --git a/.vortex/tooling/tests/unit/provision.bats b/.vortex/tooling/tests/unit/provision.bats index 2672695ce..d0e72e0a5 100644 --- a/.vortex/tooling/tests/unit/provision.bats +++ b/.vortex/tooling/tests/unit/provision.bats @@ -152,7 +152,7 @@ assert_provision_info() { "@drush -y php:eval print \Drupal::moduleHandler()->moduleExists('toolbar'); # 0 # 1" "@drush -y pm:uninstall toolbar" " > Installing contrib modules." - "@drush -y pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap" + "@drush -y pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap" " > Installing Redis module." "@drush -y pm:install redis" " > Installing and configuring ClamAV." @@ -179,6 +179,8 @@ assert_provision_info() { "@drush -y pm:install devel" " > Installing Testmode module." "@drush -y pm:install testmode" + " > Installing Reroute Email module." + "@drush -y pm:install reroute_email" " > Installing Generated content module." "@drush -y pm:install generated_content" " ==> Started development modules operations." @@ -316,7 +318,7 @@ assert_provision_info() { "@drush -y php:eval print \Drupal::moduleHandler()->moduleExists('toolbar'); # 0 # 1" "@drush -y pm:uninstall toolbar" " > Installing contrib modules." - "@drush -y pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap" + "@drush -y pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap" " > Installing Redis module." "@drush -y pm:install redis" " > Installing and configuring ClamAV." @@ -343,6 +345,8 @@ assert_provision_info() { "@drush -y pm:install devel" " > Installing Testmode module." "@drush -y pm:install testmode" + " > Installing Reroute Email module." + "@drush -y pm:install reroute_email" " > Installing Generated content module." "@drush -y pm:install generated_content" " ==> Started development modules operations." @@ -489,7 +493,7 @@ assert_provision_info() { "@drush -y php:eval print \Drupal::moduleHandler()->moduleExists('toolbar'); # 0 # 1" "@drush -y pm:uninstall toolbar" " > Installing contrib modules." - "@drush -y pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap" + "@drush -y pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap" " > Installing Redis module." "@drush -y pm:install redis" " > Installing and configuring ClamAV." @@ -516,6 +520,8 @@ assert_provision_info() { "@drush -y pm:install devel" " > Installing Testmode module." "@drush -y pm:install testmode" + " > Installing Reroute Email module." + "@drush -y pm:install reroute_email" " > Installing Generated content module." "@drush -y pm:install generated_content" " ==> Started development modules operations." @@ -677,7 +683,7 @@ assert_provision_info() { "@drush -y php:eval print \Drupal::moduleHandler()->moduleExists('toolbar'); # 0 # 1" "@drush -y pm:uninstall toolbar" " > Installing contrib modules." - "@drush -y pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap" + "@drush -y pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap" " > Installing Redis module." "@drush -y pm:install redis" " > Installing and configuring ClamAV." @@ -704,6 +710,8 @@ assert_provision_info() { "@drush -y pm:install devel" " > Installing Testmode module." "@drush -y pm:install testmode" + " > Installing Reroute Email module." + "@drush -y pm:install reroute_email" " > Installing Generated content module." "@drush -y pm:install generated_content" " ==> Started development modules operations." @@ -916,7 +924,7 @@ assert_provision_info() { "@drush -y php:eval print \Drupal::moduleHandler()->moduleExists('toolbar'); # 0 # 1" "@drush -y pm:uninstall toolbar" " > Installing contrib modules." - "@drush -y pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap" + "@drush -y pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap" " > Installing Redis module." "@drush -y pm:install redis" " > Installing and configuring ClamAV." @@ -943,6 +951,8 @@ assert_provision_info() { "@drush -y pm:install devel" " > Installing Testmode module." "@drush -y pm:install testmode" + " > Installing Reroute Email module." + "@drush -y pm:install reroute_email" " > Installing Generated content module." "@drush -y pm:install generated_content" " ==> Started development modules operations." @@ -1083,7 +1093,7 @@ assert_provision_info() { "@drush -y php:eval print \Drupal::moduleHandler()->moduleExists('toolbar'); # 0 # 1" "@drush -y pm:uninstall toolbar" " > Installing contrib modules." - "@drush -y pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap" + "@drush -y pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap" " > Installing Redis module." "@drush -y pm:install redis" " > Installing and configuring ClamAV." @@ -1110,6 +1120,8 @@ assert_provision_info() { "@drush -y pm:install devel" " > Installing Testmode module." "@drush -y pm:install testmode" + " > Installing Reroute Email module." + "@drush -y pm:install reroute_email" " > Installing Generated content module." "@drush -y pm:install generated_content" " ==> Started development modules operations." @@ -1257,7 +1269,7 @@ assert_provision_info() { "@drush -y php:eval print \Drupal::moduleHandler()->moduleExists('toolbar'); # 0 # 1" "@drush -y pm:uninstall toolbar" " > Installing contrib modules." - "@drush -y pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap" + "@drush -y pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap" " > Installing Redis module." "@drush -y pm:install redis" " > Installing and configuring ClamAV." @@ -1284,6 +1296,8 @@ assert_provision_info() { "@drush -y pm:install devel" " > Installing Testmode module." "@drush -y pm:install testmode" + " > Installing Reroute Email module." + "@drush -y pm:install reroute_email" " > Installing Generated content module." "@drush -y pm:install generated_content" " ==> Started development modules operations." @@ -1614,7 +1628,7 @@ assert_provision_info() { "@drush -y php:eval print \Drupal::moduleHandler()->moduleExists('toolbar'); # 0 # 1" "@drush -y pm:uninstall toolbar" " > Installing contrib modules." - "@drush -y pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap" + "@drush -y pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap" " > Installing Redis module." "@drush -y pm:install redis" " > Installing and configuring ClamAV." @@ -1641,6 +1655,8 @@ assert_provision_info() { "@drush -y pm:install devel" " > Installing Testmode module." "@drush -y pm:install testmode" + " > Installing Reroute Email module." + "@drush -y pm:install reroute_email" " > Installing Generated content module." "@drush -y pm:install generated_content" " ==> Started development modules operations." @@ -1785,7 +1801,7 @@ assert_provision_info() { "@drush -y php:eval print \Drupal::moduleHandler()->moduleExists('toolbar'); # 0 # 1" "@drush -y pm:uninstall toolbar" " > Installing contrib modules." - "@drush -y pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap" + "@drush -y pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap" " > Installing Redis module." "@drush -y pm:install redis" " > Installing and configuring ClamAV." @@ -1812,6 +1828,8 @@ assert_provision_info() { "@drush -y pm:install devel" " > Installing Testmode module." "@drush -y pm:install testmode" + " > Installing Reroute Email module." + "@drush -y pm:install reroute_email" " > Installing Generated content module." "@drush -y pm:install generated_content" " ==> Started development modules operations." @@ -2076,7 +2094,7 @@ assert_provision_info() { "@drush -y php:eval print \Drupal::moduleHandler()->moduleExists('toolbar'); # 0 # 1" "@drush -y pm:uninstall toolbar" " > Installing contrib modules." - "@drush -y pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap" + "@drush -y pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap" " > Installing Redis module." "@drush -y pm:install redis" " > Installing and configuring ClamAV." @@ -2103,6 +2121,8 @@ assert_provision_info() { "@drush -y pm:install devel" " > Installing Testmode module." "@drush -y pm:install testmode" + " > Installing Reroute Email module." + "@drush -y pm:install reroute_email" " > Installing Generated content module." "@drush -y pm:install generated_content" " ==> Started development modules operations." @@ -2265,7 +2285,7 @@ assert_provision_info() { "@drush -y php:eval print \Drupal::moduleHandler()->moduleExists('toolbar'); # 0 # 1" "@drush -y pm:uninstall toolbar" " > Installing contrib modules." - "@drush -y pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap" + "@drush -y pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap" " > Installing Redis module." "@drush -y pm:install redis" " > Installing and configuring ClamAV." @@ -2292,6 +2312,8 @@ assert_provision_info() { "@drush -y pm:install devel" " > Installing Testmode module." "@drush -y pm:install testmode" + " > Installing Reroute Email module." + "@drush -y pm:install reroute_email" " > Installing Generated content module." "@drush -y pm:install generated_content" " ==> Started development modules operations." @@ -2506,7 +2528,7 @@ assert_provision_info() { "@drush -y php:eval print \Drupal::moduleHandler()->moduleExists('toolbar'); # 0 # 1" "@drush -y pm:uninstall toolbar" " > Installing contrib modules." - "@drush -y pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap" + "@drush -y pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap" " > Installing Redis module." "@drush -y pm:install redis" " > Installing and configuring ClamAV." @@ -2533,6 +2555,8 @@ assert_provision_info() { "@drush -y pm:install devel" " > Installing Testmode module." "@drush -y pm:install testmode" + " > Installing Reroute Email module." + "@drush -y pm:install reroute_email" " > Installing Generated content module." "@drush -y pm:install generated_content" " ==> Started development modules operations." @@ -2834,7 +2858,7 @@ assert_provision_info() { "@drush -y php:eval print \Drupal::moduleHandler()->moduleExists('toolbar'); # 0 # 1" "@drush -y pm:uninstall toolbar" " > Installing contrib modules." - "@drush -y pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap" + "@drush -y pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap" " > Installing Redis module." "@drush -y pm:install redis" " > Installing and configuring ClamAV." @@ -2861,6 +2885,8 @@ assert_provision_info() { "@drush -y pm:install devel" " > Installing Testmode module." "@drush -y pm:install testmode" + " > Installing Reroute Email module." + "@drush -y pm:install reroute_email" " > Installing Generated content module." "@drush -y pm:install generated_content" " ==> Started development modules operations." diff --git a/scripts/provision-00-enable-demo-modules.sh b/scripts/provision-00-enable-demo-modules.sh index e0c65fabd..3d342af0b 100755 --- a/scripts/provision-00-enable-demo-modules.sh +++ b/scripts/provision-00-enable-demo-modules.sh @@ -66,7 +66,7 @@ pass "Set up the administration navigation." #;< MODULES task "Installing contrib modules." -drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap +drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap pass "Installed contrib modules." #;> MODULES diff --git a/scripts/provision-10-enable-dev-modules.sh b/scripts/provision-10-enable-dev-modules.sh index 8e1bd4fd7..efce8d3bb 100755 --- a/scripts/provision-10-enable-dev-modules.sh +++ b/scripts/provision-10-enable-dev-modules.sh @@ -57,6 +57,12 @@ drush pm:install testmode pass "Installed Testmode module." #;> MODULE_TESTMODE +#;< MODULE_REROUTE_EMAIL +task "Installing Reroute Email module." +drush pm:install reroute_email +pass "Installed Reroute Email module." +#;> MODULE_REROUTE_EMAIL + #;< MODULE_GENERATED_CONTENT task "Installing Generated content module." if [ "${DRUPAL_GENERATED_CONTENT_SKIP}" = "1" ]; then diff --git a/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 46de79f48..304d9f0ff 100644 --- a/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -321,6 +321,9 @@ public function testEnvironmentNoOverrides(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_REROUTE_EMAIL + 'reroute_email', + // phpcs:ignore #;> MODULE_REROUTE_EMAIL // phpcs:ignore #;< MODULE_SDC_DEVEL 'sdc_devel', // phpcs:ignore #;> MODULE_SDC_DEVEL @@ -421,6 +424,9 @@ public function testEnvironmentOverrides(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_REROUTE_EMAIL + 'reroute_email', + // phpcs:ignore #;> MODULE_REROUTE_EMAIL // phpcs:ignore #;< MODULE_SDC_DEVEL 'sdc_devel', // phpcs:ignore #;> MODULE_SDC_DEVEL @@ -486,6 +492,9 @@ public function testEnvironmentLocal(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_REROUTE_EMAIL + 'reroute_email', + // phpcs:ignore #;> MODULE_REROUTE_EMAIL // phpcs:ignore #;< MODULE_SDC_DEVEL 'sdc_devel', // phpcs:ignore #;> MODULE_SDC_DEVEL @@ -552,6 +561,9 @@ public function testEnvironmentLocalContainer(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_REROUTE_EMAIL + 'reroute_email', + // phpcs:ignore #;> MODULE_REROUTE_EMAIL // phpcs:ignore #;< MODULE_SDC_DEVEL 'sdc_devel', // phpcs:ignore #;> MODULE_SDC_DEVEL @@ -662,6 +674,9 @@ public function testEnvironmentCircleCi(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_REROUTE_EMAIL + 'reroute_email', + // phpcs:ignore #;> MODULE_REROUTE_EMAIL // phpcs:ignore #;< MODULE_SDC_DEVEL 'sdc_devel', // phpcs:ignore #;> MODULE_SDC_DEVEL @@ -730,6 +745,9 @@ public function testEnvironmentGha(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_REROUTE_EMAIL + 'reroute_email', + // phpcs:ignore #;> MODULE_REROUTE_EMAIL // phpcs:ignore #;< MODULE_SDC_DEVEL 'sdc_devel', // phpcs:ignore #;> MODULE_SDC_DEVEL @@ -794,6 +812,9 @@ public function testEnvironmentAcquiaDynamic(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_REROUTE_EMAIL + 'reroute_email', + // phpcs:ignore #;> MODULE_REROUTE_EMAIL // phpcs:ignore #;< MODULE_SDC_DEVEL 'sdc_devel', // phpcs:ignore #;> MODULE_SDC_DEVEL @@ -855,6 +876,9 @@ public function testEnvironmentAcquiaDev(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_REROUTE_EMAIL + 'reroute_email', + // phpcs:ignore #;> MODULE_REROUTE_EMAIL // phpcs:ignore #;< MODULE_SDC_DEVEL 'sdc_devel', // phpcs:ignore #;> MODULE_SDC_DEVEL @@ -899,7 +923,7 @@ public function testEnvironmentAcquiaStage(): void { $config['environment_indicator.settings']['favicon'] = TRUE; $config['environment_indicator.settings']['toolbar_integration'] = [TRUE]; $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /"; - $config['reroute_email.settings']['enable'] = FALSE; + $config['reroute_email.settings']['enable'] = TRUE; $config['reroute_email.settings']['address'] = 'webmaster@your-site-domain.example'; $config['reroute_email.settings']['allowed'] = '*@your-site-domain.example'; $config['shield.settings']['shield_enable'] = TRUE; @@ -916,6 +940,9 @@ public function testEnvironmentAcquiaStage(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_REROUTE_EMAIL + 'reroute_email', + // phpcs:ignore #;> MODULE_REROUTE_EMAIL // phpcs:ignore #;< MODULE_SDC_DEVEL 'sdc_devel', // phpcs:ignore #;> MODULE_SDC_DEVEL @@ -974,6 +1001,9 @@ public function testEnvironmentAcquiaProd(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_REROUTE_EMAIL + 'reroute_email', + // phpcs:ignore #;> MODULE_REROUTE_EMAIL // phpcs:ignore #;< MODULE_SDC_DEVEL 'sdc_devel', // phpcs:ignore #;> MODULE_SDC_DEVEL @@ -1036,6 +1066,9 @@ public function testEnvironmentAcquiaConfigPathOverride(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_REROUTE_EMAIL + 'reroute_email', + // phpcs:ignore #;> MODULE_REROUTE_EMAIL // phpcs:ignore #;< MODULE_SDC_DEVEL 'sdc_devel', // phpcs:ignore #;> MODULE_SDC_DEVEL @@ -1105,6 +1138,9 @@ public function testEnvironmentAcquiaConfigVcsDirectoryFallback(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_REROUTE_EMAIL + 'reroute_email', + // phpcs:ignore #;> MODULE_REROUTE_EMAIL // phpcs:ignore #;< MODULE_SDC_DEVEL 'sdc_devel', // phpcs:ignore #;> MODULE_SDC_DEVEL @@ -1174,6 +1210,9 @@ public function testEnvironmentLagoonPreview(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_REROUTE_EMAIL + 'reroute_email', + // phpcs:ignore #;> MODULE_REROUTE_EMAIL // phpcs:ignore #;< MODULE_SDC_DEVEL 'sdc_devel', // phpcs:ignore #;> MODULE_SDC_DEVEL @@ -1246,6 +1285,9 @@ public function testEnvironmentLagoonDev(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_REROUTE_EMAIL + 'reroute_email', + // phpcs:ignore #;> MODULE_REROUTE_EMAIL // phpcs:ignore #;< MODULE_SDC_DEVEL 'sdc_devel', // phpcs:ignore #;> MODULE_SDC_DEVEL @@ -1300,7 +1342,7 @@ public function testEnvironmentLagoonTest(): void { $config['environment_indicator.settings']['favicon'] = TRUE; $config['environment_indicator.settings']['toolbar_integration'] = [TRUE]; $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /"; - $config['reroute_email.settings']['enable'] = FALSE; + $config['reroute_email.settings']['enable'] = TRUE; $config['reroute_email.settings']['address'] = 'webmaster@your-site-domain.example'; $config['reroute_email.settings']['allowed'] = '*@your-site-domain.example'; $config['shield.settings']['shield_enable'] = TRUE; @@ -1318,6 +1360,9 @@ public function testEnvironmentLagoonTest(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_REROUTE_EMAIL + 'reroute_email', + // phpcs:ignore #;> MODULE_REROUTE_EMAIL // phpcs:ignore #;< MODULE_SDC_DEVEL 'sdc_devel', // phpcs:ignore #;> MODULE_SDC_DEVEL @@ -1388,6 +1433,9 @@ public function testEnvironmentLagoonProd(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_REROUTE_EMAIL + 'reroute_email', + // phpcs:ignore #;> MODULE_REROUTE_EMAIL // phpcs:ignore #;< MODULE_SDC_DEVEL 'sdc_devel', // phpcs:ignore #;> MODULE_SDC_DEVEL diff --git a/tests/phpunit/Drupal/SwitchableSettingsTest.php b/tests/phpunit/Drupal/SwitchableSettingsTest.php index 1e8bf1169..c285060b9 100644 --- a/tests/phpunit/Drupal/SwitchableSettingsTest.php +++ b/tests/phpunit/Drupal/SwitchableSettingsTest.php @@ -734,12 +734,12 @@ public static function dataProviderRerouteEmail(): \Iterator { ], ]; - // Stage: disabled by default. + // Stage: enabled by default. yield [ self::ENVIRONMENT_STAGE, [], [ - 'reroute_email.settings' => ['enable' => FALSE, 'address' => 'webmaster@your-site-domain.example', 'allowed' => '*@your-site-domain.example'], + 'reroute_email.settings' => ['enable' => TRUE, 'address' => 'webmaster@your-site-domain.example', 'allowed' => '*@your-site-domain.example'], ], ]; @@ -774,6 +774,17 @@ public static function dataProviderRerouteEmail(): \Iterator { ], ]; + // Stage with DRUPAL_REROUTE_EMAIL_DISABLED: forced off. + yield [ + self::ENVIRONMENT_STAGE, + [ + 'DRUPAL_REROUTE_EMAIL_DISABLED' => 1, + ], + [ + 'reroute_email.settings' => ['enable' => FALSE], + ], + ]; + // Custom address and allowed list. yield [ self::ENVIRONMENT_DEV, diff --git a/web/sites/default/includes/modules/settings.reroute_email.php b/web/sites/default/includes/modules/settings.reroute_email.php index 1002d73fe..94bbed06b 100644 --- a/web/sites/default/includes/modules/settings.reroute_email.php +++ b/web/sites/default/includes/modules/settings.reroute_email.php @@ -7,18 +7,21 @@ declare(strict_types=1); +$settings['config_exclude_modules'][] = 'reroute_email'; + $config['reroute_email.settings']['address'] = getenv('DRUPAL_REROUTE_EMAIL_ADDRESS') ?: 'webmaster@your-site-domain.example'; $config['reroute_email.settings']['allowed'] = getenv('DRUPAL_REROUTE_EMAIL_ALLOWED') ?: '*@your-site-domain.example'; -if (!in_array($settings['environment'], [ENVIRONMENT_LOCAL, ENVIRONMENT_CI, ENVIRONMENT_STAGE, ENVIRONMENT_PROD], TRUE)) { +if (in_array($settings['environment'], [ENVIRONMENT_LOCAL, ENVIRONMENT_CI, ENVIRONMENT_PROD], TRUE)) { + // Deliver every message to its intended recipient. Local and CI capture + // outgoing mail by other means, and production sends to real recipients. + $config['reroute_email.settings']['enable'] = FALSE; +} +else { // Send every outgoing message to the address above instead of to its // intended recipient, unless that recipient matches the allowed list. $config['reroute_email.settings']['enable'] = TRUE; } -else { - // Deliver every message to its intended recipient. - $config['reroute_email.settings']['enable'] = FALSE; -} // Allow an environment to opt out of the rerouting set above. if (!empty(getenv('DRUPAL_REROUTE_EMAIL_DISABLED'))) { From e12d9e29fcd0bc8de5e59abb932834749f0f8dc8 Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Tue, 8 Sep 2026 10:16:30 +1000 Subject: [PATCH 2/4] Updated snapshots. --- .../provision-00-enable-demo-modules.sh | 2 +- .../provision-10-enable-dev-modules.sh | 4 + .../Drupal/EnvironmentSettingsTest.php | 5 + .../phpunit/Drupal/SwitchableSettingsTest.php | 15 +- .../modules/settings.reroute_email.php | 13 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../modules/settings.reroute_email.php | 13 +- .../Drupal/EnvironmentSettingsTest.php | 10 +- .../Drupal/EnvironmentSettingsTest.php | 8 +- .../modules/settings.reroute_email.php | 13 +- .../Drupal/EnvironmentSettingsTest.php | 10 +- .../Drupal/EnvironmentSettingsTest.php | 8 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../Drupal/EnvironmentSettingsTest.php | 8 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../Drupal/EnvironmentSettingsTest.php | 4 +- .../Drupal/EnvironmentSettingsTest.php | 10 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../provision-00-enable-demo-modules.sh | 4 +- .../provision-00-enable-demo-modules.sh | 4 +- .../Drupal/EnvironmentSettingsTest.php | 6 +- .../provision-00-enable-demo-modules.sh | 4 +- .../Drupal/EnvironmentSettingsTest.php | 18 +- .../Drupal/EnvironmentSettingsTest.php | 15 +- .../provision-10-enable-dev-modules.sh | 6 +- .../Drupal/EnvironmentSettingsTest.php | 15 +- .../provision-10-enable-dev-modules.sh | 40 +++++ .../Drupal/EnvironmentSettingsTest.php | 15 +- .../.ahoy.yml | 15 ++ .../.github/workflows/build-test-deploy.yml | 27 +++ .../composer.json | 24 +++ .../-provision-10-enable-dev-modules.sh | 0 .../tests/behat/bootstrap/FeatureContext.php | 16 ++ .../tests/behat/features/-pages.feature | 0 .../Drupal/EnvironmentSettingsTest.php | 108 ++++++++++++ .../phpunit/Drupal/SwitchableSettingsTest.php | 157 ++++++++++++++++++ .../modules/custom/sw_demo/sw_demo.deploy.php | 28 ++++ .../modules/custom/sw_demo/sw_demo.info.yml | 5 + .../includes/modules/-settings.devel.php | 0 .../modules/-settings.generated_content.php | 0 .../modules/-settings.reroute_email.php | 0 .../includes/modules/-settings.sdc_devel.php | 0 .../includes/modules/-settings.testmode.php | 0 .../provision-00-enable-demo-modules.sh | 4 +- .../Drupal/EnvironmentSettingsTest.php | 8 +- .../provision-10-enable-dev-modules.sh | 8 +- .../Drupal/EnvironmentSettingsTest.php | 18 +- .../provision-00-enable-demo-modules.sh | 4 +- .../provision-00-enable-demo-modules.sh | 4 +- .../provision-00-enable-demo-modules.sh | 4 +- .../provision-00-enable-demo-modules.sh | 9 - .../provision-10-enable-dev-modules.sh | 11 ++ .../Drupal/EnvironmentSettingsTest.php | 48 +++++- .../phpunit/Drupal/SwitchableSettingsTest.php | 17 +- .../provision-00-enable-demo-modules.sh | 4 +- .../Drupal/EnvironmentSettingsTest.php | 8 +- .../Drupal/EnvironmentSettingsTest.php | 20 +-- .../Drupal/EnvironmentSettingsTest.php | 6 +- .../provision-00-enable-demo-modules.sh | 4 +- .../Drupal/EnvironmentSettingsTest.php | 14 +- .../phpunit/Drupal/SwitchableSettingsTest.php | 2 +- .../provision-00-enable-demo-modules.sh | 4 +- .../Drupal/EnvironmentSettingsTest.php | 8 +- .../provision-00-enable-demo-modules.sh | 4 +- .../phpunit/Drupal/SwitchableSettingsTest.php | 2 +- .../provision-10-enable-dev-modules.sh | 6 +- .../Drupal/EnvironmentSettingsTest.php | 20 +-- .../provision-00-enable-demo-modules.sh | 4 +- .../Drupal/EnvironmentSettingsTest.php | 8 +- .../provision-00-enable-demo-modules.sh | 2 +- .../Drupal/EnvironmentSettingsTest.php | 17 +- .../phpunit/Drupal/SwitchableSettingsTest.php | 17 +- .../Drupal/EnvironmentSettingsTest.php | 8 +- .../phpunit/Drupal/SwitchableSettingsTest.php | 4 +- .../modules/settings.reroute_email.php | 8 +- .../provision-00-enable-demo-modules.sh | 2 +- .../Drupal/EnvironmentSettingsTest.php | 8 +- .../provision-00-enable-demo-modules.sh | 2 +- .../provision-00-enable-demo-modules.sh | 2 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- .../Drupal/EnvironmentSettingsTest.php | 2 +- 103 files changed, 787 insertions(+), 218 deletions(-) create mode 100644 .vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode/scripts/provision-10-enable-dev-modules.sh create mode 100644 .vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/.ahoy.yml create mode 100644 .vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/.github/workflows/build-test-deploy.yml create mode 100644 .vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/composer.json rename .vortex/installer/tests/Fixtures/handler_process/{modules_no_devel_sdc_devel_generated_content_testmode => modules_no_devel_sdc_devel_generated_content_testmode_reroute_email}/scripts/-provision-10-enable-dev-modules.sh (100%) create mode 100644 .vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/tests/behat/bootstrap/FeatureContext.php create mode 100644 .vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/tests/behat/features/-pages.feature create mode 100644 .vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/tests/phpunit/Drupal/EnvironmentSettingsTest.php create mode 100644 .vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/tests/phpunit/Drupal/SwitchableSettingsTest.php create mode 100644 .vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/web/modules/custom/sw_demo/sw_demo.deploy.php create mode 100644 .vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/web/modules/custom/sw_demo/sw_demo.info.yml create mode 100644 .vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/web/sites/default/includes/modules/-settings.devel.php create mode 100644 .vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/web/sites/default/includes/modules/-settings.generated_content.php create mode 100644 .vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/web/sites/default/includes/modules/-settings.reroute_email.php create mode 100644 .vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/web/sites/default/includes/modules/-settings.sdc_devel.php create mode 100644 .vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/web/sites/default/includes/modules/-settings.testmode.php delete mode 100644 .vortex/installer/tests/Fixtures/handler_process/modules_no_reroute_email/scripts/provision-00-enable-demo-modules.sh create mode 100644 .vortex/installer/tests/Fixtures/handler_process/modules_no_reroute_email/scripts/provision-10-enable-dev-modules.sh diff --git a/.vortex/installer/tests/Fixtures/handler_process/_baseline/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/_baseline/scripts/provision-00-enable-demo-modules.sh index 6d1c7f60a..8ed416301 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/_baseline/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/_baseline/scripts/provision-00-enable-demo-modules.sh @@ -63,7 +63,7 @@ fi pass "Set up the administration navigation." task "Installing contrib modules." -drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap +drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap pass "Installed contrib modules." task "Installing Redis module." diff --git a/.vortex/installer/tests/Fixtures/handler_process/_baseline/scripts/provision-10-enable-dev-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/_baseline/scripts/provision-10-enable-dev-modules.sh index a9172a05f..2d3f5e25d 100755 --- a/.vortex/installer/tests/Fixtures/handler_process/_baseline/scripts/provision-10-enable-dev-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/_baseline/scripts/provision-10-enable-dev-modules.sh @@ -49,6 +49,10 @@ task "Installing Testmode module." drush pm:install testmode pass "Installed Testmode module." +task "Installing Reroute Email module." +drush pm:install reroute_email +pass "Installed Reroute Email module." + task "Installing Generated content module." if [ "${DRUPAL_GENERATED_CONTENT_SKIP}" = "1" ]; then note "Content generation skipped. DRUPAL_GENERATED_CONTENT_SKIP is set to 1." diff --git a/.vortex/installer/tests/Fixtures/handler_process/_baseline/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/_baseline/tests/phpunit/Drupal/EnvironmentSettingsTest.php index aa7474317..b1257d353 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/_baseline/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/_baseline/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -89,6 +89,7 @@ public function testEnvironmentNoOverrides(): void { $settings['config_exclude_modules'] = [ 'devel', 'generated_content', + 'reroute_email', 'sdc_devel', 'testmode', ]; @@ -172,6 +173,7 @@ public function testEnvironmentOverrides(): void { $settings['config_exclude_modules'] = [ 'devel', 'generated_content', + 'reroute_email', 'sdc_devel', 'testmode', ]; @@ -229,6 +231,7 @@ public function testEnvironmentLocal(): void { $settings['config_exclude_modules'] = [ 'devel', 'generated_content', + 'reroute_email', 'sdc_devel', 'testmode', ]; @@ -286,6 +289,7 @@ public function testEnvironmentLocalContainer(): void { $settings['config_exclude_modules'] = [ 'devel', 'generated_content', + 'reroute_email', 'sdc_devel', 'testmode', ]; @@ -386,6 +390,7 @@ public function testEnvironmentGha(): void { $settings['config_exclude_modules'] = [ 'devel', 'generated_content', + 'reroute_email', 'sdc_devel', 'testmode', ]; diff --git a/.vortex/installer/tests/Fixtures/handler_process/_baseline/tests/phpunit/Drupal/SwitchableSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/_baseline/tests/phpunit/Drupal/SwitchableSettingsTest.php index 410542d69..8ac357bc5 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/_baseline/tests/phpunit/Drupal/SwitchableSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/_baseline/tests/phpunit/Drupal/SwitchableSettingsTest.php @@ -717,12 +717,12 @@ public static function dataProviderRerouteEmail(): \Iterator { ], ]; - // Stage: disabled by default. + // Stage: enabled by default. yield [ self::ENVIRONMENT_STAGE, [], [ - 'reroute_email.settings' => ['enable' => FALSE, 'address' => 'webmaster@star-wars.com', 'allowed' => '*@star-wars.com'], + 'reroute_email.settings' => ['enable' => TRUE, 'address' => 'webmaster@star-wars.com', 'allowed' => '*@star-wars.com'], ], ]; @@ -757,6 +757,17 @@ public static function dataProviderRerouteEmail(): \Iterator { ], ]; + // Stage with DRUPAL_REROUTE_EMAIL_DISABLED: forced off. + yield [ + self::ENVIRONMENT_STAGE, + [ + 'DRUPAL_REROUTE_EMAIL_DISABLED' => 1, + ], + [ + 'reroute_email.settings' => ['enable' => FALSE], + ], + ]; + // Custom address and allowed list. yield [ self::ENVIRONMENT_DEV, diff --git a/.vortex/installer/tests/Fixtures/handler_process/_baseline/web/sites/default/includes/modules/settings.reroute_email.php b/.vortex/installer/tests/Fixtures/handler_process/_baseline/web/sites/default/includes/modules/settings.reroute_email.php index b12918021..a0bbc387d 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/_baseline/web/sites/default/includes/modules/settings.reroute_email.php +++ b/.vortex/installer/tests/Fixtures/handler_process/_baseline/web/sites/default/includes/modules/settings.reroute_email.php @@ -7,18 +7,21 @@ declare(strict_types=1); +$settings['config_exclude_modules'][] = 'reroute_email'; + $config['reroute_email.settings']['address'] = getenv('DRUPAL_REROUTE_EMAIL_ADDRESS') ?: 'webmaster@star-wars.com'; $config['reroute_email.settings']['allowed'] = getenv('DRUPAL_REROUTE_EMAIL_ALLOWED') ?: '*@star-wars.com'; -if (!in_array($settings['environment'], [ENVIRONMENT_LOCAL, ENVIRONMENT_CI, ENVIRONMENT_STAGE, ENVIRONMENT_PROD], TRUE)) { +if (in_array($settings['environment'], [ENVIRONMENT_LOCAL, ENVIRONMENT_CI, ENVIRONMENT_PROD], TRUE)) { + // Deliver every message to its intended recipient. Local and CI capture + // outgoing mail by other means, and production sends to real recipients. + $config['reroute_email.settings']['enable'] = FALSE; +} +else { // Send every outgoing message to the address above instead of to its // intended recipient, unless that recipient matches the allowed list. $config['reroute_email.settings']['enable'] = TRUE; } -else { - // Deliver every message to its intended recipient. - $config['reroute_email.settings']['enable'] = FALSE; -} // Allow an environment to opt out of the rerouting set above. if (!empty(getenv('DRUPAL_REROUTE_EMAIL_DISABLED'))) { diff --git a/.vortex/installer/tests/Fixtures/handler_process/ciprovider_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/ciprovider_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php index f7ee4f34f..158e13f0a 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/ciprovider_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/ciprovider_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -352,9 +352,9 @@ +@@ -356,9 +356,9 @@ } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/code_coverage_provider_codecov_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/code_coverage_provider_codecov_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php index f7ee4f34f..158e13f0a 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/code_coverage_provider_codecov_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/code_coverage_provider_codecov_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -352,9 +352,9 @@ +@@ -356,9 +356,9 @@ } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/deploy_types_all_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/deploy_types_all_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php index f7ee4f34f..158e13f0a 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/deploy_types_all_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/deploy_types_all_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -352,9 +352,9 @@ +@@ -356,9 +356,9 @@ } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/deploy_types_none_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/deploy_types_none_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php index f7ee4f34f..158e13f0a 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/deploy_types_none_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/deploy_types_none_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -352,9 +352,9 @@ +@@ -356,9 +356,9 @@ } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/deps_updates_provider_ci_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/deps_updates_provider_ci_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php index f7ee4f34f..158e13f0a 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/deps_updates_provider_ci_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/deps_updates_provider_ci_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -352,9 +352,9 @@ +@@ -356,9 +356,9 @@ } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/docroot/sites/default/includes/modules/settings.reroute_email.php b/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/docroot/sites/default/includes/modules/settings.reroute_email.php index b12918021..a0bbc387d 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/docroot/sites/default/includes/modules/settings.reroute_email.php +++ b/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/docroot/sites/default/includes/modules/settings.reroute_email.php @@ -7,18 +7,21 @@ declare(strict_types=1); +$settings['config_exclude_modules'][] = 'reroute_email'; + $config['reroute_email.settings']['address'] = getenv('DRUPAL_REROUTE_EMAIL_ADDRESS') ?: 'webmaster@star-wars.com'; $config['reroute_email.settings']['allowed'] = getenv('DRUPAL_REROUTE_EMAIL_ALLOWED') ?: '*@star-wars.com'; -if (!in_array($settings['environment'], [ENVIRONMENT_LOCAL, ENVIRONMENT_CI, ENVIRONMENT_STAGE, ENVIRONMENT_PROD], TRUE)) { +if (in_array($settings['environment'], [ENVIRONMENT_LOCAL, ENVIRONMENT_CI, ENVIRONMENT_PROD], TRUE)) { + // Deliver every message to its intended recipient. Local and CI capture + // outgoing mail by other means, and production sends to real recipients. + $config['reroute_email.settings']['enable'] = FALSE; +} +else { // Send every outgoing message to the address above instead of to its // intended recipient, unless that recipient matches the allowed list. $config['reroute_email.settings']['enable'] = TRUE; } -else { - // Deliver every message to its intended recipient. - $config['reroute_email.settings']['enable'] = FALSE; -} // Allow an environment to opt out of the rerouting set above. if (!empty(getenv('DRUPAL_REROUTE_EMAIL_DISABLED'))) { diff --git a/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/tests/phpunit/Drupal/EnvironmentSettingsTest.php index c394f2156..1c2408954 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -49,7 +49,7 @@ } /** -@@ -403,6 +447,331 @@ +@@ -408,6 +452,337 @@ $settings['maintenance_theme'] = 'claro'; $settings['skip_permissions_hardening'] = TRUE; $settings['config_sync_directory'] = '../config/default'; @@ -90,6 +90,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; @@ -143,6 +144,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; @@ -183,7 +185,7 @@ + $config['environment_indicator.settings']['favicon'] = TRUE; + $config['environment_indicator.settings']['toolbar_integration'] = [TRUE]; + $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /"; -+ $config['reroute_email.settings']['enable'] = FALSE; ++ $config['reroute_email.settings']['enable'] = TRUE; + $config['reroute_email.settings']['address'] = 'webmaster@star-wars.com'; + $config['reroute_email.settings']['allowed'] = '*@star-wars.com'; + $config['shield.settings']['shield_enable'] = TRUE; @@ -196,6 +198,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; @@ -246,6 +249,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; @@ -300,6 +304,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; @@ -361,6 +366,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; diff --git a/.vortex/installer/tests/Fixtures/handler_process/hosting_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/hosting_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php index a7796d841..ab2ed9bfa 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/hosting_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/hosting_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -185,7 +185,7 @@ } /** -@@ -407,6 +587,283 @@ +@@ -412,6 +592,287 @@ '^localhost$', ]; $this->assertSettings($settings); @@ -227,6 +227,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; @@ -291,6 +292,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; @@ -341,7 +343,7 @@ + $config['environment_indicator.settings']['favicon'] = TRUE; + $config['environment_indicator.settings']['toolbar_integration'] = [TRUE]; + $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /"; -+ $config['reroute_email.settings']['enable'] = FALSE; ++ $config['reroute_email.settings']['enable'] = TRUE; + $config['reroute_email.settings']['address'] = 'webmaster@star-wars.com'; + $config['reroute_email.settings']['allowed'] = '*@star-wars.com'; + $config['shield.settings']['shield_enable'] = TRUE; @@ -355,6 +357,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; @@ -417,6 +420,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; diff --git a/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/docroot/sites/default/includes/modules/settings.reroute_email.php b/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/docroot/sites/default/includes/modules/settings.reroute_email.php index b12918021..a0bbc387d 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/docroot/sites/default/includes/modules/settings.reroute_email.php +++ b/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/docroot/sites/default/includes/modules/settings.reroute_email.php @@ -7,18 +7,21 @@ declare(strict_types=1); +$settings['config_exclude_modules'][] = 'reroute_email'; + $config['reroute_email.settings']['address'] = getenv('DRUPAL_REROUTE_EMAIL_ADDRESS') ?: 'webmaster@star-wars.com'; $config['reroute_email.settings']['allowed'] = getenv('DRUPAL_REROUTE_EMAIL_ALLOWED') ?: '*@star-wars.com'; -if (!in_array($settings['environment'], [ENVIRONMENT_LOCAL, ENVIRONMENT_CI, ENVIRONMENT_STAGE, ENVIRONMENT_PROD], TRUE)) { +if (in_array($settings['environment'], [ENVIRONMENT_LOCAL, ENVIRONMENT_CI, ENVIRONMENT_PROD], TRUE)) { + // Deliver every message to its intended recipient. Local and CI capture + // outgoing mail by other means, and production sends to real recipients. + $config['reroute_email.settings']['enable'] = FALSE; +} +else { // Send every outgoing message to the address above instead of to its // intended recipient, unless that recipient matches the allowed list. $config['reroute_email.settings']['enable'] = TRUE; } -else { - // Deliver every message to its intended recipient. - $config['reroute_email.settings']['enable'] = FALSE; -} // Allow an environment to opt out of the rerouting set above. if (!empty(getenv('DRUPAL_REROUTE_EMAIL_DISABLED'))) { diff --git a/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/tests/phpunit/Drupal/EnvironmentSettingsTest.php index c394f2156..1c2408954 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -49,7 +49,7 @@ } /** -@@ -403,6 +447,331 @@ +@@ -408,6 +452,337 @@ $settings['maintenance_theme'] = 'claro'; $settings['skip_permissions_hardening'] = TRUE; $settings['config_sync_directory'] = '../config/default'; @@ -90,6 +90,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; @@ -143,6 +144,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; @@ -183,7 +185,7 @@ + $config['environment_indicator.settings']['favicon'] = TRUE; + $config['environment_indicator.settings']['toolbar_integration'] = [TRUE]; + $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /"; -+ $config['reroute_email.settings']['enable'] = FALSE; ++ $config['reroute_email.settings']['enable'] = TRUE; + $config['reroute_email.settings']['address'] = 'webmaster@star-wars.com'; + $config['reroute_email.settings']['allowed'] = '*@star-wars.com'; + $config['shield.settings']['shield_enable'] = TRUE; @@ -196,6 +198,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; @@ -246,6 +249,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; @@ -300,6 +304,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; @@ -361,6 +366,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; diff --git a/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php index a7796d841..ab2ed9bfa 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -185,7 +185,7 @@ } /** -@@ -407,6 +587,283 @@ +@@ -412,6 +592,287 @@ '^localhost$', ]; $this->assertSettings($settings); @@ -227,6 +227,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; @@ -291,6 +292,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; @@ -341,7 +343,7 @@ + $config['environment_indicator.settings']['favicon'] = TRUE; + $config['environment_indicator.settings']['toolbar_integration'] = [TRUE]; + $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /"; -+ $config['reroute_email.settings']['enable'] = FALSE; ++ $config['reroute_email.settings']['enable'] = TRUE; + $config['reroute_email.settings']['address'] = 'webmaster@star-wars.com'; + $config['reroute_email.settings']['allowed'] = '*@star-wars.com'; + $config['shield.settings']['shield_enable'] = TRUE; @@ -355,6 +357,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; @@ -417,6 +420,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php index f7ee4f34f..158e13f0a 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -352,9 +352,9 @@ +@@ -356,9 +356,9 @@ } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php index a7796d841..ab2ed9bfa 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -185,7 +185,7 @@ } /** -@@ -407,6 +587,283 @@ +@@ -412,6 +592,287 @@ '^localhost$', ]; $this->assertSettings($settings); @@ -227,6 +227,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; @@ -291,6 +292,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; @@ -341,7 +343,7 @@ + $config['environment_indicator.settings']['favicon'] = TRUE; + $config['environment_indicator.settings']['toolbar_integration'] = [TRUE]; + $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /"; -+ $config['reroute_email.settings']['enable'] = FALSE; ++ $config['reroute_email.settings']['enable'] = TRUE; + $config['reroute_email.settings']['address'] = 'webmaster@star-wars.com'; + $config['reroute_email.settings']['allowed'] = '*@star-wars.com'; + $config['shield.settings']['shield_enable'] = TRUE; @@ -355,6 +357,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; @@ -417,6 +420,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 7482fa8c4..abc65393b 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -149,6 +149,13 @@ +@@ -150,6 +150,13 @@ $databases['default']['default']['collation'] = 'utf8_general_ci'; $databases['default']['default']['driver'] = 'mysql'; $databases['default']['default']['prefix'] = ''; diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 8871b4016..7046f6392 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -149,6 +149,13 @@ +@@ -150,6 +150,13 @@ $databases['default']['default']['collation'] = 'utf8_general_ci'; $databases['default']['default']['driver'] = 'mysql'; $databases['default']['default']['prefix'] = ''; @@ -12,7 +12,7 @@ $this->assertEquals($databases, $this->databases); // Verify key config overrides. -@@ -352,9 +359,9 @@ +@@ -356,9 +363,9 @@ } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php index a685072be..944368a96 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -185,7 +185,7 @@ } /** -@@ -149,6 +329,13 @@ +@@ -150,6 +330,13 @@ $databases['default']['default']['collation'] = 'utf8_general_ci'; $databases['default']['default']['driver'] = 'mysql'; $databases['default']['default']['prefix'] = ''; @@ -199,7 +199,7 @@ $this->assertEquals($databases, $this->databases); // Verify key config overrides. -@@ -407,6 +594,283 @@ +@@ -412,6 +599,287 @@ '^localhost$', ]; $this->assertSettings($settings); @@ -241,6 +241,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; @@ -305,6 +306,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; @@ -355,7 +357,7 @@ + $config['environment_indicator.settings']['favicon'] = TRUE; + $config['environment_indicator.settings']['toolbar_integration'] = [TRUE]; + $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /"; -+ $config['reroute_email.settings']['enable'] = FALSE; ++ $config['reroute_email.settings']['enable'] = TRUE; + $config['reroute_email.settings']['address'] = 'webmaster@star-wars.com'; + $config['reroute_email.settings']['allowed'] = '*@star-wars.com'; + $config['shield.settings']['shield_enable'] = TRUE; @@ -369,6 +371,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; @@ -431,6 +434,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_fetch_source_acquia/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/migration_fetch_source_acquia/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 7482fa8c4..abc65393b 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_fetch_source_acquia/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_fetch_source_acquia/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -149,6 +149,13 @@ +@@ -150,6 +150,13 @@ $databases['default']['default']['collation'] = 'utf8_general_ci'; $databases['default']['default']['driver'] = 'mysql'; $databases['default']['default']['prefix'] = ''; diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_fetch_source_container_registry/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/migration_fetch_source_container_registry/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 7482fa8c4..abc65393b 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_fetch_source_container_registry/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_fetch_source_container_registry/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -149,6 +149,13 @@ +@@ -150,6 +150,13 @@ $databases['default']['default']['collation'] = 'utf8_general_ci'; $databases['default']['default']['driver'] = 'mysql'; $databases['default']['default']['prefix'] = ''; diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_fetch_source_ftp/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/migration_fetch_source_ftp/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 7482fa8c4..abc65393b 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_fetch_source_ftp/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_fetch_source_ftp/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -149,6 +149,13 @@ +@@ -150,6 +150,13 @@ $databases['default']['default']['collation'] = 'utf8_general_ci'; $databases['default']['default']['driver'] = 'mysql'; $databases['default']['default']['prefix'] = ''; diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_fetch_source_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/migration_fetch_source_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 7482fa8c4..abc65393b 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_fetch_source_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_fetch_source_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -149,6 +149,13 @@ +@@ -150,6 +150,13 @@ $databases['default']['default']['collation'] = 'utf8_general_ci'; $databases['default']['default']['driver'] = 'mysql'; $databases['default']['default']['prefix'] = ''; diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_fetch_source_s3/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/migration_fetch_source_s3/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 7482fa8c4..abc65393b 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_fetch_source_s3/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_fetch_source_s3/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -149,6 +149,13 @@ +@@ -150,6 +150,13 @@ $databases['default']['default']['collation'] = 'utf8_general_ci'; $databases['default']['default']['driver'] = 'mysql'; $databases['default']['default']['prefix'] = ''; diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_fetch_source_url/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/migration_fetch_source_url/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 7482fa8c4..abc65393b 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/migration_fetch_source_url/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/migration_fetch_source_url/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -149,6 +149,13 @@ +@@ -150,6 +150,13 @@ $databases['default']['default']['collation'] = 'utf8_general_ci'; $databases['default']['default']['driver'] = 'mysql'; $databases['default']['default']['prefix'] = ''; diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_coffee/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_coffee/scripts/provision-00-enable-demo-modules.sh index 05541cdcf..d60082334 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_coffee/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_coffee/scripts/provision-00-enable-demo-modules.sh @@ -2,8 +2,8 @@ pass "Set up the administration navigation." task "Installing contrib modules." --drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap -+drush pm:install config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap +-drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap ++drush pm:install config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap pass "Installed contrib modules." task "Installing Redis module." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_split/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_split/scripts/provision-00-enable-demo-modules.sh index 4965840a1..0cb9b72ec 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_split/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_split/scripts/provision-00-enable-demo-modules.sh @@ -2,8 +2,8 @@ pass "Set up the administration navigation." task "Installing contrib modules." --drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap -+drush pm:install coffee config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap +-drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap ++drush pm:install coffee config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap pass "Installed contrib modules." task "Installing Redis module." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_split/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_split/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 252a4948b..428a92b50 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_split/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_split/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -206,7 +206,6 @@ +@@ -208,7 +208,6 @@ $this->requireSettingsFile(); $config['automated_cron.settings']['interval'] = 0; @@ -6,7 +6,7 @@ $config['environment_indicator.indicator']['bg_color'] = '#006600'; $config['environment_indicator.indicator']['fg_color'] = '#ffffff'; $config['environment_indicator.indicator']['name'] = self::ENVIRONMENT_LOCAL; -@@ -263,7 +262,6 @@ +@@ -266,7 +265,6 @@ $this->requireSettingsFile(); $config['automated_cron.settings']['interval'] = 0; @@ -14,7 +14,7 @@ $config['environment_indicator.indicator']['bg_color'] = '#006600'; $config['environment_indicator.indicator']['fg_color'] = '#ffffff'; $config['environment_indicator.indicator']['name'] = self::ENVIRONMENT_LOCAL; -@@ -362,7 +360,6 @@ +@@ -366,7 +364,6 @@ $this->requireSettingsFile(); $config['automated_cron.settings']['interval'] = 0; diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_update/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_update/scripts/provision-00-enable-demo-modules.sh index fd2b6d8a6..0951fbca9 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_update/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_update/scripts/provision-00-enable-demo-modules.sh @@ -2,8 +2,8 @@ pass "Set up the administration navigation." task "Installing contrib modules." --drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap -+drush pm:install coffee config_split media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap +-drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap ++drush pm:install coffee config_split media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap pass "Installed contrib modules." task "Installing Redis module." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 39ec08ac4..3f691c0d4 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -4,37 +4,37 @@ $settings['config_exclude_modules'] = [ - 'devel', 'generated_content', + 'reroute_email', 'sdc_devel', - 'testmode', -@@ -170,7 +169,6 @@ +@@ -171,7 +170,6 @@ // Verify settings overrides. $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', 'generated_content', + 'reroute_email', 'sdc_devel', - 'testmode', -@@ -227,7 +225,6 @@ +@@ -229,7 +227,6 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', 'generated_content', + 'reroute_email', 'sdc_devel', - 'testmode', -@@ -284,7 +281,6 @@ +@@ -287,7 +284,6 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', 'generated_content', + 'reroute_email', 'sdc_devel', - 'testmode', -@@ -384,7 +380,6 @@ +@@ -388,7 +384,6 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', 'generated_content', + 'reroute_email', 'sdc_devel', - 'testmode', diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 22747d894..ba0a8bca0 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,49 +1,54 @@ -@@ -87,9 +87,7 @@ +@@ -87,10 +87,8 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', 'generated_content', + 'reroute_email', - 'sdc_devel', 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; -@@ -170,9 +168,7 @@ +@@ -171,10 +169,8 @@ // Verify settings overrides. $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', 'generated_content', + 'reroute_email', - 'sdc_devel', 'testmode', ]; $settings['config_sync_directory'] = 'custom_config'; -@@ -227,9 +223,7 @@ +@@ -229,10 +225,8 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', 'generated_content', + 'reroute_email', - 'sdc_devel', 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; -@@ -284,9 +278,7 @@ +@@ -287,10 +281,8 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', 'generated_content', + 'reroute_email', - 'sdc_devel', 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; -@@ -384,9 +376,7 @@ +@@ -388,10 +380,8 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', 'generated_content', + 'reroute_email', - 'sdc_devel', 'testmode', ]; diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content/scripts/provision-10-enable-dev-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content/scripts/provision-10-enable-dev-modules.sh index b6cc3b8b1..6921dd932 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content/scripts/provision-10-enable-dev-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content/scripts/provision-10-enable-dev-modules.sh @@ -8,7 +8,7 @@ # ------------------------------------------------------------------------------ # @formatter:off -@@ -37,25 +34,8 @@ +@@ -37,14 +34,6 @@ exit 0 fi @@ -23,6 +23,10 @@ task "Installing Testmode module." drush pm:install testmode pass "Installed Testmode module." +@@ -52,14 +41,5 @@ + task "Installing Reroute Email module." + drush pm:install reroute_email + pass "Installed Reroute Email module." - -task "Installing Generated content module." -if [ "${DRUPAL_GENERATED_CONTENT_SKIP}" = "1" ]; then diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 27d314aa7..b8792de6d 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,49 +1,54 @@ -@@ -87,9 +87,6 @@ +@@ -87,10 +87,7 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', + 'reroute_email', - 'sdc_devel', 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; -@@ -170,9 +167,6 @@ +@@ -171,10 +168,7 @@ // Verify settings overrides. $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', + 'reroute_email', - 'sdc_devel', 'testmode', ]; $settings['config_sync_directory'] = 'custom_config'; -@@ -227,9 +221,6 @@ +@@ -229,10 +223,7 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', + 'reroute_email', - 'sdc_devel', 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; -@@ -284,9 +275,6 @@ +@@ -287,10 +278,7 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', + 'reroute_email', - 'sdc_devel', 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; -@@ -384,9 +372,6 @@ +@@ -388,10 +376,7 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', + 'reroute_email', - 'sdc_devel', 'testmode', ]; diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode/scripts/provision-10-enable-dev-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode/scripts/provision-10-enable-dev-modules.sh new file mode 100644 index 000000000..7c94a364c --- /dev/null +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode/scripts/provision-10-enable-dev-modules.sh @@ -0,0 +1,40 @@ +@@ -10,9 +10,6 @@ + set -eu + [ "${VORTEX_DEBUG-}" = "1" ] && set -x + +-# Skip content generation. +-DRUPAL_GENERATED_CONTENT_SKIP="${DRUPAL_GENERATED_CONTENT_SKIP:-0}" +- + # ------------------------------------------------------------------------------ + + # @formatter:off +@@ -37,29 +34,8 @@ + exit 0 + fi + +-task "Installing Single Directory Component development tools." +-drush pm:install sdc_devel +-pass "Installed Single Directory Component development tools." +- +-task "Installing Devel module." +-drush pm:install devel +-pass "Installed Devel module." +- +-task "Installing Testmode module." +-drush pm:install testmode +-pass "Installed Testmode module." +- + task "Installing Reroute Email module." + drush pm:install reroute_email + pass "Installed Reroute Email module." +- +-task "Installing Generated content module." +-if [ "${DRUPAL_GENERATED_CONTENT_SKIP}" = "1" ]; then +- note "Content generation skipped. DRUPAL_GENERATED_CONTENT_SKIP is set to 1." +- drush pm:install generated_content +-else +- GENERATED_CONTENT_CREATE=1 drush pm:install generated_content +-fi +-pass "Installed Generated content module." + + info "Finished development modules operations." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 9f89d88d0..571a332dd 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,53 +1,58 @@ -@@ -87,10 +87,6 @@ +@@ -87,11 +87,7 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', + 'reroute_email', - 'sdc_devel', - 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; $settings['entity_update_batch_size'] = 50; -@@ -170,10 +166,6 @@ +@@ -171,11 +167,7 @@ // Verify settings overrides. $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', + 'reroute_email', - 'sdc_devel', - 'testmode', ]; $settings['config_sync_directory'] = 'custom_config'; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; -@@ -227,10 +219,6 @@ +@@ -229,11 +221,7 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', + 'reroute_email', - 'sdc_devel', - 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; $settings['entity_update_batch_size'] = 50; -@@ -284,10 +272,6 @@ +@@ -287,11 +275,7 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', + 'reroute_email', - 'sdc_devel', - 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; $settings['entity_update_batch_size'] = 50; -@@ -384,10 +368,6 @@ +@@ -388,11 +372,7 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', + 'reroute_email', - 'sdc_devel', - 'testmode', ]; diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/.ahoy.yml b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/.ahoy.yml new file mode 100644 index 000000000..6645f25fd --- /dev/null +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/.ahoy.yml @@ -0,0 +1,15 @@ +@@ -215,14 +215,6 @@ + cmd: | + ahoy cli vendor/bin/gherkinlint lint tests/behat/features + +- lint-sdc: +- usage: Validate Single Directory Components (requires a provisioned site). +- cmd: | +- ahoy cli " \ +- output=\$(vendor/bin/drush sdc-devel:validate \${DRUPAL_THEME} 2>&1); \ +- echo \"\${output}\"; \ +- if echo \"\${output}\" | grep -qE 'Critical|Errors?|Warnings?'; then echo 'SDC validation reported problems.'; exit 1; fi" +- + lint-fix: + usage: Fix lint issues of back-end and front-end code. + cmd: | diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/.github/workflows/build-test-deploy.yml b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/.github/workflows/build-test-deploy.yml new file mode 100644 index 000000000..c0b7f62c2 --- /dev/null +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/.github/workflows/build-test-deploy.yml @@ -0,0 +1,27 @@ +@@ -312,7 +312,6 @@ + VORTEX_CI_RUNNER_TOTAL: ${{ strategy.job-total }} + VORTEX_CI_IS_JEST_RUNNER: ${{ matrix.instance == 0 || strategy.job-total == 1 }} + VORTEX_CI_IS_PHPUNIT_RUNNER: ${{ matrix.instance == 0 || strategy.job-total == 1 }} +- VORTEX_CI_IS_SDC_DEVEL_RUNNER: ${{ matrix.instance == 0 || strategy.job-total == 1 }} + # Runs on every instance, using the `p` profile. + VORTEX_CI_IS_BEHAT_RUNNER: true + # Subtracted from the instance index to derive the profile number. Raise +@@ -499,18 +498,6 @@ + fi + env: + VORTEX_CI_CODE_COVERAGE_THRESHOLD: ${{ vars.VORTEX_CI_CODE_COVERAGE_THRESHOLD || '90' }} +- +- - name: Validate Single Directory Components +- if: ${{ env.VORTEX_CI_IS_SDC_DEVEL_RUNNER == 'true' }} +- run: | +- [ "${VORTEX_FRONTEND_BUILD_SKIP:-0}" -eq 1 ] && exit 0 +- output=$(docker compose exec -T cli vendor/bin/drush sdc-devel:validate "${DRUPAL_THEME}" 2>&1) +- echo "${output}" +- if echo "${output}" | grep -qE 'Critical|Errors?|Warnings?'; then +- echo "SDC validation reported problems." +- exit 1 +- fi +- continue-on-error: ${{ vars.VORTEX_CI_SDC_DEVEL_IGNORE_FAILURE == '1' }} + + - name: Test with Behat + if: ${{ env.VORTEX_CI_IS_BEHAT_RUNNER == 'true' }} diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/composer.json b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/composer.json new file mode 100644 index 000000000..0964463a7 --- /dev/null +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/composer.json @@ -0,0 +1,24 @@ +@@ -14,23 +14,18 @@ + "drupal/config_update": "__VERSION__", + "drupal/core-composer-scaffold": "__VERSION__", + "drupal/core-recommended": "__VERSION__", +- "drupal/devel": "__VERSION__", + "drupal/drupal_helpers": "__VERSION__", + "drupal/environment_indicator": "__VERSION__", +- "drupal/generated_content": "__VERSION__", + "drupal/navigation_extra_tools": "__VERSION__", + "drupal/pathauto": "__VERSION__", + "drupal/redirect": "__VERSION__", + "drupal/redis": "__VERSION__", +- "drupal/reroute_email": "__VERSION__", + "drupal/robotstxt": "__VERSION__", +- "drupal/sdc_devel": "__VERSION__", + "drupal/search_api": "__VERSION__", + "drupal/search_api_solr": "__VERSION__", + "drupal/seckit": "__VERSION__", + "drupal/shield": "__VERSION__", + "drupal/stage_file_proxy": "__VERSION__", +- "drupal/testmode": "__VERSION__", + "drupal/xmlsitemap": "__VERSION__", + "drush/drush": "__VERSION__" + }, diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode/scripts/-provision-10-enable-dev-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/scripts/-provision-10-enable-dev-modules.sh similarity index 100% rename from .vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode/scripts/-provision-10-enable-dev-modules.sh rename to .vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/scripts/-provision-10-enable-dev-modules.sh diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/tests/behat/bootstrap/FeatureContext.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/tests/behat/bootstrap/FeatureContext.php new file mode 100644 index 000000000..08695b207 --- /dev/null +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/tests/behat/bootstrap/FeatureContext.php @@ -0,0 +1,16 @@ +@@ -33,7 +33,6 @@ + use DrevOps\BehatSteps\Drupal\SearchApiTrait; + use DrevOps\BehatSteps\Drupal\StateTrait; + use DrevOps\BehatSteps\Drupal\TaxonomyTrait; +-use DrevOps\BehatSteps\Drupal\TestmodeTrait; + use DrevOps\BehatSteps\Drupal\UserTrait; + use DrevOps\BehatSteps\Drupal\WatchdogTrait; + use DrevOps\BehatSteps\ElementTrait; +@@ -99,7 +98,6 @@ + use StateTrait; + use TableTrait; + use TaxonomyTrait; +- use TestmodeTrait; + use UserTrait; + use WaitTrait; + use WatchdogTrait; diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/tests/behat/features/-pages.feature b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/tests/behat/features/-pages.feature new file mode 100644 index 000000000..e69de29bb diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/tests/phpunit/Drupal/EnvironmentSettingsTest.php new file mode 100644 index 000000000..320c6e1ac --- /dev/null +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -0,0 +1,108 @@ +@@ -79,19 +79,11 @@ + $config['shield.settings']['shield_enable'] = TRUE; + $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE; + $config['xmlsitemap_engines.settings']['submit'] = FALSE; +- $config['reroute_email.settings']['enable'] = TRUE; +- $config['reroute_email.settings']['address'] = 'webmaster@star-wars.com'; +- $config['reroute_email.settings']['allowed'] = '*@star-wars.com'; + $config['system.performance']['cache']['page']['max_age'] = 900; + $this->assertConfig($config); + + $settings['auto_create_htaccess'] = FALSE; + $settings['config_exclude_modules'] = [ +- 'devel', +- 'generated_content', +- 'reroute_email', +- 'sdc_devel', +- 'testmode', + ]; + $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; + $settings['entity_update_batch_size'] = 50; +@@ -162,9 +154,6 @@ + $config['shield.settings']['shield_enable'] = TRUE; + $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE; + $config['xmlsitemap_engines.settings']['submit'] = FALSE; +- $config['reroute_email.settings']['enable'] = TRUE; +- $config['reroute_email.settings']['address'] = 'webmaster@star-wars.com'; +- $config['reroute_email.settings']['allowed'] = '*@star-wars.com'; + $config['system.performance']['cache']['page']['max_age'] = 1800; + $this->assertConfig($config); + +@@ -171,11 +160,6 @@ + // Verify settings overrides. + $settings['auto_create_htaccess'] = FALSE; + $settings['config_exclude_modules'] = [ +- 'devel', +- 'generated_content', +- 'reroute_email', +- 'sdc_devel', +- 'testmode', + ]; + $settings['config_sync_directory'] = 'custom_config'; + $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; +@@ -220,9 +204,6 @@ + $config['xmlsitemap_engines.settings']['submit'] = FALSE; + $config['system.logging']['error_level'] = 'all'; + $config['system.performance']['cache']['page']['max_age'] = 900; +- $config['reroute_email.settings']['enable'] = FALSE; +- $config['reroute_email.settings']['address'] = 'webmaster@star-wars.com'; +- $config['reroute_email.settings']['allowed'] = '*@star-wars.com'; + $config['seckit.settings']['seckit_xss']['csp']['checkbox'] = FALSE; + $config['seckit.settings']['seckit_xss']['csp']['upgrade-req'] = FALSE; + $this->assertConfig($config); +@@ -229,11 +210,6 @@ + + $settings['auto_create_htaccess'] = FALSE; + $settings['config_exclude_modules'] = [ +- 'devel', +- 'generated_content', +- 'reroute_email', +- 'sdc_devel', +- 'testmode', + ]; + $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; + $settings['entity_update_batch_size'] = 50; +@@ -278,9 +254,6 @@ + $config['xmlsitemap_engines.settings']['submit'] = FALSE; + $config['system.logging']['error_level'] = 'all'; + $config['system.performance']['cache']['page']['max_age'] = 900; +- $config['reroute_email.settings']['enable'] = FALSE; +- $config['reroute_email.settings']['address'] = 'webmaster@star-wars.com'; +- $config['reroute_email.settings']['allowed'] = '*@star-wars.com'; + $config['seckit.settings']['seckit_xss']['csp']['checkbox'] = FALSE; + $config['seckit.settings']['seckit_xss']['csp']['upgrade-req'] = FALSE; + $this->assertConfig($config); +@@ -287,11 +260,6 @@ + + $settings['auto_create_htaccess'] = FALSE; + $settings['config_exclude_modules'] = [ +- 'devel', +- 'generated_content', +- 'reroute_email', +- 'sdc_devel', +- 'testmode', + ]; + $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; + $settings['entity_update_batch_size'] = 50; +@@ -379,9 +347,6 @@ + $config['system.logging']['error_level'] = 'all'; + $config['system.mail']['interface']['default'] = 'test_mail_collector'; + $config['system.performance']['cache']['page']['max_age'] = 900; +- $config['reroute_email.settings']['enable'] = FALSE; +- $config['reroute_email.settings']['address'] = 'webmaster@star-wars.com'; +- $config['reroute_email.settings']['allowed'] = '*@star-wars.com'; + $config['seckit.settings']['seckit_xss']['csp']['checkbox'] = FALSE; + $config['seckit.settings']['seckit_xss']['csp']['upgrade-req'] = FALSE; + $this->assertConfig($config); +@@ -388,11 +353,6 @@ + + $settings['auto_create_htaccess'] = FALSE; + $settings['config_exclude_modules'] = [ +- 'devel', +- 'generated_content', +- 'reroute_email', +- 'sdc_devel', +- 'testmode', + ]; + $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; + $settings['entity_update_batch_size'] = 50; diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/tests/phpunit/Drupal/SwitchableSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/tests/phpunit/Drupal/SwitchableSettingsTest.php new file mode 100644 index 000000000..2c1705e3e --- /dev/null +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/tests/phpunit/Drupal/SwitchableSettingsTest.php @@ -0,0 +1,157 @@ +@@ -665,156 +665,6 @@ + } + + /** +- * Test Reroute Email config. +- */ +- #[DataProvider('dataProviderRerouteEmail')] +- public function testRerouteEmail(string $env, array $vars, array $expected_present, array $expected_absent = []): void { +- $this->setEnvVars($vars + ['ENVIRONMENT_TYPE' => $env]); +- +- $this->requireSettingsFile(); +- +- $this->assertConfigContains($expected_present); +- $this->assertConfigNotContains($expected_absent); +- } +- +- /** +- * Data provider for testRerouteEmail(). +- */ +- public static function dataProviderRerouteEmail(): \Iterator { +- // Local: disabled by default. +- yield [ +- self::ENVIRONMENT_LOCAL, +- [], +- [ +- 'reroute_email.settings' => ['enable' => FALSE, 'address' => 'webmaster@star-wars.com', 'allowed' => '*@star-wars.com'], +- ], +- ]; +- +- // CI: disabled by default. +- yield [ +- self::ENVIRONMENT_CI, +- [], +- [ +- 'reroute_email.settings' => ['enable' => FALSE, 'address' => 'webmaster@star-wars.com', 'allowed' => '*@star-wars.com'], +- ], +- ]; +- +- // Dev: enabled by default. +- yield [ +- self::ENVIRONMENT_DEV, +- [], +- [ +- 'reroute_email.settings' => ['enable' => TRUE, 'address' => 'webmaster@star-wars.com', 'allowed' => '*@star-wars.com'], +- ], +- ]; +- +- // SUT: enabled by default. +- yield [ +- self::ENVIRONMENT_SUT, +- [], +- [ +- 'reroute_email.settings' => ['enable' => TRUE, 'address' => 'webmaster@star-wars.com', 'allowed' => '*@star-wars.com'], +- ], +- ]; +- +- // Stage: enabled by default. +- yield [ +- self::ENVIRONMENT_STAGE, +- [], +- [ +- 'reroute_email.settings' => ['enable' => TRUE, 'address' => 'webmaster@star-wars.com', 'allowed' => '*@star-wars.com'], +- ], +- ]; +- +- // Prod: disabled by default. +- yield [ +- self::ENVIRONMENT_PROD, +- [], +- [ +- 'reroute_email.settings' => ['enable' => FALSE, 'address' => 'webmaster@star-wars.com', 'allowed' => '*@star-wars.com'], +- ], +- ]; +- +- // Dev with DRUPAL_REROUTE_EMAIL_DISABLED: forced off. +- yield [ +- self::ENVIRONMENT_DEV, +- [ +- 'DRUPAL_REROUTE_EMAIL_DISABLED' => 1, +- ], +- [ +- 'reroute_email.settings' => ['enable' => FALSE], +- ], +- ]; +- +- // SUT with DRUPAL_REROUTE_EMAIL_DISABLED: forced off. +- yield [ +- self::ENVIRONMENT_SUT, +- [ +- 'DRUPAL_REROUTE_EMAIL_DISABLED' => 1, +- ], +- [ +- 'reroute_email.settings' => ['enable' => FALSE], +- ], +- ]; +- +- // Stage with DRUPAL_REROUTE_EMAIL_DISABLED: forced off. +- yield [ +- self::ENVIRONMENT_STAGE, +- [ +- 'DRUPAL_REROUTE_EMAIL_DISABLED' => 1, +- ], +- [ +- 'reroute_email.settings' => ['enable' => FALSE], +- ], +- ]; +- +- // Custom address and allowed list. +- yield [ +- self::ENVIRONMENT_DEV, +- [ +- 'DRUPAL_REROUTE_EMAIL_ADDRESS' => 'dev@example.com', +- 'DRUPAL_REROUTE_EMAIL_ALLOWED' => '*@example.com', +- ], +- [ +- 'reroute_email.settings' => ['enable' => TRUE, 'address' => 'dev@example.com', 'allowed' => '*@example.com'], +- ], +- ]; +- +- // DRUPAL_REROUTE_EMAIL_DISABLED with empty value: not disabled. +- yield [ +- self::ENVIRONMENT_DEV, +- [ +- 'DRUPAL_REROUTE_EMAIL_DISABLED' => '', +- ], +- [ +- 'reroute_email.settings' => ['enable' => TRUE], +- ], +- ]; +- +- // DRUPAL_REROUTE_EMAIL_DISABLED with 0: not disabled. +- yield [ +- self::ENVIRONMENT_DEV, +- [ +- 'DRUPAL_REROUTE_EMAIL_DISABLED' => 0, +- ], +- [ +- 'reroute_email.settings' => ['enable' => TRUE], +- ], +- ]; +- +- // DRUPAL_REROUTE_EMAIL_DISABLED with string '1': disabled. +- yield [ +- self::ENVIRONMENT_DEV, +- [ +- 'DRUPAL_REROUTE_EMAIL_DISABLED' => '1', +- ], +- [ +- 'reroute_email.settings' => ['enable' => FALSE], +- ], +- ]; +- } +- +- /** + * Test Stage File Proxy config. + */ + #[DataProvider('dataProviderStageFileProxy')] diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/web/modules/custom/sw_demo/sw_demo.deploy.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/web/modules/custom/sw_demo/sw_demo.deploy.php new file mode 100644 index 000000000..58141ee5f --- /dev/null +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/web/modules/custom/sw_demo/sw_demo.deploy.php @@ -0,0 +1,28 @@ +@@ -11,27 +11,6 @@ + + use Drupal\drupal_helpers\Helper; + use Drupal\menu_link_content\MenuLinkContentInterface; +-use Drupal\testmode\Testmode; +- +-/** +- * Configure testmode to filter the pages view. +- * +- * Registers the 'sw_demo_pages' view with testmode so that only +- * content matching the [TEST] prefix appears during test runs. +- * +- * @codeCoverageIgnore +- */ +-function sw_demo_deploy_configure_testmode(): string { +- $testmode = Testmode::getInstance(); +- +- $views = $testmode->getNodeViews(); +- if (!in_array('sw_demo_pages', $views)) { +- $views[] = 'sw_demo_pages'; +- $testmode->setNodeViews($views); +- } +- +- return 'Configured testmode to filter the pages view.'; +-} + + /** + * Place counter block in the "content" region. diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/web/modules/custom/sw_demo/sw_demo.info.yml b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/web/modules/custom/sw_demo/sw_demo.info.yml new file mode 100644 index 000000000..a8f1a0707 --- /dev/null +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/web/modules/custom/sw_demo/sw_demo.info.yml @@ -0,0 +1,5 @@ +@@ -8,4 +8,3 @@ + - drupal:node + - drupal:views + - drupal_helpers:drupal_helpers +- - testmode:testmode diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/web/sites/default/includes/modules/-settings.devel.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/web/sites/default/includes/modules/-settings.devel.php new file mode 100644 index 000000000..e69de29bb diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/web/sites/default/includes/modules/-settings.generated_content.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/web/sites/default/includes/modules/-settings.generated_content.php new file mode 100644 index 000000000..e69de29bb diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/web/sites/default/includes/modules/-settings.reroute_email.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/web/sites/default/includes/modules/-settings.reroute_email.php new file mode 100644 index 000000000..e69de29bb diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/web/sites/default/includes/modules/-settings.sdc_devel.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/web/sites/default/includes/modules/-settings.sdc_devel.php new file mode 100644 index 000000000..e69de29bb diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/web/sites/default/includes/modules/-settings.testmode.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode_reroute_email/web/sites/default/includes/modules/-settings.testmode.php new file mode 100644 index 000000000..e69de29bb diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_environment_indicator/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_environment_indicator/scripts/provision-00-enable-demo-modules.sh index 12e283d8b..de2d7be12 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_environment_indicator/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_environment_indicator/scripts/provision-00-enable-demo-modules.sh @@ -2,8 +2,8 @@ pass "Set up the administration navigation." task "Installing contrib modules." --drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap -+drush pm:install coffee config_split config_update media navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap +-drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap ++drush pm:install coffee config_split config_update media navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap pass "Installed contrib modules." task "Installing Redis module." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_environment_indicator/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_environment_indicator/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 437e98e89..c2afc6347 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_environment_indicator/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_environment_indicator/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -10,7 +10,7 @@ $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /"; $config['shield.settings']['shield_enable'] = TRUE; $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE; -@@ -152,11 +147,6 @@ +@@ -153,11 +148,6 @@ $this->assertEquals($databases, $this->databases); // Verify key config overrides. @@ -22,7 +22,7 @@ $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /"; $config['shield.settings']['shield_enable'] = TRUE; $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE; -@@ -207,11 +197,6 @@ +@@ -209,11 +199,6 @@ $config['automated_cron.settings']['interval'] = 0; $config['config_split.config_split.local']['status'] = TRUE; @@ -34,7 +34,7 @@ $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /"; $config['shield.settings']['shield_enable'] = FALSE; $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE; -@@ -264,11 +249,6 @@ +@@ -267,11 +252,6 @@ $config['automated_cron.settings']['interval'] = 0; $config['config_split.config_split.local']['status'] = TRUE; @@ -46,7 +46,7 @@ $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /"; $config['shield.settings']['shield_enable'] = FALSE; $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE; -@@ -363,11 +343,6 @@ +@@ -367,11 +347,6 @@ $config['automated_cron.settings']['interval'] = 0; $config['config_split.config_split.ci']['status'] = TRUE; diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_generated_content/scripts/provision-10-enable-dev-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_generated_content/scripts/provision-10-enable-dev-modules.sh index c7dedd0ce..831a83f4d 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_generated_content/scripts/provision-10-enable-dev-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_generated_content/scripts/provision-10-enable-dev-modules.sh @@ -8,10 +8,10 @@ # ------------------------------------------------------------------------------ # @formatter:off -@@ -48,14 +45,5 @@ - task "Installing Testmode module." - drush pm:install testmode - pass "Installed Testmode module." +@@ -52,14 +49,5 @@ + task "Installing Reroute Email module." + drush pm:install reroute_email + pass "Installed Reroute Email module." - -task "Installing Generated content module." -if [ "${DRUPAL_GENERATED_CONTENT_SKIP}" = "1" ]; then diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_generated_content/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_generated_content/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 995ce646a..963432045 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_generated_content/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_generated_content/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -3,38 +3,38 @@ $settings['config_exclude_modules'] = [ 'devel', - 'generated_content', + 'reroute_email', 'sdc_devel', 'testmode', - ]; -@@ -171,7 +170,6 @@ +@@ -172,7 +171,6 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ 'devel', - 'generated_content', + 'reroute_email', 'sdc_devel', 'testmode', - ]; -@@ -228,7 +226,6 @@ +@@ -230,7 +228,6 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ 'devel', - 'generated_content', + 'reroute_email', 'sdc_devel', 'testmode', - ]; -@@ -285,7 +282,6 @@ +@@ -288,7 +285,6 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ 'devel', - 'generated_content', + 'reroute_email', 'sdc_devel', 'testmode', - ]; -@@ -385,7 +381,6 @@ +@@ -389,7 +385,6 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ 'devel', - 'generated_content', + 'reroute_email', 'sdc_devel', 'testmode', - ]; diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_navigation_extra_tools/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_navigation_extra_tools/scripts/provision-00-enable-demo-modules.sh index feb0a491c..39484f46b 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_navigation_extra_tools/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_navigation_extra_tools/scripts/provision-00-enable-demo-modules.sh @@ -2,8 +2,8 @@ pass "Set up the administration navigation." task "Installing contrib modules." --drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap -+drush pm:install coffee config_split config_update media environment_indicator pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap +-drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap ++drush pm:install coffee config_split config_update media environment_indicator pathauto redirect robotstxt shield stage_file_proxy xmlsitemap pass "Installed contrib modules." task "Installing Redis module." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_pathauto/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_pathauto/scripts/provision-00-enable-demo-modules.sh index 10650f41f..282484ed5 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_pathauto/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_pathauto/scripts/provision-00-enable-demo-modules.sh @@ -2,8 +2,8 @@ pass "Set up the administration navigation." task "Installing contrib modules." --drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap -+drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap +-drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap ++drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools redirect robotstxt shield stage_file_proxy xmlsitemap pass "Installed contrib modules." task "Installing Redis module." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_redirect/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_redirect/scripts/provision-00-enable-demo-modules.sh index 0fe47173c..b9135dc62 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_redirect/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_redirect/scripts/provision-00-enable-demo-modules.sh @@ -2,8 +2,8 @@ pass "Set up the administration navigation." task "Installing contrib modules." --drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap -+drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto reroute_email robotstxt shield stage_file_proxy xmlsitemap +-drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap ++drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto robotstxt shield stage_file_proxy xmlsitemap pass "Installed contrib modules." task "Installing Redis module." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_reroute_email/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_reroute_email/scripts/provision-00-enable-demo-modules.sh deleted file mode 100644 index 8a5b116fe..000000000 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_reroute_email/scripts/provision-00-enable-demo-modules.sh +++ /dev/null @@ -1,9 +0,0 @@ -@@ -63,7 +63,7 @@ - pass "Set up the administration navigation." - - task "Installing contrib modules." --drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap -+drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap - pass "Installed contrib modules." - - task "Installing Redis module." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_reroute_email/scripts/provision-10-enable-dev-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_reroute_email/scripts/provision-10-enable-dev-modules.sh new file mode 100644 index 000000000..1f1ad794a --- /dev/null +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_reroute_email/scripts/provision-10-enable-dev-modules.sh @@ -0,0 +1,11 @@ +@@ -49,10 +49,6 @@ + drush pm:install testmode + pass "Installed Testmode module." + +-task "Installing Reroute Email module." +-drush pm:install reroute_email +-pass "Installed Reroute Email module." +- + task "Installing Generated content module." + if [ "${DRUPAL_GENERATED_CONTENT_SKIP}" = "1" ]; then + note "Content generation skipped. DRUPAL_GENERATED_CONTENT_SKIP is set to 1." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_reroute_email/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_reroute_email/tests/phpunit/Drupal/EnvironmentSettingsTest.php index aad605373..ea3870a1f 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_reroute_email/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_reroute_email/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -8,7 +8,15 @@ $config['system.performance']['cache']['page']['max_age'] = 900; $this->assertConfig($config); -@@ -161,9 +158,6 @@ +@@ -89,7 +86,6 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', +- 'reroute_email', + 'sdc_devel', + 'testmode', + ]; +@@ -162,9 +158,6 @@ $config['shield.settings']['shield_enable'] = TRUE; $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE; $config['xmlsitemap_engines.settings']['submit'] = FALSE; @@ -18,7 +26,15 @@ $config['system.performance']['cache']['page']['max_age'] = 1800; $this->assertConfig($config); -@@ -218,9 +212,6 @@ +@@ -173,7 +166,6 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', +- 'reroute_email', + 'sdc_devel', + 'testmode', + ]; +@@ -220,9 +212,6 @@ $config['xmlsitemap_engines.settings']['submit'] = FALSE; $config['system.logging']['error_level'] = 'all'; $config['system.performance']['cache']['page']['max_age'] = 900; @@ -28,7 +44,15 @@ $config['seckit.settings']['seckit_xss']['csp']['checkbox'] = FALSE; $config['seckit.settings']['seckit_xss']['csp']['upgrade-req'] = FALSE; $this->assertConfig($config); -@@ -275,9 +266,6 @@ +@@ -231,7 +220,6 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', +- 'reroute_email', + 'sdc_devel', + 'testmode', + ]; +@@ -278,9 +266,6 @@ $config['xmlsitemap_engines.settings']['submit'] = FALSE; $config['system.logging']['error_level'] = 'all'; $config['system.performance']['cache']['page']['max_age'] = 900; @@ -38,7 +62,15 @@ $config['seckit.settings']['seckit_xss']['csp']['checkbox'] = FALSE; $config['seckit.settings']['seckit_xss']['csp']['upgrade-req'] = FALSE; $this->assertConfig($config); -@@ -375,9 +363,6 @@ +@@ -289,7 +274,6 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', +- 'reroute_email', + 'sdc_devel', + 'testmode', + ]; +@@ -379,9 +363,6 @@ $config['system.logging']['error_level'] = 'all'; $config['system.mail']['interface']['default'] = 'test_mail_collector'; $config['system.performance']['cache']['page']['max_age'] = 900; @@ -48,3 +80,11 @@ $config['seckit.settings']['seckit_xss']['csp']['checkbox'] = FALSE; $config['seckit.settings']['seckit_xss']['csp']['upgrade-req'] = FALSE; $this->assertConfig($config); +@@ -390,7 +371,6 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', +- 'reroute_email', + 'sdc_devel', + 'testmode', + ]; diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_reroute_email/tests/phpunit/Drupal/SwitchableSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_reroute_email/tests/phpunit/Drupal/SwitchableSettingsTest.php index 50d573165..2c1705e3e 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_reroute_email/tests/phpunit/Drupal/SwitchableSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_reroute_email/tests/phpunit/Drupal/SwitchableSettingsTest.php @@ -1,4 +1,4 @@ -@@ -665,145 +665,6 @@ +@@ -665,156 +665,6 @@ } /** @@ -54,12 +54,12 @@ - ], - ]; - -- // Stage: disabled by default. +- // Stage: enabled by default. - yield [ - self::ENVIRONMENT_STAGE, - [], - [ -- 'reroute_email.settings' => ['enable' => FALSE, 'address' => 'webmaster@star-wars.com', 'allowed' => '*@star-wars.com'], +- 'reroute_email.settings' => ['enable' => TRUE, 'address' => 'webmaster@star-wars.com', 'allowed' => '*@star-wars.com'], - ], - ]; - @@ -94,6 +94,17 @@ - ], - ]; - +- // Stage with DRUPAL_REROUTE_EMAIL_DISABLED: forced off. +- yield [ +- self::ENVIRONMENT_STAGE, +- [ +- 'DRUPAL_REROUTE_EMAIL_DISABLED' => 1, +- ], +- [ +- 'reroute_email.settings' => ['enable' => FALSE], +- ], +- ]; +- - // Custom address and allowed list. - yield [ - self::ENVIRONMENT_DEV, diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_robotstxt/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_robotstxt/scripts/provision-00-enable-demo-modules.sh index 3ef45f84c..955c74c6a 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_robotstxt/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_robotstxt/scripts/provision-00-enable-demo-modules.sh @@ -2,8 +2,8 @@ pass "Set up the administration navigation." task "Installing contrib modules." --drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap -+drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email shield stage_file_proxy xmlsitemap +-drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap ++drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect shield stage_file_proxy xmlsitemap pass "Installed contrib modules." task "Installing Redis module." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_robotstxt/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_robotstxt/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 99c110477..3d2745c64 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_robotstxt/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_robotstxt/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -6,7 +6,7 @@ $config['shield.settings']['shield_enable'] = TRUE; $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE; $config['xmlsitemap_engines.settings']['submit'] = FALSE; -@@ -157,7 +156,6 @@ +@@ -158,7 +157,6 @@ $config['environment_indicator.indicator']['name'] = self::ENVIRONMENT_SUT; $config['environment_indicator.settings']['favicon'] = TRUE; $config['environment_indicator.settings']['toolbar_integration'] = [TRUE]; @@ -14,7 +14,7 @@ $config['shield.settings']['shield_enable'] = TRUE; $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE; $config['xmlsitemap_engines.settings']['submit'] = FALSE; -@@ -212,7 +210,6 @@ +@@ -214,7 +212,6 @@ $config['environment_indicator.indicator']['name'] = self::ENVIRONMENT_LOCAL; $config['environment_indicator.settings']['favicon'] = TRUE; $config['environment_indicator.settings']['toolbar_integration'] = [TRUE]; @@ -22,7 +22,7 @@ $config['shield.settings']['shield_enable'] = FALSE; $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE; $config['xmlsitemap_engines.settings']['submit'] = FALSE; -@@ -269,7 +266,6 @@ +@@ -272,7 +269,6 @@ $config['environment_indicator.indicator']['name'] = self::ENVIRONMENT_LOCAL; $config['environment_indicator.settings']['favicon'] = TRUE; $config['environment_indicator.settings']['toolbar_integration'] = [TRUE]; @@ -30,7 +30,7 @@ $config['shield.settings']['shield_enable'] = FALSE; $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE; $config['xmlsitemap_engines.settings']['submit'] = FALSE; -@@ -368,7 +364,6 @@ +@@ -372,7 +368,6 @@ $config['environment_indicator.indicator']['name'] = self::ENVIRONMENT_CI; $config['environment_indicator.settings']['favicon'] = TRUE; $config['environment_indicator.settings']['toolbar_integration'] = [TRUE]; diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_sdc_devel/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_sdc_devel/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 63ff39b7f..c61f428b5 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_sdc_devel/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_sdc_devel/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,39 +1,39 @@ -@@ -89,7 +89,6 @@ - $settings['config_exclude_modules'] = [ +@@ -90,7 +90,6 @@ 'devel', 'generated_content', + 'reroute_email', - 'sdc_devel', 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; -@@ -172,7 +171,6 @@ - $settings['config_exclude_modules'] = [ +@@ -174,7 +173,6 @@ 'devel', 'generated_content', + 'reroute_email', - 'sdc_devel', 'testmode', ]; $settings['config_sync_directory'] = 'custom_config'; -@@ -229,7 +227,6 @@ - $settings['config_exclude_modules'] = [ +@@ -232,7 +230,6 @@ 'devel', 'generated_content', + 'reroute_email', - 'sdc_devel', 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; -@@ -286,7 +283,6 @@ - $settings['config_exclude_modules'] = [ +@@ -290,7 +287,6 @@ 'devel', 'generated_content', + 'reroute_email', - 'sdc_devel', 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; -@@ -386,7 +382,6 @@ - $settings['config_exclude_modules'] = [ +@@ -391,7 +387,6 @@ 'devel', 'generated_content', + 'reroute_email', - 'sdc_devel', 'testmode', ]; diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 80f07636a..b41a5d5be 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -221,8 +221,6 @@ +@@ -223,8 +223,6 @@ $config['reroute_email.settings']['enable'] = FALSE; $config['reroute_email.settings']['address'] = 'webmaster@star-wars.com'; $config['reroute_email.settings']['allowed'] = '*@star-wars.com'; @@ -7,7 +7,7 @@ $this->assertConfig($config); $settings['auto_create_htaccess'] = FALSE; -@@ -278,8 +276,6 @@ +@@ -281,8 +279,6 @@ $config['reroute_email.settings']['enable'] = FALSE; $config['reroute_email.settings']['address'] = 'webmaster@star-wars.com'; $config['reroute_email.settings']['allowed'] = '*@star-wars.com'; @@ -16,7 +16,7 @@ $this->assertConfig($config); $settings['auto_create_htaccess'] = FALSE; -@@ -378,8 +374,6 @@ +@@ -382,8 +378,6 @@ $config['reroute_email.settings']['enable'] = FALSE; $config['reroute_email.settings']['address'] = 'webmaster@star-wars.com'; $config['reroute_email.settings']['allowed'] = '*@star-wars.com'; diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/scripts/provision-00-enable-demo-modules.sh index 50eebbfe2..c580fb280 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/scripts/provision-00-enable-demo-modules.sh @@ -2,8 +2,8 @@ pass "Set up the administration navigation." task "Installing contrib modules." --drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap -+drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt xmlsitemap +-drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap ++drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt xmlsitemap pass "Installed contrib modules." task "Installing Redis module." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 6f1332ca1..5be338c73 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -6,7 +6,7 @@ $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE; $config['xmlsitemap_engines.settings']['submit'] = FALSE; $config['reroute_email.settings']['enable'] = TRUE; -@@ -158,7 +157,6 @@ +@@ -159,7 +158,6 @@ $config['environment_indicator.settings']['favicon'] = TRUE; $config['environment_indicator.settings']['toolbar_integration'] = [TRUE]; $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /"; @@ -14,7 +14,7 @@ $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE; $config['xmlsitemap_engines.settings']['submit'] = FALSE; $config['reroute_email.settings']['enable'] = TRUE; -@@ -213,7 +211,6 @@ +@@ -215,7 +213,6 @@ $config['environment_indicator.settings']['favicon'] = TRUE; $config['environment_indicator.settings']['toolbar_integration'] = [TRUE]; $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /"; @@ -22,7 +22,7 @@ $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE; $config['xmlsitemap_engines.settings']['submit'] = FALSE; $config['system.logging']['error_level'] = 'all'; -@@ -221,8 +218,6 @@ +@@ -223,8 +220,6 @@ $config['reroute_email.settings']['enable'] = FALSE; $config['reroute_email.settings']['address'] = 'webmaster@star-wars.com'; $config['reroute_email.settings']['allowed'] = '*@star-wars.com'; @@ -31,7 +31,7 @@ $this->assertConfig($config); $settings['auto_create_htaccess'] = FALSE; -@@ -270,7 +265,6 @@ +@@ -273,7 +268,6 @@ $config['environment_indicator.settings']['favicon'] = TRUE; $config['environment_indicator.settings']['toolbar_integration'] = [TRUE]; $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /"; @@ -39,7 +39,7 @@ $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE; $config['xmlsitemap_engines.settings']['submit'] = FALSE; $config['system.logging']['error_level'] = 'all'; -@@ -278,8 +272,6 @@ +@@ -281,8 +275,6 @@ $config['reroute_email.settings']['enable'] = FALSE; $config['reroute_email.settings']['address'] = 'webmaster@star-wars.com'; $config['reroute_email.settings']['allowed'] = '*@star-wars.com'; @@ -48,7 +48,7 @@ $this->assertConfig($config); $settings['auto_create_htaccess'] = FALSE; -@@ -369,7 +361,6 @@ +@@ -373,7 +365,6 @@ $config['environment_indicator.settings']['favicon'] = TRUE; $config['environment_indicator.settings']['toolbar_integration'] = [TRUE]; $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /"; @@ -56,7 +56,7 @@ $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE; $config['xmlsitemap_engines.settings']['submit'] = FALSE; $config['system.logging']['error_level'] = 'all'; -@@ -378,8 +369,6 @@ +@@ -382,8 +373,6 @@ $config['reroute_email.settings']['enable'] = FALSE; $config['reroute_email.settings']['address'] = 'webmaster@star-wars.com'; $config['reroute_email.settings']['allowed'] = '*@star-wars.com'; diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/tests/phpunit/Drupal/SwitchableSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/tests/phpunit/Drupal/SwitchableSettingsTest.php index 664ee2216..a07546621 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/tests/phpunit/Drupal/SwitchableSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/tests/phpunit/Drupal/SwitchableSettingsTest.php @@ -374,7 +374,7 @@ * Test Reroute Email config. */ #[DataProvider('dataProviderRerouteEmail')] -@@ -800,131 +431,6 @@ +@@ -811,131 +442,6 @@ [ 'reroute_email.settings' => ['enable' => FALSE], ], diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_shield/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_shield/scripts/provision-00-enable-demo-modules.sh index d97ed9427..c234e1d68 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_shield/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_shield/scripts/provision-00-enable-demo-modules.sh @@ -2,8 +2,8 @@ pass "Set up the administration navigation." task "Installing contrib modules." --drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap -+drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt stage_file_proxy xmlsitemap +-drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap ++drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt stage_file_proxy xmlsitemap pass "Installed contrib modules." task "Installing Redis module." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_shield/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_shield/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 99429ea90..d49055ca1 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_shield/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_shield/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -6,7 +6,7 @@ $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE; $config['xmlsitemap_engines.settings']['submit'] = FALSE; $config['reroute_email.settings']['enable'] = TRUE; -@@ -158,7 +157,6 @@ +@@ -159,7 +158,6 @@ $config['environment_indicator.settings']['favicon'] = TRUE; $config['environment_indicator.settings']['toolbar_integration'] = [TRUE]; $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /"; @@ -14,7 +14,7 @@ $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE; $config['xmlsitemap_engines.settings']['submit'] = FALSE; $config['reroute_email.settings']['enable'] = TRUE; -@@ -213,7 +211,6 @@ +@@ -215,7 +213,6 @@ $config['environment_indicator.settings']['favicon'] = TRUE; $config['environment_indicator.settings']['toolbar_integration'] = [TRUE]; $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /"; @@ -22,7 +22,7 @@ $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE; $config['xmlsitemap_engines.settings']['submit'] = FALSE; $config['system.logging']['error_level'] = 'all'; -@@ -270,7 +267,6 @@ +@@ -273,7 +270,6 @@ $config['environment_indicator.settings']['favicon'] = TRUE; $config['environment_indicator.settings']['toolbar_integration'] = [TRUE]; $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /"; @@ -30,7 +30,7 @@ $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE; $config['xmlsitemap_engines.settings']['submit'] = FALSE; $config['system.logging']['error_level'] = 'all'; -@@ -369,7 +365,6 @@ +@@ -373,7 +369,6 @@ $config['environment_indicator.settings']['favicon'] = TRUE; $config['environment_indicator.settings']['toolbar_integration'] = [TRUE]; $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /"; diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_stage_file_proxy/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_stage_file_proxy/scripts/provision-00-enable-demo-modules.sh index 1e429d7ea..1779be128 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_stage_file_proxy/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_stage_file_proxy/scripts/provision-00-enable-demo-modules.sh @@ -2,8 +2,8 @@ pass "Set up the administration navigation." task "Installing contrib modules." --drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap -+drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield xmlsitemap +-drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap ++drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield xmlsitemap pass "Installed contrib modules." task "Installing Redis module." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_stage_file_proxy/tests/phpunit/Drupal/SwitchableSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_stage_file_proxy/tests/phpunit/Drupal/SwitchableSettingsTest.php index ab4201353..42e76540b 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_stage_file_proxy/tests/phpunit/Drupal/SwitchableSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_stage_file_proxy/tests/phpunit/Drupal/SwitchableSettingsTest.php @@ -1,4 +1,4 @@ -@@ -804,131 +804,6 @@ +@@ -815,131 +815,6 @@ } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_testmode/scripts/provision-10-enable-dev-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_testmode/scripts/provision-10-enable-dev-modules.sh index 1df2b33ce..96f907830 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_testmode/scripts/provision-10-enable-dev-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_testmode/scripts/provision-10-enable-dev-modules.sh @@ -6,6 +6,6 @@ -drush pm:install testmode -pass "Installed Testmode module." - - task "Installing Generated content module." - if [ "${DRUPAL_GENERATED_CONTENT_SKIP}" = "1" ]; then - note "Content generation skipped. DRUPAL_GENERATED_CONTENT_SKIP is set to 1." + task "Installing Reroute Email module." + drush pm:install reroute_email + pass "Installed Reroute Email module." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_testmode/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_testmode/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 01cf4bf46..b4de93c74 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_testmode/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_testmode/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,38 +1,38 @@ -@@ -90,7 +90,6 @@ - 'devel', +@@ -91,7 +91,6 @@ 'generated_content', + 'reroute_email', 'sdc_devel', - 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; $settings['entity_update_batch_size'] = 50; -@@ -173,7 +172,6 @@ - 'devel', +@@ -175,7 +174,6 @@ 'generated_content', + 'reroute_email', 'sdc_devel', - 'testmode', ]; $settings['config_sync_directory'] = 'custom_config'; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; -@@ -230,7 +228,6 @@ - 'devel', +@@ -233,7 +231,6 @@ 'generated_content', + 'reroute_email', 'sdc_devel', - 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; $settings['entity_update_batch_size'] = 50; -@@ -287,7 +284,6 @@ - 'devel', +@@ -291,7 +288,6 @@ 'generated_content', + 'reroute_email', 'sdc_devel', - 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; $settings['entity_update_batch_size'] = 50; -@@ -387,7 +383,6 @@ - 'devel', +@@ -392,7 +388,6 @@ 'generated_content', + 'reroute_email', 'sdc_devel', - 'testmode', ]; diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_xmlsitemap/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_no_xmlsitemap/scripts/provision-00-enable-demo-modules.sh index a396e188f..a49488e2b 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_xmlsitemap/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_xmlsitemap/scripts/provision-00-enable-demo-modules.sh @@ -2,8 +2,8 @@ pass "Set up the administration navigation." task "Installing contrib modules." --drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap -+drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy +-drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap ++drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy pass "Installed contrib modules." task "Installing Redis module." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_xmlsitemap/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_xmlsitemap/tests/phpunit/Drupal/EnvironmentSettingsTest.php index cc5105603..d687d58ca 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_xmlsitemap/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_xmlsitemap/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -6,7 +6,7 @@ $config['xmlsitemap_engines.settings']['submit'] = FALSE; $config['reroute_email.settings']['enable'] = TRUE; $config['reroute_email.settings']['address'] = 'webmaster@star-wars.com'; -@@ -159,7 +158,6 @@ +@@ -160,7 +159,6 @@ $config['environment_indicator.settings']['toolbar_integration'] = [TRUE]; $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /"; $config['shield.settings']['shield_enable'] = TRUE; @@ -14,7 +14,7 @@ $config['xmlsitemap_engines.settings']['submit'] = FALSE; $config['reroute_email.settings']['enable'] = TRUE; $config['reroute_email.settings']['address'] = 'webmaster@star-wars.com'; -@@ -214,7 +212,6 @@ +@@ -216,7 +214,6 @@ $config['environment_indicator.settings']['toolbar_integration'] = [TRUE]; $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /"; $config['shield.settings']['shield_enable'] = FALSE; @@ -22,7 +22,7 @@ $config['xmlsitemap_engines.settings']['submit'] = FALSE; $config['system.logging']['error_level'] = 'all'; $config['system.performance']['cache']['page']['max_age'] = 900; -@@ -271,7 +268,6 @@ +@@ -274,7 +271,6 @@ $config['environment_indicator.settings']['toolbar_integration'] = [TRUE]; $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /"; $config['shield.settings']['shield_enable'] = FALSE; @@ -30,7 +30,7 @@ $config['xmlsitemap_engines.settings']['submit'] = FALSE; $config['system.logging']['error_level'] = 'all'; $config['system.performance']['cache']['page']['max_age'] = 900; -@@ -370,7 +366,6 @@ +@@ -374,7 +370,6 @@ $config['environment_indicator.settings']['toolbar_integration'] = [TRUE]; $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /"; $config['shield.settings']['shield_enable'] = FALSE; diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_none/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/modules_none/scripts/provision-00-enable-demo-modules.sh index 43a388bf8..9bea26e9c 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_none/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_none/scripts/provision-00-enable-demo-modules.sh @@ -3,7 +3,7 @@ pass "Set up the administration navigation." -task "Installing contrib modules." --drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap +-drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap -pass "Installed contrib modules." - task "Installing Redis module." diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_none/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_none/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 14293583c..3f380ed50 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_none/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_none/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -70,27 +70,12 @@ +@@ -70,28 +70,12 @@ $this->requireSettingsFile(); @@ -21,12 +21,13 @@ $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', +- 'reroute_email', - 'sdc_devel', - 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; $settings['entity_update_batch_size'] = 50; -@@ -152,18 +137,7 @@ +@@ -153,18 +137,7 @@ $this->assertEquals($databases, $this->databases); // Verify key config overrides. @@ -45,18 +46,19 @@ $config['system.performance']['cache']['page']['max_age'] = 1800; $this->assertConfig($config); -@@ -170,10 +144,6 @@ +@@ -171,11 +144,6 @@ // Verify settings overrides. $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', +- 'reroute_email', - 'sdc_devel', - 'testmode', ]; $settings['config_sync_directory'] = 'custom_config'; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; -@@ -206,31 +176,13 @@ +@@ -208,32 +176,13 @@ $this->requireSettingsFile(); $config['automated_cron.settings']['interval'] = 0; @@ -83,12 +85,13 @@ $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', +- 'reroute_email', - 'sdc_devel', - 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; $settings['entity_update_batch_size'] = 50; -@@ -263,31 +215,13 @@ +@@ -266,32 +215,13 @@ $this->requireSettingsFile(); $config['automated_cron.settings']['interval'] = 0; @@ -115,12 +118,13 @@ $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', +- 'reroute_email', - 'sdc_devel', - 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; $settings['entity_update_batch_size'] = 50; -@@ -362,32 +296,14 @@ +@@ -366,33 +296,14 @@ $this->requireSettingsFile(); $config['automated_cron.settings']['interval'] = 0; @@ -148,6 +152,7 @@ $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', +- 'reroute_email', - 'sdc_devel', - 'testmode', ]; diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_none/tests/phpunit/Drupal/SwitchableSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_none/tests/phpunit/Drupal/SwitchableSettingsTest.php index 115e3fc55..2b1419fd7 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/modules_none/tests/phpunit/Drupal/SwitchableSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_none/tests/phpunit/Drupal/SwitchableSettingsTest.php @@ -153,7 +153,7 @@ * Test Redis settings. */ public function testRedis(): void { -@@ -293,639 +145,6 @@ +@@ -293,650 +145,6 @@ unset($this->settings['bootstrap_container_definition']); $this->assertSettingsContains($settings); @@ -581,12 +581,12 @@ public function testRedis(): void { - ], - ]; - -- // Stage: disabled by default. +- // Stage: enabled by default. - yield [ - self::ENVIRONMENT_STAGE, - [], - [ -- 'reroute_email.settings' => ['enable' => FALSE, 'address' => 'webmaster@star-wars.com', 'allowed' => '*@star-wars.com'], +- 'reroute_email.settings' => ['enable' => TRUE, 'address' => 'webmaster@star-wars.com', 'allowed' => '*@star-wars.com'], - ], - ]; - @@ -621,6 +621,17 @@ public function testRedis(): void { - ], - ]; - +- // Stage with DRUPAL_REROUTE_EMAIL_DISABLED: forced off. +- yield [ +- self::ENVIRONMENT_STAGE, +- [ +- 'DRUPAL_REROUTE_EMAIL_DISABLED' => 1, +- ], +- [ +- 'reroute_email.settings' => ['enable' => FALSE], +- ], +- ]; +- - // Custom address and allowed list. - yield [ - self::ENVIRONMENT_DEV, diff --git a/.vortex/installer/tests/Fixtures/handler_process/names/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/names/tests/phpunit/Drupal/EnvironmentSettingsTest.php index e12377a7e..8b03a87db 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/names/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/names/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -9,7 +9,7 @@ $config['system.performance']['cache']['page']['max_age'] = 900; $this->assertConfig($config); -@@ -162,8 +162,8 @@ +@@ -163,8 +163,8 @@ $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE; $config['xmlsitemap_engines.settings']['submit'] = FALSE; $config['reroute_email.settings']['enable'] = TRUE; @@ -20,7 +20,7 @@ $config['system.performance']['cache']['page']['max_age'] = 1800; $this->assertConfig($config); -@@ -219,8 +219,8 @@ +@@ -221,8 +221,8 @@ $config['system.logging']['error_level'] = 'all'; $config['system.performance']['cache']['page']['max_age'] = 900; $config['reroute_email.settings']['enable'] = FALSE; @@ -31,7 +31,7 @@ $config['seckit.settings']['seckit_xss']['csp']['checkbox'] = FALSE; $config['seckit.settings']['seckit_xss']['csp']['upgrade-req'] = FALSE; $this->assertConfig($config); -@@ -276,8 +276,8 @@ +@@ -279,8 +279,8 @@ $config['system.logging']['error_level'] = 'all'; $config['system.performance']['cache']['page']['max_age'] = 900; $config['reroute_email.settings']['enable'] = FALSE; @@ -42,7 +42,7 @@ $config['seckit.settings']['seckit_xss']['csp']['checkbox'] = FALSE; $config['seckit.settings']['seckit_xss']['csp']['upgrade-req'] = FALSE; $this->assertConfig($config); -@@ -376,8 +376,8 @@ +@@ -380,8 +380,8 @@ $config['system.mail']['interface']['default'] = 'test_mail_collector'; $config['system.performance']['cache']['page']['max_age'] = 900; $config['reroute_email.settings']['enable'] = FALSE; diff --git a/.vortex/installer/tests/Fixtures/handler_process/names/tests/phpunit/Drupal/SwitchableSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/names/tests/phpunit/Drupal/SwitchableSettingsTest.php index b680a0a10..b99ef526c 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/names/tests/phpunit/Drupal/SwitchableSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/names/tests/phpunit/Drupal/SwitchableSettingsTest.php @@ -38,8 +38,8 @@ self::ENVIRONMENT_STAGE, [], [ -- 'reroute_email.settings' => ['enable' => FALSE, 'address' => 'webmaster@star-wars.com', 'allowed' => '*@star-wars.com'], -+ 'reroute_email.settings' => ['enable' => FALSE, 'address' => 'webmaster@death-star.com', 'allowed' => '*@death-star.com'], +- 'reroute_email.settings' => ['enable' => TRUE, 'address' => 'webmaster@star-wars.com', 'allowed' => '*@star-wars.com'], ++ 'reroute_email.settings' => ['enable' => TRUE, 'address' => 'webmaster@death-star.com', 'allowed' => '*@death-star.com'], ], ]; diff --git a/.vortex/installer/tests/Fixtures/handler_process/names/web/sites/default/includes/modules/settings.reroute_email.php b/.vortex/installer/tests/Fixtures/handler_process/names/web/sites/default/includes/modules/settings.reroute_email.php index 8a75164d8..4fa256b37 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/names/web/sites/default/includes/modules/settings.reroute_email.php +++ b/.vortex/installer/tests/Fixtures/handler_process/names/web/sites/default/includes/modules/settings.reroute_email.php @@ -1,11 +1,11 @@ -@@ -7,8 +7,8 @@ +@@ -9,8 +9,8 @@ - declare(strict_types=1); + $settings['config_exclude_modules'][] = 'reroute_email'; -$config['reroute_email.settings']['address'] = getenv('DRUPAL_REROUTE_EMAIL_ADDRESS') ?: 'webmaster@star-wars.com'; -$config['reroute_email.settings']['allowed'] = getenv('DRUPAL_REROUTE_EMAIL_ALLOWED') ?: '*@star-wars.com'; +$config['reroute_email.settings']['address'] = getenv('DRUPAL_REROUTE_EMAIL_ADDRESS') ?: 'webmaster@death-star.com'; +$config['reroute_email.settings']['allowed'] = getenv('DRUPAL_REROUTE_EMAIL_ALLOWED') ?: '*@death-star.com'; - if (!in_array($settings['environment'], [ENVIRONMENT_LOCAL, ENVIRONMENT_CI, ENVIRONMENT_STAGE, ENVIRONMENT_PROD], TRUE)) { - // Send every outgoing message to the address above instead of to its + if (in_array($settings['environment'], [ENVIRONMENT_LOCAL, ENVIRONMENT_CI, ENVIRONMENT_PROD], TRUE)) { + // Deliver every message to its intended recipient. Local and CI capture diff --git a/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_file/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_file/scripts/provision-00-enable-demo-modules.sh index 90ca8ae46..e46dd7e1c 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_file/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_file/scripts/provision-00-enable-demo-modules.sh @@ -1,5 +1,5 @@ @@ -66,10 +66,6 @@ - drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap + drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap pass "Installed contrib modules." -task "Installing Redis module." diff --git a/.vortex/installer/tests/Fixtures/handler_process/provision_database_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/provision_database_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php index a7796d841..ab2ed9bfa 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/provision_database_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/provision_database_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -185,7 +185,7 @@ } /** -@@ -407,6 +587,283 @@ +@@ -412,6 +592,287 @@ '^localhost$', ]; $this->assertSettings($settings); @@ -227,6 +227,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; @@ -291,6 +292,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; @@ -341,7 +343,7 @@ + $config['environment_indicator.settings']['favicon'] = TRUE; + $config['environment_indicator.settings']['toolbar_integration'] = [TRUE]; + $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /"; -+ $config['reroute_email.settings']['enable'] = FALSE; ++ $config['reroute_email.settings']['enable'] = TRUE; + $config['reroute_email.settings']['address'] = 'webmaster@star-wars.com'; + $config['reroute_email.settings']['allowed'] = '*@star-wars.com'; + $config['shield.settings']['shield_enable'] = TRUE; @@ -355,6 +357,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; @@ -417,6 +420,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'reroute_email', + 'sdc_devel', + 'testmode', + ]; diff --git a/.vortex/installer/tests/Fixtures/handler_process/services_no_redis/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/services_no_redis/scripts/provision-00-enable-demo-modules.sh index 90ca8ae46..e46dd7e1c 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/services_no_redis/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/services_no_redis/scripts/provision-00-enable-demo-modules.sh @@ -1,5 +1,5 @@ @@ -66,10 +66,6 @@ - drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap + drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap pass "Installed contrib modules." -task "Installing Redis module." diff --git a/.vortex/installer/tests/Fixtures/handler_process/services_none/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/services_none/scripts/provision-00-enable-demo-modules.sh index a41367863..93f23bfc7 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/services_none/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/services_none/scripts/provision-00-enable-demo-modules.sh @@ -1,5 +1,5 @@ @@ -66,19 +66,6 @@ - drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect reroute_email robotstxt shield stage_file_proxy xmlsitemap + drush pm:install coffee config_split config_update media environment_indicator navigation_extra_tools pathauto redirect robotstxt shield stage_file_proxy xmlsitemap pass "Installed contrib modules." -task "Installing Redis module." diff --git a/.vortex/installer/tests/Fixtures/handler_process/timezone_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/timezone_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php index f7ee4f34f..158e13f0a 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/timezone_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/timezone_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -352,9 +352,9 @@ +@@ -356,9 +356,9 @@ } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_lint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_lint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 428665284..1b2577e8c 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_lint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_lint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -9,7 +9,7 @@ */ #[Group('drupal_settings')] class EnvironmentSettingsTest extends SettingsTestCase { -@@ -352,9 +348,9 @@ +@@ -356,9 +352,9 @@ } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php index f7ee4f34f..158e13f0a 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -352,9 +352,9 @@ +@@ -356,9 +356,9 @@ } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_no_theme_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_no_theme_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php index f7ee4f34f..158e13f0a 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_no_theme_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_no_theme_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -352,9 +352,9 @@ +@@ -356,9 +356,9 @@ } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php index f7ee4f34f..158e13f0a 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -352,9 +352,9 @@ +@@ -356,9 +356,9 @@ } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_dclint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_dclint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php index f7ee4f34f..158e13f0a 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_dclint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_dclint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -352,9 +352,9 @@ +@@ -356,9 +356,9 @@ } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_docker_linters_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_docker_linters_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php index f7ee4f34f..158e13f0a 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_docker_linters_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_docker_linters_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -352,9 +352,9 @@ +@@ -356,9 +356,9 @@ } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_eslint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_eslint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php index f7ee4f34f..158e13f0a 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_eslint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_eslint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -352,9 +352,9 @@ +@@ -356,9 +356,9 @@ } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_hadolint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_hadolint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php index f7ee4f34f..158e13f0a 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_hadolint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_hadolint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -352,9 +352,9 @@ +@@ -356,9 +356,9 @@ } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_jest_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_jest_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php index f7ee4f34f..158e13f0a 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_jest_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_jest_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -352,9 +352,9 @@ +@@ -356,9 +356,9 @@ } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpcs_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpcs_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 428665284..1b2577e8c 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpcs_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpcs_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -9,7 +9,7 @@ */ #[Group('drupal_settings')] class EnvironmentSettingsTest extends SettingsTestCase { -@@ -352,9 +348,9 @@ +@@ -356,9 +352,9 @@ } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpstan_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpstan_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php index f7ee4f34f..158e13f0a 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpstan_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpstan_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -352,9 +352,9 @@ +@@ -356,9 +356,9 @@ } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_rector_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_rector_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php index f7ee4f34f..158e13f0a 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_rector_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_rector_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -352,9 +352,9 @@ +@@ -356,9 +356,9 @@ } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_stylelint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_stylelint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php index f7ee4f34f..158e13f0a 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_stylelint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_stylelint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -352,9 +352,9 @@ +@@ -356,9 +356,9 @@ } /** diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_twig_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_twig_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php index f7ee4f34f..158e13f0a 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_twig_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php +++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_twig_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -1,4 +1,4 @@ -@@ -352,9 +352,9 @@ +@@ -356,9 +356,9 @@ } /** From 6ac76c158d3d043d80e8ef1f42a0e5d201cb56de Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Tue, 8 Sep 2026 10:28:09 +1000 Subject: [PATCH 3/4] Used the American spelling of 'sanitization' in the rerouting environment table. --- .../docs/content/development/modules/contributed-modules.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vortex/docs/content/development/modules/contributed-modules.mdx b/.vortex/docs/content/development/modules/contributed-modules.mdx index 78e82c763..ad7f8a5a6 100644 --- a/.vortex/docs/content/development/modules/contributed-modules.mdx +++ b/.vortex/docs/content/development/modules/contributed-modules.mdx @@ -181,7 +181,7 @@ Rerouting replaces the recipient of an outgoing message with the configured addr | Local | No | [Pygmy](../environment/pygmy.mdx) already catches outgoing mail | | CI | No | The [mail collector](../testing/behat.mdx#email) stores messages instead of sending them | | Dev | **Yes** | Prevents accidental delivery to real users | -| Stage | **Yes** | Stage runs a copy of production content, so any address that survives sanitisation is a real one | +| Stage | **Yes** | Stage runs a copy of production content, so any address that survives database sanitization is a real one | | Prod | No | Production emails must reach actual recipients | Rerouting is the fall-through default, so it is also enabled in any custom From 7769c1e20f36ceeedc33657a1c338d2aef04795b Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Tue, 8 Sep 2026 10:57:55 +1000 Subject: [PATCH 4/4] Covered the 'reroute_email' install in the development modules script unit tests. --- .../tooling/tests/unit/provision-enable-dev-modules.bats | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.vortex/tooling/tests/unit/provision-enable-dev-modules.bats b/.vortex/tooling/tests/unit/provision-enable-dev-modules.bats index 920672744..b3d50746b 100644 --- a/.vortex/tooling/tests/unit/provision-enable-dev-modules.bats +++ b/.vortex/tooling/tests/unit/provision-enable-dev-modules.bats @@ -25,6 +25,7 @@ load ../_helper.bash "@drush -y pm:install sdc_devel" "@drush -y pm:install devel" "@drush -y pm:install testmode" + "@drush -y pm:install reroute_email" # Content generation. Both branches install the module with the same # arguments, so the side effect records the environment that distinguishes @@ -40,6 +41,8 @@ load ../_helper.bash "Installed Devel module." "Installing Testmode module." "Installed Testmode module." + "Installing Reroute Email module." + "Installed Reroute Email module." "Installing Generated content module." "Installed Generated content module." "Finished development modules operations." @@ -73,6 +76,7 @@ load ../_helper.bash "@drush -y pm:install sdc_devel" "@drush -y pm:install devel" "@drush -y pm:install testmode" + "@drush -y pm:install reroute_email" # The module is installed either way; only the content is skipped. '@drush -y pm:install generated_content # 0 # # echo "${GENERATED_CONTENT_CREATE:-unset}" >./generated_content_create.txt' @@ -115,6 +119,7 @@ load ../_helper.bash "- Installing Single Directory Component development tools." "- Installing Devel module." "- Installing Testmode module." + "- Installing Reroute Email module." "- Installing Generated content module." "- Finished development modules operations." ) @@ -146,6 +151,7 @@ load ../_helper.bash "- Installing Single Directory Component development tools." "- Installing Devel module." "- Installing Testmode module." + "- Installing Reroute Email module." "- Installing Generated content module." "- Finished development modules operations." )