From e05018d959f71e152301e375c3378cfbfd127e57 Mon Sep 17 00:00:00 2001 From: Javier Spagnoletti Date: Tue, 15 Sep 2020 10:36:58 -0300 Subject: [PATCH] Apply "static_lambda" CS rule under `src/` dir --- src/Bridge/Doctrine/MongoDbOdm/Filter/OrderFilter.php | 2 +- .../Doctrine/MongoDbOdm/SubresourceDataProvider.php | 4 ++-- src/Bridge/Doctrine/Orm/Filter/OrderFilter.php | 2 +- .../Bundle/DependencyInjection/Configuration.php | 10 +++++----- src/GraphQl/Type/FieldsBuilder.php | 2 +- src/HttpCache/VarnishPurger.php | 2 +- .../Core/Authorization/ExpressionLanguageProvider.php | 4 ++-- src/Security/ExpressionLanguage.php | 4 ++-- src/Security/ResourceAccessChecker.php | 2 +- src/Util/RequestParser.php | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Bridge/Doctrine/MongoDbOdm/Filter/OrderFilter.php b/src/Bridge/Doctrine/MongoDbOdm/Filter/OrderFilter.php index c9aff5838a5..54b18a777f9 100644 --- a/src/Bridge/Doctrine/MongoDbOdm/Filter/OrderFilter.php +++ b/src/Bridge/Doctrine/MongoDbOdm/Filter/OrderFilter.php @@ -43,7 +43,7 @@ final class OrderFilter extends AbstractFilter implements OrderFilterInterface public function __construct(ManagerRegistry $managerRegistry, string $orderParameterName = 'order', LoggerInterface $logger = null, array $properties = null, NameConverterInterface $nameConverter = null) { if (null !== $properties) { - $properties = array_map(function ($propertyOptions) { + $properties = array_map(static function ($propertyOptions) { // shorthand for default direction if (\is_string($propertyOptions)) { $propertyOptions = [ diff --git a/src/Bridge/Doctrine/MongoDbOdm/SubresourceDataProvider.php b/src/Bridge/Doctrine/MongoDbOdm/SubresourceDataProvider.php index bda765fccac..8b8fbac09c2 100644 --- a/src/Bridge/Doctrine/MongoDbOdm/SubresourceDataProvider.php +++ b/src/Bridge/Doctrine/MongoDbOdm/SubresourceDataProvider.php @@ -157,8 +157,8 @@ private function buildAggregation(array $identifiers, array $context, Builder $p $aggregation = $this->buildAggregation($identifiers, $context, $aggregation, --$remainingIdentifiers, $topAggregationBuilder); $results = $aggregation->execute()->toArray(); - $in = array_reduce($results, function ($in, $result) use ($previousAssociationProperty) { - return $in + array_map(function ($result) { + $in = array_reduce($results, static function ($in, $result) use ($previousAssociationProperty) { + return $in + array_map(static function ($result) { return $result['_id']; }, $result[$previousAssociationProperty] ?? []); }, []); diff --git a/src/Bridge/Doctrine/Orm/Filter/OrderFilter.php b/src/Bridge/Doctrine/Orm/Filter/OrderFilter.php index 50b081fd958..78ac9577822 100644 --- a/src/Bridge/Doctrine/Orm/Filter/OrderFilter.php +++ b/src/Bridge/Doctrine/Orm/Filter/OrderFilter.php @@ -44,7 +44,7 @@ class OrderFilter extends AbstractContextAwareFilter implements OrderFilterInter public function __construct(ManagerRegistry $managerRegistry, ?RequestStack $requestStack = null, string $orderParameterName = 'order', LoggerInterface $logger = null, array $properties = null, NameConverterInterface $nameConverter = null) { if (null !== $properties) { - $properties = array_map(function ($propertyOptions) { + $properties = array_map(static function ($propertyOptions) { // shorthand for default direction if (\is_string($propertyOptions)) { $propertyOptions = [ diff --git a/src/Bridge/Symfony/Bundle/DependencyInjection/Configuration.php b/src/Bridge/Symfony/Bundle/DependencyInjection/Configuration.php index b9c3b38812f..70a19e0049c 100644 --- a/src/Bridge/Symfony/Bundle/DependencyInjection/Configuration.php +++ b/src/Bridge/Symfony/Bundle/DependencyInjection/Configuration.php @@ -284,7 +284,7 @@ private function addSwaggerSection(ArrayNodeDefinition $rootNode): void }) ->end() ->validate() - ->ifTrue(function ($v) use ($defaultVersions) { + ->ifTrue(static function ($v) use ($defaultVersions) { return $v !== array_intersect($v, $defaultVersions); }) ->thenInvalid(sprintf('Only the versions %s are supported. Got %s.', implode(' and ', $defaultVersions), '%s')) @@ -337,7 +337,7 @@ private function addHttpCacheSection(ArrayNodeDefinition $rootNode): void ->variableNode('request_options') ->defaultValue([]) ->validate() - ->ifTrue(function ($v) { return false === \is_array($v); }) + ->ifTrue(static function ($v) { return false === \is_array($v); }) ->thenInvalid('The request_options parameter must be an array.') ->end() ->info('To pass options to the client charged with the request.') @@ -435,7 +435,7 @@ private function addExceptionToStatusSection(ArrayNodeDefinition $rootNode): voi ->useAttributeAsKey('exception_class') ->beforeNormalization() ->ifArray() - ->then(function (array $exceptionToStatus) { + ->then(static function (array $exceptionToStatus) { foreach ($exceptionToStatus as &$httpStatusCode) { if (\is_int($httpStatusCode)) { continue; @@ -454,7 +454,7 @@ private function addExceptionToStatusSection(ArrayNodeDefinition $rootNode): voi ->prototype('integer')->end() ->validate() ->ifArray() - ->then(function (array $exceptionToStatus) { + ->then(static function (array $exceptionToStatus) { foreach ($exceptionToStatus as $httpStatusCode) { if ($httpStatusCode < 100 || $httpStatusCode >= 600) { throw new InvalidConfigurationException(sprintf('The HTTP status code "%s" is not valid.', $httpStatusCode)); @@ -479,7 +479,7 @@ private function addFormatSection(ArrayNodeDefinition $rootNode, string $key, ar ->useAttributeAsKey('format') ->beforeNormalization() ->ifArray() - ->then(function ($v) { + ->then(static function ($v) { foreach ($v as $format => $value) { if (isset($value['mime_types'])) { continue; diff --git a/src/GraphQl/Type/FieldsBuilder.php b/src/GraphQl/Type/FieldsBuilder.php index cd3108700a8..f28e90c6f36 100644 --- a/src/GraphQl/Type/FieldsBuilder.php +++ b/src/GraphQl/Type/FieldsBuilder.php @@ -327,7 +327,7 @@ private function getFilterArgs(array $args, ?string $resourceClass, ?ResourceMet if (\array_key_exists($key, $parsed) && \is_array($parsed[$key])) { $parsed = [$key => '']; } - array_walk_recursive($parsed, function (&$value) use ($graphqlFilterType) { + array_walk_recursive($parsed, static function (&$value) use ($graphqlFilterType) { $value = $graphqlFilterType; }); $args = $this->mergeFilterArgs($args, $parsed, $resourceMetadata, $key); diff --git a/src/HttpCache/VarnishPurger.php b/src/HttpCache/VarnishPurger.php index 5f317639314..c410602acc0 100644 --- a/src/HttpCache/VarnishPurger.php +++ b/src/HttpCache/VarnishPurger.php @@ -44,7 +44,7 @@ public function purge(array $iris) } // Create the regex to purge all tags in just one request - $parts = array_map(function ($iri) { + $parts = array_map(static function ($iri) { return sprintf('(^|\,)%s($|\,)', preg_quote($iri)); }, $iris); diff --git a/src/Security/Core/Authorization/ExpressionLanguageProvider.php b/src/Security/Core/Authorization/ExpressionLanguageProvider.php index 30cca0a31c1..826d5141e3f 100644 --- a/src/Security/Core/Authorization/ExpressionLanguageProvider.php +++ b/src/Security/Core/Authorization/ExpressionLanguageProvider.php @@ -26,9 +26,9 @@ final class ExpressionLanguageProvider implements ExpressionFunctionProviderInte public function getFunctions(): array { return [ - new ExpressionFunction('is_granted', function ($attributes, $object = 'null') { + new ExpressionFunction('is_granted', static function ($attributes, $object = 'null') { return sprintf('$auth_checker->isGranted(%s, %s)', $attributes, $object); - }, function (array $variables, $attributes, $object = null) { + }, static function (array $variables, $attributes, $object = null) { return $variables['auth_checker']->isGranted($attributes, $object); }), ]; diff --git a/src/Security/ExpressionLanguage.php b/src/Security/ExpressionLanguage.php index bb5f53849bc..dcdc59a8290 100644 --- a/src/Security/ExpressionLanguage.php +++ b/src/Security/ExpressionLanguage.php @@ -40,9 +40,9 @@ protected function registerFunctions() { parent::registerFunctions(); - $this->register('is_granted', function ($attributes, $object = 'null') { + $this->register('is_granted', static function ($attributes, $object = 'null') { return sprintf('$auth_checker->isGranted(%s, %s)', $attributes, $object); - }, function (array $variables, $attributes, $object = null) { + }, static function (array $variables, $attributes, $object = null) { return $variables['auth_checker']->isGranted($attributes, $object); }); } diff --git a/src/Security/ResourceAccessChecker.php b/src/Security/ResourceAccessChecker.php index 6b308141307..0f124c5375c 100644 --- a/src/Security/ResourceAccessChecker.php +++ b/src/Security/ResourceAccessChecker.php @@ -88,7 +88,7 @@ private function getEffectiveRoles(TokenInterface $token): array return $this->roleHierarchy->getReachableRoleNames($token->getRoleNames()); } - return array_map(function (Role $role): string { // @phpstan-ignore-line + return array_map(static function (Role $role): string { // @phpstan-ignore-line return $role->getRole(); // @phpstan-ignore-line }, $this->roleHierarchy->getReachableRoles($token->getRoles())); // @phpstan-ignore-line } diff --git a/src/Util/RequestParser.php b/src/Util/RequestParser.php index 49a43caa13e..d573dbcb553 100644 --- a/src/Util/RequestParser.php +++ b/src/Util/RequestParser.php @@ -55,7 +55,7 @@ public static function parseRequestParams(string $source): array $source = preg_replace_callback( '/(^|(?<=&))[^=[&]+/', - function ($key) { + static function ($key) { return bin2hex(urldecode($key[0])); }, $source