From fab00cc7361ae2a9293e068958778daa62143bd1 Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Wed, 29 Jul 2026 14:29:25 +1000 Subject: [PATCH 1/5] [#2851] Fenced the 'page' content model behind the demo and search modules. --- .gitignore | 2 ++ .../installer/src/Prompts/Handlers/CustomModules.php | 8 ++++++++ .../Handlers/CustomModulesHandlerProcessTest.php | 12 ++++++++++-- scripts/provision-00-enable-demo-modules.sh | 6 ++++-- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2b290fecb1..e02e81705b 100644 --- a/.gitignore +++ b/.gitignore @@ -34,7 +34,9 @@ web/sites/simpletest # Composer installs contrib recipes into 'recipes/', next to custom recipes, # so recipes stay an allow list: un-ignore custom recipes explicitly. recipes/* +#;< CONTENT_MODEL !recipes/page +#;> CONTENT_MODEL #;< AI_CODE_INSTRUCTIONS # Ignore all Claude files by default. Custom files should be added explicitly. diff --git a/.vortex/installer/src/Prompts/Handlers/CustomModules.php b/.vortex/installer/src/Prompts/Handlers/CustomModules.php index ed6feec559..95bed843a4 100644 --- a/.vortex/installer/src/Prompts/Handlers/CustomModules.php +++ b/.vortex/installer/src/Prompts/Handlers/CustomModules.php @@ -182,6 +182,14 @@ public function process(): void { File::remove($path); } } + + // The 'page' content model is shared: the demo module attaches behaviour to + // the content type and the search tests index content of that type. It is + // only removed once neither of them remains. + if (!in_array(self::DEMO, $selected) && !in_array(self::SEARCH, $selected)) { + File::removeTokenAsync('CONTENT_MODEL'); + File::remove($t . '/recipes/page'); + } } /** diff --git a/.vortex/installer/tests/Functional/Handlers/CustomModulesHandlerProcessTest.php b/.vortex/installer/tests/Functional/Handlers/CustomModulesHandlerProcessTest.php index 36d902db95..996900948e 100644 --- a/.vortex/installer/tests/Functional/Handlers/CustomModulesHandlerProcessTest.php +++ b/.vortex/installer/tests/Functional/Handlers/CustomModulesHandlerProcessTest.php @@ -29,6 +29,7 @@ public static function dataProviderHandlerProcess(): \Iterator { static::cw(function (AbstractHandlerProcessTestCase $test): void { $test->assertSutNotContains('_demo'); $test->assertSutNotContains('counter_block'); + $test->assertDirectoryExists(static::$sut . '/recipes/page'); }), ]; yield 'custom_modules_no_search' => [ @@ -36,7 +37,10 @@ public static function dataProviderHandlerProcess(): \Iterator { $test->prompts[CustomModules::id()] = [CustomModules::BASE, CustomModules::DEMO]; $test->prompts[AiCodeInstructions::id()] = TRUE; }), - static::cw(fn(FunctionalTestCase $test) => $test->assertSutNotContains('_search')), + static::cw(function (AbstractHandlerProcessTestCase $test): void { + $test->assertSutNotContains('_search'); + $test->assertDirectoryExists(static::$sut . '/recipes/page'); + }), ]; yield 'custom_modules_none' => [ static::cw(fn($test): array => $test->prompts[CustomModules::id()] = []), @@ -44,6 +48,7 @@ public static function dataProviderHandlerProcess(): \Iterator { $test->assertSutNotContains('_base'); $test->assertSutNotContains('_demo'); $test->assertSutNotContains('_search'); + $test->assertDirectoryDoesNotExist(static::$sut . '/recipes/page'); }), ]; yield 'custom_modules_search_without_solr' => [ @@ -54,7 +59,10 @@ public static function dataProviderHandlerProcess(): \Iterator { $test->prompts[Services::id()] = [Services::CLAMAV, Services::REDIS]; $test->prompts[AiCodeInstructions::id()] = TRUE; }), - static::cw(fn(FunctionalTestCase $test) => $test->assertSutNotContains('_search')), + static::cw(function (AbstractHandlerProcessTestCase $test): void { + $test->assertSutNotContains('_search'); + $test->assertDirectoryExists(static::$sut . '/recipes/page'); + }), ]; } diff --git a/scripts/provision-00-enable-demo-modules.sh b/scripts/provision-00-enable-demo-modules.sh index 03248cbad4..db74de3bd5 100755 --- a/scripts/provision-00-enable-demo-modules.sh +++ b/scripts/provision-00-enable-demo-modules.sh @@ -36,14 +36,16 @@ if ! echo "${environment}" | grep -qxF -e local -e ci -e dev -e stage; then exit 0 fi -# The demo site modules attach behaviour to the 'page' content type, so it -# must exist before those modules are installed and their deploy hooks run. +#;< CONTENT_MODEL +# Site modules attach behaviour to the 'page' content type, so it must exist +# before those modules are installed and their deploy hooks run. task "Creating the content model." # Guard against environments where the Drupal CLI is not available. if [ -x ./vendor/bin/dr ]; then ./vendor/bin/dr recipe "$(pwd)/recipes/page" --no-interaction fi pass "Created the content model." +#;> CONTENT_MODEL task "Setting site name." drush php:eval "\Drupal::service('config.factory')->getEditable('system.site')->set('name', 'YOURSITE')->save();" From 4dba383a520a0010a98380751e942450d0c98d59 Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Wed, 29 Jul 2026 14:30:07 +1000 Subject: [PATCH 2/5] Updated snapshots. --- .../provision-00-enable-demo-modules.sh | 4 ++-- .../custom_modules_none/.gitignore | 8 ++++++++ .../recipes/page/-recipe.yml | 0 ...e.entity_form_display.node.page.default.yml | 0 ...e.entity_view_display.node.page.default.yml | 0 ...re.entity_view_display.node.page.teaser.yml | 0 .../config/-field.field.node.page.body.yml | 0 .../page/config/-field.storage.node.body.yml | 0 .../recipes/page/config/-node.type.page.yml | 0 .../provision-00-enable-demo-modules.sh | 18 +++++++++++++++++- 10 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 .vortex/installer/tests/Fixtures/handler_process/custom_modules_none/.gitignore create mode 100644 .vortex/installer/tests/Fixtures/handler_process/custom_modules_none/recipes/page/-recipe.yml create mode 100644 .vortex/installer/tests/Fixtures/handler_process/custom_modules_none/recipes/page/config/-core.entity_form_display.node.page.default.yml create mode 100644 .vortex/installer/tests/Fixtures/handler_process/custom_modules_none/recipes/page/config/-core.entity_view_display.node.page.default.yml create mode 100644 .vortex/installer/tests/Fixtures/handler_process/custom_modules_none/recipes/page/config/-core.entity_view_display.node.page.teaser.yml create mode 100644 .vortex/installer/tests/Fixtures/handler_process/custom_modules_none/recipes/page/config/-field.field.node.page.body.yml create mode 100644 .vortex/installer/tests/Fixtures/handler_process/custom_modules_none/recipes/page/config/-field.storage.node.body.yml create mode 100644 .vortex/installer/tests/Fixtures/handler_process/custom_modules_none/recipes/page/config/-node.type.page.yml 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 35000ef9c3..48de9302d8 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 @@ -36,8 +36,8 @@ if ! echo "${environment}" | grep -qxF -e local -e ci -e dev -e stage; then exit 0 fi -# The demo site modules attach behaviour to the 'page' content type, so it -# must exist before those modules are installed and their deploy hooks run. +# Site modules attach behaviour to the 'page' content type, so it must exist +# before those modules are installed and their deploy hooks run. task "Creating the content model." # Guard against environments where the Drupal CLI is not available. if [ -x ./vendor/bin/dr ]; then diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/.gitignore b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/.gitignore new file mode 100644 index 0000000000..4c478b1b22 --- /dev/null +++ b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/.gitignore @@ -0,0 +1,8 @@ +@@ -32,7 +32,6 @@ + # Composer installs contrib recipes into 'recipes/', next to custom recipes, + # so recipes stay an allow list: un-ignore custom recipes explicitly. + recipes/* +-!recipes/page + + # Ignore all Claude files by default. Custom files should be added explicitly. + .claude/* diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/recipes/page/-recipe.yml b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/recipes/page/-recipe.yml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/recipes/page/config/-core.entity_form_display.node.page.default.yml b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/recipes/page/config/-core.entity_form_display.node.page.default.yml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/recipes/page/config/-core.entity_view_display.node.page.default.yml b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/recipes/page/config/-core.entity_view_display.node.page.default.yml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/recipes/page/config/-core.entity_view_display.node.page.teaser.yml b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/recipes/page/config/-core.entity_view_display.node.page.teaser.yml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/recipes/page/config/-field.field.node.page.body.yml b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/recipes/page/config/-field.field.node.page.body.yml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/recipes/page/config/-field.storage.node.body.yml b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/recipes/page/config/-field.storage.node.body.yml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/recipes/page/config/-node.type.page.yml b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/recipes/page/config/-node.type.page.yml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/scripts/provision-00-enable-demo-modules.sh index 18c38b8c59..a4d734c5cf 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/scripts/provision-00-enable-demo-modules.sh @@ -1,4 +1,20 @@ -@@ -82,11 +82,7 @@ +@@ -36,15 +36,6 @@ + exit 0 + fi + +-# Site modules attach behaviour to the 'page' content type, so it must exist +-# before those modules are installed and their deploy hooks run. +-task "Creating the content model." +-# Guard against environments where the Drupal CLI is not available. +-if [ -x ./vendor/bin/dr ]; then +- ./vendor/bin/dr recipe "$(pwd)/recipes/page" --no-interaction +-fi +-pass "Created the content model." +- + task "Setting site name." + drush php:eval "\Drupal::service('config.factory')->getEditable('system.site')->set('name', 'star wars')->save();" + pass "Set site name." +@@ -82,11 +73,7 @@ # Note that deployment hooks for already enabled modules have run in the # parent "provision.sh" script. task "Installing custom site modules." From fedd300d9a93c919251b42e08734a32764575df3 Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Wed, 29 Jul 2026 14:41:47 +1000 Subject: [PATCH 3/5] [#2851] Generalised the recipes allow-list example in the architecture docs. --- .vortex/docs/content/architecture.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vortex/docs/content/architecture.mdx b/.vortex/docs/content/architecture.mdx index a179d8612f..def135fa82 100644 --- a/.vortex/docs/content/architecture.mdx +++ b/.vortex/docs/content/architecture.mdx @@ -88,7 +88,7 @@ caches, and content files. Two sections stay as small allow lists because a deny rule cannot express them: - `recipes/` - Composer installs contributed recipes next to your custom ones, - so custom recipes are un-ignored explicitly (`!recipes/page`). + so each custom recipe is un-ignored explicitly. - `.claude/` - only `.claude/settings.json` is tracked by default. The other two ignore files apply the same deny-list model to different targets: From 1b1bc351cb903fc298cf7c91816b5b0dbe9b5c43 Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Wed, 29 Jul 2026 14:45:13 +1000 Subject: [PATCH 4/5] [#2851] Reported a skip instead of success when the Drupal CLI is absent. --- scripts/provision-00-enable-demo-modules.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/provision-00-enable-demo-modules.sh b/scripts/provision-00-enable-demo-modules.sh index db74de3bd5..ff4e58b856 100755 --- a/scripts/provision-00-enable-demo-modules.sh +++ b/scripts/provision-00-enable-demo-modules.sh @@ -43,8 +43,10 @@ task "Creating the content model." # Guard against environments where the Drupal CLI is not available. if [ -x ./vendor/bin/dr ]; then ./vendor/bin/dr recipe "$(pwd)/recipes/page" --no-interaction + pass "Created the content model." +else + note "Skipped creating the content model: Drupal CLI is not available." fi -pass "Created the content model." #;> CONTENT_MODEL task "Setting site name." From a27f766636951eea56dc20c497ca7606edf88801 Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Wed, 29 Jul 2026 14:47:47 +1000 Subject: [PATCH 5/5] Updated snapshots. --- .../_baseline/scripts/provision-00-enable-demo-modules.sh | 4 +++- .../scripts/provision-00-enable-demo-modules.sh | 2 +- .../scripts/provision-00-enable-demo-modules.sh | 2 +- .../scripts/provision-00-enable-demo-modules.sh | 2 +- .../scripts/provision-00-enable-demo-modules.sh | 8 +++++--- .../scripts/provision-00-enable-demo-modules.sh | 4 ++-- .../scripts/provision-00-enable-demo-modules.sh | 2 +- .../scripts/provision-00-enable-demo-modules.sh | 2 +- .../scripts/provision-00-enable-demo-modules.sh | 2 +- .../scripts/provision-00-enable-demo-modules.sh | 2 +- .../scripts/provision-00-enable-demo-modules.sh | 2 +- .../scripts/provision-00-enable-demo-modules.sh | 2 +- .../scripts/provision-00-enable-demo-modules.sh | 2 +- .../scripts/provision-00-enable-demo-modules.sh | 2 +- .../scripts/provision-00-enable-demo-modules.sh | 2 +- .../scripts/provision-00-enable-demo-modules.sh | 2 +- .../scripts/provision-00-enable-demo-modules.sh | 2 +- .../scripts/provision-00-enable-demo-modules.sh | 2 +- .../scripts/provision-00-enable-demo-modules.sh | 2 +- .../scripts/provision-00-enable-demo-modules.sh | 2 +- .../names/scripts/provision-00-enable-demo-modules.sh | 6 +++--- .../scripts/provision-00-enable-demo-modules.sh | 2 +- .../scripts/provision-00-enable-demo-modules.sh | 2 +- .../scripts/provision-00-enable-demo-modules.sh | 2 +- .../scripts/provision-00-enable-demo-modules.sh | 2 +- .../scripts/provision-00-enable-demo-modules.sh | 4 ++-- .../scripts/provision-00-enable-demo-modules.sh | 4 ++-- 27 files changed, 38 insertions(+), 34 deletions(-) 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 48de9302d8..9e6ef170f4 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 @@ -42,8 +42,10 @@ task "Creating the content model." # Guard against environments where the Drupal CLI is not available. if [ -x ./vendor/bin/dr ]; then ./vendor/bin/dr recipe "$(pwd)/recipes/page" --no-interaction + pass "Created the content model." +else + note "Skipped creating the content model: Drupal CLI is not available." fi -pass "Created the content model." task "Setting site name." drush php:eval "\Drupal::service('config.factory')->getEditable('system.site')->set('name', 'star wars')->save();" diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_base/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_base/scripts/provision-00-enable-demo-modules.sh index d525dc46a7..2fd7c1f8a0 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_base/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_base/scripts/provision-00-enable-demo-modules.sh @@ -1,4 +1,4 @@ -@@ -82,7 +82,6 @@ +@@ -84,7 +84,6 @@ # Note that deployment hooks for already enabled modules have run in the # parent "provision.sh" script. task "Installing custom site modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_demo/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_demo/scripts/provision-00-enable-demo-modules.sh index aa70722f2f..f9310788be 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_demo/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_demo/scripts/provision-00-enable-demo-modules.sh @@ -1,4 +1,4 @@ -@@ -86,7 +86,6 @@ +@@ -88,7 +88,6 @@ drush pm:install sw_search diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_search/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_search/scripts/provision-00-enable-demo-modules.sh index aa2194e8c1..7002b6dffc 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_search/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_no_search/scripts/provision-00-enable-demo-modules.sh @@ -1,4 +1,4 @@ -@@ -84,8 +84,6 @@ +@@ -86,8 +86,6 @@ task "Installing custom site modules." drush pm:install sw_base diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/scripts/provision-00-enable-demo-modules.sh index a4d734c5cf..dc9bed60b0 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_none/scripts/provision-00-enable-demo-modules.sh @@ -1,4 +1,4 @@ -@@ -36,15 +36,6 @@ +@@ -36,17 +36,6 @@ exit 0 fi @@ -8,13 +8,15 @@ -# Guard against environments where the Drupal CLI is not available. -if [ -x ./vendor/bin/dr ]; then - ./vendor/bin/dr recipe "$(pwd)/recipes/page" --no-interaction +- pass "Created the content model." +-else +- note "Skipped creating the content model: Drupal CLI is not available." -fi --pass "Created the content model." - task "Setting site name." drush php:eval "\Drupal::service('config.factory')->getEditable('system.site')->set('name', 'star wars')->save();" pass "Set site name." -@@ -82,11 +73,7 @@ +@@ -84,11 +73,7 @@ # Note that deployment hooks for already enabled modules have run in the # parent "provision.sh" script. task "Installing custom site modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_search_without_solr/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_search_without_solr/scripts/provision-00-enable-demo-modules.sh index 8fb9c4a2e0..1be342f823 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/custom_modules_search_without_solr/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/custom_modules_search_without_solr/scripts/provision-00-enable-demo-modules.sh @@ -1,4 +1,4 @@ -@@ -73,10 +73,6 @@ +@@ -75,10 +75,6 @@ drush config-set clamav.settings mode_daemon_tcpip.hostname clamav pass "Installed and configured ClamAV." @@ -9,7 +9,7 @@ # Enable custom site module and run its deployment hooks. # # Note that deployment hooks for already enabled modules have run in the -@@ -83,8 +79,6 @@ +@@ -85,8 +81,6 @@ # parent "provision.sh" script. task "Installing custom site modules." drush pm:install sw_base 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 dfcc688190..05541cdcf3 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 @@ -1,4 +1,4 @@ -@@ -61,7 +61,7 @@ +@@ -63,7 +63,7 @@ pass "Set up the administration navigation." task "Installing contrib modules." 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 9857ee02d7..4965840a1d 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 @@ -1,4 +1,4 @@ -@@ -61,7 +61,7 @@ +@@ -63,7 +63,7 @@ pass "Set up the administration navigation." task "Installing contrib modules." 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 c1250d1c39..fd2b6d8a66 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 @@ -1,4 +1,4 @@ -@@ -61,7 +61,7 @@ +@@ -63,7 +63,7 @@ pass "Set up the administration navigation." task "Installing contrib modules." 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 aa4e98b55c..12e283d8b8 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 @@ -1,4 +1,4 @@ -@@ -61,7 +61,7 @@ +@@ -63,7 +63,7 @@ pass "Set up the administration navigation." task "Installing contrib modules." 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 83900fa05a..feb0a491c1 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 @@ -1,4 +1,4 @@ -@@ -61,7 +61,7 @@ +@@ -63,7 +63,7 @@ pass "Set up the administration navigation." task "Installing contrib modules." 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 9138c9109e..10650f41f0 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 @@ -1,4 +1,4 @@ -@@ -61,7 +61,7 @@ +@@ -63,7 +63,7 @@ pass "Set up the administration navigation." task "Installing contrib modules." 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 54a06eb83a..0fe47173c2 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 @@ -1,4 +1,4 @@ -@@ -61,7 +61,7 @@ +@@ -63,7 +63,7 @@ pass "Set up the administration navigation." task "Installing contrib modules." 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 index baa18c322b..8a5b116fe7 100644 --- 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 @@ -1,4 +1,4 @@ -@@ -61,7 +61,7 @@ +@@ -63,7 +63,7 @@ pass "Set up the administration navigation." task "Installing contrib modules." 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 2ece4a67c6..3ef45f84c2 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 @@ -1,4 +1,4 @@ -@@ -61,7 +61,7 @@ +@@ -63,7 +63,7 @@ pass "Set up the administration navigation." task "Installing contrib modules." 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 ee668cff07..50eebbfe22 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 @@ -1,4 +1,4 @@ -@@ -61,7 +61,7 @@ +@@ -63,7 +63,7 @@ pass "Set up the administration navigation." task "Installing contrib modules." 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 db1a6095b1..d97ed94271 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 @@ -1,4 +1,4 @@ -@@ -61,7 +61,7 @@ +@@ -63,7 +63,7 @@ pass "Set up the administration navigation." task "Installing contrib modules." 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 953073569b..1e429d7ea9 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 @@ -1,4 +1,4 @@ -@@ -61,7 +61,7 @@ +@@ -63,7 +63,7 @@ pass "Set up the administration navigation." task "Installing contrib modules." 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 8f2c9993bd..a396e188f5 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 @@ -1,4 +1,4 @@ -@@ -61,7 +61,7 @@ +@@ -63,7 +63,7 @@ pass "Set up the administration navigation." task "Installing contrib modules." 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 8cb7355b3a..43a388bf8d 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 @@ -1,4 +1,4 @@ -@@ -60,10 +60,6 @@ +@@ -62,10 +62,6 @@ fi pass "Set up the administration navigation." diff --git a/.vortex/installer/tests/Fixtures/handler_process/names/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/names/scripts/provision-00-enable-demo-modules.sh index 5958575bb2..004acf6cf9 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/names/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/names/scripts/provision-00-enable-demo-modules.sh @@ -1,5 +1,5 @@ -@@ -46,7 +46,7 @@ - pass "Created the content model." +@@ -48,7 +48,7 @@ + fi task "Setting site name." -drush php:eval "\Drupal::service('config.factory')->getEditable('system.site')->set('name', 'star wars')->save();" @@ -7,7 +7,7 @@ pass "Set site name." # Use the core Navigation module as the administration interface and remove -@@ -82,11 +82,11 @@ +@@ -84,11 +84,11 @@ # Note that deployment hooks for already enabled modules have run in the # parent "provision.sh" script. task "Installing custom site modules." 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 900b3bc87e..fd71160db9 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,4 +1,4 @@ -@@ -64,10 +64,6 @@ +@@ -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 pass "Installed contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_string/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_string/scripts/provision-00-enable-demo-modules.sh index 99920b4dd5..f03c800444 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_string/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/non_interactive_config_string/scripts/provision-00-enable-demo-modules.sh @@ -1,4 +1,4 @@ -@@ -68,11 +68,6 @@ +@@ -70,11 +70,6 @@ drush pm:install redis || true pass "Installed Redis module." diff --git a/.vortex/installer/tests/Fixtures/handler_process/services_no_clamav/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/services_no_clamav/scripts/provision-00-enable-demo-modules.sh index 99920b4dd5..f03c800444 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/services_no_clamav/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/services_no_clamav/scripts/provision-00-enable-demo-modules.sh @@ -1,4 +1,4 @@ -@@ -68,11 +68,6 @@ +@@ -70,11 +70,6 @@ drush pm:install redis || true pass "Installed Redis module." 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 900b3bc87e..fd71160db9 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,4 +1,4 @@ -@@ -64,10 +64,6 @@ +@@ -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 pass "Installed contrib modules." diff --git a/.vortex/installer/tests/Fixtures/handler_process/services_no_solr/scripts/provision-00-enable-demo-modules.sh b/.vortex/installer/tests/Fixtures/handler_process/services_no_solr/scripts/provision-00-enable-demo-modules.sh index 8fb9c4a2e0..1be342f823 100644 --- a/.vortex/installer/tests/Fixtures/handler_process/services_no_solr/scripts/provision-00-enable-demo-modules.sh +++ b/.vortex/installer/tests/Fixtures/handler_process/services_no_solr/scripts/provision-00-enable-demo-modules.sh @@ -1,4 +1,4 @@ -@@ -73,10 +73,6 @@ +@@ -75,10 +75,6 @@ drush config-set clamav.settings mode_daemon_tcpip.hostname clamav pass "Installed and configured ClamAV." @@ -9,7 +9,7 @@ # Enable custom site module and run its deployment hooks. # # Note that deployment hooks for already enabled modules have run in the -@@ -83,8 +79,6 @@ +@@ -85,8 +81,6 @@ # parent "provision.sh" script. task "Installing custom site modules." drush pm:install sw_base 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 be740471e6..92edd12dd8 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,4 +1,4 @@ -@@ -64,19 +64,6 @@ +@@ -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 pass "Installed contrib modules." @@ -18,7 +18,7 @@ # Enable custom site module and run its deployment hooks. # # Note that deployment hooks for already enabled modules have run in the -@@ -83,8 +70,6 @@ +@@ -85,8 +72,6 @@ # parent "provision.sh" script. task "Installing custom site modules." drush pm:install sw_base