Allow both guzzle 6.x and 7.x

sadika9 · vinjiang · commit 5dc75923f110 · 2020-12-03T23:48:28.000-08:00
fixes #248 fixes #253
diff --git a/azure-storage-common/composer.json b/azure-storage-common/composer.json
@@ -12,11 +12,11 @@
     ],
     "require": {
         "php": ">=5.6.0",
-		"guzzlehttp/guzzle": "~6.0"
+		"guzzlehttp/guzzle": "~6.0|^7.0"
     },
     "autoload": {
         "psr-4": {
             "MicrosoftAzure\\Storage\\Common\\": "src/Common"
         }
     }
-}
+}
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
     ],
     "require": {
         "php": ">=5.6.0",
-		"guzzlehttp/guzzle": "~6.0"
+		"guzzlehttp/guzzle": "~6.0|^7.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.8.35",

Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,11 @@`
`12`	`12`	`],`
`13`	`13`	`"require": {`
`14`	`14`	`"php": ">=5.6.0",`
`15`		`- "guzzlehttp/guzzle": "~6.0"`
	`15`	`+ "guzzlehttp/guzzle": "~6.0\|^7.0"`
`16`	`16`	`},`
`17`	`17`	`"autoload": {`
`18`	`18`	`"psr-4": {`
`19`	`19`	`"MicrosoftAzure\\Storage\\Common\\": "src/Common"`
`20`	`20`	`}`
`21`	`21`	`}`
`22`		`-}`
	`22`	`+}`