From c15c8ca89e758d3c3bb3a57936b961cc2b163499 Mon Sep 17 00:00:00 2001 From: Volker Killesreiter Date: Mon, 18 May 2026 09:51:09 +0200 Subject: [PATCH 1/4] update php version --- .ddev/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ddev/config.yaml b/.ddev/config.yaml index 2796a9d..760eb17 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -1,7 +1,7 @@ name: thunder-develop type: drupal docroot: docroot -php_version: "8.3" +php_version: "8.4" webserver_type: nginx-fpm xdebug_enabled: false additional_hostnames: [] From 80f79af879987759b2790ae6bdfcd027d260f4f8 Mon Sep 17 00:00:00 2001 From: Volker Killesreiter Date: Mon, 18 May 2026 10:39:13 +0200 Subject: [PATCH 2/4] make recipe compatible, update composer/installers --- composer.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index c212b27..54f3834 100644 --- a/composer.json +++ b/composer.json @@ -56,7 +56,7 @@ } }, "require": { - "composer/installers": "^1.2", + "composer/installers": "^2.3", "cweagans/composer-patches": "^1.6.5", "drupal/core": "^10 || ^11", "drupal/core-composer-scaffold": "^10 || ^11", @@ -67,7 +67,8 @@ "oomphinc/composer-installers-extender": "^1.1||^2.0", "netcarver/textile": "^3.7", "drupal/default_content": "2.0.x-dev", - "mglaman/composer-drupal-lenient": "^1.0" + "mglaman/composer-drupal-lenient": "^1.0", + "drupal/core-recipe-unpack": "^11.3" }, "require-dev": { "drupal/core-dev": "^10 || ^11", @@ -167,7 +168,8 @@ "phpstan/extension-installer": true, "php-http/discovery": true, "mglaman/composer-drupal-lenient": true, - "tbachert/spi": true + "tbachert/spi": true, + "drupal/core-recipe-unpack": true } } } From 7cdd5a0fb32b511a3ca4fbcd8787188c063adf81 Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Mon, 18 May 2026 11:32:08 +0200 Subject: [PATCH 3/4] Add installer path --- .gitignore | 1 + composer.json | 3 +++ 2 files changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 9efedb7..de477ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # Ignore directories generated by Composer drush/contrib +recipes/contrib vendor bin docroot diff --git a/composer.json b/composer.json index 54f3834..2e33738 100644 --- a/composer.json +++ b/composer.json @@ -117,6 +117,9 @@ "npm-asset" ], "installer-paths": { + "recipes/contrib/{$name}": [ + "type:drupal-recipe" + ], "docroot/core": [ "type:drupal-core" ], From 522932c419249e29ed239d5b9bc394fdc69b636a Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Mon, 18 May 2026 11:48:46 +0200 Subject: [PATCH 4/4] Remove contrib subfolder --- .gitignore | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index de477ce..56ae31f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ # Ignore directories generated by Composer drush/contrib -recipes/contrib +recipes vendor bin docroot diff --git a/composer.json b/composer.json index 2e33738..368baf0 100644 --- a/composer.json +++ b/composer.json @@ -117,7 +117,7 @@ "npm-asset" ], "installer-paths": { - "recipes/contrib/{$name}": [ + "recipes/{$name}": [ "type:drupal-recipe" ], "docroot/core": [