Merge pull request #698 from mcg-web/merge-0.13

Merge 0.13

Author: mcg-web

src/ExpressionLanguage/ExpressionFunction/DependencyInjection/Parameter.php

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

src/ExpressionLanguage/ExpressionFunction/DependencyInjection/Service.php

@@ -5,16 +5,16 @@
 namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\DependencyInjection;
 
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Overblog\GraphQLBundle\Generator\TypeGenerator;
 
 final class Service extends ExpressionFunction
 {
-    public function __construct(ContainerInterface $container, $name = 'service')
+    public function __construct($name = 'service')
     {
         parent::__construct(
             $name,
             fn (string $serviceId) => "$this->globalVars->get('container')->get($serviceId)",
-            fn ($arguments, $serviceId) => $container->get($serviceId)
+            static fn (array $arguments, $serviceId) => $arguments[TypeGenerator::GLOBAL_VARS]->get('container')->get($serviceId)
         );
     }
 }

src/ExpressionLanguage/ExpressionFunction/GraphQL/Arguments.php

@@ -5,16 +5,16 @@
 namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\GraphQL;
 
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
-use Overblog\GraphQLBundle\Transformer\ArgumentsTransformer;
+use Overblog\GraphQLBundle\Generator\TypeGenerator;
 
 final class Arguments extends ExpressionFunction
 {
-    public function __construct(ArgumentsTransformer $transformer)
+    public function __construct()
     {
         parent::__construct(
             'arguments',
             fn ($mapping, $data) => "$this->globalVars->get('container')->get('overblog_graphql.arguments_transformer')->getArguments($mapping, $data, \$info)",
-            static fn ($arguments, $mapping, $data) => $transformer->getArguments($mapping, $data, $arguments['info'])
+            static fn (array $arguments, $mapping, $data) => $arguments[TypeGenerator::GLOBAL_VARS]->get('container')->get('overblog_graphql.arguments_transformer')->getArguments($mapping, $data, $arguments['info'])
         );
     }
 }

src/ExpressionLanguage/ExpressionFunction/NewObject.php

@@ -12,8 +12,8 @@ public function __construct()
     {
         parent::__construct(
             'newObject',
-            fn ($className, $args = '[]') => "(new \\ReflectionClass($className))->newInstanceArgs($args)",
-            fn ($arguments, $className, $args = []) => new $className(...$args)
+            static fn ($className, $args = '[]') => "(new \\ReflectionClass($className))->newInstanceArgs($args)",
+            static fn ($arguments, $className, $args = []) => new $className(...$args)
         );
     }
 }

src/ExpressionLanguage/ExpressionFunction/Security/GetUser.php

@@ -5,16 +5,16 @@
 namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\Security;
 
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
-use Overblog\GraphQLBundle\Security\Security;
+use Overblog\GraphQLBundle\Generator\TypeGenerator;
 
 final class GetUser extends ExpressionFunction
 {
-    public function __construct(Security $security)
+    public function __construct()
     {
         parent::__construct(
             'getUser',
             fn () => "$this->globalVars->get('security')->getUser()",
-            fn () => $security->getUser()
+            static fn (array $arguments) => $arguments[TypeGenerator::GLOBAL_VARS]->get('security')->getUser()
         );
     }
 }

src/ExpressionLanguage/ExpressionFunction/Security/HasAnyPermission.php

@@ -5,16 +5,16 @@
 namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\Security;
 
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
-use Overblog\GraphQLBundle\Security\Security;
+use Overblog\GraphQLBundle\Generator\TypeGenerator;
 
 final class HasAnyPermission extends ExpressionFunction
 {
-    public function __construct(Security $security)
+    public function __construct()
     {
         parent::__construct(
             'hasAnyPermission',
             fn ($object, $permissions) => "$this->globalVars->get('security')->hasAnyPermission($object, $permissions)",
-            fn ($_, $object, $permissions) => $security->hasAnyPermission($object, $permissions)
+            static fn (array $arguments, $object, $permissions) => $arguments[TypeGenerator::GLOBAL_VARS]->get('security')->hasAnyPermission($object, $permissions)
         );
     }
 }

src/ExpressionLanguage/ExpressionFunction/Security/HasAnyRole.php

@@ -5,16 +5,16 @@
 namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\Security;
 
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
-use Overblog\GraphQLBundle\Security\Security;
+use Overblog\GraphQLBundle\Generator\TypeGenerator;
 
 final class HasAnyRole extends ExpressionFunction
 {
-    public function __construct(Security $security)
+    public function __construct()
     {
         parent::__construct(
             'hasAnyRole',
             fn ($roles) => "$this->globalVars->get('security')->hasAnyRole($roles)",
-            fn ($_, $roles) => $security->hasAnyRole($roles)
+            static fn (array $arguments, $roles) => $arguments[TypeGenerator::GLOBAL_VARS]->get('security')->hasAnyRole($roles)
         );
     }
 }

src/ExpressionLanguage/ExpressionFunction/Security/HasPermission.php

@@ -5,16 +5,16 @@
 namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\Security;
 
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
-use Overblog\GraphQLBundle\Security\Security;
+use Overblog\GraphQLBundle\Generator\TypeGenerator;
 
 final class HasPermission extends ExpressionFunction
 {
-    public function __construct(Security $security)
+    public function __construct()
     {
         parent::__construct(
             'hasPermission',
             fn ($object, $permission) => "$this->globalVars->get('security')->hasPermission($object, $permission)",
-            fn ($_, $object, $permission) => $security->hasPermission($object, $permission)
+            static fn (array $arguments, $object, $permission) => $arguments[TypeGenerator::GLOBAL_VARS]->get('security')->hasPermission($object, $permission)
         );
     }
 }

src/ExpressionLanguage/ExpressionFunction/Security/HasRole.php

@@ -5,16 +5,16 @@
 namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\Security;
 
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
-use Overblog\GraphQLBundle\Security\Security;
+use Overblog\GraphQLBundle\Generator\TypeGenerator;
 
 final class HasRole extends ExpressionFunction
 {
-    public function __construct(Security $security)
+    public function __construct()
     {
         parent::__construct(
             'hasRole',
             fn ($role) => "$this->globalVars->get('security')->hasRole($role)",
-            fn ($_, $role) => $security->hasRole($role)
+            static fn (array $arguments, $role) => $arguments[TypeGenerator::GLOBAL_VARS]->get('security')->hasRole($role)
         );
     }
 }

src/ExpressionLanguage/ExpressionFunction/Security/IsAnonymous.php

@@ -5,16 +5,16 @@
 namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\Security;
 
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
-use Overblog\GraphQLBundle\Security\Security;
+use Overblog\GraphQLBundle\Generator\TypeGenerator;
 
 final class IsAnonymous extends ExpressionFunction
 {
-    public function __construct(Security $security)
+    public function __construct()
     {
         parent::__construct(
             'isAnonymous',
             fn () => "$this->globalVars->get('security')->isAnonymous()",
-            fn () => $security->isAnonymous()
+            static fn (array $arguments) => $arguments[TypeGenerator::GLOBAL_VARS]->get('security')->isAnonymous()
         );
     }
 }