merge

bshaffer · bshaffer · commit 6d24699d4a9c · 2020-08-14T16:38:52.000-07:00
diff --git a/testing/composer.json b/testing/composer.json
@@ -1,11 +1,12 @@
 {
+    "require": {
+        "php": "^7.2|^7.3|7.4"
+    },
     "require-dev": {
         "google/cloud-tools": "dev-master",
         "phpunit/phpunit": "^7",
         "bshaffer/phpunit-retry-annotations": "^0.1.0",
-        "guzzlehttp/guzzle": "^7.0"
-    },
-    "require": {
+        "guzzlehttp/guzzle": "^7.0",
         "symfony/browser-kit": "^4.0"
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,12 @@`
`1`	`1`	`{`
	`2`	`+ "require": {`
	`3`	`+ "php": "^7.2\|^7.3\|7.4"`
	`4`	`+ },`
`2`	`5`	`"require-dev": {`
`3`	`6`	`"google/cloud-tools": "dev-master",`
`4`	`7`	`"phpunit/phpunit": "^7",`
`5`	`8`	`"bshaffer/phpunit-retry-annotations": "^0.1.0",`
`6`		`- "guzzlehttp/guzzle": "^7.0"`
`7`		`- },`
`8`		`- "require": {`
	`9`	`+ "guzzlehttp/guzzle": "^7.0",`
`9`	`10`	`"symfony/browser-kit": "^4.0"`
`10`	`11`	`}`
`11`	`12`	`}`