Merge branch 'release/1.0.5'

v1.0.5
Update getScopes
2025-05-31 14:12:07 +05:30 · 2013-02-21 17:51:59 +00:00 · 2013-02-21 17:51:51 +00:00 · 2013-02-21 17:51:01 +00:00 · 2013-02-21 17:45:27 +00:00 · 2013-02-21 17:44:42 +00:00
3 changed files with 8 additions and 10 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog

-## 1.0.4 (released 2013-02-21)
+## 1.0.5 (released 2013-02-21)

 * Fixed the SQL example for SessionInterface::getScopes()

--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
 	"name": "lncd/oauth2",
 	"description": "OAuth 2.0 Framework",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"homepage": "https://github.com/lncd/OAuth2",
 	"license": "MIT",
 	"require": {
--- a/src/OAuth2/Storage/SessionInterface.php
+++ b/src/OAuth2/Storage/SessionInterface.php
@@ -225,8 +225,7 @@ interface SessionInterface
     * Example SQL query:
     *
     * <code>
-     * SELECT oauth_scopes.scope, oauth_scopes.name, oauth_scopes.description
-     *  FROM oauth_session_scopes JOIN oauth_scopes ON
+     * SELECT oauth_scopes.scope FROM oauth_session_scopes JOIN oauth_scopes ON
     *  oauth_session_scopes.scope_id = oauth_scopes.id WHERE
     *  session_id = $sessionId
     * </code>
@@ -236,12 +235,11 @@ interface SessionInterface
     * <code>
     * Array
     * (
-     *     [0] => Array
-     *         (
-     *             [scope] => (string) The scope
-     *             [name] => (string) The scope's name
-     *             [description] => (string) The scope's description
-     *         )
+     *     [0] => (string) The scope
+     *     [1] => (string) The scope
+     *     [2] => (string) The scope
+     *     ...
+     *     ...
     * )
     * </code>
     *
Author	SHA1	Message	Date
Alex Bilbie	e04e6d2fae	Merge branch 'release/1.0.5'	2013-02-21 17:51:59 +00:00
Alex Bilbie	e555f67c8d	v1.0.5	2013-02-21 17:51:51 +00:00
Alex Bilbie	822669fc0c	Update getScopes	2013-02-21 17:51:01 +00:00
Alex Bilbie	828bc299b2	Merge branch 'develop' of github.com:lncd/OAuth2 into develop	2013-02-21 17:45:27 +00:00
Alex Bilbie	d22e489626	Merge branch 'release/1.0.4' into develop	2013-02-21 17:44:42 +00:00
Alex Bilbie	6b2f5944ef	Merge branch 'release/1.0.1' into develop	2013-02-19 00:42:49 +00:00