renamed to requireAll to scopeStrict

Author: pulkitjalan

src/Auth/Provider/OAuth2.php

@@ -81,7 +81,7 @@ public function authenticate(Request $request, Route $route)
 
             $token = $this->resource->getAccessToken();
 
-            if ($route->requiresAllScopes()) {
+            if ($route->scopeStrict()) {
                 $this->validateAllRouteScopes($token, $route);
             } else {
                 $this->validateAnyRouteScopes($token, $route);

src/Routing/Route.php

@@ -353,13 +353,14 @@ public function getScopes()
     }
 
     /**
-     * Check if route requires any or all scopes
+     * Check if route requires all scopes
+     * or any scope to be valid.
      *
      * @return bool
      */
-    public function requiresAllScopes()
+    public function scopeStrict()
     {
-        return array_get($this->action, 'requireAll', false);
+        return array_get($this->action, 'scopeStrict', false);
     }
 
     /**

tests/Auth/Provider/OAuth2Test.php

@@ -36,7 +36,7 @@ public function testExceptionThrownWhenNoScopesProvided()
 
         $route = m::mock('Dingo\Api\Routing\Route');
         $route->shouldReceive('scopes')->once()->andReturn(['foo']);
-        $route->shouldReceive('requiresAllScopes')->once()->andReturn(false);
+        $route->shouldReceive('scopeStrict')->once()->andReturn(false);
 
         $this->provider->authenticate($request, $route);
     }
@@ -63,7 +63,7 @@ public function testOnlyOneScopeRequiredToValidateCorrectlyIfRequiredAllSetToFal
 
         $route = m::mock('Dingo\Api\Routing\Route');
         $route->shouldReceive('scopes')->once()->andReturn(['foo', 'bar']);
-        $route->shouldReceive('requiresAllScopes')->once()->andReturn(false);
+        $route->shouldReceive('scopeStrict')->once()->andReturn(false);
 
         $this->assertNull($this->provider->authenticate($request, $route));
     }
@@ -76,19 +76,19 @@ public function testAllScopeRequiredToValidateCorrectlyIfRequiredAllSetToTrue()
         $request = Request::create('GET', '/', [], [], [], ['HTTP_AUTHORIZATION' => 'Bearer 12345']);
 
         $this->server->shouldReceive('isValidRequest')->once()->andReturn(true);
-        
+
         $token = m::mock('League\OAuth2\Server\Entity\AccessTokenEntity');
         $token->shouldReceive('hasScope')->once()->with('foo')->andReturn(true);
         $token->shouldReceive('hasScope')->once()->with('bar')->andReturn(false);
         $this->server->shouldReceive('getAccessToken')->once()->andReturn($token);
-        
+
         $this->provider->setClientResolver(function ($id) {
             //
         });
-        
+
         $route = m::mock('Dingo\Api\Routing\Route');
         $route->shouldReceive('scopes')->once()->andReturn(['foo', 'bar']);
-        $route->shouldReceive('requiresAllScopes')->once()->andReturn(true);
+        $route->shouldReceive('scopeStrict')->once()->andReturn(true);
 
         $this->provider->authenticate($request, $route);
     }
@@ -114,7 +114,7 @@ public function testClientIsResolved()
 
         $route = m::mock('Dingo\Api\Routing\Route');
         $route->shouldReceive('scopes')->once()->andReturn([]);
-        $route->shouldReceive('requiresAllScopes')->once()->andReturn(false);
+        $route->shouldReceive('scopeStrict')->once()->andReturn(false);
 
         $this->assertEquals('foo', $this->provider->authenticate($request, $route));
     }
@@ -140,7 +140,7 @@ public function testUserIsResolved()
 
         $route = m::mock('Dingo\Api\Routing\Route');
         $route->shouldReceive('scopes')->once()->andReturn([]);
-        $route->shouldReceive('requiresAllScopes')->once()->andReturn(false);
+        $route->shouldReceive('scopeStrict')->once()->andReturn(false);
 
         $this->assertEquals('foo', $this->provider->authenticate($request, $route));
     }