Use logical operators

Closes #409

Author: vinkla

src/Middleware/OAuthMiddleware.php

@@ -69,7 +69,7 @@ public function handle($request, Closure $next, $scopesString = null)
      */
     public function validateScopes($scopes)
     {
-        if (!empty($scopes) and !$this->authorizer->hasScope($scopes)) {
+        if (!empty($scopes) && !$this->authorizer->hasScope($scopes)) {
             throw new InvalidScopeException(implode(',', $scopes));
         }
     }

src/Storage/FluentClient.php

@@ -98,7 +98,7 @@ public function get($clientId, $clientSecret = null, $redirectUri = null, $grant
                    ->where('oauth_client_endpoints.redirect_uri', $redirectUri);
         }
 
-        if ($this->limitClientsToGrants === true and !is_null($grantType)) {
+        if ($this->limitClientsToGrants === true && !is_null($grantType)) {
             $query = $query->join('oauth_client_grants', 'oauth_clients.id', '=', 'oauth_client_grants.client_id')
                    ->join('oauth_grants', 'oauth_grants.id', '=', 'oauth_client_grants.grant_id')
                    ->where('oauth_grants.id', $grantType);

src/Storage/FluentScope.php

@@ -74,12 +74,12 @@ public function get($scope, $grantType = null, $clientId = null)
                     ->select('oauth_scopes.id as id', 'oauth_scopes.description as description')
                     ->where('oauth_scopes.id', $scope);
 
-        if ($this->limitClientsToScopes === true and !is_null($clientId)) {
+        if ($this->limitClientsToScopes === true && !is_null($clientId)) {
             $query = $query->join('oauth_client_scopes', 'oauth_scopes.id', '=', 'oauth_client_scopes.scope_id')
                            ->where('oauth_client_scopes.client_id', $clientId);
         }
 
-        if ($this->limitScopesToGrants === true and !is_null($grantType)) {
+        if ($this->limitScopesToGrants === true && !is_null($grantType)) {
             $query = $query->join('oauth_grant_scopes', 'oauth_scopes.id', '=', 'oauth_grant_scopes.scope_id')
                            ->join('oauth_grants', 'oauth_grants.id', '=', 'oauth_grant_scopes.grant_id')
                            ->where('oauth_grants.id', $grantType);