Merge branch 'feature/drupal-10' of github.com:opendevshop/devshop in…

…to feature/drupal-10
opendevshop · Dec 19, 2023 · b8cf59a · b8cf59a
2 parents 15cd7eb + 9a91cc9
commit b8cf59a
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 5 deletions.
diff --git 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"
@@ -105,6 +107,11 @@
                 "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": {
+            "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_1.patch"
+            }
         }
     },
     "minimum-stability": "dev",

diff --git a/composer.lock b/composer.lock
diff --git 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_1.patch"
         }
       }
     },