[#1882] Added support for DrupalCMS.

.github/workflows/vortex-test-common.yml

@@ -114,9 +114,9 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
-        batch: [0, 1, 2, 3]
+        batch: [0, 1, 2, 3, 4]
 
     container:
       image: drevops/ci-runner:25.8.0@sha256:d6ba40fc4248ce291302a2cf212de9b80da5433f2fdf29be09ed59659df9e18d
@@ -183,7 +183,7 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
         batch: [0, 1]
 

.gitignore

@@ -31,7 +31,7 @@ web/sites/default/*
 # Preserve default settings files to use them in Functional test.
 !web/sites/default/default.settings.php
 !web/sites/default/default.services.yml
-# Whitelist Drupal Scaffold files. @see https://github.com/drupal-composer/drupal-scaffold#limitation
+# Allow Drupal Scaffold files. @see https://github.com/drupal-composer/drupal-scaffold#limitation
 !web/.editorconfig
 !web/.eslintignore
 !web/.gitattributes
@@ -41,6 +41,9 @@ web/sites/default/*
 !web/robots.txt
 !web/update.php
 
+# Ignore all recipes by default. Custom recipes should be added explicitly.
+recipes/*
+
 #;< VORTEX_DEV
 #; Ignore these files in Vortex itself, but do not ignore in consumer site.
 /composer.lock

.vortex/installer/src/Prompts/Handlers/AbstractHandler.php

@@ -134,7 +134,7 @@ public function resolvedValue(array $responses): null|string|bool|array {
   /**
    * {@inheritdoc}
    */
-  public function resolvedMessage(array $responses): ?string {
+  public function resolvedMessage(array $responses, mixed $resolved): ?string {
     return NULL;
   }
 

.vortex/installer/src/Prompts/Handlers/HandlerInterface.php

@@ -146,11 +146,13 @@ public function resolvedValue(array $responses): null|string|bool|array;
    *
    * @param array $responses
    *   Current form responses for context-aware message generation.
+   * @param mixed $resolved
+   *   The resolved value from resolvedValue().
    *
    * @return string|null
    *   The message to display, or null if no message needed.
    */
-  public function resolvedMessage(array $responses): ?string;
+  public function resolvedMessage(array $responses, mixed $resolved): ?string;
 
   /**
    * Set the responses.

.vortex/installer/src/Prompts/Handlers/Internal.php

@@ -124,7 +124,7 @@ protected function processDemoMode(array $responses, string $dir): void {
     $is_demo = $this->config->get(Config::IS_DEMO);
 
     if (is_null($is_demo)) {
-      if ($responses[Starter::id()] !== Starter::DRUPAL_LOAD_DATABASE_DEMO) {
+      if ($responses[Starter::id()] !== Starter::LOAD_DATABASE_DEMO) {
         $is_demo = FALSE;
       }
       // Check if it should be enabled based on the provision type and database

.vortex/installer/src/Prompts/Handlers/Profile.php

@@ -73,32 +73,29 @@ public function discover(): null|string|bool|array {
   /**
    * {@inheritdoc}
    */
-  public function process(): void {
-    $v = $this->getResponseAsString();
+  public function resolvedValue(array $responses): null|string|bool|array {
+    $discovered = $this->discover();
 
-    // If user selected 'custom', use the ProfileCustom response instead.
-    if ($v === self::CUSTOM && isset($this->responses['profile_custom'])) {
-      $v = $this->responses['profile_custom'];
+    if (!is_null($discovered)) {
+      return $discovered;
     }
 
-    $t = $this->tmpDir;
-    $w = $this->webroot;
-
-    File::replaceContentInFile($t . '/.env', '/DRUPAL_PROFILE=.*/', 'DRUPAL_PROFILE=' . $v);
+    if (($responses[Starter::id()] ?? '') === Starter::INSTALL_PROFILE_DRUPALCMS) {
+      return Starter::INSTALL_PROFILE_DRUPALCMS_PATH;
+    }
 
-    if (in_array($v, [self::STANDARD, self::MINIMAL, self::DEMO_UMAMI])) {
-      File::rmdir(sprintf('%s/%s/profiles/your_site_profile', $t, $w));
-      File::rmdir(sprintf('%s/%s/profiles/custom/your_site_profile', $t, $w));
+    return NULL;
+  }
 
-      File::replaceContentAsync([
-        '/profiles/your_site_profile,' => '',
-        '/profiles/custom/your_site_profile,' => '',
-      ]);
-    }
-    else {
-      File::replaceContentAsync('your_site_profile', $v);
-      File::renameInDir($t, 'your_site_profile', $v);
+  /**
+   * {@inheritdoc}
+   */
+  public function resolvedMessage(array $responses, mixed $resolved): ?string {
+    if (is_string($resolved)) {
+      return sprintf('Profile will be set to "%s".', $resolved);
     }
+
+    return NULL;
   }
 
   /**
@@ -131,4 +128,38 @@ public function discoverName(): null|string|bool|array {
     return str_replace(['.info.yml', '.info'], '', basename($path));
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function process(): void {
+    $v = $this->getResponseAsString();
+
+    // If user selected 'custom', use the ProfileCustom response instead.
+    if ($v === self::CUSTOM && isset($this->responses[ProfileCustom::id()])) {
+      $v = $this->responses[ProfileCustom::id()];
+    }
+
+    $t = $this->tmpDir;
+    $w = $this->webroot;
+
+    File::replaceContentInFile($t . '/.env', '/DRUPAL_PROFILE=.*/', 'DRUPAL_PROFILE=' . $v);
+
+    // Assume that profiles provided as a path are contrib profiles.
+    $is_contrib_profile = str_contains($v, DIRECTORY_SEPARATOR);
+
+    if (in_array($v, [self::STANDARD, self::MINIMAL, self::DEMO_UMAMI]) || $is_contrib_profile) {
+      File::rmdir(sprintf('%s/%s/profiles/your_site_profile', $t, $w));
+      File::rmdir(sprintf('%s/%s/profiles/custom/your_site_profile', $t, $w));
+
+      File::replaceContentAsync([
+        '/profiles/your_site_profile,' => '',
+        '/profiles/custom/your_site_profile,' => '',
+      ]);
+    }
+    else {
+      File::replaceContentAsync('your_site_profile', $v);
+      File::renameInDir($t, 'your_site_profile', $v);
+    }
+  }
+
 }

.vortex/installer/src/Prompts/Handlers/Starter.php

@@ -4,13 +4,18 @@
 
 namespace DrevOps\VortexInstaller\Prompts\Handlers;
 
+use DrevOps\VortexInstaller\Utils\JsonManipulator;
 use DrevOps\VortexInstaller\Utils\Tui;
 
 class Starter extends AbstractHandler {
 
-  const DRUPAL_LOAD_DATABASE_DEMO = 'demodb';
+  const INSTALL_PROFILE_CORE = 'install_profile_core';
 
-  const DRUPAL_INSTALL_PROFILE = 'drupal_profile';
+  const INSTALL_PROFILE_DRUPALCMS = 'install_profile_drupalcms';
+
+  const LOAD_DATABASE_DEMO = 'load_demodb';
+
+  const INSTALL_PROFILE_DRUPALCMS_PATH = '../recipes/drupal_cms_starter';
 
   /**
    * {@inheritdoc}
@@ -25,8 +30,12 @@ public function label(): string {
   public static function description(array $responses): ?string {
     $label1 = Tui::bold('Drupal, installed from profile');
     $label11 = Tui::underscore('populating a fresh database');
-    $label2 = Tui::bold('Drupal, loaded from the demo database');
-    $label21 = Tui::underscore('loading an existing demo database');
+
+    $label2 = Tui::bold('Drupal CMS, installed from profile');
+    $label21 = Tui::underscore('populating a fresh database');
+
+    $label3 = Tui::bold('Drupal, loaded from the demo database');
+    $label31 = Tui::underscore('loading an existing demo database');
 
     return <<<DOC
 Choose how your site will be created the first time after this installer finishes:
@@ -36,7 +45,11 @@ public static function description(array $responses): ?string {
       from one of the standard Drupal installation profiles.
 
     ○ {$label2}
-      Creates a site by {$label21}
+      Creates a new site by {$label21}
+      from the Drupal CMS recipe.
+
+    ○ {$label3}
+      Creates a site by {$label31}
       provided with the installer.
 DOC;
   }
@@ -53,16 +66,17 @@ public function hint(array $responses): ?string {
    */
   public function options(array $responses): ?array {
     return [
-      self::DRUPAL_INSTALL_PROFILE => 'Drupal, installed from profile',
-      self::DRUPAL_LOAD_DATABASE_DEMO => 'Drupal, loaded from the demo database',
+      self::INSTALL_PROFILE_CORE => 'Drupal, installed from profile',
+      self::INSTALL_PROFILE_DRUPALCMS => 'Drupal CMS, installed from profile',
+      self::LOAD_DATABASE_DEMO => 'Drupal, loaded from the demo database',
     ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function default(array $responses): null|string|bool|array {
-    return self::DRUPAL_LOAD_DATABASE_DEMO;
+    return self::LOAD_DATABASE_DEMO;
   }
 
   /**
@@ -76,7 +90,29 @@ public function discover(): null|string|bool|array {
    * {@inheritdoc}
    */
   public function process(): void {
-    // @todo Implement.
+    if ($this->response == self::INSTALL_PROFILE_DRUPALCMS) {
+      $cj = JsonManipulator::fromFile($this->tmpDir . '/composer.json');
+
+      $cj->addLink('require', 'drupal/cms', '^1.0', TRUE);
+      $cj->addLink('require', 'wikimedia/composer-merge-plugin', '^2.1', TRUE);
+      $cj->addLink('require', 'symfony/http-client', '^6.4 || ^7.0', TRUE);
+
+      $cj->addConfigSetting('allow-plugins.drupal/core-project-message', TRUE);
+      $cj->addConfigSetting('allow-plugins.wikimedia/composer-merge-plugin', TRUE);
+
+      $cj->addProperty('extra.merge-plugin.ignore-duplicates', FALSE);
+      $cj->addProperty('extra.merge-plugin.merge-false', TRUE);
+      $cj->addProperty('extra.merge-plugin.merge-extra', FALSE);
+      $cj->addProperty('extra.merge-plugin.merge-extra-deep', FALSE);
+      $cj->addProperty('extra.merge-plugin.merge-replace', TRUE);
+      $cj->addProperty('extra.merge-plugin.merge-scripts', FALSE);
+      $cj->addProperty('extra.merge-plugin.recurse', TRUE);
+      $cj->addProperty('extra.merge-plugin.replace', TRUE);
+      $cj->addProperty('extra.merge-plugin.require', ['vendor/drupal/cms/composer.json']);
+
+      $c = $cj->getContents();
+      file_put_contents($this->tmpDir . '/composer.json', $c);
+    }
   }
 
   /**
@@ -89,12 +125,12 @@ public function postInstall(): ?string {
 
     $output = '';
 
-    if ($this->response == self::DRUPAL_LOAD_DATABASE_DEMO) {
+    if ($this->response == self::LOAD_DATABASE_DEMO) {
       $output .= 'Build project locally:' . PHP_EOL;
       $output .= '  ahoy build' . PHP_EOL;
       $output .= PHP_EOL;
     }
-    elseif ($this->response == self::DRUPAL_INSTALL_PROFILE) {
+    elseif ($this->response == self::INSTALL_PROFILE_CORE || $this->response == self::INSTALL_PROFILE_DRUPALCMS) {
       $output .= 'Build project locally:' . PHP_EOL;
       $output .= '  VORTEX_PROVISION_TYPE=profile ahoy build' . PHP_EOL;
       $output .= PHP_EOL;

.vortex/installer/src/Prompts/Handlers/Webroot.php

@@ -112,16 +112,9 @@ public function resolvedValue(array $responses): null|string|bool|array {
   /**
    * {@inheritdoc}
    */
-  public function resolvedMessage(array $responses): ?string {
-    if (
-      isset($responses[HostingProvider::id()]) &&
-      $responses[HostingProvider::id()] !== HostingProvider::OTHER
-    ) {
-      $webroot = $this->default($responses);
-      if (is_array($webroot)) {
-        throw new \InvalidArgumentException('Web root must be a string, got: ' . gettype($webroot));
-      }
-      return sprintf('Web root will be set to "%s".', (string) $webroot);
+  public function resolvedMessage(array $responses, mixed $resolved): ?string {
+    if (is_string($resolved)) {
+      return sprintf('Web root will be set to "%s".', $resolved);
     }
 
     return NULL;

.vortex/installer/src/Prompts/PromptManager.php

@@ -125,7 +125,9 @@ public function runPrompts(): void {
       ->intro('Drupal')
       ->add(fn($r, $pr, $n): int|string => select(...$this->args(Starter::class, NULL, $r)), Starter::id())
       ->add(
-          fn($r, $pr, $n): int|string => select(...$this->args(Profile::class)),
+          function (array $r, $pr, $n): string {
+            return $this->resolveOrPrompt(Profile::id(), $r, fn(): int|string => select(...$this->args(Profile::class)));
+          },
           Profile::id()
         )
         ->addIf(
@@ -147,17 +149,8 @@ public function runPrompts(): void {
       ->intro('Hosting')
       ->add(fn($r, $pr, $n): int|string => select(...$this->args(HostingProvider::class)), HostingProvider::id())
       ->add(
-          // @todo Move into centralised resolver within this class.
           function (array $r, $pr, $n): string {
-            $handler = $this->handlers[Webroot::id()];
-            $resolved = $handler->resolvedValue($r);
-            if (is_string($resolved)) {
-              info($handler->resolvedMessage($r));
-              return $resolved;
-            }
-            else {
-              return text(...$this->args(Webroot::class, NULL, $r));
-            }
+            return $this->resolveOrPrompt(Webroot::id(), $r, fn(): string => text(...$this->args(Webroot::class, NULL, $r)));
           },
           Webroot::id()
         )
@@ -567,4 +560,38 @@ private function args(string $handler_class, mixed $default_override = NULL, arr
     return array_filter($args, fn($value): bool => $value !== NULL);
   }
 
+  /**
+   * Resolve a value via handler or prompt the user.
+   *
+   * This method is used to resolve a value via a handler's resolvedValue()
+   * method. If the value is not resolved, it will prompt the user using the
+   * provided prompt callable.
+   *
+   * @param string $handler_id
+   *   The handler ID.
+   * @param array $r
+   *   Current form responses for context-aware methods.
+   * @param callable $prompt
+   *   The prompt callable to use if the value is not resolved.
+   *
+   * @return string
+   *   The resolved value.
+   */
+  protected function resolveOrPrompt(string $handler_id, array $r, callable $prompt): string {
+    $handler = $this->handlers[$handler_id];
+    $resolved = $handler->resolvedValue($r);
+
+    if (is_string($resolved)) {
+      $message = $handler->resolvedMessage($r, $resolved);
+
+      if ($message) {
+        info($message);
+      }
+
+      return $resolved;
+    }
+
+    return (string) $prompt();
+  }
+
 }

.vortex/installer/tests/Fixtures/install/_baseline/.gitignore

@@ -29,7 +29,7 @@ web/sites/default/*
 # Preserve default settings files to use them in Functional test.
 !web/sites/default/default.settings.php
 !web/sites/default/default.services.yml
-# Whitelist Drupal Scaffold files. @see https://github.com/drupal-composer/drupal-scaffold#limitation
+# Allow Drupal Scaffold files. @see https://github.com/drupal-composer/drupal-scaffold#limitation
 !web/.editorconfig
 !web/.eslintignore
 !web/.gitattributes
@@ -39,6 +39,9 @@ web/sites/default/*
 !web/robots.txt
 !web/update.php
 
+# Ignore all recipes by default. Custom recipes should be added explicitly.
+recipes/*
+
 # Ignore dependencies cache files.
 /vendor
 /node_modules

.vortex/installer/tests/Fixtures/install/_baseline/composer.json

@@ -130,6 +130,9 @@
             "web/profiles/contrib/{$name}": [
                 "type:drupal-profile"
             ],
+            "recipes/{$name}": [
+                "type:drupal-recipe"
+            ],
             "web/themes/contrib/{$name}": [
                 "type:drupal-theme"
             ],