Merge branch 'release/0.3.4'

Version bump
Clean trailing whitespace
2025-05-31 14:12:07 +05:30 · 2012-12-11 15:33:05 +00:00 · 2012-12-11 15:32:27 +00:00 · 2012-12-11 15:31:42 +00:00 · 2012-12-11 12:09:56 +00:00 · 2012-12-10 21:31:58 +00:00
2 changed files with 41 additions and 39 deletions
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
 	"name": "lncd/oauth2",
 	"description": "OAuth 2.0 Framework",
-	"version": "0.3.2",
+	"version": "0.3.4",
 	"homepage": "https://github.com/lncd/OAuth2",
 	"license": "MIT",
 	"require": {
@@ -29,7 +29,7 @@
 		{
 			"name": "Alex Bilbie",
 			"email": "hello@alexbilbie.com",
-			"homepage": "http://www.httpster.org",
+			"homepage": "http://www.alexbilbie.com",
 			"role": "Developer"
 		}
 	],
--- a/src/Oauth2/Authentication/Server.php
+++ b/src/Oauth2/Authentication/Server.php
@@ -163,6 +163,8 @@ class Server
            throw new ClientException($this->errors['invalid_client'], 8);
        }

+        $params['client_details'] = $clientDetails;
+
        // Response type
        if ( ! isset($authParams['response_type']) && ! isset($_GET['response_type'])) {

@@ -297,7 +299,7 @@ class Server
                $typeId,
                $authCode,
                $accessToken,
-                'request'
+                'requested'
            );

        } else {
@@ -315,7 +317,7 @@ class Server
                $authCode,
                null,
                null,
-                'request'
+                'requested'
            );

            // Add the scopes
Author	SHA1	Message	Date
Alex Bilbie	1be25955d6	Merge branch 'release/0.3.4'	2012-12-11 15:33:05 +00:00
Alex Bilbie	3365953257	Version bump	2012-12-11 15:32:27 +00:00
Alex Bilbie	302bf1f70d	Clean trailing whitespace	2012-12-11 15:31:42 +00:00
Alex Bilbie	6553fb3f22	Return client details	2012-12-11 12:09:56 +00:00
Alex Bilbie	fdfe80289a	Merge branch 'release/0.3.3'. Release version 0.3.3 Conflicts: composer.json	2012-12-10 21:31:58 +00:00
Alex Bilbie	0ed6674ceb	Version bump. Fixed website	2012-12-10 21:31:08 +00:00
Alex Bilbie	912cd3fa25	Changed session stage to 'requested' as per enum	2012-12-10 21:19:11 +00:00
Alex Bilbie	b2188514d9	Merge branch 'release/0.3' into develop	2012-10-14 17:21:04 +01:00