Guzzle 6 is now fully supported and tested

Author: kamermans

guzzle_environments/4/phpunit.xml.dist

@@ -4,6 +4,7 @@
     <testsuites>
         <testsuite name="All Tests">
             <directory>../../tests</directory>
+            <exclude>../../tests/OAuth2MiddlewareTest.php</exclude>
         </testsuite>
     </testsuites>
     <filter>

guzzle_environments/5/phpunit.xml.dist

@@ -4,6 +4,7 @@
     <testsuites>
         <testsuite name="All Tests">
             <directory>../../tests</directory>
+            <exclude>../../tests/OAuth2SubscriberTest.php</exclude>
         </testsuite>
     </testsuites>
     <filter>

guzzle_environments/6/phpunit.xml.dist

@@ -4,6 +4,7 @@
     <testsuites>
         <testsuite name="All Tests">
             <directory>../../tests</directory>
+            <exclude>../../tests/OAuth2SubscriberTest.php</exclude>
         </testsuite>
     </testsuites>
     <filter>

src/OAuth2Middleware.php

@@ -30,8 +30,8 @@ public function __invoke(callable $handler)
             $request = $this->signRequest($request);
 
             return $handler($request, $options)->then(
-                $this->onFulfilled($request, $options),
-                $this->onRejected($request, $options)
+                $this->onFulfilled($request, $options, $handler),
+                $this->onRejected($request, $options, $handler)
             );
         };
     }
@@ -44,15 +44,18 @@ public function __invoke(callable $handler)
       *
       * @param ErrorEvent $event Event received
       */
