Merge branch 'release/1.0.5'

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.5 (released 2013-02-21)
+
+* Fixed the SQL example for SessionInterface::getScopes()
+
 ## 1.0.3 (released 2013-02-20)
 
 * Changed all instances of the "authentication server" to "authorization server"

composer.json

@@ -1,7 +1,7 @@
 {
 	"name": "lncd/oauth2",
 	"description": "OAuth 2.0 Framework",
-	"version": "1.0.3",
+	"version": "1.0.5",
 	"homepage": "https://github.com/lncd/OAuth2",
 	"license": "MIT",
 	"require": {

src/OAuth2/Storage/SessionInterface.php

@@ -225,10 +225,9 @@ interface SessionInterface
      * Example SQL query:
      *
      * <code>
-     * SELECT oauth_scopes.scope, oauth_scopes.name, oauth_scopes.description
+     * SELECT oauth_scopes.scope FROM oauth_session_scopes JOIN oauth_scopes ON
-     *  FROM oauth_session_scopes JOIN oauth_scopes ON
+     *  oauth_session_scopes.scope_id = oauth_scopes.id WHERE
-     *  oauth_session_scopes.scope = oauth_scopes.scope
+     *  session_id = $sessionId
-     *  WHERE access_token = $accessToken
      * </code>
      *
      * Response:
@@ -236,17 +235,16 @@ interface SessionInterface
      * <code>
      * Array
      * (
-     *     [0] => Array
+     *     [0] => (string) The scope
-     *         (
+     *     [1] => (string) The scope
-     *             [scope] => (string) The scope
+     *     [2] => (string) The scope
-     *             [name] => (string) The scope's name
+     *     ...
-     *             [description] => (string) The scope's description
+     *     ...
-     *         )
      * )
      * </code>
      *
-     * @param  string $accessToken The access token
+     * @param  int   $sessionId The session ID
      * @return array
      */
-    public function getScopes($accessToken);
+    public function getScopes($sessionId);
 }