fix: handle Guzzle 8 client config and drop stale phpstan ignore

Author: GrahamCampbell

phpstan.neon.dist

@@ -3,11 +3,3 @@ parameters:
     level: 5
     paths:
     - src
-    ignoreErrors:
-        # On Guzzle 7 the base RequestException has getResponse(), so the
-        # method_exists() guard is statically true; it stays for the Guzzle 8
-        # code path, where the response lives only on the ResponseException
-        # subclass.
-        -
-            message: '#^Call to function method_exists\(\) with GuzzleHttp\\Exception\\RequestException and ''getResponse'' will always evaluate to true\.$#'
-            path: src/Http/REST.php

src/AuthHandler/Guzzle6AuthHandler.php

@@ -67,7 +67,7 @@ private function attachToHttp(
             $tokenCallback
         );
 
-        $config = $http->getConfig();
+        $config = $this->getClientConfig($http);
         $config['handler']->remove('google_auth');
         $config['handler']->push($middleware, 'google_auth');
         $config['auth'] = 'google_auth';
@@ -95,7 +95,7 @@ public function attachToken(ClientInterface $http, array $token, array $scopes)
             $this->cache
         );
 
-        $config = $http->getConfig();
+        $config = $this->getClientConfig($http);
         $config['handler']->remove('google_auth');
         $config['handler']->push($middleware, 'google_auth');
         $config['auth'] = 'scoped';
@@ -108,7 +108,7 @@ public function attachKey(ClientInterface $http, $key)
     {
         $middleware = new SimpleMiddleware(['key' => $key]);
 
-        $config = $http->getConfig();
+        $config = $this->getClientConfig($http);
         $config['handler']->remove('google_auth');
         $config['handler']->push($middleware, 'google_auth');
         $config['auth'] = 'simple';
@@ -119,6 +119,15 @@ public function attachKey(ClientInterface $http, $key)
 
     private function createAuthHttp(ClientInterface $http)
     {
-        return new Client(['http_errors' => true] + $http->getConfig());
+        return new Client(['http_errors' => true] + $this->getClientConfig($http));
+    }
+
+    /**
+     * getConfig() was removed from ClientInterface in Guzzle 8 but remains on
+     * the concrete Client, which is what these handlers operate on.
+     */
+    private function getClientConfig(ClientInterface $http): array
+    {
+        return $http instanceof Client ? $http->getConfig() : [];
     }
 }