allows string tokens in revoke method (#993)

Author: bshaffer

src/Google/AccessToken/Revoke.php

@@ -45,18 +45,20 @@ public function __construct(ClientInterface $http = null)
    * Revoke an OAuth2 access token or refresh token. This method will revoke the current access
    * token, if a token isn't provided.
    *
-   * @param string|null $token The token (access token or a refresh token) that should be revoked.
+   * @param string|array $token The token (access token or a refresh token) that should be revoked.
    * @return boolean Returns True if the revocation was successful, otherwise False.
    */
-  public function revokeToken(array $token)
+  public function revokeToken($token)
   {
-    if (isset($token['refresh_token'])) {
-      $tokenString = $token['refresh_token'];
-    } else {
-      $tokenString = $token['access_token'];
+    if (is_array($token)) {
+      if (isset($token['refresh_token'])) {
+        $token = $token['refresh_token'];
+      } else {
+        $token = $token['access_token'];
+      }
     }
 
-    $body = Psr7\stream_for(http_build_query(array('token' => $tokenString)));
+    $body = Psr7\stream_for(http_build_query(array('token' => $token)));
     $request = new Request(
         'POST',
         Google_Client::OAUTH2_REVOKE_URI,

tests/Google/AccessToken/RevokeTest.php

@@ -30,11 +30,11 @@ public function testRevokeAccess()
     $token = '';
 
     $response = $this->getMock('Psr\Http\Message\ResponseInterface');
-    $response->expects($this->exactly(2))
+    $response->expects($this->exactly(3))
       ->method('getStatusCode')
       ->will($this->returnValue(200));
     $http = $this->getMock('GuzzleHttp\ClientInterface');
-    $http->expects($this->exactly(2))
+    $http->expects($this->exactly(3))
       ->method('send')
       ->will($this->returnCallback(
             function ($request) use (&$token, $response) {
@@ -49,13 +49,13 @@ function ($request) use (&$token, $response) {
     if ($this->isGuzzle5()) {
       $requestToken = null;
       $request = $this->getMock('GuzzleHttp\Message\RequestInterface');
-      $request->expects($this->exactly(2))
+      $request->expects($this->exactly(3))
           ->method('getBody')
           ->will($this->returnCallback(
               function () use (&$requestToken) {
                 return 'token='.$requestToken;
               }));
-      $http->expects($this->exactly(2))
+      $http->expects($this->exactly(3))
         ->method('createRequest')
         ->will($this->returnCallback(
               function ($method, $url, $params) use (&$requestToken, $request) {
@@ -88,19 +88,11 @@ function ($method, $url, $params) use (&$requestToken, $request) {
     );
     $this->assertTrue($revoke->revokeToken($t));
     $this->assertEquals($refreshToken, $token);
-  }
 
-  public function testInvalidStringToken()
-  {
-    $phpVersion = phpversion();
-    if ('7' === $phpVersion[0]) {
-      // primitive type hints actually throw exceptions in PHP7
-      $this->setExpectedException('TypeError');
-    } else {
-      $this->setExpectedException('PHPUnit_Framework_Error');
-    }
-    // Test with string token
-    $revoke = new Google_AccessToken_Revoke();
-    $revoke->revokeToken('ACCESS_TOKEN');
+    // Test with token string.
+    $revoke = new Google_AccessToken_Revoke($http);
+    $t = $accessToken;
+    $this->assertTrue($revoke->revokeToken($t));
+    $this->assertEquals($accessToken, $token);
   }
 }