Merge branch 'develop' of github.com:thephpleague/oauth2-server into develop

examples/relational/Storage/ScopeStorage.php

@@ -13,7 +13,7 @@ class ScopeStorage extends Adapter implements ScopeInterface
     /**
      * {@inheritdoc}
      */
-    public function get($scope, $grantType = null)
+    public function get($scope, $grantType = null, $clientId = null)
     {
         $result = Capsule::table('oauth_scopes')
                                 ->where('id', $scope)

src/Grant/AuthCodeGrant.php

@@ -215,6 +215,8 @@ class AuthCodeGrant extends AbstractGrant
         }
 
         $session = $code->getSession();
+        $session->associateClient($client);
+
         $authCodeScopes = $code->getScopes();
 
         // Generate the access token