From d001435f611cba8a86d75f4a25e38748a773fd70 Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Mon, 11 Dec 2023 17:07:04 -0500 Subject: [PATCH 01/10] add patches to root --- composer.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/composer.json b/composer.json index e9f46da6e..d4b0297cd 100644 --- a/composer.json +++ b/composer.json @@ -105,6 +105,14 @@ "src/DevShop/Component/YamlTasks": "https://github.com/devshop-packages/yaml-tasks.git", "src/DevShop/Component/ControlProject": "https://github.com/devshop-packages/devshop-control-project.git" } + }, + "patches": { + "drush/drush": { + "https://www.drupal.org/project/provision/issues/3353492#comment-15336648": "https://www.drupal.org/files/issues/2023-11-28/drush-8-symfony-console-compat.patch" + }, + "symfony/console": { + "https://www.drupal.org/project/provision/issues/3353492#comment-15336648": "https://www.drupal.org/files/issues/2023-11-28/symfony-console-4-update.patch" + } } }, "minimum-stability": "dev", From 030a608ee8a77dc00faa415d32bd23bc0774d5c2 Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Mon, 11 Dec 2023 17:08:17 -0500 Subject: [PATCH 02/10] add cweagans/patches --- composer.json | 6 ++++-- composer.lock | 52 +++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index d4b0297cd..3d81fe57d 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,8 @@ "php-http/httplug": "^2.3", "devshop/git-traits": "1.x-dev", "drush/drush": "^10.6", - "devshop/github-api-cli": "1.x-dev" + "devshop/github-api-cli": "1.x-dev", + "cweagans/composer-patches": "^1.7" }, "replace": { "drupal/drupal": "*" @@ -81,7 +82,8 @@ "sort-packages:": "true", "allow-plugins": { "devshop/git-split": true, - "devshop/yaml-tasks": true + "devshop/yaml-tasks": true, + "cweagans/composer-patches": true }, "platform": { "php": "7.4.0" diff --git a/composer.lock b/composer.lock index e28a4ddef..dd4afc062 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f8cb0da8a38644abbb3fef5db2e70257", + "content-hash": "a8f1a2ac9e7a2f9d61e7c1cb57dafed5", "packages": [ { "name": "chi-teck/drupal-code-generator", @@ -831,6 +831,54 @@ "abandoned": "psr/container", "time": "2017-02-14T19:40:03+00:00" }, + { + "name": "cweagans/composer-patches", + "version": "1.7.3", + "source": { + "type": "git", + "url": "https://github.com/cweagans/composer-patches.git", + "reference": "e190d4466fe2b103a55467dfa83fc2fecfcaf2db" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/e190d4466fe2b103a55467dfa83fc2fecfcaf2db", + "reference": "e190d4466fe2b103a55467dfa83fc2fecfcaf2db", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0 || ^2.0", + "php": ">=5.3.0" + }, + "require-dev": { + "composer/composer": "~1.0 || ~2.0", + "phpunit/phpunit": "~4.6" + }, + "type": "composer-plugin", + "extra": { + "class": "cweagans\\Composer\\Patches" + }, + "autoload": { + "psr-4": { + "cweagans\\Composer\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Cameron Eagans", + "email": "me@cweagans.net" + } + ], + "description": "Provides a way to patch Composer packages.", + "support": { + "issues": "https://github.com/cweagans/composer-patches/issues", + "source": "https://github.com/cweagans/composer-patches/tree/1.7.3" + }, + "time": "2022-12-20T22:53:13+00:00" + }, { "name": "devshop/bin-tools", "version": "1.x-dev", @@ -4955,5 +5003,5 @@ "platform-overrides": { "php": "7.4.0" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.2.0" } From 6c2e38a614468dddd0265a49dc4bc987a071b646 Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Mon, 11 Dec 2023 17:09:35 -0500 Subject: [PATCH 03/10] removing patch for drush 8 --- composer.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/composer.json b/composer.json index 3d81fe57d..20e3ee90f 100644 --- a/composer.json +++ b/composer.json @@ -109,9 +109,6 @@ } }, "patches": { - "drush/drush": { - "https://www.drupal.org/project/provision/issues/3353492#comment-15336648": "https://www.drupal.org/files/issues/2023-11-28/drush-8-symfony-console-compat.patch" - }, "symfony/console": { "https://www.drupal.org/project/provision/issues/3353492#comment-15336648": "https://www.drupal.org/files/issues/2023-11-28/symfony-console-4-update.patch" } From 0f97a757abb558b25b5c60310591d1b71d06cb29 Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Mon, 11 Dec 2023 17:10:08 -0500 Subject: [PATCH 04/10] hash update --- composer.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index dd4afc062..27e73d458 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a8f1a2ac9e7a2f9d61e7c1cb57dafed5", + "content-hash": "4bcd064c3b8d05376209c418402fc120", "packages": [ { "name": "chi-teck/drupal-code-generator", From f59d1b4b00f1e9ddc989dbd19513eaa8fb7ac5a3 Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Mon, 11 Dec 2023 18:24:32 -0500 Subject: [PATCH 05/10] New Patch --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 20e3ee90f..bc037d63a 100644 --- a/composer.json +++ b/composer.json @@ -110,7 +110,7 @@ }, "patches": { "symfony/console": { - "https://www.drupal.org/project/provision/issues/3353492#comment-15336648": "https://www.drupal.org/files/issues/2023-11-28/symfony-console-4-update.patch" + "https://www.drupal.org/project/provision/issues/3353492#comment-15336648": "https://www.drupal.org/files/issues/2023-12-11/3353492-symfony-console-4-update.patch" } } }, From 48e38c69b66ff6b34509669b8ec760a3c87b384c Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Mon, 11 Dec 2023 18:25:33 -0500 Subject: [PATCH 06/10] update patch --- src/DevShop/Control/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DevShop/Control/composer.json b/src/DevShop/Control/composer.json index 904ae4f08..9246a7102 100644 --- a/src/DevShop/Control/composer.json +++ b/src/DevShop/Control/composer.json @@ -199,7 +199,7 @@ "https://www.drupal.org/project/provision/issues/3353492#comment-15336648": "https://www.drupal.org/files/issues/2023-11-28/drush-8-symfony-console-compat.patch" }, "symfony/console": { - "https://www.drupal.org/project/provision/issues/3353492#comment-15336648": "https://www.drupal.org/files/issues/2023-11-28/symfony-console-4-update.patch" + "https://www.drupal.org/project/provision/issues/3353492#comment-15336648": "https://www.drupal.org/files/issues/2023-12-11/3353492-symfony-console-4-update.patch" } } }, From 7ae76c8ef3de22fdf5ff322f9a0fe653dd0d5054 Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Mon, 11 Dec 2023 18:34:18 -0500 Subject: [PATCH 07/10] update patch --- src/DevShop/Control/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DevShop/Control/composer.json b/src/DevShop/Control/composer.json index 9246a7102..2cb8344a5 100644 --- a/src/DevShop/Control/composer.json +++ b/src/DevShop/Control/composer.json @@ -199,7 +199,7 @@ "https://www.drupal.org/project/provision/issues/3353492#comment-15336648": "https://www.drupal.org/files/issues/2023-11-28/drush-8-symfony-console-compat.patch" }, "symfony/console": { - "https://www.drupal.org/project/provision/issues/3353492#comment-15336648": "https://www.drupal.org/files/issues/2023-12-11/3353492-symfony-console-4-update.patch" + "https://www.drupal.org/project/provision/issues/3353492#comment-15336648": "https://www.drupal.org/files/issues/2023-12-11/3353492-symfony-console-4-update_0.patch" } } }, From eb8b111fb9ab1c51274e66df851f949de9568d19 Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Mon, 11 Dec 2023 18:35:57 -0500 Subject: [PATCH 08/10] update patch --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bc037d63a..d877c7305 100644 --- a/composer.json +++ b/composer.json @@ -110,7 +110,7 @@ }, "patches": { "symfony/console": { - "https://www.drupal.org/project/provision/issues/3353492#comment-15336648": "https://www.drupal.org/files/issues/2023-12-11/3353492-symfony-console-4-update.patch" + "https://www.drupal.org/project/provision/issues/3353492#comment-15336648": "https://www.drupal.org/files/issues/2023-11-28/drush-8-symfony-console-compat.patch" } } }, From 231ebd8561bc52664eef1f50cd0ad3b7f85bf65b Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Mon, 11 Dec 2023 18:37:47 -0500 Subject: [PATCH 09/10] typo --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d877c7305..b7d8a056b 100644 --- a/composer.json +++ b/composer.json @@ -110,7 +110,7 @@ }, "patches": { "symfony/console": { - "https://www.drupal.org/project/provision/issues/3353492#comment-15336648": "https://www.drupal.org/files/issues/2023-11-28/drush-8-symfony-console-compat.patch" + "https://www.drupal.org/project/provision/issues/3353492#comment-15336648": "https://www.drupal.org/files/issues/2023-12-11/3353492-symfony-console-4-update_0.patch" } } }, From 9a91cc947b392e2720aa4c2c7cfa49ef62907687 Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Mon, 11 Dec 2023 18:43:16 -0500 Subject: [PATCH 10/10] update patch --- composer.json | 2 +- src/DevShop/Control/composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index b7d8a056b..ddd3381fa 100644 --- a/composer.json +++ b/composer.json @@ -110,7 +110,7 @@ }, "patches": { "symfony/console": { - "https://www.drupal.org/project/provision/issues/3353492#comment-15336648": "https://www.drupal.org/files/issues/2023-12-11/3353492-symfony-console-4-update_0.patch" + "https://www.drupal.org/project/provision/issues/3353492#comment-15336648": "https://www.drupal.org/files/issues/2023-12-11/3353492-symfony-console-4-update_1.patch" } } }, diff --git a/src/DevShop/Control/composer.json b/src/DevShop/Control/composer.json index 2cb8344a5..d322aba7e 100644 --- a/src/DevShop/Control/composer.json +++ b/src/DevShop/Control/composer.json @@ -199,7 +199,7 @@ "https://www.drupal.org/project/provision/issues/3353492#comment-15336648": "https://www.drupal.org/files/issues/2023-11-28/drush-8-symfony-console-compat.patch" }, "symfony/console": { - "https://www.drupal.org/project/provision/issues/3353492#comment-15336648": "https://www.drupal.org/files/issues/2023-12-11/3353492-symfony-console-4-update_0.patch" + "https://www.drupal.org/project/provision/issues/3353492#comment-15336648": "https://www.drupal.org/files/issues/2023-12-11/3353492-symfony-console-4-update_1.patch" } } },