Merge branch 'alexbilbie-2.0'

Author: taylorotwell

composer.json

@@ -21,7 +21,7 @@
         "illuminate/encryption": "~5.4",
         "illuminate/http": "~5.4",
         "illuminate/support": "~5.4",
-        "league/oauth2-server": "~5.0",
+        "league/oauth2-server": "^6.0",
         "symfony/psr-http-message-bridge": "~1.0",
         "zendframework/zend-diactoros": "~1.0",
         "phpseclib/phpseclib": "^2.0"

src/PassportServiceProvider.php

@@ -200,7 +200,7 @@ public function makeAuthorizationServer()
             $this->app->make(Bridge\AccessTokenRepository::class),
             $this->app->make(Bridge\ScopeRepository::class),
             'file://'.Passport::keyPath('oauth-private.key'),
-            'file://'.Passport::keyPath('oauth-public.key')
+            app('encrypter')->getKey()
         );
     }