Skip to content

Commit 4440c09

Browse files
mcg-webmcg-web
authored
Merge pull request #697 from teqneers/issues/gh588
Changes setup of expression language functions to fix issue #588
2 parents aeada63 + 026eab1 commit 4440c09

28 files changed

+242
-183
lines changed

‎src/ExpressionLanguage/ExpressionFunction/DependencyInjection/Parameter.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,18 @@
55
namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\DependencyInjection;
66

77
use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
8-
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
98

109
final class Parameter extends ExpressionFunction
1110
{
12-
public function __construct(ParameterBagInterface $parameterBag, $name = 'parameter')
11+
public function __construct($name = 'parameter')
1312
{
1413
parent::__construct(
1514
$name,
16-
function (string $value) {
15+
static function (string $value) {
1716
return "\$globalVariable->get('container')->getParameter($value)";
1817
},
19-
function ($arguments, $paramName) use ($parameterBag) {
20-
return $parameterBag->get($paramName);
18+
static function ($arguments, $paramName) {
19+
return $arguments['globalVariable']->get('container')->getParameter($paramName);
2120
}
2221
);
2322
}

‎src/ExpressionLanguage/ExpressionFunction/DependencyInjection/Service.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,18 @@
55
namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\DependencyInjection;
66

77
use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
8-
use Symfony\Component\DependencyInjection\ContainerInterface;
98

109
final class Service extends ExpressionFunction
1110
{
12-
public function __construct(ContainerInterface $container, $name = 'service')
11+
public function __construct($name = 'service')
1312
{
1413
parent::__construct(
1514
$name,
16-
function (string $serviceId): string {
15+
static function (string $serviceId): string {
1716
return "\$globalVariable->get('container')->get($serviceId)";
1817
},
19-
function ($arguments, $serviceId) use ($container): ?object {
20-
return $container->get($serviceId);
18+
static function ($arguments, $serviceId): ?object {
19+
return $arguments['globalVariable']->get('container')->get($serviceId);
2120
}
2221
);
2322
}

‎src/ExpressionLanguage/ExpressionFunction/GraphQL/Arguments.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,18 @@
55
namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\GraphQL;
66

77
use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
8-
use Overblog\GraphQLBundle\Transformer\ArgumentsTransformer;
98

109
final class Arguments extends ExpressionFunction
1110
{
12-
public function __construct(ArgumentsTransformer $transformer)
11+
public function __construct()
1312
{
1413
parent::__construct(
1514
'arguments',
16-
function ($mapping, $data) {
15+
static function ($mapping, $data) {
1716
return "\$globalVariable->get('container')->get('overblog_graphql.arguments_transformer')->getArguments($mapping, $data, \$info)";
1817
},
19-
function ($arguments, $mapping, $data) use ($transformer) {
20-
return $transformer->getArguments($mapping, $data, $arguments['info']);
18+
static function ($arguments, $mapping, $data) {
19+
return $arguments['globalVariable']->get('container')->get('overblog_graphql.arguments_transformer')->getArguments($mapping, $data, $arguments['info']);
2120
}
2221
);
2322
}

‎src/ExpressionLanguage/ExpressionFunction/Security/GetUser.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,18 @@
55
namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\Security;
66

77
use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
8-
use Overblog\GraphQLBundle\Security\Security;
98

109
final class GetUser extends ExpressionFunction
1110
{
12-
public function __construct(Security $security)
11+
public function __construct()
1312
{
1413
parent::__construct(
1514
'getUser',
1615
static function (): string {
1716
return '$globalVariable->get(\'security\')->getUser()';
1817
},
19-
static function () use ($security) {
20-
return $security->getUser();
18+
static function ($arguments) {
19+
return $arguments['globalVariable']->get('security')->getUser();
2120
}
2221
);
2322
}

‎src/ExpressionLanguage/ExpressionFunction/Security/HasAnyPermission.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,18 @@
55
namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\Security;
66

77
use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
8-
use Overblog\GraphQLBundle\Security\Security;
98

109
final class HasAnyPermission extends ExpressionFunction
1110
{
12-
public function __construct(Security $security)
11+
public function __construct()
1312
{
1413
parent::__construct(
1514
'hasAnyPermission',
1615
static function ($object, $permissions): string {
1716
return \sprintf('$globalVariable->get(\'security\')->hasAnyPermission(%s, %s)', $object, $permissions);
1817
},
19-
function ($_, $object, $permissions) use ($security): bool {
20-
return $security->hasAnyPermission($object, $permissions);
18+
static function ($arguments, $object, $permissions): bool {
19+
return $arguments['globalVariable']->get('security')->hasAnyPermission($object, $permissions);
2120
}
2221
);
2322
}

‎src/ExpressionLanguage/ExpressionFunction/Security/HasAnyRole.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,18 @@
55
namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\Security;
66

77
use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
8-
use Overblog\GraphQLBundle\Security\Security;
98

109
final class HasAnyRole extends ExpressionFunction
1110
{
12-
public function __construct(Security $security)
11+
public function __construct()
1312
{
1413
parent::__construct(
1514
'hasAnyRole',
1615
static function ($roles): string {
1716
return \sprintf('$globalVariable->get(\'security\')->hasAnyRole(%s)', $roles);
1817
},
19-
static function ($_, $roles) use ($security): bool {
20-
return $security->hasAnyRole($roles);
18+
static function ($arguments, $roles): bool {
19+
return $arguments['globalVariable']->get('security')->hasAnyRole($roles);
2120
}
2221
);
2322
}

‎src/ExpressionLanguage/ExpressionFunction/Security/HasPermission.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,18 @@
55
namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\Security;
66

77
use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
8-
use Overblog\GraphQLBundle\Security\Security;
98

109
final class HasPermission extends ExpressionFunction
1110
{
12-
public function __construct(Security $security)
11+
public function __construct()
1312
{
1413
parent::__construct(
1514
'hasPermission',
1615
static function ($object, $permission): string {
1716
return \sprintf('$globalVariable->get(\'security\')->hasPermission(%s, %s)', $object, $permission);
1817
},
19-
static function ($_, $object, $permission) use ($security): bool {
20-
return $security->hasPermission($object, $permission);
18+
static function ($arguments, $object, $permission): bool {
19+
return $arguments['globalVariable']->get('security')->hasPermission($object, $permission);
2120
}
2221
);
2322
}

‎src/ExpressionLanguage/ExpressionFunction/Security/HasRole.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,18 @@
55
namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\Security;
66

77
use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
8-
use Overblog\GraphQLBundle\Security\Security;
98

109
final class HasRole extends ExpressionFunction
1110
{
12-
public function __construct(Security $security)
11+
public function __construct()
1312
{
1413
parent::__construct(
1514
'hasRole',
1615
static function ($role): string {
1716
return \sprintf('$globalVariable->get(\'security\')->hasRole(%s)', $role);
1817
},
19-
static function ($_, $role) use ($security): bool {
20-
return $security->hasRole($role);
18+
static function ($arguments, $role): bool {
19+
return $arguments['globalVariable']->get('security')->hasRole($role);
2120
}
2221
);
2322
}

‎src/ExpressionLanguage/ExpressionFunction/Security/IsAnonymous.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,18 @@
55
namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\Security;
66

77
use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
8-
use Overblog\GraphQLBundle\Security\Security;
98

109
final class IsAnonymous extends ExpressionFunction
1110
{
12-
public function __construct(Security $security)
11+
public function __construct()
1312
{
1413
parent::__construct(
1514
'isAnonymous',
1615
static function (): string {
1716
return '$globalVariable->get(\'security\')->isAnonymous()';
1817
},
19-
static function () use ($security): bool {
20-
return $security->isAnonymous();
18+
static function ($arguments): bool {
19+
return $arguments['globalVariable']->get('security')->isAnonymous();
2120
}
2221
);
2322
}

‎src/ExpressionLanguage/ExpressionFunction/Security/IsAuthenticated.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,18 @@
55
namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\Security;
66

77
use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
8-
use Overblog\GraphQLBundle\Security\Security;
98

109
final class IsAuthenticated extends ExpressionFunction
1110
{
12-
public function __construct(Security $security)
11+
public function __construct()
1312
{
1413
parent::__construct(
1514
'isAuthenticated',
1615
static function (): string {
1716
return '$globalVariable->get(\'security\')->isAuthenticated()';
1817
},
19-
static function () use ($security): bool {
20-
return $security->isAuthenticated();
18+
static function ($arguments): bool {
19+
return $arguments['globalVariable']->get('security')->isAuthenticated();
2120
}
2221
);
2322
}

0 commit comments

Comments
 (0)