Merge pull request #93 from bshaffer/misc-fixes

misc fixes - usability and doc fix

README.md

@@ -5,6 +5,7 @@
   <dt>Authors</dt>
     <dd><a href="mailto:[email protected]">Tim Emiola</a></dd>
     <dd><a href="mailto:[email protected]">Stanley Cheung</a></dd>
+    <dd><a href="mailto:[email protected]">Brent Shaffer</a></dd>
   <dt>Copyright</dt><dd>Copyright © 2015 Google, Inc.</dd>
   <dt>License</dt><dd>Apache 2.0</dd>
 </dl>
@@ -14,11 +15,6 @@
 This is Google's officially supported PHP client library for using OAuth 2.0
 authorization and authentication with Google APIs.
 
-## Alpha
-
-This library is in Alpha. We will make an effort to support the library, but
-we reserve the right to make incompatible changes when necessary.
-
 ### Installing via Composer
 
 The recommended way to install the google auth library is through

src/Credentials/UserRefreshCredentials.php

@@ -43,7 +43,7 @@ class UserRefreshCredentials extends CredentialsLoader
    * @param array $jsonKey JSON credentials.
    *
    * @param string $jsonKeyPath the path to a file containing JSON credentials.  If
-   *   jsonKeyStream is set, it is ignored.
+   *   jsonKey is set, it is ignored.
    */
   public function __construct(
     $scope,

src/OAuth2.php

@@ -713,7 +713,7 @@ public function getGrantType()
 
     // Returns the inferred grant type, based on the current object instance
     // state.
-    if (!is_null($this->code) && !is_null($this->redirectUri)) {
+    if (!is_null($this->code)) {
       return 'authorization_code';
     } else if (!is_null($this->refreshToken)) {
       return 'refresh_token';