Merge remote-tracking branch 'original/main' into feature/support-dru…

…pal11

aljibe-kickstart/composer.json

@@ -46,12 +46,11 @@
             "dealerdirect/phpcodesniffer-composer-installer": true,
             "phpstan/extension-installer": true,
             "phpro/grumphp": true,
-            "metadrop/drupal-boilerplate-assistant": true,
+            "metadrop/backstopjs-addons": true,
+            "liborm85/composer-vendor-cleaner": true,
             "metadrop/composer-comments": true,
             "php-http/discovery": true,
             "tbachert/spi": true,
-            "liborm85/composer-vendor-cleaner": true,
-            "metadrop/backstopjs-addons": true,
             "mxr576/ddqg-composer-audit": true
         }
     },
@@ -75,6 +74,11 @@
             "web/profiles/custom/{$name}": ["type:drupal-custom-profile"],
             "web/themes/custom/{$name}": ["type:drupal-custom-theme"]
         },
+        "dev-files": {
+            "bin": [
+                "composer"
+            ]
+        },
         "composer-exit-on-patch-failure": true,
         "enable-patching": true
     }

aljibe-kickstart/docroot

@@ -0,0 +1 @@
+web/

aljibe-kickstart/public_html

@@ -0,0 +1 @@
+web/

aljibe-kickstart/tests/behat/local/behat.yml

@@ -1,6 +1,7 @@
 default:
   autoload:
-    "": "%paths.base%/bootstrap/"
+    - '%paths.base%/bootstrap/'
+    - '%paths.base%/../common/boostrap/'
   formatters:
     pretty:
       verbose: false

aljibe.yaml.example

@@ -1,4 +1,5 @@
 #####
+#ddev-generated
 ##
 ## Aljibe config file
 ##
@@ -32,7 +33,8 @@ hooks:
   pre_setup: []
   post_setup: []
   pre_site_install: []
-  post_site_install: []
+  post_site_install:
+    - drush @${SITE_ALIAS} uli
   pre_site_install_config: []
   post_site_install_config: []
   pre_site_install_db: []

commands/host/setup

@@ -49,7 +49,7 @@ handle_options() {
   while [ $# -gt 0 ]; do
     case $1 in
       -a | --all)
-        mapfile -t SITES < <(drush site:alias --fields=name --format=list --filter=.local | sed 's/@//' | sed 's/.local//')
+        SITES=all
         shift
         ;;
       -h | --help)
@@ -128,6 +128,9 @@ fi
 
 # Try to install sites if not --no-install is given
 if [ "$NO_INSTALL" -eq 0 ]; then
+    if [ "$SITES" == "all" ]; then
+        mapfile -t SITES < <(ddev drush site:alias --fields=name --format=list --filter=.local | sed 's/@//' | sed 's/.local//')
+    fi
     for SITE in "${SITES[@]}"; do
         echo
         echo -e "\033[32mInstalling site: ${SITE}  \033[0m\n"

config.aljibe.yaml

@@ -0,0 +1,4 @@
+#ddev-generated
+# Custom config to alter composer executable in case Drupal is defining a custom version.
+# See https://github.com/ddev/ddev/issues/6602 for more details.
+hooks:

install.yaml

@@ -6,7 +6,9 @@ project_files:
  - aljibe-kickstart
  - aljibe.yaml.example
  - site-profiles
- - web-build
+ - config.aljibe.yaml
+
+ddev_version_constraint: '>= v1.23.5'
 
 post_install_actions:
   - ./scripts/install-dependencies.sh