Merge branch 'master' of github.com:lucadegasperi/oauth2-server-laravel

Author: lucadegasperi

CONTRIBUTING.md

@@ -0,0 +1,15 @@
+Thanks for contributing to this project.
+
+Everytime you open an issue please state which version of Laravel are you using and which version of this package are you using.
+This is very important so that problems can be issued quicker.
+
+
+Please ensure that you run `phpunit` from the project root after you've made any changes.
+
+If you've added something new please create a new unit test, if you've changed something please update any unit tests as appropritate.
+
+We're trying to ensure there is **100%** test code coverage (including testing PHP errors and exceptions) so please ensure any new/updated tests cover all of your changes.
+
+Thank you,
+
+@lucadegasperi

src/Authorizer.php

@@ -73,12 +73,11 @@ public function getChecker()
 
     /**
      * Issue an access token if the request parameters are valid
-     * @param array $params optional array of parsed $_POST keys
      * @return array a response object for the protocol in use
      */
-    public function issueAccessToken($params = [])
+    public function issueAccessToken()
     {
-        return $this->issuer->issueAccessToken($params);
+        return $this->issuer->issueAccessToken();
     }
 
     /**

src/Console/MigrationsCommand.php

@@ -47,7 +47,7 @@ public function __construct()
      */
     public function fire()
     {
-        $this->call('migrate:publish', ['package' => 'lucadegasperi/oauth2-server-laravel']);
+        $this->call('publish:migration', ['package' => 'lucadegasperi/oauth2-server-laravel']);
         $this->call('dump-autoload');
     }
 }

src/OAuth2ServerServiceProvider.php

@@ -17,6 +17,7 @@
 use LucaDegasperi\OAuth2Server\Filters\CheckAuthCodeRequestFilter;
 use LucaDegasperi\OAuth2Server\Filters\OAuthFilter;
 use LucaDegasperi\OAuth2Server\Filters\OAuthOwnerFilter;
+use Illuminate\Contracts\Exception\Handler;
 
 class OAuth2ServerServiceProvider extends ServiceProvider
 {
@@ -30,10 +31,10 @@ class OAuth2ServerServiceProvider extends ServiceProvider
      * Bootstrap the application events.
      * @return void
      */
-    public function boot()
+    public function boot(Handler $handler)
     {
         $this->package('lucadegasperi/oauth2-server-laravel', 'oauth2-server-laravel', __DIR__.'/');
-
+        $this->registerErrorHandlers($handler);
         $this->bootFilters();
     }
 
@@ -43,7 +44,6 @@ public function boot()
      */
     public function register()
     {
-        $this->registerErrorHandlers();
         $this->registerAuthorizer();
         $this->registerFilterBindings();
         $this->registerCommands();
@@ -162,9 +162,9 @@ private function bootFilters()
      * Register the OAuth error handlers
      * @return void
      */
-    private function registerErrorHandlers()
+    private function registerErrorHandlers(Handler $handler)
     {
-        $this->app->error(function(OAuthException $e) {
+        $handler->error(function(OAuthException $e) {
             return new JsonResponse([
                     'error' => $e->errorType,
                     'error_description' => $e->getMessage()

tests/unit/LucaDegasperi/OAuth2Server/AuthorizerSpec.php

@@ -24,9 +24,9 @@ function it_is_initializable()
 
     function it_issues_an_access_token(AuthorizationServer $issuer)
     {
-        $issuer->issueAccessToken([])->willReturn('foo')->shouldBeCalled();
+        $issuer->issueAccessToken()->willReturn('foo')->shouldBeCalled();
 
-        $this->issueAccessToken([])->shouldReturn('foo');
+        $this->issueAccessToken()->shouldReturn('foo');
     }
 
     function it_checks_the_auth_code_request_parameters(AuthorizationServer $issuer, AuthCodeGrant $authCodeGrant)