-    private function onFulfilled(RequestInterface $request, array $options)
+    private function onFulfilled(RequestInterface $request, array $options, $handler)
     {
-        return function ($response) use ($request, $options) {
+        return function ($response) use ($request, $options, $handler) {
             // Only deal with Unauthorized response.
             if ($response && $response->getStatusCode() != 401) {
                 return $response;
             }
 
             // If we already retried once, give up.
+            // This is extremely unlikely in Guzzle 6+ since we're using promises
+            // to check the response - looping should be impossible, but I'm leaving
+            // the code here in case something interferes with the Middleware
             if ($request->hasHeader('X-Guzzle-Retry')) {
                 return $response;
             }
@@ -66,11 +69,11 @@ private function onFulfilled(RequestInterface $request, array $options)
             $request = $request->withHeader('X-Guzzle-Retry', '1');
             $request = $this->signRequest($request);
 
-            return $this($request, $options);
+            return $handler($request, $options);
         };
     }
 
-    private function onRejected(RequestInterface $request, array $options)
+    private function onRejected(RequestInterface $request, array $options, $handler)
     {
         return function ($reason) use ($request, $options) {
             return \GuzzleHttp\Promise\rejection_for($reason);

src/Signer/AccessToken/BasicAuth.php

@@ -8,7 +8,7 @@ class BasicAuth implements SignerInterface
 {
     public function sign($request, $accessToken)
     {
-        if (Helper::guzzleIs('~', 6)) {
+        if (Helper::guzzleIs('>=', 6)) {
             return $request->withHeader('Authorization', 'Bearer ' . $accessToken);
         }
 

src/Signer/AccessToken/QueryString.php

@@ -16,7 +16,7 @@ public function __construct($fieldName = 'access_token')
     public function sign($request, $accessToken)
     {
         if (Helper::guzzleIs('~', 6)) {
-            $uri = Psr\Http\Message\UriInterface\Uri::withQueryValue(
+            $uri = \GuzzleHttp\Psr7\Uri::withQueryValue(
                     $request->getUri(),
                     $this->fieldName,
                     $accessToken

src/Signer/ClientCredentials/PostFormData.php

@@ -18,7 +18,7 @@ public function __construct($clientIdField = 'client_id', $clientSecretField = '
 
     public function sign($request, $clientId, $clientSecret)
     {
-        if (Helper::guzzleIs('~', 6)) {
+        if (Helper::guzzleIs('>=', 6)) {
             if ($request->getHeaderLine('Content-Type') != 'application/x-www-form-urlencoded') {
                 throw new \RuntimeException('Unable to set fields in request body');
             }

tests/BaseTestCase.php

@@ -2,7 +2,76 @@
 
 namespace kamermans\OAuth2\Tests;
 
+use kamermans\OAuth2\Utils\Helper;
+use GuzzleHttp\Post\PostBody;
+use GuzzleHttp\Message\Request;
+use GuzzleHttp\Psr7\Request as Psr7Request;
+
 class BaseTestCase extends \PHPUnit_Framework_TestCase
 {
 
+    protected function createRequest($method, $uri, $options=[])
+    {
+        return Helper::guzzleIs('>=', 6)?
+            new Psr7Request($method, $uri, $options):
+            new Request($method, $uri, ['headers' => $options]);
+    }
+
+    protected function getHeader($request, $header)
+    {
+        return Helper::guzzleIs('>=', 6)?
+            $request->getHeaderLine($header):
+            $request->getHeader($header);
+    }
+
+    protected function getQueryStringValue($request, $field)
+    {
+        if (Helper::guzzleIs('<', 6)) {
+            return $request->getQuery()->get($field);
+        }
+
+        $query_string = $request->getUri()->getQuery();
+
+        $values = $this->parseQueryString($query_string);
+
+        return array_key_exists($field, $values)? $values[$field]: null;
+
+    }
+
+    protected function getFormPostBodyValue($request, $field)
+    {
+        if (Helper::guzzleIs('<', 6)) {
+            return $request->getBody()->getField($field);
+        }
+
+        $query_string = (string)$request->getBody();
+
+        $values = $this->parseQueryString($query_string);
+
+        return array_key_exists($field, $values)? $values[$field]: null;
+
+    }
+
+    protected function parseQueryString($query_string)
+    {
+        $values = [];
+        foreach (explode('&', $query_string) as $component) {
+            list($key, $value) = explode('=', $component);
+            $values[rawurldecode($key)] = rawurldecode($value);
+        }
+
+        return $values;
+    }
+
+    protected function setPostBody($request, array $data=[])
+    {
+        if (Helper::guzzleIs('>=', 6)) {
+            return $request->withBody(\GuzzleHttp\Psr7\stream_for(http_build_query($data, '', '&')));
+        }
+
+        $request->setBody(new PostBody($data));
+
+        return $request;
+    }
+
 }

tests/GrantType/AuthorizationCodeTest.php

@@ -17,7 +17,7 @@
 use kamermans\OAuth2\GrantType\AuthorizationCode;
 use kamermans\OAuth2\Tests\BaseTestCase;
 
-class AuthorizationCodeTest extends \kamermans\OAuth2\Tests\BaseTestCase
+class AuthorizationCodeTest extends BaseTestCase
 {
     public function testConstruct()
     {

tests/GrantType/ClientCredentialsTest.php

@@ -16,7 +16,7 @@
 use kamermans\OAuth2\Utils\Helper;
 use kamermans\OAuth2\GrantType\ClientCredentials;
 
-class ClientCredentialsTest extends \kamermans\OAuth2\Tests\BaseTestCase
+class ClientCredentialsTest extends BaseTestCase
 {
     public function testConstruct()
     {

tests/GrantType/PasswordCredentialsTest.php

@@ -16,7 +16,7 @@
 use kamermans\OAuth2\Utils\Helper;
 use kamermans\OAuth2\GrantType\PasswordCredentials;
 
-class PasswordCredentialsTest extends \kamermans\OAuth2\Tests\BaseTestCase
+class PasswordCredentialsTest extends BaseTestCase
 {
     public function testConstruct()
     {

tests/GrantType/RefreshTokenTest.php

@@ -16,7 +16,7 @@
 use kamermans\OAuth2\Utils\Helper;
 use kamermans\OAuth2\GrantType\RefreshToken;
 
-class RefreshTokenTest extends \kamermans\OAuth2\Tests\BaseTestCase
+class RefreshTokenTest extends BaseTestCase
 {
     public function testConstruct()
     {

tests/GrantType/Specific/GithubApplicationTest.php

@@ -17,7 +17,7 @@
 use kamermans\OAuth2\Utils\Helper;
 use kamermans\OAuth2\GrantType\Specific\GithubApplication;
 
-class GithubApplicationTest extends \kamermans\OAuth2\Tests\BaseTestCase
+class GithubApplicationTest extends BaseTestCase
 {
     public function testConstruct()
     {