CS fixes

Author: Spomky

lib/OAuth2/IOAuth2GrantClient.php

@@ -5,37 +5,34 @@
 use OAuth2\Model\IOAuth2Client;
 
 /**
- * Storage engines that support the "Client Credentials"
- * grant type should implement this interface
+ * Storage engines that support the "Client Credentials" grant type should implement this interface
  *
  * @author Dave Rochwerger <catch.dave@gmail.com>
- * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-4.4
+ *
+ * @see    http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-4.4
  */
-interface IOAuth2GrantClient extends IOAuth2Storage {
-
+interface IOAuth2GrantClient extends IOAuth2Storage
+{
     /**
      * Required for OAuth2::GRANT_TYPE_CLIENT_CREDENTIALS.
      *
-     * @param IOAuth2Client $client
-     * The client for which to check credentials.
-     * @param string $client_secret
-     * (optional) If a secret is required, check that they've given the right one.
+     * @param IOAuth2Client $client       The client for which to check credentials.
+     * @param string        $clientSecret (optional) If a secret is required, check that they've given the right one.
      *
-     * @return
-     * TRUE if the client credentials are valid, and MUST return FALSE if they aren't.
+     * @return bool|array Returns true if the client credentials are valid, and MUST return false if they aren't.
      * When using "client credentials" grant mechanism and you want to
      * verify the scope of a user's access, return an associative array
      * with the scope values as below. We'll check the scope you provide
      * against the requested scope before providing an access token:
      * @code
      * return array(
-     * 'scope' => <stored scope values (space-separated string)>,
+     *     'scope' => <stored scope values (space-separated string)>,
      * );
      * @endcode
      *
-     * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-4.4.2
+     * @see     http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-4.4.2
      *
      * @ingroup oauth2_section_4
      */
-    public function checkClientCredentialsGrant(IOAuth2Client $client, $client_secret);
+    public function checkClientCredentialsGrant(IOAuth2Client $client, $clientSecret);
 }

lib/OAuth2/IOAuth2GrantCode.php

@@ -6,14 +6,14 @@
 use OAuth2\Model\IOAuth2AuthCode;
 
 /**
- * Storage engines that support the "Authorization Code"
- * grant type should implement this interface
+ * Storage engines that support the "Authorization Code" grant type should implement this interface
  *
  * @author Dave Rochwerger <catch.dave@gmail.com>
- * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-4.1
+ *
+ * @see    http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-4.1
  */
-interface IOAuth2GrantCode extends IOAuth2Storage {
-
+interface IOAuth2GrantCode extends IOAuth2Storage
+{
     /**
      * The Authorization Code grant type supports a response type of "code".
      *
@@ -27,15 +27,13 @@ interface IOAuth2GrantCode extends IOAuth2Storage {
      * Fetch authorization code data (probably the most common grant type).
      *
      * Retrieve the stored data for the given authorization code.
-     *
      * Required for OAuth2::GRANT_TYPE_AUTH_CODE.
      *
-     * @param string $code
-     * The authorization code string for which to fetch data.
+     * @param string $code The authorization code string for which to fetch data.
      *
      * @return IOAuth2AuthCode
      *
-     * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-4.1
+     * @see     http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-4.1
      *
      * @ingroup oauth2_section_4
      */
@@ -45,29 +43,20 @@ public function getAuthCode($code);
      * Take the provided authorization code values and store them somewhere.
      *
      * This function should be the storage counterpart to getAuthCode().
-     *
-     * If storage fails for some reason, we're not currently checking for
-     * any sort of success/failure, so you should bail out of the script
-     * and provide a descriptive fail message.
-     *
+     * If storage fails for some reason, we're not currently checking for any sort of success/failure, so you should
+     * bail out of the script and provide a descriptive fail message.
      * Required for OAuth2::GRANT_TYPE_AUTH_CODE.
      *
-     * @param string $code
-     * Authorization code string to be stored.
-     * @param IOAuth2Client $client
-     * The client associated with this authorization code.
-     * @param mixed $data
-     * Application data to associate with this authorization code, such as a User object.
-     * @param string $redirect_uri
-     * Redirect URI to be stored.
-     * @param int $expires
-     * The timestamp when the authorization code will expire.
-     * @param string $scope
-     * (optional) Scopes to be stored in space-separated string.
+     * @param string        $code        Authorization code string to be stored.
+     * @param IOAuth2Client $client      The client associated with this authorization code.
+     * @param mixed         $data        Application data to associate with this authorization code, such as a User object.
+     * @param string        $redirectUri Redirect URI to be stored.
+     * @param int           $expires     The timestamp when the authorization code will expire.
+     * @param string        $scope       l(optional) Scopes to be stored in space-separated string.
      *
      * @ingroup oauth2_section_4
      */
-    public function createAuthCode($code, IOAuth2Client $client, $data, $redirect_uri, $expires, $scope = NULL);
+    public function createAuthCode($code, IOAuth2Client $client, $data, $redirectUri, $expires, $scope = null);
 
     /**
      * Marks auth code as expired.

lib/OAuth2/IOAuth2GrantExtension.php

@@ -9,24 +9,22 @@
  * grant types should implement this interface
  *
  * @author Dave Rochwerger <catch.dave@gmail.com>
- * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-4.5
+ *
+ *
+ * @see    http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-4.5
  */
-interface IOAuth2GrantExtension extends IOAuth2Storage {
-
+interface IOAuth2GrantExtension extends IOAuth2Storage
+{
     /**
      * Check any extended grant types.
      *
      * @param IOAuth2Client $client
-     * @param string $uri
-     * URI of the grant type definition
-     * @param array $inputData
-     * Unfiltered input data. The source is *not* guaranteed to be POST (but
-     * is likely to be).
-     * @param array $authHeaders
-     * Authorization headers
-     * @return
-     * FALSE if the authorization is rejected or not support.
-     * TRUE or an associative array if you want to verify the scope:
+     * @param string        $uri         URI of the grant type definition
+     * @param array         $inputData   Unfiltered input data. The source is *not* guaranteed to be POST (but is likely to be).
+     * @param array         $authHeaders Authorization headers
+     *
+     * @return bool|array Returns false if the authorization is rejected or not support. Returns true or an associative array if you
+     * want to verify the scope:
      * @code
      * return array(
      * 'scope' => <stored scope values (space-separated string)>,

lib/OAuth2/IOAuth2GrantImplicit.php

@@ -3,18 +3,19 @@
 namespace OAuth2;
 
 /**
- * Storage engines that support the "Implicit"
- * grant type should implement this interface
+ * Storage engines that support the "Implicit" grant type should implement this interface
  *
  * @author Dave Rochwerger <catch.dave@gmail.com>
- * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-4.2
+ *
+ * @see    http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-4.2
  */
-interface IOAuth2GrantImplicit extends IOAuth2Storage {
-
+interface IOAuth2GrantImplicit extends IOAuth2Storage
+{
     /**
      * The Implicit grant type supports a response type of "token".
      *
      * @var string
+     *
      * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-1.4.2
      * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-4.2
      */

lib/OAuth2/IOAuth2GrantUser.php

@@ -5,44 +5,37 @@
 use OAuth2\Model\IOAuth2Client;
 
 /**
- * Storage engines that support the "Resource Owner Password Credentials"
- * grant type should implement this interface
+ * Storage engines that support the "Resource Owner Password Credentials" grant type should implement this interface
  *
  * @author Dave Rochwerger <catch.dave@gmail.com>
- * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-4.3
+ *         
+ * @see    http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-4.3
  */
-interface IOAuth2GrantUser extends IOAuth2Storage {
-
+interface IOAuth2GrantUser extends IOAuth2Storage
+{
     /**
      * Grant access tokens for basic user credentials.
      *
      * Check the supplied username and password for validity.
-     *
-     * You can also use the $client param to do any checks required based
-     * on a client, if you need that.
-     *
+     * You can also use the $client param to do any checks required based on a client, if you need that.
      * Required for OAuth2::GRANT_TYPE_USER_CREDENTIALS.
      *
-     * @param IOAuth2Client $client
-     * Client to check.
-     * @param string $username
-     * Username to check.
-     * @param string $password
-     * Password to check.
+     * @param IOAuth2Client $client   Client to check.
+     * @param string        $username Username to check.
+     * @param string        $password Password to check.
      *
-     * @return
-     * TRUE if the username and password are valid, and FALSE if they aren't.
+     * @return bool|array Returns true if the username and password are valid or false if they aren't.
      * Moreover, if the username and password are valid, and you want to
      * verify the scope of a user's access, return an associative array
      * with the scope values as below. We'll check the scope you provide
      * against the requested scope before providing an access token:
      * @code
      * return array(
-     * 'scope' => <stored scope values (space-separated string)>,
+     *     'scope' => <stored scope values (space-separated string)>,
      * );
      * @endcode
      *
-     * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-4.3
+     * @see     http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-4.3
      *
      * @ingroup oauth2_section_4
      */

lib/OAuth2/IOAuth2RefreshTokens.php

@@ -6,74 +6,61 @@
 use OAuth2\Model\IOAuth2Token;
 
 /**
- * Storage engines that want to support refresh tokens should
- * implement this interface.
+ * Storage engines that want to support refresh tokens should implement this interface.
  *
  * @author Dave Rochwerger <catch.dave@gmail.com>
- * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-6
- * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-1.5
+ *
+ * @see    http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-6
+ * @see    http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-1.5
  */
-interface IOAuth2RefreshTokens extends IOAuth2Storage {
-
+interface IOAuth2RefreshTokens extends IOAuth2Storage
+{
     /**
      * Grant refresh access tokens.
      *
      * Retrieve the stored data for the given refresh token.
-     *
      * Required for OAuth2::GRANT_TYPE_REFRESH_TOKEN.
      *
-     * @param string $refresh_token
-     * Refresh token string.
+     * @param string $refreshToken Refresh token string.
      *
      * @return IOAuth2Token
      *
-     * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-6
+     * @see     http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-6
      *
      * @ingroup oauth2_section_6
      */
-    public function getRefreshToken($refresh_token);
+    public function getRefreshToken($refreshToken);
 
     /**
      * Take the provided refresh token values and store them somewhere.
      *
      * This function should be the storage counterpart to getRefreshToken().
-     *
      * If storage fails for some reason, we're not currently checking for
      * any sort of success/failure, so you should bail out of the script
      * and provide a descriptive fail message.
-     *
      * Required for OAuth2::GRANT_TYPE_REFRESH_TOKEN.
      *
-     * @param string $refresh_token
-     * The refresh token string to be stored.
-     * @param IOAuth2Client $client
-     * The client associated with this refresh token.
-     * @param mixed $data
-     * Application data associated with the refresh token, such as a User object.
-     * @param int $expires
-     * The timestamp when the refresh token will expire.
-     * @param string $scope
-     * (optional) Scopes to be stored in space-separated string.
+     * @param string        $refreshToken The refresh token string to be stored.
+     * @param IOAuth2Client $client       The client associated with this refresh token.
+     * @param mixed         $data         Application data associated with the refresh token, such as a User object.
+     * @param int           $expires      The timestamp when the refresh token will expire.
+     * @param string        $scope        (optional) Scopes to be stored in space-separated string.
      *
      * @ingroup oauth2_section_6
      */
-    public function createRefreshToken($refresh_token, IOAuth2Client $client, $data, $expires, $scope = NULL);
+    public function createRefreshToken($refreshToken, IOAuth2Client $client, $data, $expires, $scope = null);
 
     /**
      * Expire a used refresh token.
      *
-     * This is not explicitly required in the spec, but is almost implied.
-     * After granting a new refresh token, the old one is no longer useful and
-     * so should be forcibly expired in the data store so it can't be used again.
-     *
-     * If storage fails for some reason, we're not currently checking for
-     * any sort of success/failure, so you should bail out of the script
-     * and provide a descriptive fail message.
+     * This is not explicitly required in the spec, but is almost implied. After granting a new refresh token, the old
+     * one is no longer useful and so should be forcibly expired in the data store so it can't be used again.
+     * If storage fails for some reason, we're not currently checking for any sort of success/failure, so you should
+     * bail out of the script and provide a descriptive fail message.
      *
-     * @param string $refresh_token
-     * The refresh token string to expire.
+     * @param string $refreshToken The refresh token string to expire.
      *
      * @ingroup oauth2_section_6
      */
-    public function unsetRefreshToken($refresh_token);
+    public function unsetRefreshToken($refreshToken);
 }

lib/OAuth2/IOAuth2Storage.php

@@ -3,90 +3,78 @@
 namespace OAuth2;
 
 use OAuth2\Model\IOAuth2Client;
+use OAuth2\Model\IOAuth2AccessToken;
 
 /**
  * All storage engines need to implement this interface in order to use OAuth2 server
  *
  * @author David Rochwerger <catch.dave@gmail.com>
  */
-interface IOAuth2Storage {
-
+interface IOAuth2Storage
+{
     /**
      * Get a client by its ID.
      *
-     * @param string $client_id
+     * @param string $clientId
+     *
      * @return IOAuth2Client
      */
-    public function getClient($client_id);
+    public function getClient($clientId);
 
     /**
      * Make sure that the client credentials are valid.
      *
-     * @param IOAuth2Client $client
-     * The client for which to check credentials.
-     * @param string $client_secret
-     * (optional) If a secret is required, check that they've given the right one.
+     * @param IOAuth2Client $client       The client for which to check credentials.
+     * @param string        $clientSecret (optional) If a secret is required, check that they've given the right one.
      *
-     * @return
-     * TRUE if the client credentials are valid, and MUST return FALSE if they aren't.
-     * @endcode
+     * @return bool TRUE if the client credentials are valid, and MUST return FALSE if they aren't.
      *
-     * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-3.1
+     * @see     http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-3.1
      *
      * @ingroup oauth2_section_3
      */
-    public function checkClientCredentials(IOAuth2Client $client, $client_secret = NULL);
+    public function checkClientCredentials(IOAuth2Client $client, $clientSecret = null);
 
     /**
      * Look up the supplied oauth_token from storage.
      *
      * We need to retrieve access token data as we create and verify tokens.
      *
-     * @param string $oauth_token
-     * The token string.
+     * @param string $oauthToken The token string.
      *
      * @return IOAuth2AccessToken
      *
      * @ingroup oauth2_section_7
      */
-    public function getAccessToken($oauth_token);
+    public function getAccessToken($oauthToken);
 
     /**
      * Store the supplied access token values to storage.
      *
      * We need to store access token data as we create and verify tokens.
      *
-     * @param string $oauth_token
-     * The access token string to be stored.
-     * @param IOAuth2Client $client
-     * The client associated with this refresh token.
-     * @param mixed $data
-     * Application data associated with the refresh token, such as a User object.
-     * @param int $expires
-     * The timestamp when the refresh token will expire.
-     * @param string $scope
-     * (optional) Scopes to be stored in space-separated string.
+     * @param string        $oauthToken The access token string to be stored.
+     * @param IOAuth2Client $client     The client associated with this refresh token.
+     * @param mixed         $data       Application data associated with the refresh token, such as a User object.
+     * @param int           $expires    The timestamp when the refresh token will expire.
+     * @param string        $scope      (optional) Scopes to be stored in space-separated string.
      *
      * @ingroup oauth2_section_4
      */
-    public function createAccessToken($oauth_token, IOAuth2Client $client, $data, $expires, $scope = NULL);
+    public function createAccessToken($oauthToken, IOAuth2Client $client, $data, $expires, $scope = null);
 
     /**
      * Check restricted grant types of corresponding client identifier.
      *
      * If you want to restrict clients to certain grant types, override this
      * function.
      *
-     * @param IOAuth2Client $client
-     * Client to check.
-     * @param string $grant_type
-     * Grant type to check. One of the values contained in OAuth2::GRANT_TYPE_REGEXP.
+     * @param IOAuth2Client $client    Client to check.
+     * @param string        $grantType Grant type to check. One of the values contained in OAuth2::GRANT_TYPE_REGEXP.
      *
-     * @return
-     * TRUE if the grant type is supported by this client identifier, and
-     * FALSE if it isn't.
+     * @return bool Returns true if the grant type is supported by this client identifier or false if it isn't.
      *
      * @ingroup oauth2_section_4
      */
-    public function checkRestrictedGrantType(IOAuth2Client $client, $grant_type);
+    public function checkRestrictedGrantType(IOAuth2Client $client, $grantType);
 }

lib/OAuth2/Model/IOAuth2AccessToken.php

@@ -2,6 +2,6 @@
 
 namespace OAuth2\Model;
 
-interface IOAuth2AccessToken extends IOAuth2Token {
+interface IOAuth2AccessToken extends IOAuth2Token
+{
 }
-

lib/OAuth2/Model/IOAuth2AuthCode.php

@@ -2,8 +2,10 @@
 
 namespace OAuth2\Model;
 
-interface IOAuth2AuthCode extends IOAuth2Token {
-
+interface IOAuth2AuthCode extends IOAuth2Token
+{
+    /**
+     * @return string
+     */
     public function getRedirectUri();
 }
-

lib/OAuth2/Model/IOAuth2Client.php

@@ -2,9 +2,15 @@
 
 namespace OAuth2\Model;
 
-interface IOAuth2Client {
-
+interface IOAuth2Client
+{
+    /**
+     * @return string
+     */
     public function getPublicId();
+
+    /**
+     * @return array
+     */
     public function getRedirectUris();
 }
-

lib/OAuth2/Model/IOAuth2RefreshToken.php

@@ -2,6 +2,6 @@
 
 namespace OAuth2\Model;
 
-interface IOAuth2RefreshToken extends IOAuth2Token {
+interface IOAuth2RefreshToken extends IOAuth2Token
+{
 }
-

lib/OAuth2/Model/IOAuth2Token.php

@@ -2,17 +2,35 @@
 
 namespace OAuth2\Model;
 
-interface IOAuth2Token {
-
+interface IOAuth2Token
+{
+    /**
+     * @return string
+     */
     public function getClientId();
 
+    /**
+     * @return integer
+     */
     public function getExpiresIn();
+
+    /**
+     * @return boolean
+     */
     public function hasExpired();
 
+    /**
+     * @return string
+     */
     public function getToken();
 
+    /**
+     * @return null|string
+     */
     public function getScope();
 
+    /**
+     * @return mixed
+     */
     public function getData();
 }
-

lib/OAuth2/Model/OAuth2AccessToken.php

@@ -2,6 +2,6 @@
 
 namespace OAuth2\Model;
 
-class OAuth2AccessToken extends OAuth2Token implements IOAuth2AccessToken {
+class OAuth2AccessToken extends OAuth2Token implements IOAuth2AccessToken
+{
 }
-

lib/OAuth2/Model/OAuth2AuthCode.php

@@ -2,19 +2,40 @@
 
 namespace OAuth2\Model;
 
-class OAuth2AuthCode extends OAuth2Token implements IOAuth2AuthCode {
+class OAuth2AuthCode extends OAuth2Token implements IOAuth2AuthCode
+{
+    /**
+     * @var null|string
+     */
+    private $redirectUri;
 
-    public function __construct($clientId, $token, $expiresAt = NULL, $scope = NULL, $data = NULL, $redirectUri = NULL) {
+    /**
+     * @param string       $clientId
+     * @param string       $token
+     * @param null|integer $expiresAt
+     * @param null|string  $scope
+     * @param mixed        $data
+     * @param null|string  $redirectUri
+     */
+    public function __construct($clientId, $token, $expiresAt = null, $scope = null, $data = null, $redirectUri = null)
+    {
         parent::__construct($clientId, $token, $expiresAt, $scope, $data);
         $this->setRedirectUri($redirectUri);
     }
 
-    public function setRedirectUri($uri) {
+    /**
+     * @param null|string $uri
+     */
+    public function setRedirectUri($uri)
+    {
         $this->redirectUri = $uri;
     }
 
-    public function getRedirectUri() {
+    /**
+     * {@inheritdoc}
+     */
+    public function getRedirectUri()
+    {
         return $this->redirectUri;
     }
 }
-

lib/OAuth2/Model/OAuth2Client.php

@@ -2,40 +2,82 @@
 
 namespace OAuth2\Model;
 
-class OAuth2Client implements IOAuth2Client {
-
+class OAuth2Client implements IOAuth2Client
+{
+    /**
+     * @var string
+     */
     private $id;
+
+    /**
+     * @var array
+     */
     private $redirectUris;
+
+    /**
+     * @var null|string
+     */
     private $secret;
 
-    public function __construct($id, $secret = NULL, array $redirectUris = array()) {
+    /**
+     * @param string $id
+     * @param null   $secret
+     * @param array  $redirectUris
+     */
+    public function __construct($id, $secret = null, array $redirectUris = array())
+    {
         $this->setPublicId($id);
         $this->setSecret($secret);
         $this->setRedirectUris($redirectUris);
     }
 
-    public function setPublicId($id) {
+    /**
+     * @param string $id
+     */
+    public function setPublicId($id)
+    {
         $this->id = $id;
     }
 
-    public function getPublicId() {
+    /**
+     * {@inheritdoc}
+     */
+    public function getPublicId()
+    {
         return $this->id;
     }
 
-    public function setSecret($secret) {
+    /**
+     * @param string $secret
+     */
+    public function setSecret($secret)
+    {
         $this->secret = $secret;
     }
 
-    public function checkSecret($secret) {
-        return $this->secret === NULL || $secret === $this->secret;
+    /**
+     * @param mixed $secret
+     *
+     * @return boolean
+     */
+    public function checkSecret($secret)
+    {
+        return $this->secret === null || $secret === $this->secret;
     }
 
-    public function setRedirectUris(array $redirectUris) {
+    /**
+     * @param array $redirectUris
+     */
+    public function setRedirectUris(array $redirectUris)
+    {
         $this->redirectUris = $redirectUris;
     }
 
-    public function getRedirectUris() {
+    /**
+     * {@inheritdoc}
+     */
+    public function getRedirectUris()
+    {
         return $this->redirectUris;
     }
 }
-

lib/OAuth2/Model/OAuth2RefreshToken.php

@@ -2,6 +2,6 @@
 
 namespace OAuth2\Model;
 
-class OAuth2RefreshToken extends OAuth2Token implements IOAuth2RefreshToken {
+class OAuth2RefreshToken extends OAuth2Token implements IOAuth2RefreshToken
+{
 }
-

lib/OAuth2/Model/OAuth2Token.php

@@ -2,71 +2,138 @@
 
 namespace OAuth2\Model;
 
-class OAuth2Token implements IOAuth2Token {
-
+class OAuth2Token implements IOAuth2Token
+{
+    /**
+     * @var string
+     */
     private $clientId;
+
+    /**
+     * @var string
+     */
     private $token;
+
+    /**
+     * @var null|integer
+     */
     private $expiresAt;
+
+    /**
+     * @var null|string
+     */
     private $scope;
+
+    /**
+     * @var mixed
+     */
     private $data;
 
-    public function __construct($clientId, $token, $expiresAt = NULL, $scope = NULL, $data = NULL) {
+    /**
+     * @param string       $clientId
+     * @param string       $token
+     * @param null|integer $expiresAt
+     * @param null|string  $scope
+     * @param mixed   $data
+     */
+    public function __construct($clientId, $token, $expiresAt = null, $scope = null, $data = null)
+    {
         $this->setClientId($clientId);
         $this->setToken($token);
         $this->setExpiresAt($expiresAt);
         $this->setScope($scope);
         $this->setData($data);
     }
 
-    public function setClientId($id) {
+    /**
+     * @param string $id
+     */
+    public function setClientId($id)
+    {
         $this->clientId = $id;
     }
 
-    public function getClientId() {
+    /**
+     * {@inheritdoc}
+     */
+    public function getClientId()
+    {
         return $this->clientId;
     }
 
-    public function setExpiresAt($timestamp) {
+    /**
+     * @param null|integer $timestamp
+     */
+    public function setExpiresAt($timestamp)
+    {
         $this->expiresAt = $timestamp;
     }
 
-    public function getExpiresIn() {
+    /**
+     * {@inheritdoc}
+     */
+    public function getExpiresIn()
+    {
         if ($this->expiresAt) {
             return $this->expiresAt - time();
         } else {
             return PHP_INT_MAX;
         }
     }
 
-    public function hasExpired() {
+    /**
+     * {@inheritdoc}
+     */
+    public function hasExpired()
+    {
         return time() > $this->expiresAt;
     }
 
-    public function setToken($token) {
+    /**
+     * @param string $token
+     */
+    public function setToken($token)
+    {
         $this->token = $token;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getToken()
     {
         return $this->token;
     }
 
-    public function setScope($scope) {
+    /**
+     * @param null|string $scope
+     */
+    public function setScope($scope)
+    {
         $this->scope = $scope;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getScope()
     {
         return $this->scope;
     }
 
-    public function setData($data) {
+    /**
+     * @param null|string $data
+     */
+    public function setData($data)
+    {
         $this->data = $data;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getData()
     {
         return $this->data;
     }
 }
-

lib/OAuth2/OAuth2.php

@@ -6,60 +6,74 @@
  * Send an error header with the given realm and an error, if provided.
  * Suitable for the bearer token type.
  *
- * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-bearer-04#section-2.4
+ * @see     http://tools.ietf.org/html/draft-ietf-oauth-v2-bearer-04#section-2.4
  *
  * @ingroup oauth2_error
  */
-class OAuth2AuthenticateException extends OAuth2ServerException {
-  
-  protected $header;
-  
-  /**
-   * 
-   * @param $http_status_code
-   *   HTTP status code message as predefined.
-   * @param $error
-   *   The "error" attribute is used to provide the client with the reason
-   *   why the access request was declined.
-   * @param $error_description
-   *   (optional) The "error_description" attribute provides a human-readable text
-   *   containing additional information, used to assist in the understanding
-   *   and resolution of the error occurred.
-   * @param $scope
-   *   A space-delimited list of scope values indicating the required scope
-   *   of the access token for accessing the requested resource.
-   */
-  public function __construct($httpCode, $tokenType, $realm, $error, $error_description = NULL, $scope = NULL) {
-    parent::__construct($httpCode, $error, $error_description);
-    
-    if ($scope) {
-      $this->errorData['scope'] = $scope;
-    }
-    
-    // Build header
-    $header = sprintf('%s realm=%s', ucwords($tokenType), $this->quotedString($realm));
-    foreach ($this->errorData as $key => $value) {
-      $header .= sprintf(', %s=%s', $key, $this->quotedString($value));
+class OAuth2AuthenticateException extends OAuth2ServerException
+{
+    /**
+     * @var array
+     */
+    protected $header;
+
+    /**
+     * @param string $httpCode
+     * @param string $tokenType
+     * @param string $realm
+     * @param string $error            The "error" attribute is used to provide the client with the reason why the access request was declined.
+     * @param string $errorDescription (optional) Human-readable text containing additional information, used to assist in the understanding and resolution of the error occurred.
+     * @param string $scope            (optional) A space-delimited list of scope values indicating the required scope of the access token for accessing the requested resource.
+     */
+    public function __construct($httpCode, $tokenType, $realm, $error, $errorDescription = null, $scope = null)
+    {
+        parent::__construct($httpCode, $error, $errorDescription);
+
+        if ($scope) {
+            $this->errorData['scope'] = $scope;
+        }
+
+        // Build header
+        $header = sprintf('%s realm=%s', ucwords($tokenType), $this->quote($realm));
+        foreach ($this->errorData as $key => $value) {
+            $header .= sprintf(', %s=%s', $key, $this->quote($value));
+        }
+
+        $this->header = array('WWW-Authenticate' => $header);
     }
-    $this->header = array('WWW-Authenticate' => $header);
-  }
 
-  public function getResponseHeaders() {
-    return $this->header + parent::getResponseHeaders();
-  }
+    /**
+     * @return array
+     */
+    public function getResponseHeaders()
+    {
+        return $this->header + parent::getResponseHeaders();
+    }
 
-  private function quotedString($str) {
+    /**
+     * Adds quotes around $text
+     *
+     * @param string $text
+     *
+     * @return string
+     */
+    private function quote($text)
+    {
+        // https://tools.ietf.org/html/draft-ietf-httpbis-p1-messaging-17#section-3.2.3
+        $text = preg_replace(
+            '~
+                        [^
+                            \x21-\x7E
+                            \x80-\xFF
+                            \ \t
+                        ]
+                        ~x',
+            '',
+            $text
+        );
 
-    // https://tools.ietf.org/html/draft-ietf-httpbis-p1-messaging-17#section-3.2.3
-    $str = preg_replace('~
-      [^
-        \x21-\x7E
-        \x80-\xFF
-        \ \t
-      ]
-      ~x', '', $str);
-    $str = addcslashes($str, '"\\');
+        $text = addcslashes($text, '"\\');
 
-    return '"' . $str . '"';
-  }
+        return '"' . $text . '"';
+    }
 }

lib/OAuth2/OAuth2AuthenticateException.php

@@ -2,7 +2,6 @@
 
 namespace OAuth2;
 
-
 /**
  * OAuth2.0 draft v10 exception handling.
  *
@@ -11,78 +10,80 @@
  *
  * @sa <a href="https://github.com/facebook/php-sdk">Facebook PHP SDK</a>.
  */
-class OAuth2Exception extends \Exception {
+class OAuth2Exception extends \Exception
+{
+    /**
+     * The result from the API server that represents the exception information.
+     *
+     * @var array
+     */
+    protected $result;
 
-  /**
-   * The result from the API server that represents the exception information.
-   */
-  protected $result;
+    /**
+     * Make a new API Exception with the given result.
+     *
+     * @param array $result The result from the API server.
+     */
+    public function __construct($result)
+    {
+        $this->result = $result;
 
-  /**
-   * Make a new API Exception with the given result.
-   *
-   * @param $result
-   *   The result from the API server.
-   */
-  public function __construct($result) {
-    $this->result = $result;
+        $code = isset($result['code']) ? $result['code'] : 0;
 
-    $code = isset($result['code']) ? $result['code'] : 0;
+        if (isset($result['error'])) {
+            // OAuth 2.0 Draft 10 style
+            $message = $result['error'];
+        } elseif (isset($result['message'])) {
+            // cURL style
+            $message = $result['message'];
+        } else {
+            $message = 'Unknown Error. Check getResult()';
+        }
 
-    if (isset($result['error'])) {
-      // OAuth 2.0 Draft 10 style
-      $message = $result['error'];
-    }
-    elseif (isset($result['message'])) {
-      // cURL style
-      $message = $result['message'];
-    }
-    else {
-      $message = 'Unknown Error. Check getResult()';
+        parent::__construct($message, $code);
     }
 
-    parent::__construct($message, $code);
-  }
+    /**
+     * Return the associated result object returned by the API server.
+     *
+     * @return array The result from the API server.
+     */
+    public function getResult()
+    {
+        return $this->result;
+    }
 
-  /**
-   * Return the associated result object returned by the API server.
-   *
-   * @returns
-   *   The result from the API server.
-   */
-  public function getResult() {
-    return $this->result;
-  }
+    /**
+     * Returns the associated type for the error. This will default to
+     * 'Exception' when a type is not available.
+     *
+     * @return string The type for the error.
+     */
+    public function getType()
+    {
+        if (isset($this->result['error'])) {
+            $message = $this->result['error'];
+            if (is_string($message)) {
+                // OAuth 2.0 Draft 10 style
+                return $message;
+            }
+        }
 
-  /**
-   * Returns the associated type for the error. This will default to
-   * 'Exception' when a type is not available.
-   *
-   * @return
-   *   The type for the error.
-   */
-  public function getType() {
-    if (isset($this->result['error'])) {
-      $message = $this->result['error'];
-      if (is_string($message)) {
-        // OAuth 2.0 Draft 10 style
-        return $message;
-      }
+        return 'Exception';
     }
-    return 'Exception';
-  }
 
-  /**
-   * To make debugging easier.
-   *
-   * @returns
-   *   The string representation of the error.
-   */
-  public function __toString() {
-    $str = $this->getType() . ': ';
-    if ($this->code != 0) {
-      $str .= $this->code . ': ';
+    /**
+     * To make debugging easier.
+     *
+     * @return string The string representation of the error.
+     */
+    public function __toString()
+    {
+        $str = $this->getType() . ': ';
+        if ($this->code != 0) {
+            $str .= $this->code . ': ';
+        }
+
+        return $str . $this->message;
     }
-    return $str . $this->message;
-  }
 }

lib/OAuth2/OAuth2Client.php

@@ -5,86 +5,86 @@
 /**
  * Redirect the end-user's user agent with error message.
  *
- * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-4.1
+ * @see     http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-4.1
  *
  * @ingroup oauth2_error
  */
-class OAuth2RedirectException extends OAuth2ServerException {
-  
-  protected $redirectUri;
-  
-  /**
-   * @param $redirect_uri
-   *   An absolute URI to which the authorization server will redirect the
-   *   user-agent to when the end-user authorization step is completed.
-   * @param $error
-   *   A single error code as described in Section 4.1.2.1
-   * @param $error_description
-   *   (optional) A human-readable text providing additional information,
-   *   used to assist in the understanding and resolution of the error
-   *   occurred.
-   * @param $state
-   *   (optional) REQUIRED if the "state" parameter was present in the client
-   *   authorization request. Set to the exact value received from the client.
-   *
-   * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-4.1.2.1
-   *
-   * @ingroup oauth2_error
-   */
-  public function __construct($redirect_uri, $error, $error_description = NULL, $state = NULL) {
-    parent::__construct(OAuth2::HTTP_FOUND, $error, $error_description);
-    
-    $this->redirectUri = $redirect_uri;
-    if ($state) {
-      $this->errorData['state'] = $state;
+class OAuth2RedirectException extends OAuth2ServerException
+{
+    /**
+     * Redirect URI
+     *
+     * @var string
+     */
+    protected $redirectUri;
+
+    /**
+     * @param string $redirectUri      An absolute URI to which the authorization server will redirect the user-agent to when the end-user authorization step is completed.
+     * @param string $error            A single error code as described in Section 4.1.2.1
+     * @param string $errorDescription (optional) A human-readable text providing additional information, used to assist in the understanding and resolution of the error occurred.
+     * @param string $state            (optional) REQUIRED if the "state" parameter was present in the client authorization request. Set to the exact value received from the client.
+     *
+     * @see     http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-4.1.2.1
+     *
+     * @ingroup oauth2_error
+     */
+    public function __construct($redirectUri, $error, $errorDescription = null, $state = null)
+    {
+        parent::__construct(OAuth2::HTTP_FOUND, $error, $errorDescription);
+
+        $this->redirectUri = $redirectUri;
+        if ($state) {
+            $this->errorData['state'] = $state;
+        }
     }
-    
-  }
-  
-  /**
-   * Redirect the user agent.
-   *
-   * @ingroup oauth2_section_4
-   */
-  public function getResponseHeaders() {
-    $params = array('query' => $this->errorData);
-    return array(
-        'Location' => $this->buildUri($this->redirectUri, $params),
-    );
-  }
 
-  /**
-   * Build the absolute URI based on supplied URI and parameters.
-   *
-   * @param $uri
-   *   An absolute URI.
-   * @param $params
-   *   Parameters to be append as GET.
-   *
-   * @return
-   *   An absolute URI with supplied parameters.
-   *
-   * @ingroup oauth2_section_4
-   */
-  protected function buildUri($uri, $params) {
-    $parse_url = parse_url($uri);
+    /**
+     * Redirect the user agent.
+     *
+     * @return array
+     *
+     * @ingroup oauth2_section_4
+     */
+    public function getResponseHeaders()
+    {
+        $params = array('query' => $this->errorData);
 
-    // Add our params to the parsed uri
-    foreach ($params as $k => $v) {
-      if (isset($parse_url[$k]))
-        $parse_url[$k] .= "&" . http_build_query($v);
-      else
-        $parse_url[$k] = http_build_query($v);
+        return array(
+            'Location' => $this->buildUri($this->redirectUri, $params),
+        );
     }
 
-    // Put humpty dumpty back together
-    return
-      ((isset($parse_url["scheme"])) ? $parse_url["scheme"] . "://" : "")
-      . ((isset($parse_url["user"])) ? $parse_url["user"] . ((isset($parse_url["pass"])) ? ":" . $parse_url["pass"] : "") . "@" : "")
-      . ((isset($parse_url["host"])) ? $parse_url["host"] : "")
-      . ((isset($parse_url["port"])) ? ":" . $parse_url["port"] : "")
-      . ((isset($parse_url["path"])) ? $parse_url["path"] : "")
-      . ((isset($parse_url["query"])) ? "?" . $parse_url["query"] : "")
-      . ((isset($parse_url["fragment"])) ? "#" . $parse_url["fragment"] : "");
-  }
+    /**
+     * Build the absolute URI based on supplied URI and parameters.
+     *
+     * @param string $uri    An absolute URI.
+     * @param array  $params Parameters to be append as GET.
+     *
+     * @return string An absolute URI with supplied parameters.
+     *
+     * @ingroup oauth2_section_4
+     */
+    protected function buildUri($uri, $params)
+    {
+        $parse_url = parse_url($uri);
+
+        // Add our params to the parsed uri
+        foreach ($params as $k => $v) {
+            if (isset($parse_url[$k])) {
+                $parse_url[$k] .= "&" . http_build_query($v);
+            } else {
+                $parse_url[$k] = http_build_query($v);
+            }
+        }
+
+        // Put humpty dumpty back together
+        return
+            ((isset($parse_url["scheme"])) ? $parse_url["scheme"] . "://" : "")
+            . ((isset($parse_url["user"])) ? $parse_url["user"] . ((isset($parse_url["pass"])) ? ":" . $parse_url["pass"] : "") . "@" : "")
+            . ((isset($parse_url["host"])) ? $parse_url["host"] : "")
+            . ((isset($parse_url["port"])) ? ":" . $parse_url["port"] : "")
+            . ((isset($parse_url["path"])) ? $parse_url["path"] : "")
+            . ((isset($parse_url["query"])) ? "?" . $parse_url["query"] : "")
+            . ((isset($parse_url["fragment"])) ? "#" . $parse_url["fragment"] : "");
+    }
 }

lib/OAuth2/OAuth2Exception.php

@@ -2,98 +2,119 @@
 
 namespace OAuth2;
 
-use Exception;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
- * OAuth2 errors that require termination of OAuth2 due to
- * an error.
- *
+ * OAuth2 errors that require termination of OAuth2 due to an error.
  */
-class OAuth2ServerException extends Exception {
-  
-  protected $httpCode;
-  protected $errorData = array();
-  
-  /**
-   * @param $http_status_code
-   *   HTTP status code message as predefined.
-   * @param $error
-   *   A single error code.
-   * @param $error_description
-   *   (optional) A human-readable text providing additional information,
-   *   used to assist in the understanding and resolution of the error
-   *   occurred.
-   */
-  public function __construct($http_status_code, $error, $error_description = NULL) {
-    parent::__construct($error);
-    
-    $this->httpCode = $http_status_code;
-    
-    $this->errorData['error'] = $error;
-    if ($error_description) {
-      $this->errorData['error_description'] = $error_description;
+class OAuth2ServerException extends \Exception
+{
+    /**
+     * @var string
+     */
+    protected $httpCode;
+
+    /**
+     * @var array
+     */
+    protected $errorData = array();
+
+    /**
+     * @param string $httpStatusCode   HTTP status code message as predefined.
+     * @param string $error            A single error code.
+     * @param string $errorDescription (optional) A human-readable text providing additional information, used to assist in the understanding and resolution of the error occurred.
+     */
+    public function __construct($httpStatusCode, $error, $errorDescription = null)
+    {
+        parent::__construct($error);
+
+        $this->httpCode = $httpStatusCode;
+
+        $this->errorData['error'] = $error;
+        $this->errorData['error_description'] = $errorDescription;
+    }
+
+    /**
+     * Get error description
+     *
+     * @return string
+     */
+    public function getDescription()
+    {
+        return $this->errorData['error_description'];
+    }
+
+    /**
+     * Get HTTP code
+     *
+     * @return string
+     */
+    public function getHttpCode()
+    {
+        return $this->httpCode;
     }
-  }
 
-  /**
-   * @return string 
-   */
-  public function getDescription() {
-    return isset($this->errorData['error_description']) ? $this->errorData['error_description'] : null;
-  }
-  
-  /**
-   * @return string 
-   */
-  public function getHttpCode() {
-    return $this->httpCode;
-  }
+    /**
+     * Get HTTP Error Response
+     *
+     * @return Response
+     *
+     * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-5.1
+     * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-5.2
+     *
+     * @ingroup oauth2_error
+     */
+    public function getHttpResponse()
+    {
+        return new Response(
+            $this->getResponseBody(),
+            $this->getHttpCode(),
+            $this->getResponseHeaders()
+        );
+    }
 
-  /**
-   * Get HTTP Error Response
-   *
-   * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-5.1
-   * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-5.2
-   *
-   * @ingroup oauth2_error
-   */
-  public function getHttpResponse() {
-    return new Response(
-      $this->getResponseBody(),
-      $this->getHttpCode(),
-      $this->getResponseHeaders()
-    );
-  }
+    /**
+     * Get HTTP Error Response headers
+     *
+     * @return array
+     *
+     * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-5.2
+     *
+     * @ingroup oauth2_error
+     */
+    public function getResponseHeaders()
+    {
+        return array(
+            'Content-Type' => 'application/json',
+            'Cache-Control' => 'no-store',
+            'Pragma' => 'no-cache',
+        );
+    }
 
-  /**
-   * Get HTTP Error Response headers
-   *
-   * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-5.2
-   *
-   * @ingroup oauth2_error
-   */
-  public function getResponseHeaders() {
-    return array(
-      'Content-Type' => 'application/json',
-      'Cache-Control' => 'no-store',
-      'Pragma' => 'no-cache',
-    );
-  }
+    /**
+     * Get response body as JSON string
+     *
+     * @return string
+     */
+    public function getResponseBody()
+    {
+        return json_encode($this->errorData);
+    }
 
-  public function getResponseBody() {
-    return json_encode($this->errorData);
-  }
-  
-  public function sendHttpResponse() {
-    $this->getHttpResponse()->send();
-    exit;
-  }
-  
-  /**
-   * @see Exception::__toString()
-   */
-  public function __toString() {
-    return $this->getResponseBody();
-  }
+    /**
+     * Outputs response
+     */
+    public function sendHttpResponse()
+    {
+        $this->getHttpResponse()->send();
+        exit; // TODO: refactor out this piece of code
+    }
+
+    /**
+     * @see \Exception::__toString()
+     */
+    public function __toString()
+    {
+        return $this->getResponseBody();
+    }
 }

lib/OAuth2/OAuth2RedirectException.php

@@ -7,32 +7,32 @@
  * Obviously not production-ready code, just simple and to the point.
  */
 
-include "lib/MongoOAuth2.php";
+include 'lib/MongoOAuth2.php';
 
 if ($_POST && isset($_POST["client_id"]) && isset($_POST["client_secret"]) && isset($_POST["redirect_uri"])) {
-  $oauth = new MongoOAuth2();
-  $oauth->addClient($_POST["client_id"], $_POST["client_secret"], $_POST["redirect_uri"]);
+    $oauth = new MongoOAuth2();
+    $oauth->addClient($_POST["client_id"], $_POST["client_secret"], $_POST["redirect_uri"]);
 }
 
 ?>
 
 <html>
-  <head>Add Client</head>
-  <body>
-    <form method="post" action="addclient.php">
-      <p>
-        <label for="client_id">Client ID:</label>
-        <input type="text" name="client_id" id="client_id" />
-      </p>
-      <p>
-        <label for="client_secret">Client Secret (password/key):</label>
-        <input type="text" name="client_secret" id="client_secret" />
-      </p>
-      <p>
-        <label for="redirect_uri">Redirect URI:</label>
-        <input type="text" name="redirect_uri" id="redirect_uri" />
-      </p>
-      <input type="submit" value="Submit" />
-    </form>
-  </body>
+    <head>Add Client</head>
+    <body>
+        <form method="post" action="addclient.php">
+            <p>
+                <label for="client_id">Client ID:</label>
+                <input type="text" name="client_id" id="client_id" />
+            </p>
+            <p>
+                <label for="client_secret">Client Secret (password/key):</label>
+                <input type="text" name="client_secret" id="client_secret" />
+            </p>
+            <p>
+                <label for="redirect_uri">Redirect URI:</label>
+                <input type="text" name="redirect_uri" id="redirect_uri" />
+            </p>
+            <input type="submit" value="Submit" />
+        </form>
+    </body>
 </html>

lib/OAuth2/OAuth2ServerException.php

@@ -9,33 +9,33 @@
  * In reality, you'd probably use a nifty framework to handle most of the crud for you.
  */
 
-require "lib/MongoOAuth2.php";
+require 'lib/MongoOAuth2.php';
 
 $oauth = new MongoOAuth2();
 
 if ($_POST) {
-  $oauth->finishClientAuthorization($_POST["accept"] == "Yep", $_POST);
+    $oauth->finishClientAuthorization($_POST["accept"] == "Yep", $_POST);
 }
 
 try {
-  $auth_params = $oauth->getAuthorizeParams();
+    $auth_params = $oauth->getAuthorizeParams();
 } catch (OAuth2ServerException $oauthError) {
-  $oauthError->sendHttpResponse();
+    $oauthError->sendHttpResponse();
 }
 
 ?>
 <html>
-  <head>Authorize</head>
-  <body>
-    <form method="post" action="authorize.php">
-      <?php foreach ($auth_params as $k => $v) { ?>
-      <input type="hidden" name="<?php echo $k ?>" value="<?php echo $v ?>" />
-      <?php } ?>
-      Do you authorize the app to do its thing?
-      <p>
-        <input type="submit" name="accept" value="Yep" />
-        <input type="submit" name="accept" value="Nope" />
-      </p>
-    </form>
-  </body>
+    <head>Authorize</head>
+    <body>
+        <form method="post" action="authorize.php">
+            <?php foreach ($auth_params as $k => $v) { ?>
+            <input type="hidden" name="<?php echo $k ?>" value="<?php echo $v ?>" />
+            <?php } ?>
+            Do you authorize the app to do its thing?
+            <p>
+                <input type="submit" name="accept" value="Yep" />
+                <input type="submit" name="accept" value="Nope" />
+            </p>
+        </form>
+    </body>
 </html>

server/examples/mongo/addclient.php

@@ -3,7 +3,7 @@
 /**
  * @file
  * Sample OAuth2 Library Mongo DB Implementation.
- * 
+ *
  */
 
 require_once __DIR__.'/../../../../lib/OAuth2.php';
@@ -14,174 +14,191 @@
 /**
  * Mongo storage engine for the OAuth2 Library.
  */
-class OAuth2StorageMongo implements IOAuth2GrantCode, IOAuth2RefreshTokens {
-
-  /**
-   * Change this to something unique for your system
-   * @var string
-   */
-  const SALT = 'CHANGE_ME!';
-  
-  const CONNECTION = 'mongodb://user:pass@mongoserver/mydb';
-  const DB = 'mydb';
-  
-  /**
-   * @var Mongo
-   */
-  private $db;
-
-  /**
-   * Implements OAuth2::__construct().
-   */
-  public function __construct(PDO $db) {
-
-    $mongo = new Mongo(self::CONNECTION);
-    $this->db = $mongo->selectDB(self::DB);
-  }
-
-  /**
-   * Release DB connection during destruct.
-   */
-  function __destruct() {
-    $this->db = NULL; // Release db connection
-  }
-
-  /**
-   * Handle PDO exceptional cases.
-   */
-  private function handleException($e) {
-    echo 'Database error: '. $e->getMessage();
-    exit;
-  }
-
-  /**
-   * Little helper function to add a new client to the database.
-   *
-   * @param $client_id
-   *   Client identifier to be stored.
-   * @param $client_secret
-   *   Client secret to be stored.
-   * @param $redirect_uri
-   *   Redirect URI to be stored.
-   */
-  public function addClient($client_id, $client_secret, $redirect_uri) {
-    $this->db->clients->insert(array(
-      "_id" => $client_id,
-      "pw" => $this->hash($client_secret, $client_id),
-      "redirect_uri" => $redirect_uri
-    ));
-  }
-
-  /**
-   * Implements IOAuth2Storage::checkClientCredentials().
-   *
-   */
-  public function checkClientCredentials($client_id, $client_secret = NULL) {
-    $client = $this->db->clients->findOne(array("_id" => $client_id, "pw" => $client_secret));
-    return $this->checkPassword($client_secret, $result['client_secret'], $client_id);
-  }
-
-  /**
-   * Implements IOAuth2Storage::getRedirectUri().
-   */
-  public function getClientDetails($client_id) {
-    $result = $this->db->clients->findOne(array("_id" => $client_id), array("redirect_uri"));
-  }
-
-  /**
-   * Implements IOAuth2Storage::getAccessToken().
-   */
-  public function getAccessToken($oauth_token) {
-  	return $this->db->tokens->findOne(array("_id" => $oauth_token));
-  }
-
-  /**
-   * Implements IOAuth2Storage::setAccessToken().
-   */
-  public function setAccessToken($oauth_token, $client_id, $user_id, $expires, $scope = NULL) {
-  	$this->db->tokens->insert(array(
-      "_id" => $oauth_token,
-      "client_id" => $client_id,
-      "expires" => $expires,
-      "scope" => $scope
-    ));
-  }
-  
-  /**
-   * @see IOAuth2Storage::getRefreshToken()
-   */
-  public function getRefreshToken($refresh_token) {
-    return $this->getToken($refresh_token, TRUE);
-  }
-  
-  /**
-   * @see IOAuth2Storage::setRefreshToken()
-   */
-  public function setRefreshToken($refresh_token, $client_id, $user_id, $expires, $scope = NULL) {
-    return $this->setToken($refresh_token, $client_id, $user_id, $expires, $scope, TRUE);
-  }
-  
-  /**
-   * @see IOAuth2Storage::unsetRefreshToken()
-   */
-  public function unsetRefreshToken($refresh_token) {
-    try {
-	  $sql = 'DELETE FROM '.self::TABLE_TOKENS.' WHERE refresh_token = :refresh_token';
-      $stmt = $this->db->prepare($sql);
-      $stmt->bindParam(':refresh_token', $refresh_token, PDO::PARAM_STR);
-      $stmt->execute();
-    } catch (PDOException $e) {
-	  $this->handleException($e);
-    }
-  }
-
-  /**
-   * Implements IOAuth2Storage::getAuthCode().
-   */
-  public function getAuthCode($code) {
-    $stored_code = $this->db->auth_codes->findOne(array("_id" => $code));
-    return $stored_code !== NULL ? $stored_code : FALSE;
-  }
-
-  /**
-   * Implements IOAuth2Storage::setAuthCode().
-   */
-  public function setAuthCode($code, $client_id, $user_id, $redirect_uri, $expires, $scope = NULL) {
-    $this->db->auth_codes->insert(array(
-      "_id" => $code,
-      "client_id" => $client_id,
-      "redirect_uri" => $redirect_uri,
-      "expires" => $expires,
-      "scope" => $scope
-    ));
-  }
-  
-  /**
-   * @see IOAuth2Storage::checkRestrictedGrantType()
-   */
-  public function checkRestrictedGrantType($client_id, $grant_type) {
-    return TRUE; // Not implemented
-  }
-  
-  /**
-   * Change/override this to whatever your own password hashing method is.
-   * 
-   * @param string $secret
-   * @return string
-   */
-  protected function hash($client_secret, $client_id) {
-  	return hash('blowfish', $client_id.$client_secret.self::SALT);
-  }
-  
-  /**
-   * Checks the password.
-   * Override this if you need to
-   * 
-   * @param string $client_id
-   * @param string $client_secret
-   * @param string $actualPassword
-   */
-  protected function checkPassword($try, $client_secret, $client_id) {
-  	return $try == $this->hash($client_secret, $client_id);
-  }
+class OAuth2StorageMongo implements IOAuth2GrantCode, IOAuth2RefreshTokens
+{
+    /**
+     * Change this to something unique for your system
+     * @var string
+     */
+    const SALT = 'CHANGE_ME!';
+
+    const CONNECTION = 'mongodb://user:pass@mongoserver/mydb';
+    const DB = 'mydb';
+
+    /**
+     * @var Mongo
+     */
+    private $db;
+
+    /**
+     * Implements OAuth2::__construct().
+     */
+    public function __construct(PDO $db)
+    {
+        $mongo = new Mongo(self::CONNECTION);
+        $this->db = $mongo->selectDB(self::DB);
+    }
+
+    /**
+     * Release DB connection during destruct.
+     */
+    public function __destruct()
+    {
+        $this->db = null; // Release db connection
+    }
+
+    /**
+     * Handle PDO exceptional cases.
+     */
+    private function handleException($e)
+    {
+        echo 'Database error: '. $e->getMessage();
+        exit;
+    }
+
+    /**
+     * Little helper function to add a new client to the database.
+     *
+     * @param $client_id
+     *   Client identifier to be stored.
+     * @param $client_secret
+     *   Client secret to be stored.
+     * @param $redirect_uri
+     *   Redirect URI to be stored.
+     */
+    public function addClient($client_id, $client_secret, $redirect_uri)
+    {
+        $this->db->clients->insert(array(
+            "_id" => $client_id,
+            "pw" => $this->hash($client_secret, $client_id),
+            "redirect_uri" => $redirect_uri
+        ));
+    }
+
+    /**
+     * Implements IOAuth2Storage::checkClientCredentials().
+     *
+     */
+    public function checkClientCredentials($client_id, $client_secret = null)
+    {
+        $client = $this->db->clients->findOne(array("_id" => $client_id, "pw" => $client_secret));
+
+        return $this->checkPassword($client_secret, $result['client_secret'], $client_id);
+    }
+
+    /**
+     * Implements IOAuth2Storage::getRedirectUri().
+     */
+    public function getClientDetails($client_id)
+    {
+        $result = $this->db->clients->findOne(array("_id" => $client_id), array("redirect_uri"));
+    }
+
+    /**
+     * Implements IOAuth2Storage::getAccessToken().
+     */
+    public function getAccessToken($oauth_token)
+    {
+        return $this->db->tokens->findOne(array("_id" => $oauth_token));
+    }
+
+    /**
+     * Implements IOAuth2Storage::setAccessToken().
+     */
+    public function setAccessToken($oauth_token, $client_id, $user_id, $expires, $scope = null)
+    {
+        $this->db->tokens->insert(array(
+            "_id" => $oauth_token,
+            "client_id" => $client_id,
+            "expires" => $expires,
+            "scope" => $scope
+        ));
+    }
+
+    /**
+     * @see IOAuth2Storage::getRefreshToken()
+     */
+    public function getRefreshToken($refresh_token)
+    {
+        return $this->getToken($refresh_token, true);
+    }
+
+    /**
+     * @see IOAuth2Storage::setRefreshToken()
+     */
+    public function setRefreshToken($refresh_token, $client_id, $user_id, $expires, $scope = null)
+    {
+        return $this->setToken($refresh_token, $client_id, $user_id, $expires, $scope, true);
+    }
+
+    /**
+     * @see IOAuth2Storage::unsetRefreshToken()
+     */
+    public function unsetRefreshToken($refresh_token)
+    {
+        try {
+            $sql = 'DELETE FROM '.self::TABLE_TOKENS.' WHERE refresh_token = :refresh_token';
+            $stmt = $this->db->prepare($sql);
+            $stmt->bindParam(':refresh_token', $refresh_token, PDO::PARAM_STR);
+            $stmt->execute();
+        } catch (PDOException $e) {
+            $this->handleException($e);
+        }
+    }
+
+    /**
+     * Implements IOAuth2Storage::getAuthCode().
+     */
+    public function getAuthCode($code)
+    {
+        $stored_code = $this->db->auth_codes->findOne(array("_id" => $code));
+
+        return $stored_code !== null ? $stored_code : false;
+    }
+
+    /**
+     * Implements IOAuth2Storage::setAuthCode().
+     */
+    public function setAuthCode($code, $client_id, $user_id, $redirect_uri, $expires, $scope = null)
+    {
+        $this->db->auth_codes->insert(array(
+            "_id" => $code,
+            "client_id" => $client_id,
+            "redirect_uri" => $redirect_uri,
+            "expires" => $expires,
+            "scope" => $scope
+        ));
+    }
+
+    /**
+     * @see IOAuth2Storage::checkRestrictedGrantType()
+     */
+    public function checkRestrictedGrantType($client_id, $grant_type)
+    {
+        return true; // Not implemented
+    }
+
+    /**
+     * Change/override this to whatever your own password hashing method is.
+     *
+     * @param  string $secret
+     * @return string
+     */
+    protected function hash($client_secret, $client_id)
+    {
+        return hash('blowfish', $client_id.$client_secret.self::SALT);
+    }
+
+    /**
+     * Checks the password.
+     * Override this if you need to
+     *
+     * @param string $client_id
+     * @param string $client_secret
+     * @param string $actualPassword
+     */
+    protected function checkPassword($try, $client_secret, $client_id)
+    {
+        return $try == $this->hash($client_secret, $client_id);
+    }
 }

server/examples/mongo/authorize.php

@@ -9,15 +9,15 @@
  * In reality, you'd probably use a nifty framework to handle most of the crud for you.
  */
 
-require "lib/OAuth2StorageMongo.php";
+require 'lib/OAuth2StorageMongo.php';
 
 $token = isset($_GET[OAuth2::TOKEN_PARAM_NAME]) ? $_GET[OAuth2::TOKEN_PARAM_NAME] : null;
 $oauth = new OAuth2(new OAuth2StorageMongo());
 
 try {
-  $oauth->verifyAccessToken($token);
+    $oauth->verifyAccessToken($token);
 } catch (OAuth2ServerException $oauthError) {
-  $oauthError->sendHttpResponse();
+    $oauthError->sendHttpResponse();
 }
 
 // With a particular scope, you'd do:
@@ -26,10 +26,10 @@
 ?>
 
 <html>
-  <head>
-    <title>Hello!</title>
-  </head>
-  <body>
-    <p>This is a secret.</p>
-  </body>
+    <head>
+        <title>Hello!</title>
+    </head>
+    <body>
+        <p>This is a secret.</p>
+    </body>
 </html>

server/examples/mongo/lib/OAuth2StorageMongo.php

@@ -9,12 +9,11 @@
  * In reality, you'd probably use a nifty framework to handle most of the crud for you.
  */
 
-require "lib/MongoOAuth2.php";
+require 'lib/MongoOAuth2.php';
 
 $oauth = new MongoOAuth2();
 try {
-  $oauth->grantAccessToken();
-}
-catch (OAuth2ServerException $oauthError) {
-  $oauthError->sendHttpResponse();
+    $oauth->grantAccessToken();
+} catch (OAuth2ServerException $oauthError) {
+    $oauthError->sendHttpResponse();
 }

server/examples/mongo/protected_resource.php

@@ -10,31 +10,31 @@
 require 'lib/bootstrap.php';
 
 if ($_POST && isset($_POST["client_id"]) && isset($_POST["client_secret"]) && isset($_POST["redirect_uri"])) {
-  $oauth = new OAuth2StoragePDO(newPDO());
-  $oauth->addClient($_POST["client_id"], $_POST["client_secret"], $_POST["redirect_uri"]);
+    $oauth = new OAuth2StoragePDO(newPDO());
+    $oauth->addClient($_POST["client_id"], $_POST["client_secret"], $_POST["redirect_uri"]);
 }
 
 ?>
 
 <html>
-  <head>
-  	<title>Add Client</title>
-  </head>
-  <body>
-    <form method="post" action="addclient.php">
-      <p>
-        <label for="client_id">Client ID:</label>
-        <input type="text" name="client_id" id="client_id" />
-      </p>
-      <p>
-        <label for="client_secret">Client Secret (password/key):</label>
-        <input type="text" name="client_secret" id="client_secret" />
-      </p>
-      <p>
-        <label for="redirect_uri">Redirect URI:</label>
-        <input type="text" name="redirect_uri" id="redirect_uri" />
-      </p>
-      <input type="submit" value="Submit" />
-    </form>
-  </body>
+    <head>
+        <title>Add Client</title>
+    </head>
+    <body>
+        <form method="post" action="addclient.php">
+            <p>
+                <label for="client_id">Client ID:</label>
+                <input type="text" name="client_id" id="client_id" />
+            </p>
+            <p>
+                <label for="client_secret">Client Secret (password/key):</label>
+                <input type="text" name="client_secret" id="client_secret" />
+            </p>
+            <p>
+                <label for="redirect_uri">Redirect URI:</label>
+                <input type="text" name="redirect_uri" id="redirect_uri" />
+            </p>
+            <input type="submit" value="Submit" />
+        </form>
+    </body>
 </html>

server/examples/mongo/token.php

@@ -3,8 +3,8 @@
  * @file
  * Sample authorize endpoint.
  *
- * This sample provides two click-jacking prevention methods, neither which are perfect. 
- * The javascript solution is similar to what facebook used to have (but can be defeated with a 
+ * This sample provides two click-jacking prevention methods, neither which are perfect.
+ * The javascript solution is similar to what facebook used to have (but can be defeated with a
  * specially crafted frame-wrapper).
  */
 
@@ -18,56 +18,56 @@
 
 /*
  * You would need to authenticate the user before authorization.
- * 
+ *
  * Below is some psudeo-code to show what you might do:
- * 
+ *
 session_start();
 if (!isLoggedIn()) {
-	redirectToLoginPage();
-	exit();
+        redirectToLoginPage();
+        exit();
 }
  */
 
 $oauth = new OAuth2(new OAuth2StoragePDO(newPDO()));
 
 if ($_POST) {
-  $userId = 123; // Use whatever method you have for identifying users.
-  try { 
-    $response = $oauth->finishClientAuthorization($_POST["accept"] == "Yep", $userId);
-    $response->send();
-  } catch(OAuth2ServerException $e) {
-    $e->getHttpResponse()->send();
-  }
-  exit;
+    $userId = 123; // Use whatever method you have for identifying users.
+    try {
+        $response = $oauth->finishClientAuthorization($_POST["accept"] == "Yep", $userId);
+        $response->send();
+    } catch (OAuth2ServerException $e) {
+        $e->getHttpResponse()->send();
+    }
+    exit;
 }
 
 try {
-  $auth_params = $oauth->getAuthorizeParams();
+    $auth_params = $oauth->getAuthorizeParams();
 } catch (OAuth2ServerException $oauthError) {
-  $oauthError->sendHttpResponse();
+    $oauthError->sendHttpResponse();
 }
 
 ?>
 <html>
-  <head>
-  <title>Authorize</title>
-  <script>
-	if (top != self) {
-		window.document.write("<div style='background:black; opacity:0.5; filter: alpha (opacity = 50); position: absolute; top:0px; left: 0px;"
-		+ "width: 9999px; height: 9999px; zindex: 1000001' onClick='top.location.href=window.location.href'></div>");
-	}
-  </script>
-  </head>
-  <body>
-    <form method="post" action="">
-      <?php foreach ($auth_params as $key => $value) : ?>
-      	<input type="hidden" name="<?php htmlspecialchars($key, ENT_QUOTES); ?>" value="<?php echo htmlspecialchars($value, ENT_QUOTES); ?>" />
-      <?php endforeach; ?>
-      Do you authorize the app to do its thing?
-      <p>
-        <input type="submit" name="accept" value="Yep" />
-        <input type="submit" name="accept" value="Nope" />
-      </p>
-    </form>
-  </body>
+    <head>
+    <title>Authorize</title>
+    <script>
+        if (top != self) {
+                window.document.write("<div style='background:black; opacity:0.5; filter: alpha (opacity = 50); position: absolute; top:0px; left: 0px;"
+                + "width: 9999px; height: 9999px; zindex: 1000001' onClick='top.location.href=window.location.href'></div>");
+        }
+    </script>
+    </head>
+    <body>
+        <form method="post" action="">
+            <?php foreach ($auth_params as $key => $value) : ?>
+                    <input type="hidden" name="<?php htmlspecialchars($key, ENT_QUOTES); ?>" value="<?php echo htmlspecialchars($value, ENT_QUOTES); ?>" />
+            <?php endforeach; ?>
+            Do you authorize the app to do its thing?
+            <p>
+                <input type="submit" name="accept" value="Yep" />
+                <input type="submit" name="accept" value="Nope" />
+            </p>
+        </form>
+    </body>
 </html>

server/examples/pdo/addclient.php

@@ -16,11 +16,11 @@
 
 require_once __DIR__ . '/OAuth2StoragePdo.php';
 
-function newPDO() {
-
+function newPDO()
+{
     $settings = parse_ini_file(__DIR__ . '/settings.ini');
     $pdo = new PDO($settings['dsn'], $settings['user'], $settings['password']);
     $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+
     return $pdo;
 }
-

server/examples/pdo/authorize.php

@@ -6,37 +6,37 @@ DROP TABLE IF EXISTS access_tokens;
 DROP TABLE IF EXISTS refresh_tokens;
 
 CREATE TABLE `auth_codes` (
-  `code` varchar(40) NOT NULL,
-  `client_id` varchar(20) NOT NULL,
-  `user_id` varchar(20) NOT NULL,
-  `redirect_uri` varchar(200) NOT NULL,
-  `expires` int(11) NOT NULL,
-  `scope` varchar(250) DEFAULT NULL,
-  PRIMARY KEY (`code`)
+    `code` varchar(40) NOT NULL,
+    `client_id` varchar(20) NOT NULL,
+    `user_id` varchar(20) NOT NULL,
+    `redirect_uri` varchar(200) NOT NULL,
+    `expires` int(11) NOT NULL,
+    `scope` varchar(250) DEFAULT NULL,
+    PRIMARY KEY (`code`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 CREATE TABLE `clients` (
-  `client_id` varchar(20) NOT NULL,
-  `client_secret` varchar(200) NOT NULL,
-  `redirect_uri` varchar(200) NOT NULL,
-  PRIMARY KEY (`client_id`)
+    `client_id` varchar(20) NOT NULL,
+    `client_secret` varchar(200) NOT NULL,
+    `redirect_uri` varchar(200) NOT NULL,
+    PRIMARY KEY (`client_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 CREATE TABLE `access_tokens` (
-  `oauth_token` varchar(40) NOT NULL,
-  `client_id` varchar(20) NOT NULL,
-  `user_id` int(11) UNSIGNED NOT NULL,
-  `expires` int(11) NOT NULL,
-  `scope` varchar(200) DEFAULT NULL,
-  PRIMARY KEY (`oauth_token`)
+    `oauth_token` varchar(40) NOT NULL,
+    `client_id` varchar(20) NOT NULL,
+    `user_id` int(11) UNSIGNED NOT NULL,
+    `expires` int(11) NOT NULL,
+    `scope` varchar(200) DEFAULT NULL,
+    PRIMARY KEY (`oauth_token`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 CREATE TABLE `refresh_tokens` (
-  `oauth_token` varchar(40) NOT NULL,
-  `refresh_token` varchar(40) NOT NULL,
-  `client_id` varchar(20) NOT NULL,
-  `user_id` int(11) UNSIGNED NOT NULL,
-  `expires` int(11) NOT NULL,
-  `scope` varchar(200) DEFAULT NULL,
-  PRIMARY KEY (`oauth_token`)
+    `oauth_token` varchar(40) NOT NULL,
+    `refresh_token` varchar(40) NOT NULL,
+    `client_id` varchar(20) NOT NULL,
+    `user_id` int(11) UNSIGNED NOT NULL,
+    `expires` int(11) NOT NULL,
+    `scope` varchar(200) DEFAULT NULL,
+    PRIMARY KEY (`oauth_token`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;

server/examples/pdo/lib/OAuth2StoragePdo.php

@@ -17,10 +17,10 @@
 $oauth = new OAuth2(new OAuth2StoragePDO(newPDO()));
 
 try {
-  $token = $oauth->getBearerToken();
-  $oauth->verifyAccessToken($token);
+    $token = $oauth->getBearerToken();
+    $oauth->verifyAccessToken($token);
 } catch (OAuth2ServerException $oauthError) {
-  $oauthError->sendHttpResponse();
+    $oauthError->sendHttpResponse();
 }
 
 // With a particular scope, you'd do:
@@ -29,10 +29,10 @@
 ?>
 
 <html>
-  <head>
+    <head>
     <title>Hello!</title>
-  </head>
-  <body>
+    </head>
+    <body>
     <p>This is a secret.</p>
-  </body>
+    </body>
 </html>

server/examples/pdo/lib/bootstrap.php

@@ -16,9 +16,8 @@
 
 $oauth = new OAuth2(new OAuth2StoragePDO(newPDO()));
 try {
-  $response = $oauth->grantAccessToken();
-  $response->send();
-}
-catch (OAuth2ServerException $oauthError) {
-  $oauthError->getHttpResponse()->send();
+    $response = $oauth->grantAccessToken();
+    $response->send();
+} catch (OAuth2ServerException $oauthError) {
+    $oauthError->getHttpResponse()->send();
 }

server/examples/pdo/mysql_create_tables.sql

@@ -28,9 +28,9 @@ public function getLastAuthCode()
         return end($this->authCodes);
     }
 
-    public function createAuthCode($code, IOAuth2Client $client, $data, $redirect_uri, $expires, $scope = NULL)
+    public function createAuthCode($code, IOAuth2Client $client, $data, $redirectUri, $expires, $scope = null)
     {
-        $token = new OAuth2AuthCode($client->getPublicId(), $code, $expires, $scope, $data, $redirect_uri);
+        $token = new OAuth2AuthCode($client->getPublicId(), $code, $expires, $scope, $data, $redirectUri);
         $this->authCodes[$code] = $token;
     }
 

server/examples/pdo/protected_resource.php

@@ -33,15 +33,16 @@ public function getClients()
         return $this->clients;
     }
 
-    public function checkClientCredentials(IOAuth2Client $client, $client_secret = NULL)
+    public function checkClientCredentials(IOAuth2Client $client, $clientSecret = null)
     {
-        return $client->checkSecret($client_secret);
+        return $client->checkSecret($clientSecret);
     }
 
-    public function createAccessToken($oauth_token, IOAuth2Client $client, $data, $expires, $scope = NULL)
+    public function createAccessToken($oauthToken, IOAuth2Client $client, $data, $expires, $scope = null)
     {
-        $token = new OAuth2AccessToken($client->getPublicId(), $oauth_token, $expires, $scope, $data);
-        $this->accessTokens[$oauth_token] = $token;
+        $token = new OAuth2AccessToken($client->getPublicId(), $oauthToken, $expires, $scope, $data);
+
+        $this->accessTokens[$oauthToken] = $token;
     }
 
     public function getAccessToken($oauth_token)
@@ -66,8 +67,8 @@ public function setAllowedGrantTypes(array $types)
         $this->allowedGrantTypes = $types;
     }
 
-    public function checkRestrictedGrantType(IOAuth2Client $client, $grant_type)
+    public function checkRestrictedGrantType(IOAuth2Client $client, $grantType)
     {
-        return in_array($grant_type, $this->allowedGrantTypes);
+        return in_array($grantType, $this->allowedGrantTypes);
     }
 }

server/examples/pdo/token.php

@@ -4,10 +4,10 @@
 
 use OAuth2\Model\OAuth2Token;
 
-class OAuth2TokenTest extends \PHPUnit_Framework_TestCase {
-
-    public function testConstruct() {
-
+class OAuth2TokenTest extends \PHPUnit_Framework_TestCase
+{
+    public function testConstruct()
+    {
         $expiresAt = time() + 42;
         $data = new \stdClass;
 
@@ -23,14 +23,15 @@ public function testConstruct() {
     }
 
     /** @dataProvider getTestExpiresData */
-    public function testExpires($offset, $expired) {
-
+    public function testExpires($offset, $expired)
+    {
         $token = new OAuth2Token('foo', 'bar', time() + $offset);
 
         $this->assertSame($expired, $token->hasExpired());
     }
 
-    public function getTestExpiresData() {
+    public function getTestExpiresData()
+    {
         return array(
             array(-10, true),
             array(-5, true),
@@ -39,4 +40,3 @@ public function getTestExpiresData() {
         );
     }
 }
-

tests/OAuth2/Tests/Fixtures/OAuth2GrantCodeStub.php

@@ -8,83 +8,85 @@
 /**
  * OAuth2 test cases that invovle capturing output.
  */
-class OAuth2OutputTest extends PHPUnit_Framework_TestCase {
-  
-  /**
-   * @var OAuth2
-   */
-  private $fixture;
-  
-  /**
-   * Tests OAuth2->grantAccessToken() with successful Auth code grant
-   * 
-   */
-  public function testGrantAccessTokenWithGrantAuthCodeSuccess() {
-    $request = new Request(
-      array('grant_type' => OAuth2::GRANT_TYPE_AUTH_CODE, 'redirect_uri' => 'http://www.example.com/my/subdir', 'client_id' => 'my_little_app', 'client_secret' => 'b', 'code'=> 'foo')
-    );
-    $storedToken = new OAuth2AuthCode('my_little_app', '', time() + 60, NULL, NULL, 'http://www.example.com');
+class OAuth2OutputTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @var OAuth2
+     */
+    private $fixture;
 
-    $mockStorage = $this->createBaseMock('OAuth2\IOAuth2GrantCode');
-    $mockStorage->expects($this->any())
-      ->method('getAuthCode')
-      ->will($this->returnValue($storedToken));
-      
-    $this->fixture = new OAuth2($mockStorage);
-    $response = $this->fixture->grantAccessToken($request);
+    /**
+     * Tests OAuth2->grantAccessToken() with successful Auth code grant
+     *
+     */
+    public function testGrantAccessTokenWithGrantAuthCodeSuccess()
+    {
+        $request = new Request(
+            array('grant_type' => OAuth2::GRANT_TYPE_AUTH_CODE, 'redirect_uri' => 'http://www.example.com/my/subdir', 'client_id' => 'my_little_app', 'client_secret' => 'b', 'code'=> 'foo')
+        );
+        $storedToken = new OAuth2AuthCode('my_little_app', '', time() + 60, null, null, 'http://www.example.com');
 
-    // Successful token grant will return a JSON encoded token:
-    $this->assertRegexp('/{"access_token":".*","expires_in":\d+,"token_type":"bearer"/', $response->getContent());
-  }
-  
-  /**
-   * Tests OAuth2->grantAccessToken() with successful Auth code grant, but without redreict_uri in the input
-   */
-  public function testGrantAccessTokenWithGrantAuthCodeSuccessWithoutRedirect() {
-    $request = new Request(
-      array('grant_type' => OAuth2::GRANT_TYPE_AUTH_CODE, 'client_id' => 'my_little_app', 'client_secret' => 'b', 'code'=> 'foo')
-    );
-    $storedToken = new OAuth2AuthCode('my_little_app', '', time() + 60, NULL, NULL, 'http://www.example.com');
-    
-    $mockStorage = $this->createBaseMock('OAuth2\IOAuth2GrantCode');
-    $mockStorage->expects($this->any())
-      ->method('getAuthCode')
-      ->will($this->returnValue($storedToken));
-      
-    $this->fixture = new OAuth2($mockStorage);
-    $this->fixture->setVariable(OAuth2::CONFIG_ENFORCE_INPUT_REDIRECT, false); 
-    $response = $this->fixture->grantAccessToken($request);
+        $mockStorage = $this->createBaseMock('OAuth2\IOAuth2GrantCode');
+        $mockStorage->expects($this->any())
+            ->method('getAuthCode')
+            ->will($this->returnValue($storedToken));
+
+        $this->fixture = new OAuth2($mockStorage);
+        $response = $this->fixture->grantAccessToken($request);
+
+        // Successful token grant will return a JSON encoded token:
+        $this->assertRegexp('/{"access_token":".*","expires_in":\d+,"token_type":"bearer"/', $response->getContent());
+    }
+
+    /**
+     * Tests OAuth2->grantAccessToken() with successful Auth code grant, but without redreict_uri in the input
+     */
+    public function testGrantAccessTokenWithGrantAuthCodeSuccessWithoutRedirect()
+    {
+        $request = new Request(
+            array('grant_type' => OAuth2::GRANT_TYPE_AUTH_CODE, 'client_id' => 'my_little_app', 'client_secret' => 'b', 'code'=> 'foo')
+        );
+        $storedToken = new OAuth2AuthCode('my_little_app', '', time() + 60, null, null, 'http://www.example.com');
+
+        $mockStorage = $this->createBaseMock('OAuth2\IOAuth2GrantCode');
+        $mockStorage->expects($this->any())
+            ->method('getAuthCode')
+            ->will($this->returnValue($storedToken));
+
+        $this->fixture = new OAuth2($mockStorage);
+        $this->fixture->setVariable(OAuth2::CONFIG_ENFORCE_INPUT_REDIRECT, false);
+        $response = $this->fixture->grantAccessToken($request);
+
+        // Successful token grant will return a JSON encoded token:
+        $this->assertRegexp('/{"access_token":".*","expires_in":\d+,"token_type":"bearer"/', $response->getContent());
+    }
 
-    // Successful token grant will return a JSON encoded token:
-    $this->assertRegexp('/{"access_token":".*","expires_in":\d+,"token_type":"bearer"/', $response->getContent());
-  }
-  
 // Utility methods
-  
-  /**
-   * 
-   * @param string $interfaceName
-   */
-  protected function createBaseMock($interfaceName) {
 
-    $client = new OAuth2Client('my_little_app');
+    /**
+     *
+     * @param string $interfaceName
+     */
+    protected function createBaseMock($interfaceName)
+    {
+        $client = new OAuth2Client('my_little_app');
+
+        $mockStorage = $this->getMock($interfaceName);
+        $mockStorage->expects($this->any())
+            ->method('getClient')
+            ->will($this->returnCallback(function ($id) use ($client) {
+                if ('my_little_app' === $id) {
+                    return $client;
+                }
+            }));
+        $mockStorage->expects($this->any())
+            ->method('checkClientCredentials')
+            ->will($this->returnValue(true)); // Always return true for any combination of user/pass
+        $mockStorage->expects($this->any())
+            ->method('checkRestrictedGrantType')
+            ->will($this->returnValue(true)); // Always return true for any combination of user/pass
+
+         return $mockStorage;
+    }
 
-    $mockStorage = $this->getMock($interfaceName);
-    $mockStorage->expects($this->any())
-      ->method('getClient')
-      ->will($this->returnCallback(function($id) use ($client) {
-        if ('my_little_app' === $id) {
-          return $client;
-        }
-      }));
-    $mockStorage->expects($this->any())
-      ->method('checkClientCredentials')
-      ->will($this->returnValue(TRUE)); // Always return true for any combination of user/pass
-    $mockStorage->expects($this->any())
-      ->method('checkRestrictedGrantType')
-      ->will($this->returnValue(TRUE)); // Always return true for any combination of user/pass
-      
-     return $mockStorage;
-  }
-  
 }