Merge branch 'release/1.0.5'

This commit is contained in:
Alex Bilbie 2013-02-21 17:51:59 +00:00
commit e04e6d2fae
3 changed files with 8 additions and 10 deletions

View File

@ -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()

View File

@ -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": {

View File

@ -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>
*