From 00cb7ee88f22ea050bf547a5d256aa82fa382dba Mon Sep 17 00:00:00 2001 From: Jigarius Date: Wed, 13 Dec 2023 16:18:30 +0530 Subject: [PATCH] Support site-alias 3.x and 4.x; fixes #85 --- .docker/main/composer.json | 1 - composer.json | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.docker/main/composer.json b/.docker/main/composer.json index 615684c..ffb99dd 100644 --- a/.docker/main/composer.json +++ b/.docker/main/composer.json @@ -26,7 +26,6 @@ "drupal/core-composer-scaffold": "*", "drupal/core-recommended": "^10", "drupal/core-vendor-hardening": "*", - "drush/drush": "^11", "jigarius/drall": "*" }, "conflict": { diff --git a/composer.json b/composer.json index cf989ef..b754bf1 100644 --- a/composer.json +++ b/composer.json @@ -22,8 +22,8 @@ "amphp/process": "^1.1", "amphp/sync": "^1.4", "consolidation/filter-via-dot-access-data": "^2.0", - "consolidation/site-alias": "^3.1", - "drush/drush": "^11.0", + "consolidation/site-alias": "^3 || ^4", + "drush/drush": "^11 || ^12", "webflo/drupal-finder": "^1.2" }, "require-dev": { @@ -48,8 +48,8 @@ "config": { "allow-plugins": { "dealerdirect/phpcodesniffer-composer-installer": true, - "phpro/grumphp": true, - "ergebnis/composer-normalize": true + "ergebnis/composer-normalize": true, + "phpro/grumphp": true }, "sort-packages": true },