From 92db36c7c92389c1ef0c407ef4e110e698b0e24d Mon Sep 17 00:00:00 2001
From: Brent Shaffer <betterbrent@google.com>
Date: Tue, 18 Aug 2020 14:52:03 -0700
Subject: [PATCH] fix: remove/upgrade test deps already defined in
 testing/composer.json

---
 appengine/flexible/analytics/composer.json | 2 +-
 appengine/flexible/datastore/composer.json | 3 ---
 appengine/flexible/logging/composer.json   | 4 ----
 appengine/flexible/storage/composer.json   | 4 ----
 testing/composer.json                      | 2 +-
 5 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/appengine/flexible/analytics/composer.json b/appengine/flexible/analytics/composer.json
index 26f44b481e..b267cd091a 100644
--- a/appengine/flexible/analytics/composer.json
+++ b/appengine/flexible/analytics/composer.json
@@ -2,7 +2,7 @@
     "require": {
         "silex/silex": "^2.3",
         "twig/twig": "^1.24",
-        "guzzlehttp/guzzle": "^6.3",
+        "guzzlehttp/guzzle": "^7.0",
         "symfony/css-selector": "^3.1"
     }
 }
diff --git a/appengine/flexible/datastore/composer.json b/appengine/flexible/datastore/composer.json
index 31641479e9..e26f7aac31 100644
--- a/appengine/flexible/datastore/composer.json
+++ b/appengine/flexible/datastore/composer.json
@@ -2,8 +2,5 @@
     "require": {
         "silex/silex": "^2.3",
         "google/cloud-datastore": "^1.0"
-    },
-    "require-dev": {
-        "guzzlehttp/guzzle": "^6.3"
     }
 }
diff --git a/appengine/flexible/logging/composer.json b/appengine/flexible/logging/composer.json
index e4addc1aef..19db2b7281 100644
--- a/appengine/flexible/logging/composer.json
+++ b/appengine/flexible/logging/composer.json
@@ -4,9 +4,5 @@
         "google/cloud-error-reporting": "^0.16.2",
         "silex/silex": "^2.0",
         "twig/twig": "^1.29"
-    },
-    "require-dev": {
-        "guzzlehttp/guzzle": "^6.3",
-        "symfony/browser-kit": "^3.2"
     }
 }
diff --git a/appengine/flexible/storage/composer.json b/appengine/flexible/storage/composer.json
index 598dcff52f..8cb351de42 100644
--- a/appengine/flexible/storage/composer.json
+++ b/appengine/flexible/storage/composer.json
@@ -2,9 +2,5 @@
     "require": {
         "silex/silex": "^2.3",
         "google/cloud-storage": "^1.0"
-    },
-    "require-dev": {
-        "guzzlehttp/guzzle": "^6.3",
-        "symfony/browser-kit": "^3.0"
     }
 }
diff --git a/testing/composer.json b/testing/composer.json
index 72549a6e37..465a95d2e7 100755
--- a/testing/composer.json
+++ b/testing/composer.json
@@ -6,7 +6,7 @@
         "google/cloud-tools": "dev-master",
         "phpunit/phpunit": "^7",
         "bshaffer/phpunit-retry-annotations": "^0.1.0",
-        "guzzlehttp/guzzle": "^6.3",
+        "guzzlehttp/guzzle": "^7.0",
         "symfony/browser-kit": "^4.0"
     }
 }