diff --git a/.vortex/docs/content/development/modules/contributed-modules.mdx b/.vortex/docs/content/development/modules/contributed-modules.mdx index 5622c733bd..a55b32c08e 100644 --- a/.vortex/docs/content/development/modules/contributed-modules.mdx +++ b/.vortex/docs/content/development/modules/contributed-modules.mdx @@ -224,7 +224,7 @@ email rerouting in an environment where it would otherwise be enabled. ### Configuration -No settings override. +[`settings.sdc_devel.php`](https://github.com/drevops/vortex/blob/main/web/sites/default/includes/modules/settings.sdc_devel.php) excludes it from the exported configuration. ## Search API 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 e7efbff6b4..aa7474317e 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', + 'sdc_devel', 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; @@ -171,6 +172,7 @@ public function testEnvironmentOverrides(): void { $settings['config_exclude_modules'] = [ 'devel', 'generated_content', + 'sdc_devel', 'testmode', ]; $settings['config_sync_directory'] = 'custom_config'; @@ -227,6 +229,7 @@ public function testEnvironmentLocal(): void { $settings['config_exclude_modules'] = [ 'devel', 'generated_content', + 'sdc_devel', 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; @@ -283,6 +286,7 @@ public function testEnvironmentLocalContainer(): void { $settings['config_exclude_modules'] = [ 'devel', 'generated_content', + 'sdc_devel', 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; @@ -382,6 +386,7 @@ public function testEnvironmentGha(): void { $settings['config_exclude_modules'] = [ 'devel', 'generated_content', + 'sdc_devel', 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; diff --git a/.vortex/installer/tests/Fixtures/handler_process/_baseline/web/sites/default/includes/modules/settings.sdc_devel.php b/.vortex/installer/tests/Fixtures/handler_process/_baseline/web/sites/default/includes/modules/settings.sdc_devel.php new file mode 100644 index 0000000000..f0759b3ae7 --- /dev/null +++ b/.vortex/installer/tests/Fixtures/handler_process/_baseline/web/sites/default/includes/modules/settings.sdc_devel.php @@ -0,0 +1,10 @@ +app_root . '/' . $this->site_path . '/services.yml'; @@ -142,6 +143,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; @@ -194,6 +196,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; @@ -243,6 +246,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; @@ -296,6 +300,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['config_sync_directory'] = 'custom_acquia_config'; @@ -356,6 +361,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['config_sync_directory'] = '/var/www/site-php/mysite/config'; diff --git a/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/web/sites/default/includes/modules/-settings.sdc_devel.php b/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/web/sites/default/includes/modules/-settings.sdc_devel.php new file mode 100644 index 0000000000..e69de29bb2 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 0312069061..a7796d8418 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 @@ } /** -@@ -402,6 +582,279 @@ +@@ -407,6 +587,283 @@ '^localhost$', ]; $this->assertSettings($settings); @@ -227,6 +227,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['config_sync_directory'] = '../config/default'; @@ -290,6 +291,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['config_sync_directory'] = '../config/default'; @@ -353,6 +355,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['config_sync_directory'] = '../config/default'; @@ -414,6 +417,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['config_sync_directory'] = '../config/default'; diff --git a/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/docroot/sites/default/includes/modules/settings.sdc_devel.php b/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/docroot/sites/default/includes/modules/settings.sdc_devel.php new file mode 100644 index 0000000000..f0759b3ae7 --- /dev/null +++ b/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/docroot/sites/default/includes/modules/settings.sdc_devel.php @@ -0,0 +1,10 @@ +app_root . '/' . $this->site_path . '/services.yml'; @@ -142,6 +143,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; @@ -194,6 +196,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; @@ -243,6 +246,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; @@ -296,6 +300,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['config_sync_directory'] = 'custom_acquia_config'; @@ -356,6 +361,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['config_sync_directory'] = '/var/www/site-php/mysite/config'; diff --git a/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/web/sites/default/includes/modules/-settings.sdc_devel.php b/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/web/sites/default/includes/modules/-settings.sdc_devel.php new file mode 100644 index 0000000000..e69de29bb2 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 0312069061..a7796d8418 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 @@ } /** -@@ -402,6 +582,279 @@ +@@ -407,6 +587,283 @@ '^localhost$', ]; $this->assertSettings($settings); @@ -227,6 +227,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['config_sync_directory'] = '../config/default'; @@ -290,6 +291,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['config_sync_directory'] = '../config/default'; @@ -353,6 +355,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['config_sync_directory'] = '../config/default'; @@ -414,6 +417,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['config_sync_directory'] = '../config/default'; 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 7d0df7d198..f7ee4f34f3 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 @@ -@@ -348,9 +348,9 @@ +@@ -352,9 +352,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 0312069061..a7796d8418 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 @@ } /** -@@ -402,6 +582,279 @@ +@@ -407,6 +587,283 @@ '^localhost$', ]; $this->assertSettings($settings); @@ -227,6 +227,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['config_sync_directory'] = '../config/default'; @@ -290,6 +291,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['config_sync_directory'] = '../config/default'; @@ -353,6 +355,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['config_sync_directory'] = '../config/default'; @@ -414,6 +417,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['config_sync_directory'] = '../config/default'; 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 734d038d61..7482fa8c44 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 @@ -@@ -148,6 +148,13 @@ +@@ -149,6 +149,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 4f08f83362..8871b4016b 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 @@ -@@ -148,6 +148,13 @@ +@@ -149,6 +149,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. -@@ -348,9 +355,9 @@ +@@ -352,9 +359,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 7b61da9954..a685072be4 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 @@ } /** -@@ -148,6 +328,13 @@ +@@ -149,6 +329,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. -@@ -402,6 +589,279 @@ +@@ -407,6 +594,283 @@ '^localhost$', ]; $this->assertSettings($settings); @@ -241,6 +241,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['config_sync_directory'] = '../config/default'; @@ -304,6 +305,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['config_sync_directory'] = '../config/default'; @@ -367,6 +369,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['config_sync_directory'] = '../config/default'; @@ -428,6 +431,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['config_sync_directory'] = '../config/default'; 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 734d038d61..7482fa8c44 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 @@ -@@ -148,6 +148,13 @@ +@@ -149,6 +149,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 734d038d61..7482fa8c44 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 @@ -@@ -148,6 +148,13 @@ +@@ -149,6 +149,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 734d038d61..7482fa8c44 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 @@ -@@ -148,6 +148,13 @@ +@@ -149,6 +149,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 734d038d61..7482fa8c44 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 @@ -@@ -148,6 +148,13 @@ +@@ -149,6 +149,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 734d038d61..7482fa8c44 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 @@ -@@ -148,6 +148,13 @@ +@@ -149,6 +149,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 734d038d61..7482fa8c44 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 @@ -@@ -148,6 +148,13 @@ +@@ -149,6 +149,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_config_split/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_split/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 0001d8a6a2..252a4948b7 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 @@ -@@ -204,7 +204,6 @@ +@@ -206,7 +206,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; -@@ -260,7 +259,6 @@ +@@ -263,7 +262,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; -@@ -358,7 +356,6 @@ +@@ -362,7 +360,6 @@ $this->requireSettingsFile(); $config['automated_cron.settings']['interval'] = 0; 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 2b07faf38a..39ec08ac42 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', + 'sdc_devel', 'testmode', - ]; -@@ -169,7 +168,6 @@ +@@ -170,7 +169,6 @@ // Verify settings overrides. $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', 'generated_content', + 'sdc_devel', 'testmode', - ]; -@@ -225,7 +223,6 @@ +@@ -227,7 +225,6 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', 'generated_content', + 'sdc_devel', 'testmode', - ]; -@@ -281,7 +278,6 @@ +@@ -284,7 +281,6 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', 'generated_content', + 'sdc_devel', 'testmode', - ]; -@@ -380,7 +376,6 @@ +@@ -384,7 +380,6 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', 'generated_content', + '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 2b07faf38a..22747d894b 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,40 +1,50 @@ -@@ -87,7 +87,6 @@ +@@ -87,9 +87,7 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', 'generated_content', +- 'sdc_devel', 'testmode', ]; -@@ -169,7 +168,6 @@ + $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; +@@ -170,9 +168,7 @@ // Verify settings overrides. $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', 'generated_content', +- 'sdc_devel', 'testmode', ]; -@@ -225,7 +223,6 @@ + $settings['config_sync_directory'] = 'custom_config'; +@@ -227,9 +223,7 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', 'generated_content', +- 'sdc_devel', 'testmode', ]; -@@ -281,7 +278,6 @@ + $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; +@@ -284,9 +278,7 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', 'generated_content', +- 'sdc_devel', 'testmode', ]; -@@ -380,7 +376,6 @@ + $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; +@@ -384,9 +376,7 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', 'generated_content', +- 'sdc_devel', 'testmode', ]; + $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel/web/sites/default/includes/modules/-settings.sdc_devel.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel/web/sites/default/includes/modules/-settings.sdc_devel.php new file mode 100644 index 0000000000..e69de29bb2 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 748b69a58a..27d314aa7a 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,45 +1,50 @@ -@@ -87,8 +87,6 @@ +@@ -87,9 +87,6 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', +- 'sdc_devel', 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; -@@ -169,8 +167,6 @@ +@@ -170,9 +167,6 @@ // Verify settings overrides. $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', +- 'sdc_devel', 'testmode', ]; $settings['config_sync_directory'] = 'custom_config'; -@@ -225,8 +221,6 @@ +@@ -227,9 +221,6 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', +- 'sdc_devel', 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; -@@ -281,8 +275,6 @@ +@@ -284,9 +275,6 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', +- 'sdc_devel', 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; -@@ -380,8 +372,6 @@ +@@ -384,9 +372,6 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', +- 'sdc_devel', 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content/web/sites/default/includes/modules/-settings.sdc_devel.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content/web/sites/default/includes/modules/-settings.sdc_devel.php new file mode 100644 index 0000000000..e69de29bb2 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 8266f390b1..9f89d88d09 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,49 +1,54 @@ -@@ -87,9 +87,6 @@ +@@ -87,10 +87,6 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', +- 'sdc_devel', - 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; $settings['entity_update_batch_size'] = 50; -@@ -169,9 +166,6 @@ +@@ -170,10 +166,6 @@ // Verify settings overrides. $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', +- 'sdc_devel', - 'testmode', ]; $settings['config_sync_directory'] = 'custom_config'; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; -@@ -225,9 +219,6 @@ +@@ -227,10 +219,6 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', +- 'sdc_devel', - 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; $settings['entity_update_batch_size'] = 50; -@@ -281,9 +272,6 @@ +@@ -284,10 +272,6 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', +- 'sdc_devel', - 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; $settings['entity_update_batch_size'] = 50; -@@ -380,9 +368,6 @@ +@@ -384,10 +368,6 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', +- 'sdc_devel', - 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode/web/sites/default/includes/modules/-settings.sdc_devel.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode/web/sites/default/includes/modules/-settings.sdc_devel.php new file mode 100644 index 0000000000..e69de29bb2 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 4bc1b7fec6..437e98e897 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; -@@ -151,11 +146,6 @@ +@@ -152,11 +147,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; -@@ -205,11 +195,6 @@ +@@ -207,11 +197,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; -@@ -261,11 +246,6 @@ +@@ -264,11 +249,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; -@@ -359,11 +339,6 @@ +@@ -363,11 +343,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/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_generated_content/tests/phpunit/Drupal/EnvironmentSettingsTest.php index cfabe5cc44..995ce646a6 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', + 'sdc_devel', 'testmode', ]; - $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; -@@ -170,7 +169,6 @@ +@@ -171,7 +170,6 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ 'devel', - 'generated_content', + 'sdc_devel', 'testmode', ]; - $settings['config_sync_directory'] = 'custom_config'; -@@ -226,7 +224,6 @@ +@@ -228,7 +226,6 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ 'devel', - 'generated_content', + 'sdc_devel', 'testmode', ]; - $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; -@@ -282,7 +279,6 @@ +@@ -285,7 +282,6 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ 'devel', - 'generated_content', + 'sdc_devel', 'testmode', ]; - $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; -@@ -381,7 +377,6 @@ +@@ -385,7 +381,6 @@ $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ 'devel', - 'generated_content', + 'sdc_devel', 'testmode', ]; - $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; 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 8d62d28055..aad6053731 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,7 @@ $config['system.performance']['cache']['page']['max_age'] = 900; $this->assertConfig($config); -@@ -160,9 +157,6 @@ +@@ -161,9 +158,6 @@ $config['shield.settings']['shield_enable'] = TRUE; $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE; $config['xmlsitemap_engines.settings']['submit'] = FALSE; @@ -18,7 +18,7 @@ $config['system.performance']['cache']['page']['max_age'] = 1800; $this->assertConfig($config); -@@ -216,9 +210,6 @@ +@@ -218,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 +28,7 @@ $config['seckit.settings']['seckit_xss']['csp']['checkbox'] = FALSE; $config['seckit.settings']['seckit_xss']['csp']['upgrade-req'] = FALSE; $this->assertConfig($config); -@@ -272,9 +263,6 @@ +@@ -275,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 +38,7 @@ $config['seckit.settings']['seckit_xss']['csp']['checkbox'] = FALSE; $config['seckit.settings']['seckit_xss']['csp']['upgrade-req'] = FALSE; $this->assertConfig($config); -@@ -371,9 +359,6 @@ +@@ -375,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; 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 310cf6c5f6..99c110477a 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; -@@ -156,7 +155,6 @@ +@@ -157,7 +156,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; -@@ -210,7 +208,6 @@ +@@ -212,7 +210,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; -@@ -266,7 +263,6 @@ +@@ -269,7 +266,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; -@@ -364,7 +360,6 @@ +@@ -368,7 +364,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 new file mode 100644 index 0000000000..63ff39b7f3 --- /dev/null +++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_sdc_devel/tests/phpunit/Drupal/EnvironmentSettingsTest.php @@ -0,0 +1,40 @@ +@@ -89,7 +89,6 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', +- 'sdc_devel', + 'testmode', + ]; + $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; +@@ -172,7 +171,6 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', +- 'sdc_devel', + 'testmode', + ]; + $settings['config_sync_directory'] = 'custom_config'; +@@ -229,7 +227,6 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', +- 'sdc_devel', + 'testmode', + ]; + $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; +@@ -286,7 +283,6 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', +- 'sdc_devel', + 'testmode', + ]; + $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; +@@ -386,7 +382,6 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', +- 'sdc_devel', + 'testmode', + ]; + $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_sdc_devel/web/sites/default/includes/modules/-settings.sdc_devel.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_sdc_devel/web/sites/default/includes/modules/-settings.sdc_devel.php new file mode 100644 index 0000000000..e69de29bb2 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 d174cfdd43..80f07636a5 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 @@ -@@ -219,8 +219,6 @@ +@@ -221,8 +221,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; -@@ -275,8 +273,6 @@ +@@ -278,8 +276,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; -@@ -374,8 +370,6 @@ +@@ -378,8 +374,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/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/tests/phpunit/Drupal/EnvironmentSettingsTest.php index eb4468ee81..6f1332ca15 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; -@@ -157,7 +156,6 @@ +@@ -158,7 +157,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; -@@ -211,7 +209,6 @@ +@@ -213,7 +211,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'; -@@ -219,8 +216,6 @@ +@@ -221,8 +218,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; -@@ -267,7 +262,6 @@ +@@ -270,7 +265,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'; -@@ -275,8 +269,6 @@ +@@ -278,8 +272,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; -@@ -365,7 +357,6 @@ +@@ -369,7 +361,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'; -@@ -374,8 +365,6 @@ +@@ -378,8 +369,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_shield/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_shield/tests/phpunit/Drupal/EnvironmentSettingsTest.php index b6ff39ff7b..99429ea90b 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; -@@ -157,7 +156,6 @@ +@@ -158,7 +157,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; -@@ -211,7 +209,6 @@ +@@ -213,7 +211,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'; -@@ -267,7 +264,6 @@ +@@ -270,7 +267,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'; -@@ -365,7 +361,6 @@ +@@ -369,7 +365,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_testmode/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_testmode/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 135fa197c1..01cf4bf466 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,39 +1,39 @@ -@@ -89,7 +89,6 @@ - $settings['config_exclude_modules'] = [ +@@ -90,7 +90,6 @@ 'devel', 'generated_content', + 'sdc_devel', - 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; $settings['entity_update_batch_size'] = 50; -@@ -171,7 +170,6 @@ - $settings['config_exclude_modules'] = [ +@@ -173,7 +172,6 @@ 'devel', 'generated_content', + 'sdc_devel', - 'testmode', ]; $settings['config_sync_directory'] = 'custom_config'; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; -@@ -227,7 +225,6 @@ - $settings['config_exclude_modules'] = [ +@@ -230,7 +228,6 @@ 'devel', 'generated_content', + 'sdc_devel', - 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; $settings['entity_update_batch_size'] = 50; -@@ -283,7 +280,6 @@ - $settings['config_exclude_modules'] = [ +@@ -287,7 +284,6 @@ 'devel', 'generated_content', + 'sdc_devel', - 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; $settings['entity_update_batch_size'] = 50; -@@ -382,7 +378,6 @@ - $settings['config_exclude_modules'] = [ +@@ -387,7 +383,6 @@ 'devel', 'generated_content', + 'sdc_devel', - 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; 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 a6979936eb..cc51056031 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'; -@@ -158,7 +157,6 @@ +@@ -159,7 +158,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'; -@@ -212,7 +210,6 @@ +@@ -214,7 +212,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; -@@ -268,7 +265,6 @@ +@@ -271,7 +268,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; -@@ -366,7 +362,6 @@ +@@ -370,7 +366,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/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_none/tests/phpunit/Drupal/EnvironmentSettingsTest.php index d5c535bb0a..14293583cf 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,26 +70,12 @@ +@@ -70,27 +70,12 @@ $this->requireSettingsFile(); @@ -21,11 +21,12 @@ $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', +- 'sdc_devel', - 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; $settings['entity_update_batch_size'] = 50; -@@ -151,18 +137,7 @@ +@@ -152,18 +137,7 @@ $this->assertEquals($databases, $this->databases); // Verify key config overrides. @@ -44,17 +45,18 @@ $config['system.performance']['cache']['page']['max_age'] = 1800; $this->assertConfig($config); -@@ -169,9 +144,6 @@ +@@ -170,10 +144,6 @@ // Verify settings overrides. $settings['auto_create_htaccess'] = FALSE; $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', +- 'sdc_devel', - 'testmode', ]; $settings['config_sync_directory'] = 'custom_config'; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; -@@ -204,30 +176,13 @@ +@@ -206,31 +176,13 @@ $this->requireSettingsFile(); $config['automated_cron.settings']['interval'] = 0; @@ -81,11 +83,12 @@ $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', +- 'sdc_devel', - 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; $settings['entity_update_batch_size'] = 50; -@@ -260,30 +215,13 @@ +@@ -263,31 +215,13 @@ $this->requireSettingsFile(); $config['automated_cron.settings']['interval'] = 0; @@ -112,11 +115,12 @@ $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', +- 'sdc_devel', - 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; $settings['entity_update_batch_size'] = 50; -@@ -358,31 +296,14 @@ +@@ -362,32 +296,14 @@ $this->requireSettingsFile(); $config['automated_cron.settings']['interval'] = 0; @@ -144,6 +148,7 @@ $settings['config_exclude_modules'] = [ - 'devel', - 'generated_content', +- 'sdc_devel', - 'testmode', ]; $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml'; diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_none/web/sites/default/includes/modules/-settings.sdc_devel.php b/.vortex/installer/tests/Fixtures/handler_process/modules_none/web/sites/default/includes/modules/-settings.sdc_devel.php new file mode 100644 index 0000000000..e69de29bb2 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 f0691eb028..e12377a7ef 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); -@@ -161,8 +161,8 @@ +@@ -162,8 +162,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); -@@ -217,8 +217,8 @@ +@@ -219,8 +219,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); -@@ -273,8 +273,8 @@ +@@ -276,8 +276,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); -@@ -372,8 +372,8 @@ +@@ -376,8 +376,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/provision_database_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/provision_database_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 0312069061..a7796d8418 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 @@ } /** -@@ -402,6 +582,279 @@ +@@ -407,6 +587,283 @@ '^localhost$', ]; $this->assertSettings($settings); @@ -227,6 +227,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['config_sync_directory'] = '../config/default'; @@ -290,6 +291,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['config_sync_directory'] = '../config/default'; @@ -353,6 +355,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['config_sync_directory'] = '../config/default'; @@ -414,6 +417,7 @@ + $settings['config_exclude_modules'] = [ + 'devel', + 'generated_content', ++ 'sdc_devel', + 'testmode', + ]; + $settings['config_sync_directory'] = '../config/default'; 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 7d0df7d198..f7ee4f34f3 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 @@ -@@ -348,9 +348,9 @@ +@@ -352,9 +352,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 8ac795c73e..4286652841 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 { -@@ -348,9 +344,9 @@ +@@ -352,9 +348,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 7d0df7d198..f7ee4f34f3 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 @@ -@@ -348,9 +348,9 @@ +@@ -352,9 +352,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 7d0df7d198..f7ee4f34f3 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 @@ -@@ -348,9 +348,9 @@ +@@ -352,9 +352,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 7d0df7d198..f7ee4f34f3 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 @@ -@@ -348,9 +348,9 @@ +@@ -352,9 +352,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 7d0df7d198..f7ee4f34f3 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 @@ -@@ -348,9 +348,9 @@ +@@ -352,9 +352,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 7d0df7d198..f7ee4f34f3 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 @@ -@@ -348,9 +348,9 @@ +@@ -352,9 +352,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 7d0df7d198..f7ee4f34f3 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 @@ -@@ -348,9 +348,9 @@ +@@ -352,9 +352,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 7d0df7d198..f7ee4f34f3 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 @@ -@@ -348,9 +348,9 @@ +@@ -352,9 +352,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 7d0df7d198..f7ee4f34f3 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 @@ -@@ -348,9 +348,9 @@ +@@ -352,9 +352,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 8ac795c73e..4286652841 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 { -@@ -348,9 +344,9 @@ +@@ -352,9 +348,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 7d0df7d198..f7ee4f34f3 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 @@ -@@ -348,9 +348,9 @@ +@@ -352,9 +352,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 7d0df7d198..f7ee4f34f3 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 @@ -@@ -348,9 +348,9 @@ +@@ -352,9 +352,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 7d0df7d198..f7ee4f34f3 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 @@ -@@ -348,9 +348,9 @@ +@@ -352,9 +352,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 7d0df7d198..f7ee4f34f3 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 @@ -@@ -348,9 +348,9 @@ +@@ -352,9 +352,9 @@ } /** diff --git a/.vortex/tests/phpunit/Traits/Subtests/SubtestAhoyTrait.php b/.vortex/tests/phpunit/Traits/Subtests/SubtestAhoyTrait.php index f16d1ed935..b4d7e4c7f5 100644 --- a/.vortex/tests/phpunit/Traits/Subtests/SubtestAhoyTrait.php +++ b/.vortex/tests/phpunit/Traits/Subtests/SubtestAhoyTrait.php @@ -271,11 +271,25 @@ protected function subtestAhoyProvision(): void { $this->syncToHost('config'); $this->assertFilesWildcardExists('config/default/*.yml'); - $this->logSubstep('Assert demo-only modules are excluded from the exported configuration'); - $this->cmd('ahoy drush pm:list --status=enabled --type=module --format=list', ['* generated_content', '* testmode'], 'Demo-only modules should be enabled after provisioning with demo content'); + $this->logSubstep('Assert development modules are excluded from the exported configuration'); + $this->cmd('ahoy drush pm:list --status=enabled --type=module --format=json', ['* "devel":', '* "generated_content":', '* "sdc_devel":', '* "testmode":'], 'Development modules should be enabled after provisioning'); + $this->assertFileNotContainsString('config/default/core.extension.yml', 'devel', 'Excluded module "devel" should not appear in the exported extension list'); $this->assertFileNotContainsString('config/default/core.extension.yml', 'generated_content', 'Excluded module "generated_content" should not appear in the exported extension list'); + $this->assertFileNotContainsString('config/default/core.extension.yml', 'sdc_devel', 'Excluded module "sdc_devel" should not appear in the exported extension list'); $this->assertFileNotContainsString('config/default/core.extension.yml', 'testmode', 'Excluded module "testmode" should not appear in the exported extension list'); + $this->logSubstep('Assert provisioned modules are captured in the exported configuration'); + $this->assertFileContainsString('config/default/core.extension.yml', 'config_split', 'Module "config_split" should appear in the exported extension list'); + $this->assertFileContainsString('config/default/core.extension.yml', 'environment_indicator', 'Module "environment_indicator" should appear in the exported extension list'); + $this->assertFileContainsString('config/default/core.extension.yml', 'pathauto', 'Module "pathauto" should appear in the exported extension list'); + $this->assertFileContainsString('config/default/core.extension.yml', 'redirect', 'Module "redirect" should appear in the exported extension list'); + $this->assertFileContainsString('config/default/core.extension.yml', 'search_api', 'Module "search_api" should appear in the exported extension list'); + $this->assertFileContainsString('config/default/core.extension.yml', 'shield', 'Module "shield" should appear in the exported extension list'); + $this->assertFileContainsString('config/default/core.extension.yml', 'stage_file_proxy', 'Module "stage_file_proxy" should appear in the exported extension list'); + $this->assertFileContainsString('config/default/core.extension.yml', 'sw_base', 'Module "sw_base" should appear in the exported extension list'); + $this->assertFileContainsString('config/default/core.extension.yml', 'sw_demo', 'Module "sw_demo" should appear in the exported extension list'); + $this->assertFileContainsString('config/default/core.extension.yml', 'sw_search', 'Module "sw_search" should appear in the exported extension list'); + $this->seedCacheTableRow(); $this->cmd('ahoy export-db db.sql', '* Exported database dump saved', 'Export database should complete successfully'); diff --git a/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/tests/phpunit/Drupal/EnvironmentSettingsTest.php index 3c1a3c4c60..46de79f48d 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_SDC_DEVEL + 'sdc_devel', + // phpcs:ignore #;> MODULE_SDC_DEVEL // phpcs:ignore #;< MODULE_TESTMODE 'testmode', // phpcs:ignore #;> MODULE_TESTMODE @@ -418,6 +421,9 @@ public function testEnvironmentOverrides(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_SDC_DEVEL + 'sdc_devel', + // phpcs:ignore #;> MODULE_SDC_DEVEL // phpcs:ignore #;< MODULE_TESTMODE 'testmode', // phpcs:ignore #;> MODULE_TESTMODE @@ -480,6 +486,9 @@ public function testEnvironmentLocal(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_SDC_DEVEL + 'sdc_devel', + // phpcs:ignore #;> MODULE_SDC_DEVEL // phpcs:ignore #;< MODULE_TESTMODE 'testmode', // phpcs:ignore #;> MODULE_TESTMODE @@ -543,6 +552,9 @@ public function testEnvironmentLocalContainer(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_SDC_DEVEL + 'sdc_devel', + // phpcs:ignore #;> MODULE_SDC_DEVEL // phpcs:ignore #;< MODULE_TESTMODE 'testmode', // phpcs:ignore #;> MODULE_TESTMODE @@ -650,6 +662,9 @@ public function testEnvironmentCircleCi(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_SDC_DEVEL + 'sdc_devel', + // phpcs:ignore #;> MODULE_SDC_DEVEL // phpcs:ignore #;< MODULE_TESTMODE 'testmode', // phpcs:ignore #;> MODULE_TESTMODE @@ -715,6 +730,9 @@ public function testEnvironmentGha(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_SDC_DEVEL + 'sdc_devel', + // phpcs:ignore #;> MODULE_SDC_DEVEL // phpcs:ignore #;< MODULE_TESTMODE 'testmode', // phpcs:ignore #;> MODULE_TESTMODE @@ -776,6 +794,9 @@ public function testEnvironmentAcquiaDynamic(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_SDC_DEVEL + 'sdc_devel', + // phpcs:ignore #;> MODULE_SDC_DEVEL // phpcs:ignore #;< MODULE_TESTMODE 'testmode', // phpcs:ignore #;> MODULE_TESTMODE @@ -834,6 +855,9 @@ public function testEnvironmentAcquiaDev(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_SDC_DEVEL + 'sdc_devel', + // phpcs:ignore #;> MODULE_SDC_DEVEL // phpcs:ignore #;< MODULE_TESTMODE 'testmode', // phpcs:ignore #;> MODULE_TESTMODE @@ -892,6 +916,9 @@ public function testEnvironmentAcquiaStage(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_SDC_DEVEL + 'sdc_devel', + // phpcs:ignore #;> MODULE_SDC_DEVEL // phpcs:ignore #;< MODULE_TESTMODE 'testmode', // phpcs:ignore #;> MODULE_TESTMODE @@ -947,6 +974,9 @@ public function testEnvironmentAcquiaProd(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_SDC_DEVEL + 'sdc_devel', + // phpcs:ignore #;> MODULE_SDC_DEVEL // phpcs:ignore #;< MODULE_TESTMODE 'testmode', // phpcs:ignore #;> MODULE_TESTMODE @@ -1006,6 +1036,9 @@ public function testEnvironmentAcquiaConfigPathOverride(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_SDC_DEVEL + 'sdc_devel', + // phpcs:ignore #;> MODULE_SDC_DEVEL // phpcs:ignore #;< MODULE_TESTMODE 'testmode', // phpcs:ignore #;> MODULE_TESTMODE @@ -1072,6 +1105,9 @@ public function testEnvironmentAcquiaConfigVcsDirectoryFallback(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_SDC_DEVEL + 'sdc_devel', + // phpcs:ignore #;> MODULE_SDC_DEVEL // phpcs:ignore #;< MODULE_TESTMODE 'testmode', // phpcs:ignore #;> MODULE_TESTMODE @@ -1138,6 +1174,9 @@ public function testEnvironmentLagoonPreview(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_SDC_DEVEL + 'sdc_devel', + // phpcs:ignore #;> MODULE_SDC_DEVEL // phpcs:ignore #;< MODULE_TESTMODE 'testmode', // phpcs:ignore #;> MODULE_TESTMODE @@ -1207,6 +1246,9 @@ public function testEnvironmentLagoonDev(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_SDC_DEVEL + 'sdc_devel', + // phpcs:ignore #;> MODULE_SDC_DEVEL // phpcs:ignore #;< MODULE_TESTMODE 'testmode', // phpcs:ignore #;> MODULE_TESTMODE @@ -1276,6 +1318,9 @@ public function testEnvironmentLagoonTest(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_SDC_DEVEL + 'sdc_devel', + // phpcs:ignore #;> MODULE_SDC_DEVEL // phpcs:ignore #;< MODULE_TESTMODE 'testmode', // phpcs:ignore #;> MODULE_TESTMODE @@ -1343,6 +1388,9 @@ public function testEnvironmentLagoonProd(): void { // phpcs:ignore #;< MODULE_GENERATED_CONTENT 'generated_content', // phpcs:ignore #;> MODULE_GENERATED_CONTENT + // phpcs:ignore #;< MODULE_SDC_DEVEL + 'sdc_devel', + // phpcs:ignore #;> MODULE_SDC_DEVEL // phpcs:ignore #;< MODULE_TESTMODE 'testmode', // phpcs:ignore #;> MODULE_TESTMODE diff --git a/web/sites/default/includes/modules/settings.sdc_devel.php b/web/sites/default/includes/modules/settings.sdc_devel.php new file mode 100644 index 0000000000..f0759b3ae7 --- /dev/null +++ b/web/sites/default/includes/modules/settings.sdc_devel.php @@ -0,0 +1,10 @@ +