Merge pull request #1207 from lucasmichot/feature/8.x/cleanup-resolveInheritedScopes

[8.x] Fix resolveInheritedScopes.

Author: taylorotwell

src/Token.php

@@ -117,9 +117,11 @@ protected function resolveInheritedScopes($scope)
     {
         $parts = explode(':', $scope);
 
+        $partsCount = count($parts);
+
         $scopes = [];
 
-        for ($i = 0; $i <= count($parts); $i++) {
+        for ($i = 1; $i <= $partsCount; $i++) {
             $scopes[] = implode(':', array_slice($parts, 0, $i));
         }
 

tests/TokenTest.php

@@ -5,6 +5,7 @@
 use Laravel\Passport\Passport;
 use Laravel\Passport\Token;
 use PHPUnit\Framework\TestCase;
+use ReflectionObject;
 
 class TokenTest extends TestCase
 {
@@ -58,4 +59,20 @@ public function test_token_can_determine_if_it_has_inherited_scopes()
         $this->assertTrue($token->can('something'));
         $this->assertTrue($token->can('admin:webhooks:write'));
     }
+
+    public function test_token_resolves_inherited_scopes()
+    {
+        $token = new Token;
+
+        $reflector = new ReflectionObject($token);
+        $method = $reflector->getMethod('resolveInheritedScopes');
+        $method->setAccessible(true);
+        $inheritedScopes = $method->invoke($token, 'admin:webhooks:read');
+
+        $this->assertSame([
+            'admin',
+            'admin:webhooks',
+            'admin:webhooks:read',
+        ], $inheritedScopes);
+    }
 }