Fix isGranted expression function

Author: Jeremiah VALERIE

src/ExpressionLanguage/ExpressionFunction/Security/IsGranted.php

@@ -13,11 +13,11 @@ public function __construct(Security $security)
     {
         parent::__construct(
             'isGranted',
-            static function ($attributes, $subject): string {
-                return \sprintf('$globalVariable->get(\'security\')->isGranted(%s, %s)', $attributes, $subject);
+            static function ($attributes, $object = 'null'): string {
+                return \sprintf('$globalVariable->get(\'security\')->isGranted(%s, %s)', $attributes, $object);
             },
-            static function ($_, $attributes, $subject) use ($security): bool {
-                return $security->isGranted($attributes, $subject);
+            static function ($_, $attributes, $object = null) use ($security): bool {
+                return $security->isGranted($attributes, $object);
             }
         );
     }

tests/ExpressionLanguage/ExpressionFunction/Security/HasAnyPermissionTest.php

@@ -16,7 +16,7 @@ protected function getFunctions()
     {
         $this->expectedObject = new \stdClass();
 
-        $security = parent::getSecurityIsGrantedWithExpectation(
+        $security = $this->getSecurityIsGrantedWithExpectation(
             [
                 $this->matchesRegularExpression('/^(OWNER|WRITER)$/'),
                 $this->identicalTo($this->expectedObject),

tests/ExpressionLanguage/ExpressionFunction/Security/HasAnyRoleTest.php

@@ -11,12 +11,12 @@ class HasAnyRoleTest extends TestCase
 {
     protected function getFunctions()
     {
-        $authorizationChecker = parent::getSecurityIsGrantedWithExpectation(
+        $Security = $this->getSecurityIsGrantedWithExpectation(
             'ROLE_ADMIN',
             $this->any()
         );
 
-        return [new HasAnyRole($authorizationChecker)];
+        return [new HasAnyRole($Security)];
     }
 
     public function testEvaluator(): void

tests/ExpressionLanguage/ExpressionFunction/Security/HasPermissionTest.php

@@ -16,15 +16,15 @@ protected function getFunctions()
     {
         $this->expectedObject = new \stdClass();
 
-        $authorizationChecker = parent::getSecurityIsGrantedWithExpectation(
+        $Security = $this->getSecurityIsGrantedWithExpectation(
             [
                 'OWNER',
                 $this->identicalTo($this->expectedObject),
             ],
             $this->any()
         );
 
-        return [new HasPermission($authorizationChecker)];
+        return [new HasPermission($Security)];
     }
 
     public function testEvaluator(): void

tests/ExpressionLanguage/ExpressionFunction/Security/HasRoleTest.php

@@ -11,12 +11,12 @@ class HasRoleTest extends TestCase
 {
     protected function getFunctions()
     {
-        $authorizationChecker = parent::getSecurityIsGrantedWithExpectation(
+        $Security = $this->getSecurityIsGrantedWithExpectation(
             'ROLE_USER',
             $this->any()
         );
 
-        return [new HasRole($authorizationChecker)];
+        return [new HasRole($Security)];
     }
 
     public function testEvaluator(): void

tests/ExpressionLanguage/ExpressionFunction/Security/IsAnonymousTest.php

@@ -11,12 +11,12 @@ class IsAnonymousTest extends TestCase
 {
     protected function getFunctions()
     {
-        $authorizationChecker = parent::getSecurityIsGrantedWithExpectation(
+        $Security = $this->getSecurityIsGrantedWithExpectation(
             'IS_AUTHENTICATED_ANONYMOUSLY',
             $this->any()
         );
 
-        return [new IsAnonymous($authorizationChecker)];
+        return [new IsAnonymous($Security)];
     }
 
     public function testEvaluator(): void

tests/ExpressionLanguage/ExpressionFunction/Security/IsAuthenticatedTest.php

@@ -11,12 +11,12 @@ class IsAuthenticatedTest extends TestCase
 {
     protected function getFunctions()
     {
-        $authorizationChecker = parent::getSecurityIsGrantedWithExpectation(
+        $Security = $this->getSecurityIsGrantedWithExpectation(
             $this->matchesRegularExpression('/^IS_AUTHENTICATED_(REMEMBERED|FULLY)$/'),
             $this->any()
         );
 
-        return [new IsAuthenticated($authorizationChecker)];
+        return [new IsAuthenticated($Security)];
     }
 
     public function testEvaluator(): void

tests/ExpressionLanguage/ExpressionFunction/Security/IsFullyAuthenticatedTest.php

@@ -11,12 +11,12 @@ class IsFullyAuthenticatedTest extends TestCase
 {
     protected function getFunctions()
     {
-        $authorizationChecker = parent::getSecurityIsGrantedWithExpectation(
+        $Security = $this->getSecurityIsGrantedWithExpectation(
             'IS_AUTHENTICATED_FULLY',
             $this->any()
         );
 
-        return [new IsFullyAuthenticated($authorizationChecker)];
+        return [new IsFullyAuthenticated($Security)];
     }
 
     public function testEvaluator(): void

tests/ExpressionLanguage/ExpressionFunction/Security/IsGrantedTest.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Overblog\GraphQLBundle\Tests\ExpressionLanguage\ExpressionFunction\Security;
+
+use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\Security\IsGranted;
+use Overblog\GraphQLBundle\Tests\ExpressionLanguage\TestCase;
+
+class IsGrantedTest extends TestCase
+{
+    protected function getFunctions()
+    {
+        $security = $this->getSecurityIsGrantedWithExpectation(
+            $this->matchesRegularExpression('/^ROLE_(USER|ADMIN)$/'),
+            $this->any()
+        );
+
+        return [new IsGranted($security)];
+    }
+
+    public function testEvaluator(): void
+    {
+        $this->assertTrue($this->expressionLanguage->evaluate('isGranted("ROLE_USER")'));
+    }
+
+    public function testIsGranted(): void
+    {
+        $this->assertExpressionCompile('isGranted("ROLE_ADMIN")', 'ROLE_ADMIN');
+    }
+}

tests/ExpressionLanguage/ExpressionFunction/Security/IsRememberMeTest.php

@@ -11,12 +11,12 @@ class IsRememberMeTest extends TestCase
 {
     protected function getFunctions()
     {
-        $authorizationChecker = parent::getSecurityIsGrantedWithExpectation(
+        $Security = $this->getSecurityIsGrantedWithExpectation(
             'IS_AUTHENTICATED_REMEMBERED',
             $this->any()
         );
 
-        return [new IsRememberMe($authorizationChecker)];
+        return [new IsRememberMe($Security)];
     }
 
     public function testEvaluator(): void