Changes setup of expression language functions to fix issue #588

src/ExpressionLanguage/ExpressionFunction/DependencyInjection/Parameter.php

@@ -5,19 +5,18 @@
 namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\DependencyInjection;
 
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 
 final class Parameter extends ExpressionFunction
 {
-    public function __construct(ParameterBagInterface $parameterBag, $name = 'parameter')
+    public function __construct($name = 'parameter')
     {
         parent::__construct(
             $name,
-            function (string $value) {
+            static function (string $value) {
                 return "\$globalVariable->get('container')->getParameter($value)";
             },
-            function ($arguments, $paramName) use ($parameterBag) {
-                return $parameterBag->get($paramName);
+            static function ($arguments, $paramName) {
+                return $arguments['globalVariable']->get('container')->getParameter($paramName);
             }
         );
     }

src/ExpressionLanguage/ExpressionFunction/DependencyInjection/Service.php

@@ -5,19 +5,18 @@
 namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\DependencyInjection;
 
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 final class Service extends ExpressionFunction
 {
-    public function __construct(ContainerInterface $container, $name = 'service')
+    public function __construct($name = 'service')
     {
         parent::__construct(
             $name,
-            function (string $serviceId): string {
+            static function (string $serviceId): string {
                 return "\$globalVariable->get('container')->get($serviceId)";
             },
-            function ($arguments, $serviceId) use ($container): ?object {
-                return $container->get($serviceId);
+            static function ($arguments, $serviceId): ?object {
+                return $arguments['globalVariable']->get('container')->get($serviceId);
             }
         );
     }

src/ExpressionLanguage/ExpressionFunction/GraphQL/Arguments.php

@@ -5,19 +5,18 @@
 namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\GraphQL;
 
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
-use Overblog\GraphQLBundle\Transformer\ArgumentsTransformer;
 
 final class Arguments extends ExpressionFunction
 {
-    public function __construct(ArgumentsTransformer $transformer)
+    public function __construct()
     {
         parent::__construct(
             'arguments',
-            function ($mapping, $data) {
+            static function ($mapping, $data) {
                 return "\$globalVariable->get('container')->get('overblog_graphql.arguments_transformer')->getArguments($mapping, $data, \$info)";
             },
-            function ($arguments, $mapping, $data) use ($transformer) {
-                return $transformer->getArguments($mapping, $data, $arguments['info']);
+            static function ($arguments, $mapping, $data) {
+                return $arguments['globalVariable']->get('container')->get('overblog_graphql.arguments_transformer')->getArguments($mapping, $data, $arguments['info']);
             }
         );
     }

src/ExpressionLanguage/ExpressionFunction/Security/GetUser.php

@@ -5,19 +5,18 @@
 namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\Security;
 
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
-use Overblog\GraphQLBundle\Security\Security;
 
 final class GetUser extends ExpressionFunction
 {
-    public function __construct(Security $security)
+    public function __construct()
     {
         parent::__construct(
             'getUser',
             static function (): string {
                 return '$globalVariable->get(\'security\')->getUser()';
             },
-            static function () use ($security) {
-                return $security->getUser();
+            static function ($arguments) {
+                return $arguments['globalVariable']->get('security')->getUser();
             }
         );
     }

src/ExpressionLanguage/ExpressionFunction/Security/HasAnyPermission.php

@@ -5,19 +5,18 @@
 namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\Security;
 
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
-use Overblog\GraphQLBundle\Security\Security;
 
 final class HasAnyPermission extends ExpressionFunction
 {
-    public function __construct(Security $security)
+    public function __construct()
     {
         parent::__construct(
             'hasAnyPermission',
             static function ($object, $permissions): string {
                 return \sprintf('$globalVariable->get(\'security\')->hasAnyPermission(%s, %s)', $object, $permissions);
             },
-            function ($_, $object, $permissions) use ($security): bool {
-                return $security->hasAnyPermission($object, $permissions);
+            static function ($arguments, $object, $permissions): bool {
+                return $arguments['globalVariable']->get('security')->hasAnyPermission($object, $permissions);
             }
         );
     }

src/ExpressionLanguage/ExpressionFunction/Security/HasAnyRole.php

@@ -5,19 +5,18 @@
 namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\Security;
 
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
-use Overblog\GraphQLBundle\Security\Security;
 
 final class HasAnyRole extends ExpressionFunction
 {
-    public function __construct(Security $security)
+    public function __construct()
     {
         parent::__construct(
             'hasAnyRole',
             static function ($roles): string {
                 return \sprintf('$globalVariable->get(\'security\')->hasAnyRole(%s)', $roles);
             },
-            static function ($_, $roles) use ($security): bool {
-                return $security->hasAnyRole($roles);
+            static function ($arguments, $roles): bool {
+                return $arguments['globalVariable']->get('security')->hasAnyRole($roles);
             }
         );
     }

src/ExpressionLanguage/ExpressionFunction/Security/HasPermission.php

@@ -5,19 +5,18 @@
 namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\Security;
 
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
-use Overblog\GraphQLBundle\Security\Security;
 
 final class HasPermission extends ExpressionFunction
 {
-    public function __construct(Security $security)
+    public function __construct()
     {
         parent::__construct(
             'hasPermission',
             static function ($object, $permission): string {
                 return \sprintf('$globalVariable->get(\'security\')->hasPermission(%s, %s)', $object, $permission);
             },
-            static function ($_, $object, $permission) use ($security): bool {
-                return $security->hasPermission($object, $permission);
+            static function ($arguments, $object, $permission): bool {
+                return $arguments['globalVariable']->get('security')->hasPermission($object, $permission);
             }
         );
     }

src/ExpressionLanguage/ExpressionFunction/Security/HasRole.php

@@ -5,19 +5,18 @@
 namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\Security;
 
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
-use Overblog\GraphQLBundle\Security\Security;
 
 final class HasRole extends ExpressionFunction
 {
-    public function __construct(Security $security)
+    public function __construct()
     {
         parent::__construct(
             'hasRole',
             static function ($role): string {
                 return \sprintf('$globalVariable->get(\'security\')->hasRole(%s)', $role);
             },
-            static function ($_, $role) use ($security): bool {
-                return $security->hasRole($role);
+            static function ($arguments, $role): bool {
+                return $arguments['globalVariable']->get('security')->hasRole($role);
             }
         );
     }

src/ExpressionLanguage/ExpressionFunction/Security/IsAnonymous.php

@@ -5,19 +5,18 @@
 namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\Security;
 
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
-use Overblog\GraphQLBundle\Security\Security;
 
 final class IsAnonymous extends ExpressionFunction
 {
-    public function __construct(Security $security)
+    public function __construct()
     {
         parent::__construct(
             'isAnonymous',
             static function (): string {
                 return '$globalVariable->get(\'security\')->isAnonymous()';
             },
-            static function () use ($security): bool {
-                return $security->isAnonymous();
+            static function ($arguments): bool {
+                return $arguments['globalVariable']->get('security')->isAnonymous();
             }
         );
     }

src/ExpressionLanguage/ExpressionFunction/Security/IsAuthenticated.php

@@ -5,19 +5,18 @@
 namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\Security;
 
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
-use Overblog\GraphQLBundle\Security\Security;
 
 final class IsAuthenticated extends ExpressionFunction
 {
-    public function __construct(Security $security)
+    public function __construct()
     {
         parent::__construct(
             'isAuthenticated',
             static function (): string {
                 return '$globalVariable->get(\'security\')->isAuthenticated()';
             },
-            static function () use ($security): bool {
-                return $security->isAuthenticated();
+            static function ($arguments): bool {
+                return $arguments['globalVariable']->get('security')->isAuthenticated();
             }
         );
     }

src/ExpressionLanguage/ExpressionFunction/Security/IsFullyAuthenticated.php

@@ -5,19 +5,18 @@
 namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\Security;
 
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
-use Overblog\GraphQLBundle\Security\Security;
 
 final class IsFullyAuthenticated extends ExpressionFunction
 {
-    public function __construct(Security $security)
+    public function __construct()
     {
         parent::__construct(
             'isFullyAuthenticated',
             static function (): string {
                 return '$globalVariable->get(\'security\')->isFullyAuthenticated()';
             },
-            static function () use ($security): bool {
-                return $security->isFullyAuthenticated();
+            static function ($arguments): bool {
+                return $arguments['globalVariable']->get('security')->isFullyAuthenticated();
             }
         );
     }

src/ExpressionLanguage/ExpressionFunction/Security/IsGranted.php

@@ -5,19 +5,18 @@
 namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\Security;
 
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
-use Overblog\GraphQLBundle\Security\Security;
 
 final class IsGranted extends ExpressionFunction
 {
-    public function __construct(Security $security)
+    public function __construct()
     {
         parent::__construct(
             'isGranted',
             static function ($attributes, $object = 'null'): string {
                 return \sprintf('$globalVariable->get(\'security\')->isGranted(%s, %s)', $attributes, $object);
             },
-            static function ($_, $attributes, $object = null) use ($security): bool {
-                return $security->isGranted($attributes, $object);
+            static function ($arguments, $attributes, $object = null): bool {
+                return $arguments['globalVariable']->get('security')->isGranted($attributes, $object);
             }
         );
     }

src/ExpressionLanguage/ExpressionFunction/Security/IsRememberMe.php

@@ -5,19 +5,18 @@
 namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\Security;
 
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
-use Overblog\GraphQLBundle\Security\Security;
 
 final class IsRememberMe extends ExpressionFunction
 {
-    public function __construct(Security $security)
+    public function __construct()
     {
         parent::__construct(
             'isRememberMe',
             static function (): string {
                 return '$globalVariable->get(\'security\')->isRememberMe()';
             },
-            static function () use ($security): bool {
-                return $security->isRememberMe();
+            static function ($arguments): bool {
+                return $arguments['globalVariable']->get('security')->isRememberMe();
             }
         );
     }

src/Validator/Constraints/ExpressionValidator.php

@@ -4,6 +4,7 @@
 
 namespace Overblog\GraphQLBundle\Validator\Constraints;
 
+use Overblog\GraphQLBundle\Definition\GlobalVariables;
 use Overblog\GraphQLBundle\Validator\ValidationNode;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\HttpKernel\Kernel;
@@ -15,9 +16,12 @@ class ExpressionValidator extends \Symfony\Component\Validator\Constraints\Expre
 {
     private $expressionLanguage;
 
-    public function __construct(ExpressionLanguage $expressionLanguage)
+    private $globalVariables;
+
+    public function __construct(ExpressionLanguage $expressionLanguage, GlobalVariables $globalVariables)
     {
         $this->expressionLanguage = $expressionLanguage;
+        $this->globalVariables = $globalVariables;
         if (Kernel::VERSION_ID >= 40400) {
             parent::__construct($expressionLanguage);
         } else {
@@ -36,6 +40,7 @@ public function validate($value, Constraint $constraint): void
 
         $variables = $constraint->values;
         $variables['value'] = $value;
+        $variables['globalVariable'] = $this->globalVariables;
 
         $object = $this->context->getObject();
 
@@ -50,9 +55,9 @@ public function validate($value, Constraint $constraint): void
 
         if (!$this->expressionLanguage->evaluate($constraint->expression, $variables)) {
             $this->context->buildViolation($constraint->message)
-                ->setParameter('{{ value }}', $this->formatValue($value, self::OBJECT_TO_STRING))
-                ->setCode(Expression::EXPRESSION_FAILED_ERROR)
-                ->addViolation();
+                          ->setParameter('{{ value }}', $this->formatValue($value, self::OBJECT_TO_STRING))
+                          ->setCode(Expression::EXPRESSION_FAILED_ERROR)
+                          ->addViolation();
         }
     }
 }

tests/ExpressionLanguage/ExpressionFunction/DependencyInjection/ParameterTest.php

@@ -7,18 +7,14 @@
 use Overblog\GraphQLBundle\Definition\GlobalVariables;
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\DependencyInjection\Parameter;
 use Overblog\GraphQLBundle\Tests\ExpressionLanguage\TestCase;
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 class ParameterTest extends TestCase
 {
     protected function getFunctions()
     {
-        $parameterBag = new ParameterBag();
-        $parameterBag->set('test', 5);
-
         return [
-            new Parameter($parameterBag),
-            new Parameter($parameterBag, 'param'),
+            new Parameter(),
+            new Parameter('param'),
         ];
     }
 
@@ -39,7 +35,11 @@ public function testParameterCompilation($name): void
      */
     public function testParameterEvaluation($name): void
     {
-        $this->assertSame(5, $this->expressionLanguage->evaluate($name.'("test")'));
+        $globalVariable = new GlobalVariables(['container' => $this->getDIContainerMock([], ['test' => 5])]);
+        $this->assertSame(
+            5,
+            $this->expressionLanguage->evaluate($name.'("test")', ['globalVariable' => $globalVariable])
+        );
     }
 
     public function getNames()