Merge branch 'release/0.3.5'

Conflicts:
	composer.json

composer.json

@@ -1,7 +1,7 @@
 {
 	"name": "lncd/oauth2",
 	"description": "OAuth 2.0 Framework",
-	"version": "0.3.2",
+	"version": "0.3.5",
 	"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"
 		}
 	],

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

src/Oauth2/Resource/Server.php

@@ -75,7 +75,7 @@ class Server
     public function __construct($options = null)
     {
         if ($options !== null) {
-            $this->config = array_merge($this->config, $options);
+            $this->_config = array_merge($this->_config, $options);
         }
     }