From ebdbdb8fd3f1ce12f7c28407252cbe64febbb6b4 Mon Sep 17 00:00:00 2001
From: Mike Baynton <mike@mbaynton.com>
Date: Tue, 6 Oct 2020 18:18:45 -0500
Subject: [PATCH 1/3] Version bumps and package removals for Composer 2

This leaves drupal/console in place for now, which doesn't have a
Composer 2-capable release yet. TBD what happens next for that one,
making this PR WIP. Otherwise, this works with Composer 2.
---
 composer.json                        |  2 +-
 upstream-configuration/.gitignore    | 17 ----------------
 upstream-configuration/composer.json | 30 +++++++++++++++++++++-------
 3 files changed, 24 insertions(+), 25 deletions(-)
 delete mode 100644 upstream-configuration/.gitignore

diff --git a/composer.json b/composer.json
index c85ca81f..bc2a81f8 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,7 @@
         "preferred-install": "dist",
         "sort-packages": true,
         "platform": {
-            "php": "7.0.8"
+            "php": "7.3"
         }
     }
 }
diff --git a/upstream-configuration/.gitignore b/upstream-configuration/.gitignore
deleted file mode 100644
index 54863165..00000000
--- a/upstream-configuration/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-composer.lock
-/vendor/
-.csslintrc
-.editorconfig
-.eslintignore
-.eslintrc.json
-.gitattributes
-.ht.router.php
-.htaccess
-INSTALL.txt
-README.txt
-autoload.php
-example.gitignore
-index.php
-robots.txt
-update.php
-web.config
diff --git a/upstream-configuration/composer.json b/upstream-configuration/composer.json
index b50c717e..a5aa5077 100644
--- a/upstream-configuration/composer.json
+++ b/upstream-configuration/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "pantheon-upstreams/upstream-configuration",
+    "name": "internal/upstream-configuration",
     "type": "project",
     "version": "1.0.0",
     "repositories": [
@@ -10,16 +10,32 @@
     ],
     "require": {
         "php": ">=7.0.8",
-        "composer/installers": "^1.0.20",
+        "composer/installers": "^1.9",
         "drupal/core-composer-scaffold": "^8.8.1",
         "drupal/core-recommended": "^8.8",
         "pantheon-systems/drupal-integrations": "^8",
-        "drush/drush": "~8.3",
+        "pantheon-systems/quicksilver-pushback": "^2",
+        "drush/drush": "^10.3",
         "drupal/console": "^1",
-        "cweagans/composer-patches": "^1.0",
+        "cweagans/composer-patches": "^1.7",
         "drupal/config_direct_save": "^1.0",
-        "drupal/config_installer": "^1.0",
-        "rvtraveller/qs-composer-installer": "^1.1",
-        "zaporylie/composer-drupal-optimizations": "^1.0"
+        "drush-ops/behat-drush-endpoint": "^9.3"
+    },
+    "require-dev": {
+        "behat/behat": "3.*",
+        "behat/mink": "^1.7",
+        "behat/mink-extension": "^2.2",
+        "behat/mink-goutte-driver": "^1.2",
+        "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
+        "dmore/behat-chrome-extension": "^1.3",
+        "drupal/coder": "^8.3.1",
+        "drupal/drupal-extension": "~3",
+        "genesis/behat-fail-aid": "^2.1",
+        "jcalderonzumba/gastonjs": "^1.0.2",
+        "jcalderonzumba/mink-phantomjs-driver": "^0.3.1",
+        "mikey179/vfsstream": "^1.2",
+        "phpunit/phpunit": "^6.5",
+        "squizlabs/php_codesniffer": "^3.4.0",
+        "symfony/css-selector": "^2.8"
     }
 }

From 15abac43a18e00c86f94d17c1c3fd614315283b7 Mon Sep 17 00:00:00 2001
From: Mike Baynton <mike@mbaynton.com>
Date: Tue, 6 Oct 2020 18:24:36 -0500
Subject: [PATCH 2/3] Newer php 7.3

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index bc2a81f8..058e5870 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,7 @@
         "preferred-install": "dist",
         "sort-packages": true,
         "platform": {
-            "php": "7.3"
+            "php": "7.3.23"
         }
     }
 }

From a49560047594f6f74d9ec1b0909b21c11f47640b Mon Sep 17 00:00:00 2001
From: Mike Baynton <mike@mbaynton.com>
Date: Fri, 23 Oct 2020 10:45:56 -0500
Subject: [PATCH 3/3] Restore zap.../composer-drupal-optimizations

A Composer2 no-op version is available.
Folks running composer 1 locally will appreciate it.
---
 upstream-configuration/.gitignore    | 17 +++++++++++++++++
 upstream-configuration/composer.json |  5 +++--
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 upstream-configuration/.gitignore

diff --git a/upstream-configuration/.gitignore b/upstream-configuration/.gitignore
new file mode 100644
index 00000000..54863165
--- /dev/null
+++ b/upstream-configuration/.gitignore
@@ -0,0 +1,17 @@
+composer.lock
+/vendor/
+.csslintrc
+.editorconfig
+.eslintignore
+.eslintrc.json
+.gitattributes
+.ht.router.php
+.htaccess
+INSTALL.txt
+README.txt
+autoload.php
+example.gitignore
+index.php
+robots.txt
+update.php
+web.config
diff --git a/upstream-configuration/composer.json b/upstream-configuration/composer.json
index a5aa5077..ce5d4015 100644
--- a/upstream-configuration/composer.json
+++ b/upstream-configuration/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "internal/upstream-configuration",
+    "name": "pantheon-upstreams/upstream-configuration",
     "type": "project",
     "version": "1.0.0",
     "repositories": [
@@ -19,7 +19,8 @@
         "drupal/console": "^1",
         "cweagans/composer-patches": "^1.7",
         "drupal/config_direct_save": "^1.0",
-        "drush-ops/behat-drush-endpoint": "^9.3"
+        "drush-ops/behat-drush-endpoint": "^9.3",
+        "zaporylie/composer-drupal-optimizations": "^1.2"
     },
     "require-dev": {
         "behat/behat": "3.*",