From ffcad85d95fae42f017b54d8931009d478156563 Mon Sep 17 00:00:00 2001
From: Alex Bilbie <hello@alexbilbie.com>
Date: Tue, 29 Jan 2013 16:21:21 +0000
Subject: [PATCH] Renamed functions, changed some doc terms

---
 src/OAuth2/Storage/SessionInterface.php | 33 +++++++++++--------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/OAuth2/Storage/SessionInterface.php b/src/OAuth2/Storage/SessionInterface.php
index eb660451..a84e50d2 100644
--- a/src/OAuth2/Storage/SessionInterface.php
+++ b/src/OAuth2/Storage/SessionInterface.php
@@ -7,7 +7,7 @@ interface SessionInterface
 	/**
      * Create a new OAuth session
      *
-     * Database query:
+     * Example SQL query:
      *
      * <code>
      * INSERT INTO oauth_sessions (client_id, redirect_uri, owner_type,
@@ -26,7 +26,7 @@ interface SessionInterface
      * @param  string $stage        The stage of the session (default ="request")
      * @return  int The session ID
      */
-    public function new(
+    public function create(
         $clientId,
         $redirectUri,
         $type = 'user',
@@ -41,7 +41,7 @@ interface SessionInterface
     /**
      * Update an OAuth session
      *
-     * Database query:
+     * Example SQL query:
      *
      * <code>
      * UPDATE oauth_sessions SET auth_code = $authCode, access_token =
@@ -87,7 +87,7 @@ interface SessionInterface
     /**
      * Return the session ID for a given session owner and client combination
      *
-     * Database query:
+     * Example SQL query:
      *
      * <code>
      * SELECT id FROM oauth_sessions WHERE client_id = $clientId
@@ -109,7 +109,7 @@ interface SessionInterface
     /**
      * Validate that an authorisation code is valid
      *
-     * Database query:
+     * Example SQL query:
      *
      * <code>
      * SELECT id FROM oauth_sessions WHERE client_id = $clientID AND
@@ -150,7 +150,7 @@ interface SessionInterface
     /**
      * Removes an authorisation code associated with a session
      *
-     * Database query:
+     * Example SQL query:
      *
      * <code>
      * UPDATE oauth_sessions SET auth_code = NULL WHERE id = $sessionId
@@ -164,7 +164,7 @@ interface SessionInterface
     /**
      * Sets a sessions access token
      *
-     * Database query:
+     * Example SQL query:
      *
      * <code>
      * UPDATE oauth_sessions SET access_token = $accessToken WHERE id =
@@ -185,7 +185,7 @@ interface SessionInterface
     /**
      * Return the access token for a given session
      *
-     * Database query:
+     * Example SQL query:
      *
      * <code>
      * SELECT access_token FROM oauth_sessions WHERE id = $sessionId
@@ -202,7 +202,7 @@ interface SessionInterface
     /**
      * Update the refresh token
      *
-     * Database query:
+     * Example SQL query:
      *
      * <code>
      * UPDATE oauth_sessions SET access_token = $newAccessToken, refresh_token =
@@ -221,26 +221,23 @@ interface SessionInterface
     /**
      * Associates a session with a scope
      *
-     * Database query:
+     * Example SQL query:
      *
      * <code>
-     * INSERT INTO oauth_session_scopes (session_id, scope) VALUE ($sessionId,
-     *  $scope)
+     * INSERT INTO oauth_session_scopes (session_id, scope_id) VALUE ($sessionId,
+     *  $scopeId)
      * </code>
      *
      * @param int    $sessionId The session ID
-     * @param string $scope     The scope
+     * @param string $scope     The scope ID
      * @return void
      */
-    public function associateScope(
-        $sessionId,
-        $scope
-    );
+    public function associateScope($sessionId, $scopeId);
 
     /**
      * Return the scopes associated with an access token
      *
-     * Database query:
+     * Example SQL query:
      *
      * <code>
      * SELECT scopes.scope, scopes.name, scopes.description FROM