Merge branch 'Lullabot:main' into plopesc-patch-7

.github/workflows/DrainpipeDev.yml

@@ -17,7 +17,7 @@ permissions:
 jobs:
   Drainpipe-Dev:
     name: Push to drainpipe-dev
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/DrainpipeDevClean.yml

@@ -12,7 +12,7 @@ permissions:
 jobs:
   Drainpipe-Dev-Clean:
     name: Push branch to drainpipe-dev
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/TestBinaryInstaller.yml

@@ -12,7 +12,7 @@ concurrency:
 
 jobs:
   Test-Binary-Installer:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         php-version: [ 8.1, 8.2, 8.3 ]
@@ -47,15 +47,15 @@ jobs:
           ddev config --auto
           ddev config --php-version ${{ matrix.php-version }}
           ddev start
-          ddev composer config extra.drupal-scaffold.gitignore true
-          ddev composer config --json extra.drupal-scaffold.allowed-packages '["lullabot/drainpipe-dev", "lullabot/drainpipe"]'
-          ddev composer config --no-plugins allow-plugins.composer/installers true
-          ddev composer config --no-plugins allow-plugins.drupal/core-composer-scaffold true
-          ddev composer config --no-plugins allow-plugins.lullabot/drainpipe true
-          ddev composer config --no-plugins allow-plugins.lullabot/drainpipe-dev true
-          ddev composer config repositories.drainpipe --json '{"type": "path", "url": "drainpipe", "options": {"symlink": false}}'
-          ddev composer config repositories.drainpipe-dev --json '{"type": "path", "url": "drainpipe-dev", "options": {"symlink": false}}'
-          ddev composer config minimum-stability dev
+          ddev exec --raw composer config extra.drupal-scaffold.gitignore true
+          ddev exec --raw composer config --json extra.drupal-scaffold.allowed-packages '["lullabot/drainpipe-dev", "lullabot/drainpipe"]'
+          ddev exec --raw composer config --no-plugins allow-plugins.composer/installers true
+          ddev exec --raw composer config --no-plugins allow-plugins.drupal/core-composer-scaffold true
+          ddev exec --raw composer config --no-plugins allow-plugins.lullabot/drainpipe true
+          ddev exec --raw composer config --no-plugins allow-plugins.lullabot/drainpipe-dev true
+          ddev exec --raw composer config repositories.drainpipe --json '{"type": "path", "url": "drainpipe", "options": {"symlink": false}}'
+          ddev exec --raw composer config repositories.drainpipe-dev --json '{"type": "path", "url": "drainpipe-dev", "options": {"symlink": false}}'
+          ddev exec --raw composer config minimum-stability dev
           ddev composer require "lullabot/drainpipe @dev" --with-all-dependencies
           ddev composer require "lullabot/drainpipe-dev @dev" --dev --with-all-dependencies
 

.github/workflows/TestComposerLockDiff.yml

@@ -10,7 +10,7 @@ concurrency:
 
 jobs:
   Test-Composer-Lock-Diff:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         drupal-version: [ 10, 11 ]
@@ -36,13 +36,13 @@ jobs:
         run: |
           ddev config --auto
           ddev start
