Rejiggery.

.travis.yml

@@ -5,7 +5,7 @@ php:
   - 5.5
   - 5.6
   - hhvm
-  
+
 matrix:
   allow_failures:
     - php: hhvm

CHANGELOG.md

@@ -1,9 +1,5 @@
 # Changelog
 
-## 3.2.2 (released 2014-07-23)
-
-* Fix Resource server Request HTTP header access (Issue #188)
-
 ## 3.2 (released 2014-04-16)
 
 * Added the ability to change the algorithm that is used to generate the token strings (Issue #151)

README.md

@@ -12,7 +12,7 @@ The framework is provided as a Composer package which can be installed by adding
 ```javascript
 {
 	"require": {
-		"league/oauth2-server": "3.*"
+		"league/oauth2-server": "~3.2"
 	}
 }
 ```
@@ -42,13 +42,27 @@ The authorization server is a flexible class and the following core specificatio
 * client credentials ([section 2.3.1](http://tools.ietf.org/html/rfc6749#section-2.3.1))
 * password (user credentials) ([section 4.3](http://tools.ietf.org/html/rfc6749#section-4.3))
 
+An [overview of the different OAuth 2.0 grants](https://github.com/thephpleague/oauth2-server/wiki/Which-OAuth-2.0-grant-should-I-use%3F) can be found in the [wiki].
+
 ### Resource Server
 
 The resource server allows you to secure your API endpoints by checking for a valid OAuth access token in the request and ensuring the token has the correct scope(s) (i.e. permissions) to access resources.
 
 ### Custom grants
 
-Custom grants can be created easily by implementing an interface.
+Custom grants can be created easily by implementing an interface. Check out the [custom grant guide](https://github.com/thephpleague/oauth2-server/wiki/Creating-custom-grants).
+
+## Tutorials and Documentation
+
+* **[Wiki]** - The wiki has lots of guides on how to use this library.
+
+* **[Developing an OAuth-2.0 Authorization Server]** - A simple tutorial on how to use the authorization server.
+
+* **[Securing your API with OAuth 2.0]** - A simple tutorial on how to use the resource server to secure an API server.
+
+[Wiki]: https://github.com/thephpleague/oauth2-server/wiki
+[Securing your API with OAuth 2.0]: https://github.com/thephpleague/oauth2-server/wiki/Securing-your-API-with-OAuth-2.0
+[Developing an OAuth-2.0 Authorization Server]: https://github.com/thephpleague/oauth2-server/wiki/Developing-an-OAuth-2.0-authorization-server
 
 ## Changelog
 

composer.json

@@ -6,7 +6,7 @@
 		"php": ">=5.4.0"
 	},
 	"require-dev": {
-		"mockery/mockery": "~0.8",
+		"mockery/mockery": ">=0.7.2",
 		"league/phpunit-coverage-listener": "~1.0"
 	},
 	"repositories": [
@@ -43,9 +43,7 @@
 			"League\\OAuth2\\Server": "src/"
 		}
 	},
-	"extra": {
-		"branch-alias": {
-			"dev-master": "3.2.x-dev"
-		}
+	"suggest": {
+
 	}
 }

src/League/OAuth2/Server/Resource.php

@@ -84,7 +84,6 @@ class Resource
         0   =>  'invalid_request',
         1   =>  'invalid_token',
         2   =>  'insufficient_scope',
-        3   =>  'missing_token',
     );
 
     /**
@@ -95,7 +94,6 @@ class Resource
         'invalid_request'    =>  'The request is missing a required parameter, includes an invalid parameter value, includes a parameter more than once, or is otherwise malformed. Check the "%s" parameter.',
         'invalid_token'      =>  'The access token provided is expired, revoked, malformed, or invalid for other reasons.',
         'insufficient_scope' =>  'The request requires higher privileges than provided by the access token. Required scopes are: %s.',
-        'missing_token'      =>  'The request is missing an access token in either the Authorization header or the %s request parameter.',
     );
 
     /**
@@ -111,7 +109,6 @@ class Resource
         'invalid_request'    =>  400,
         'invalid_token'      =>  401,
         'insufficient_scope' =>  403,
-        'missing_token'      =>  400,
     );
 
     /**
@@ -168,7 +165,7 @@ class Resource
         // @codeCoverageIgnoreStart
         if ($error === 'invalid_token') {
             $authScheme = null;
-            $request = Request::buildFromGlobals();
+            $request = new Request();
             if ($request->server('PHP_AUTH_USER') !== null) {
                 $authScheme = 'Basic';
             } else {
@@ -390,7 +387,7 @@ class Resource
         }
 
         if (empty($accessToken)) {
-            throw new Exception\MissingAccessTokenException(sprintf(self::$exceptionMessages['missing_token'], $this->tokenKey), 3);
+            throw new Exception\MissingAccessTokenException(self::$exceptionMessages['invalid_request'], 0);
         }
 
         return $accessToken;

src/League/OAuth2/Server/Util/Request.php

@@ -76,25 +76,22 @@ class Request implements RequestInterface
 
     protected function readHeaders()
     {
-        if (function_exists('apache_request_headers')) {
+        if (function_exists('getallheaders')) {
             // @codeCoverageIgnoreStart
-            $headers = apache_request_headers();
-        } elseif (function_exists('http_get_request_headers')) {
-            $headers = http_get_request_headers();
+            $headers = getallheaders();
         } else {
             // @codeCoverageIgnoreEnd
             $headers = array();
             foreach ($this->server() as $name => $value) {
                 if (substr($name, 0, 5) == 'HTTP_') {
-                    // HTTP_FOO_BAR becomes FOO-BAR
-                    $name = str_replace(array('HTTP_', '_'), array('', '-'), $name);
+                    $name = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))));
                     $headers[$name] = $value;
                 }
             }
         }
 
         return $this->normalizeHeaders($headers);
-    }
+   }
 
     protected function getPropertyValue($property, $index = null, $default = null)
     {
@@ -146,4 +143,4 @@ class Request implements RequestInterface
 
         return $key;
     }
-}
+}