fix: exception option fallback is http_errors on guzzle 6 and 7 (#1966)

sylvain-msl · web-flow · commit e6d64bef2031 · 2020-10-20T13:06:44.000-07:00
diff --git a/src/Google/AuthHandler/Guzzle6AuthHandler.php b/src/Google/AuthHandler/Guzzle6AuthHandler.php
@@ -97,7 +97,7 @@ private function createAuthHttp(ClientInterface $http)
     return new Client(
         [
           'base_uri' => $http->getConfig('base_uri'),
-          'exceptions' => true,
+          'http_errors' => true,
           'verify' => $http->getConfig('verify'),
           'proxy' => $http->getConfig('proxy'),
         ]
diff --git a/src/Google/Client.php b/src/Google/Client.php
@@ -1148,11 +1148,10 @@ protected function createDefaultHttpClient()
       $guzzleVersion = (int)substr(ClientInterface::VERSION, 0, 1);
     }
 
-    $options = ['exceptions' => false];
     if (5 === $guzzleVersion) {
       $options = [
         'base_url' => $this->config['base_path'],
-        'defaults' => $options,
+        'defaults' => ['exceptions' => false],
       ];
       if ($this->isAppEngine()) {
         // set StreamHandler on AppEngine by default
@@ -1161,7 +1160,10 @@ protected function createDefaultHttpClient()
       }
     } elseif (6 === $guzzleVersion || 7 === $guzzleVersion) {
       // guzzle 6 or 7
-      $options['base_uri'] = $this->config['base_path'];
+      $options = [
+        'base_uri' => $this->config['base_path'],
+        'http_errors' => false,
+      ];
     } else {
       throw new LogicException('Could not find supported version of Guzzle.');
     }
diff --git a/tests/Google/ClientTest.php b/tests/Google/ClientTest.php
@@ -301,6 +301,21 @@ public function testSettersGetters()
     $this->assertEquals($token, $client->getAccessToken());
   }
 
+  public function testDefaultConfigOptions()
+  {
+      $client = new Google_Client();
+      if ($this->isGuzzle6() || $this->isGuzzle7()) {
+          $this->assertArrayHasKey('http_errors', $client->getHttpClient()->getConfig());
+          $this->assertArrayNotHasKey('exceptions', $client->getHttpClient()->getConfig());
+          $this->assertFalse($client->getHttpClient()->getConfig()['http_errors']);
+      }
+      if ($this->isGuzzle5()) {
+          $this->assertArrayHasKey('exceptions', $client->getHttpClient()->getDefaultOption());
+          $this->assertArrayNotHasKey('http_errors', $client->getHttpClient()->getDefaultOption());
+          $this->assertFalse($client->getHttpClient()->getDefaultOption()['exceptions']);
+      }
+  }
+
   public function testAppEngineStreamHandlerConfig()
   {
     $this->onlyGuzzle5();

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ private function createAuthHttp(ClientInterface $http)`
`97`	`97`	`return new Client(`
`98`	`98`	`[`
`99`	`99`	`'base_uri' => $http->getConfig('base_uri'),`
`100`		`- 'exceptions' => true,`
	`100`	`+ 'http_errors' => true,`
`101`	`101`	`'verify' => $http->getConfig('verify'),`
`102`	`102`	`'proxy' => $http->getConfig('proxy'),`
`103`	`103`	`]`