-          ddev composer config extra.drupal-scaffold.gitignore true
-          ddev composer config --json extra.drupal-scaffold.allowed-packages \[\"lullabot/drainpipe\"]
-          ddev composer config --no-plugins allow-plugins.composer/installers true
-          ddev composer config --no-plugins allow-plugins.drupal/core-composer-scaffold true
-          ddev composer config --no-plugins allow-plugins.lullabot/drainpipe true
-          ddev composer config repositories.drainpipe --json '{"type": "path", "url": "drainpipe", "options": {"symlink": false}}'
-          ddev composer config minimum-stability dev
+          ddev exec --raw composer config extra.drupal-scaffold.gitignore true
+          ddev exec --raw composer config --json extra.drupal-scaffold.allowed-packages \[\"lullabot/drainpipe\"]
+          ddev exec --raw composer config --no-plugins allow-plugins.composer/installers true
+          ddev exec --raw composer config --no-plugins allow-plugins.drupal/core-composer-scaffold true
+          ddev exec --raw composer config --no-plugins allow-plugins.lullabot/drainpipe true
+          ddev exec --raw composer config repositories.drainpipe --json '{"type": "path", "url": "drainpipe", "options": {"symlink": false}}'
+          ddev exec --raw composer config minimum-stability dev
           ddev composer require lullabot/drainpipe --with-all-dependencies
 
       - name: Commit current state

.github/workflows/TestDDEV.yml

@@ -12,7 +12,7 @@ concurrency:
 
 jobs:
   Test-DDEV-Install:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         drupal-version: [ 10, 11 ]
@@ -39,15 +39,15 @@ jobs:
         run: |
           ddev config --auto
           ddev start
-          ddev composer config extra.drupal-scaffold.gitignore true
-          ddev composer config --json extra.drupal-scaffold.allowed-packages '["lullabot/drainpipe-dev", "lullabot/drainpipe"]'
-          ddev composer config --no-plugins allow-plugins.composer/installers true
-          ddev composer config --no-plugins allow-plugins.drupal/core-composer-scaffold true
-          ddev composer config --no-plugins allow-plugins.lullabot/drainpipe true
-          ddev composer config --no-plugins allow-plugins.lullabot/drainpipe-dev true
-          ddev composer config repositories.drainpipe --json '{"type": "path", "url": "drainpipe", "options": {"symlink": false}}'
-          ddev composer config repositories.drainpipe-dev --json '{"type": "path", "url": "drainpipe-dev", "options": {"symlink": false}}'
-          ddev composer config minimum-stability dev
+          ddev exec --raw composer config extra.drupal-scaffold.gitignore true
+          ddev exec --raw composer config --json extra.drupal-scaffold.allowed-packages '["lullabot/drainpipe-dev", "lullabot/drainpipe"]'
+          ddev exec --raw composer config --no-plugins allow-plugins.composer/installers true
+          ddev exec --raw composer config --no-plugins allow-plugins.drupal/core-composer-scaffold true
+          ddev exec --raw composer config --no-plugins allow-plugins.lullabot/drainpipe true
+          ddev exec --raw composer config --no-plugins allow-plugins.lullabot/drainpipe-dev true
+          ddev exec --raw composer config repositories.drainpipe --json '{"type": "path", "url": "drainpipe", "options": {"symlink": false}}'
+          ddev exec --raw composer config repositories.drainpipe-dev --json '{"type": "path", "url": "drainpipe-dev", "options": {"symlink": false}}'
+          ddev exec --raw composer config minimum-stability dev
           ddev composer require "lullabot/drainpipe @dev" --with-all-dependencies
           ddev composer require "lullabot/drainpipe-dev @dev" --dev --with-all-dependencies
 

.github/workflows/TestEnv.yml

@@ -10,7 +10,7 @@ concurrency:
 
 jobs:
   Test-Env:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         drupal-version: [ 10, 11 ]
@@ -35,13 +35,13 @@ jobs:
         run: |
           ddev config --auto
           ddev start
-          ddev composer config extra.drupal-scaffold.gitignore true
-          ddev composer config --json extra.drupal-scaffold.allowed-packages \[\"lullabot/drainpipe\"]
-          ddev composer config --no-plugins allow-plugins.composer/installers true
-          ddev composer config --no-plugins allow-plugins.drupal/core-composer-scaffold true
-          ddev composer config --no-plugins allow-plugins.lullabot/drainpipe true
-          ddev composer config repositories.drainpipe --json "{\"type\": \"path\", \"url\": \"drainpipe\", \"options\": {\"symlink\": false}}"
-          ddev composer config minimum-stability dev
+          ddev exec --raw composer config extra.drupal-scaffold.gitignore true
+          ddev exec --raw composer config --json extra.drupal-scaffold.allowed-packages \[\"lullabot/drainpipe\"]
+          ddev exec --raw composer config --no-plugins allow-plugins.composer/installers true
+          ddev exec --raw composer config --no-plugins allow-plugins.drupal/core-composer-scaffold true
+          ddev exec --raw composer config --no-plugins allow-plugins.lullabot/drainpipe true
+          ddev exec --raw composer config repositories.drainpipe --json "{\"type\": \"path\", \"url\": \"drainpipe\", \"options\": {\"symlink\": false}}"
+          ddev exec --raw composer config minimum-stability dev
           cat composer.json | jq --indent 4 '."autoload-dev" = {"files": ["vendor/lullabot/drainpipe/scaffold/env/dotenv.php"]}' | tee composer.json > /dev/null
           ddev composer update --lock
           ddev composer validate

.github/workflows/TestFunctional.yml

@@ -12,7 +12,7 @@ concurrency:
 
 jobs:
   Build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         drupal-version: [ 10, 11 ]
@@ -41,15 +41,15 @@ jobs:
           ddev config --nodejs-version "22"
           ddev config --corepack-enable
           ddev start
-          ddev composer config extra.drupal-scaffold.gitignore true
-          ddev composer config --json extra.drupal-scaffold.allowed-packages '["lullabot/drainpipe-dev", "lullabot/drainpipe"]'
-          ddev composer config --no-plugins allow-plugins.composer/installers true
-          ddev composer config --no-plugins allow-plugins.drupal/core-composer-scaffold true
-          ddev composer config --no-plugins allow-plugins.lullabot/drainpipe true
-          ddev composer config --no-plugins allow-plugins.lullabot/drainpipe-dev true
-          ddev composer config repositories.drainpipe --json '{"type": "path", "url": "drainpipe", "options": {"symlink": false}}'
-          ddev composer config repositories.drainpipe-dev --json '{"type": "path", "url": "drainpipe-dev", "options": {"symlink": false}}'
-          ddev composer config minimum-stability dev
+          ddev exec --raw composer config extra.drupal-scaffold.gitignore true
+          ddev exec --raw composer config --json extra.drupal-scaffold.allowed-packages '["lullabot/drainpipe-dev", "lullabot/drainpipe"]'
+          ddev exec --raw composer config --no-plugins allow-plugins.composer/installers true
+          ddev exec --raw composer config --no-plugins allow-plugins.drupal/core-composer-scaffold true
+          ddev exec --raw composer config --no-plugins allow-plugins.lullabot/drainpipe true
+          ddev exec --raw composer config --no-plugins allow-plugins.lullabot/drainpipe-dev true
+          ddev exec --raw composer config repositories.drainpipe --json '{"type": "path", "url": "drainpipe", "options": {"symlink": false}}'
+          ddev exec --raw composer config repositories.drainpipe-dev --json '{"type": "path", "url": "drainpipe-dev", "options": {"symlink": false}}'
+          ddev exec --raw composer config minimum-stability dev
           ddev composer require "lullabot/drainpipe @dev" --with-all-dependencies
           ddev composer require "lullabot/drainpipe-dev @dev" --dev --with-all-dependencies
           git config --global user.email "[email protected]"
@@ -91,7 +91,7 @@ jobs:
           path: /tmp/drainpipe.zip
 
   Test-NPM:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: Build
     strategy:
       matrix:
@@ -139,7 +139,7 @@ jobs:
           path: test_result
 
   Test-Yarn-Classic:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: Build
     strategy:
       matrix:
@@ -190,7 +190,7 @@ jobs:
           path: test_result
 
   Test-Yarn-3-Node-Linker:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: Build
     strategy:
       matrix:
@@ -241,7 +241,7 @@ jobs:
           path: test_result
 
   Test-Yarn-4-Node-Linker:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: Build
     strategy:
       matrix:
@@ -293,7 +293,7 @@ jobs:
           path: test_result
 
   Test-Yarn-3:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: Build
     strategy:
       matrix:
@@ -350,7 +350,7 @@ jobs:
           path: test_result
 
   Test-Yarn-4:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: Build
     strategy:
       matrix:

.github/workflows/TestGitHubActions.yml

@@ -10,7 +10,7 @@ concurrency:
 
 jobs:
   Test-GitHub-Actions:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Create a Drupal project
         run: composer create-project drupal/recommended-project . --ignore-platform-reqs
@@ -33,15 +33,15 @@ jobs:
         run: |
           ddev config --auto
           ddev start
-          ddev composer config extra.drupal-scaffold.gitignore true
-          ddev composer config --json extra.drupal-scaffold.allowed-packages \[\"lullabot/drainpipe\"]
-          ddev composer config --no-plugins allow-plugins.composer/installers true
-          ddev composer config --no-plugins allow-plugins.drupal/core-composer-scaffold true
-          ddev composer config --no-plugins allow-plugins.lullabot/drainpipe true
-          ddev composer config --no-plugins allow-plugins.lullabot/drainpipe-dev true
-          ddev composer config repositories.drainpipe --json '{"type": "path", "url": "drainpipe", "options": {"symlink": false}}'
-          ddev composer config repositories.drainpipe-dev --json '{"type": "path", "url": "drainpipe/drainpipe-dev", "options": {"symlink": false}}'
-          ddev composer config minimum-stability dev
+          ddev exec --raw composer config extra.drupal-scaffold.gitignore true
+          ddev exec --raw composer config --json extra.drupal-scaffold.allowed-packages \[\"lullabot/drainpipe\"]
+          ddev exec --raw composer config --no-plugins allow-plugins.composer/installers true
+          ddev exec --raw composer config --no-plugins allow-plugins.drupal/core-composer-scaffold true
+          ddev exec --raw composer config --no-plugins allow-plugins.lullabot/drainpipe true
+          ddev exec --raw composer config --no-plugins allow-plugins.lullabot/drainpipe-dev true
+          ddev exec --raw composer config repositories.drainpipe --json '{"type": "path", "url": "drainpipe", "options": {"symlink": false}}'
+          ddev exec --raw composer config repositories.drainpipe-dev --json '{"type": "path", "url": "drainpipe/drainpipe-dev", "options": {"symlink": false}}'
+          ddev exec --raw composer config minimum-stability dev
           ddev composer require lullabot/drainpipe --with-all-dependencies
           ddev composer require --dev lullabot/drainpipe-dev --with-all-dependencies
 

.github/workflows/TestMetapackages.yml

@@ -12,7 +12,7 @@ concurrency:
 
 jobs:
   Build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Create a Drupal project
         run: composer create-project drupal/recommended-project . --ignore-platform-reqs
@@ -38,15 +38,15 @@ jobs:
           ddev config --nodejs-version "22"
           ddev config --corepack-enable
           ddev start
-          ddev composer config extra.drupal-scaffold.gitignore true
-          ddev composer config --json extra.drupal-scaffold.allowed-packages '["lullabot/drainpipe-dev", "lullabot/drainpipe"]'
-          ddev composer config --no-plugins allow-plugins.composer/installers true
-          ddev composer config --no-plugins allow-plugins.drupal/core-composer-scaffold true
-          ddev composer config --no-plugins allow-plugins.lullabot/drainpipe true
-          ddev composer config --no-plugins allow-plugins.lullabot/drainpipe-dev true
-          ddev composer config repositories.drainpipe --json '{"type": "path", "url": "drainpipe", "options": {"symlink": false}}'
-          ddev composer config repositories.drainpipe-dev --json '{"type": "path", "url": "drainpipe-dev", "options": {"symlink": false}}'
-          ddev composer config minimum-stability dev
+          ddev exec --raw composer config extra.drupal-scaffold.gitignore true
+          ddev exec --raw composer config --json extra.drupal-scaffold.allowed-packages '["lullabot/drainpipe-dev", "lullabot/drainpipe"]'
+          ddev exec --raw composer config --no-plugins allow-plugins.composer/installers true
+          ddev exec --raw composer config --no-plugins allow-plugins.drupal/core-composer-scaffold true
+          ddev exec --raw composer config --no-plugins allow-plugins.lullabot/drainpipe true
+          ddev exec --raw composer config --no-plugins allow-plugins.lullabot/drainpipe-dev true
+          ddev exec --raw composer config repositories.drainpipe --json '{"type": "path", "url": "drainpipe", "options": {"symlink": false}}'
+          ddev exec --raw composer config repositories.drainpipe-dev --json '{"type": "path", "url": "drainpipe-dev", "options": {"symlink": false}}'
+          ddev exec --raw composer config minimum-stability dev
           ddev composer require "lullabot/drainpipe @dev" --with-all-dependencies
           ddev composer require "lullabot/drainpipe-dev @dev" --dev --with-all-dependencies
 
@@ -66,7 +66,7 @@ jobs:
           path: /tmp/drainpipe.zip
 
   Test-Sass-NPM:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: Build
     steps:
       - uses: actions/download-artifact@v4
@@ -100,7 +100,7 @@ jobs:
         run: ddev task sass
 
   Test-Sass-Yarn-Classic:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: Build
     steps:
       - uses: actions/download-artifact@v4
@@ -137,7 +137,7 @@ jobs:
         run: ddev task sass
 
   Test-Sass-Yarn-3:
-     runs-on: ubuntu-22.04
+     runs-on: ubuntu-24.04
      needs: Build
      steps:
        - uses: actions/download-artifact@v4
@@ -173,7 +173,7 @@ jobs:
          run: ddev task sass
 
   Test-Sass-Yarn-4:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: Build
     steps:
       - uses: actions/download-artifact@v4
@@ -211,7 +211,7 @@ jobs:
         run: ddev task sass
 
   Test-JavaScript-NPM:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: Build
     steps:
       - uses: actions/download-artifact@v4
@@ -246,7 +246,7 @@ jobs:
         run: ddev task javascript
 
   Test-JavaScript-Yarn-Classic:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: Build
     steps:
       - uses: actions/download-artifact@v4
@@ -284,7 +284,7 @@ jobs:
         run: ddev task javascript
 
   Test-JavaScript-Yarn-3:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: Build
     steps:
       - uses: actions/download-artifact@v4
@@ -321,7 +321,7 @@ jobs:
         run: ddev task javascript
 
   Test-JavaScript-Yarn-4:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: Build
     steps:
       - uses: actions/download-artifact@v4