minor #48793 Leverage arrow function syntax for closure (tigitz)

nicolas-grekas · nicolas-grekas · commit 6bd00c044da4 · 2023-01-13T10:23:11.000+01:00
This PR was merged into the 6.3 branch. Discussion ---------- Leverage arrow function syntax for closure | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | no | New feature? | no  | Deprecations? | no  | Tickets | Fix #47658  | License | MIT | Doc PR |  Rationale in the RFC [here](https://wiki.php.net/rfc/arrow_functions_v2#introduction) It's also notable that using arrow function syntax rather than the classic one has been enforced in the past by symfony core member: symfony/symfony#48069 (comment) So this PR would be consistent. Commits ------- f5802d3a2a Leverage arrow function syntax for closure
diff --git a/Command/DebugFirewallCommand.php b/Command/DebugFirewallCommand.php
@@ -216,11 +216,9 @@ private function displayAuthenticators(string $name, SymfonyStyle $io): void
         $io->table(
             ['Classname'],
             array_map(
-                static function ($authenticator) {
-                    return [
-                        $authenticator::class,
-                    ];
-                },
+                static fn ($authenticator) => [
+                    $authenticator::class,
+                ],
                 $authenticators
             )
         );
diff --git a/DependencyInjection/Compiler/SortFirewallListenersPass.php b/DependencyInjection/Compiler/SortFirewallListenersPass.php
@@ -45,9 +45,7 @@ private function sortFirewallContextListeners(Definition $definition, ContainerB
         $prioritiesByServiceId = $this->getListenerPriorities($listenerIteratorArgument, $container);
 
         $listeners = $listenerIteratorArgument->getValues();
-        usort($listeners, function (Reference $a, Reference $b) use ($prioritiesByServiceId) {
-            return $prioritiesByServiceId[(string) $b] <=> $prioritiesByServiceId[(string) $a];
-        });
+        usort($listeners, fn (Reference $a, Reference $b) => $prioritiesByServiceId[(string) $b] <=> $prioritiesByServiceId[(string) $a]);
 
         $listenerIteratorArgument->setValues(array_values($listeners));
     }
diff --git a/DependencyInjection/MainConfiguration.php b/DependencyInjection/MainConfiguration.php
@@ -78,15 +78,15 @@ public function getConfigTreeBuilder(): TreeBuilder
                         ->booleanNode('allow_if_equal_granted_denied')->defaultTrue()->end()
                     ->end()
                     ->validate()
-                        ->ifTrue(function ($v) { return isset($v['strategy'], $v['service']); })
+                        ->ifTrue(fn ($v) => isset($v['strategy'], $v['service']))
                         ->thenInvalid('"strategy" and "service" cannot be used together.')
                     ->end()
                     ->validate()
-                        ->ifTrue(function ($v) { return isset($v['strategy'], $v['strategy_service']); })
+                        ->ifTrue(fn ($v) => isset($v['strategy'], $v['strategy_service']))
                         ->thenInvalid('"strategy" and "strategy_service" cannot be used together.')
                     ->end()
                     ->validate()
-                        ->ifTrue(function ($v) { return isset($v['service'], $v['strategy_service']); })
+                        ->ifTrue(fn ($v) => isset($v['service'], $v['strategy_service']))
                         ->thenInvalid('"service" and "strategy_service" cannot be used together.')
                     ->end()
                 ->end()
@@ -111,10 +111,10 @@ private function addRoleHierarchySection(ArrayNodeDefinition $rootNode)
                     ->useAttributeAsKey('id')
                     ->prototype('array')
                         ->performNoDeepMerging()
-                        ->beforeNormalization()->ifString()->then(function ($v) { return ['value' => $v]; })->end()
+                        ->beforeNormalization()->ifString()->then(fn ($v) => ['value' => $v])->end()
                         ->beforeNormalization()
-                            ->ifTrue(function ($v) { return \is_array($v) && isset($v['value']); })
-                            ->then(function ($v) { return preg_split('/\s*,\s*/', $v['value']); })
+                            ->ifTrue(fn ($v) => \is_array($v) && isset($v['value']))
+                            ->then(fn ($v) => preg_split('/\s*,\s*/', $v['value']))
                         ->end()
                         ->prototype('scalar')->end()
                     ->end()
@@ -324,9 +324,7 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
         $firewallNodeBuilder
             ->end()
             ->validate()
-                ->ifTrue(function ($v) {
-                    return true === $v['security'] && isset($v['pattern']) && !isset($v['request_matcher']);
-                })
+                ->ifTrue(fn ($v) => true === $v['security'] && isset($v['pattern']) && !isset($v['request_matcher']))
                 ->then(function ($firewall) use ($abstractFactoryKeys) {
                     foreach ($abstractFactoryKeys as $k) {
                         if (!isset($firewall[$k]['check_path'])) {
@@ -375,7 +373,7 @@ private function addProvidersSection(ArrayNodeDefinition $rootNode)
                         ->arrayNode('providers')
                             ->beforeNormalization()
                                 ->ifString()
-                                ->then(function ($v) { return preg_split('/\s*,\s*/', $v); })
+                                ->then(fn ($v) => preg_split('/\s*,\s*/', $v))
                             ->end()
                             ->prototype('scalar')->end()
                         ->end()
@@ -393,11 +391,11 @@ private function addProvidersSection(ArrayNodeDefinition $rootNode)
 
         $providerNodeBuilder
             ->validate()
-                ->ifTrue(function ($v) { return \count($v) > 1; })
+                ->ifTrue(fn ($v) => \count($v) > 1)
                 ->thenInvalid('You cannot set multiple provider types for the same provider')
             ->end()
             ->validate()
-                ->ifTrue(function ($v) { return 0 === \count($v); })
+                ->ifTrue(fn ($v) => 0 === \count($v))
                 ->thenInvalid('You must set a provider definition for the provider.')
             ->end()
         ;
diff --git a/DependencyInjection/Security/Factory/AccessTokenFactory.php b/DependencyInjection/Security/Factory/AccessTokenFactory.php
@@ -46,7 +46,7 @@ public function addConfiguration(NodeDefinition $node): void
                 ->fixXmlConfig('token_extractors')
                 ->beforeNormalization()
                     ->ifString()
-                    ->then(static function (string $v): array { return [$v]; })
+                    ->then(static fn (string $v): array => [$v])
                 ->end()
                 ->cannotBeEmpty()
                 ->defaultValue([
@@ -97,17 +97,15 @@ private function createExtractor(ContainerBuilder $container, string $firewallNa
             'request_body' => 'security.access_token_extractor.request_body',
             'header' => 'security.access_token_extractor.header',
         ];
-        $extractors = array_map(static function (string $extractor) use ($aliases): string {
-            return $aliases[$extractor] ?? $extractor;
-        }, $extractors);
+        $extractors = array_map(static fn (string $extractor): string => $aliases[$extractor] ?? $extractor, $extractors);
 
         if (1 === \count($extractors)) {
             return current($extractors);
         }
         $extractorId = sprintf('security.authenticator.access_token.chain_extractor.%s', $firewallName);
         $container
             ->setDefinition($extractorId, new ChildDefinition('security.authenticator.access_token.chain_extractor'))
-            ->replaceArgument(0, array_map(function (string $extractorId): Reference {return new Reference($extractorId); }, $extractors))
+            ->replaceArgument(0, array_map(fn (string $extractorId): Reference => new Reference($extractorId), $extractors))
         ;
 
         return $extractorId;
diff --git a/DependencyInjection/Security/Factory/CustomAuthenticatorFactory.php b/DependencyInjection/Security/Factory/CustomAuthenticatorFactory.php
@@ -47,7 +47,7 @@ public function addConfiguration(NodeDefinition $builder)
         $factoryRootNode
             ->fixXmlConfig('custom_authenticator')
             ->validate()
-                ->ifTrue(function ($v) { return isset($v['custom_authenticators']) && empty($v['custom_authenticators']); })
+                ->ifTrue(fn ($v) => isset($v['custom_authenticators']) && empty($v['custom_authenticators']))
                 ->then(function ($v) {
                     unset($v['custom_authenticators']);
 
diff --git a/DependencyInjection/Security/Factory/RememberMeFactory.php b/DependencyInjection/Security/Factory/RememberMeFactory.php
@@ -148,7 +148,7 @@ public function addConfiguration(NodeDefinition $node)
             ->scalarNode('service')->end()
             ->arrayNode('user_providers')
                 ->beforeNormalization()
-                    ->ifString()->then(function ($v) { return [$v]; })
+                    ->ifString()->then(fn ($v) => [$v])
                 ->end()
                 ->prototype('scalar')->end()
             ->end()
@@ -162,7 +162,7 @@ public function addConfiguration(NodeDefinition $node)
             ->end()
             ->arrayNode('token_provider')
                 ->beforeNormalization()
-                    ->ifString()->then(function ($v) { return ['service' => $v]; })
+                    ->ifString()->then(fn ($v) => ['service' => $v])
                 ->end()
                 ->children()
                     ->scalarNode('service')->info('The service ID of a custom rememberme token provider.')->end()
diff --git a/DependencyInjection/Security/UserProvider/InMemoryFactory.php b/DependencyInjection/Security/UserProvider/InMemoryFactory.php
@@ -54,7 +54,7 @@ public function addConfiguration(NodeDefinition $node)
                         ->children()
                             ->scalarNode('password')->defaultNull()->end()
                             ->arrayNode('roles')
-                                ->beforeNormalization()->ifString()->then(function ($v) { return preg_split('/\s*,\s*/', $v); })->end()
+                                ->beforeNormalization()->ifString()->then(fn ($v) => preg_split('/\s*,\s*/', $v))->end()
                                 ->prototype('scalar')->end()
                             ->end()
                         ->end()
diff --git a/DependencyInjection/Security/UserProvider/LdapFactory.php b/DependencyInjection/Security/UserProvider/LdapFactory.php
@@ -59,7 +59,7 @@ public function addConfiguration(NodeDefinition $node)
                     ->prototype('scalar')->end()
                 ->end()
                 ->arrayNode('default_roles')
-                    ->beforeNormalization()->ifString()->then(function ($v) { return preg_split('/\s*,\s*/', $v); })->end()
+                    ->beforeNormalization()->ifString()->then(fn ($v) => preg_split('/\s*,\s*/', $v))->end()
                     ->requiresAtLeastOneElement()
                     ->prototype('scalar')->end()
                 ->end()
diff --git a/DependencyInjection/SecurityExtension.php b/DependencyInjection/SecurityExtension.php
@@ -501,9 +501,7 @@ private function createFirewall(ContainerBuilder $container, string $id, array $
         $configuredEntryPoint = $defaultEntryPoint;
 
         // authenticator manager
-        $authenticators = array_map(function ($id) {
-            return new Reference($id);
-        }, $firewallAuthenticationProviders);
+        $authenticators = array_map(fn ($id) => new Reference($id), $firewallAuthenticationProviders);
         $container
             ->setDefinition($managerId = 'security.authenticator.manager.'.$id, new ChildDefinition('security.authenticator.manager'))
             ->replaceArgument(0, $authenticators)
@@ -1027,9 +1025,7 @@ public function getConfiguration(array $config, ContainerBuilder $container): ?C
 
     private function isValidIps(string|array $ips): bool
     {
-        $ipsList = array_reduce((array) $ips, static function (array $ips, string $ip) {
-            return array_merge($ips, preg_split('/\s*,\s*/', $ip));
-        }, []);
+        $ipsList = array_reduce((array) $ips, static fn (array $ips, string $ip) => array_merge($ips, preg_split('/\s*,\s*/', $ip)), []);
 
         if (!$ipsList) {
             return false;
@@ -1081,9 +1077,7 @@ private function getSortedFactories(): array
                 $factories[] = array_merge($factory, [$i]);
             }
 
-            usort($factories, function ($a, $b) {
-                return $b[0] <=> $a[0] ?: $a[2] <=> $b[2];
-            });
+            usort($factories, fn ($a, $b) => $b[0] <=> $a[0] ?: $a[2] <=> $b[2]);
 
             $this->sortedFactories = array_column($factories, 1);
         }
diff --git a/Tests/DataCollector/SecurityDataCollectorTest.php b/Tests/DataCollector/SecurityDataCollectorTest.php
@@ -342,7 +342,7 @@ public function testCollectDecisionLog(string $strategy, array $decisionLog, arr
         $this->assertEquals($dataCollector->getAccessDecisionLog(), $expectedDecisionLog, 'Wrong value returned by getAccessDecisionLog');
 
         $this->assertSame(
-            array_map(function ($classStub) { return (string) $classStub; }, $dataCollector->getVoters()),
+            array_map(fn ($classStub) => (string) $classStub, $dataCollector->getVoters()),
             $expectedVoterClasses,
             'Wrong value returned by getVoters'
         );
diff --git a/Tests/DependencyInjection/Compiler/RegisterGlobalSecurityEventListenersPassTest.php b/Tests/DependencyInjection/Compiler/RegisterGlobalSecurityEventListenersPassTest.php
@@ -191,10 +191,8 @@ private function assertListeners(array $expectedListeners, string $dispatcherId
             $actualListeners[] = $arguments;
         }
 
-        $foundListeners = array_uintersect($expectedListeners, $actualListeners, function (array $a, array $b) {
-            // PHP internally sorts all the arrays first, so returning proper 1 / -1 values is crucial
-            return $a <=> $b;
-        });
+        // PHP internally sorts all the arrays first, so returning proper 1 / -1 values is crucial
+        $foundListeners = array_uintersect($expectedListeners, $actualListeners, fn (array $a, array $b) => $a <=> $b);
 
         $this->assertEquals($expectedListeners, $foundListeners);
     }
diff --git a/Tests/DependencyInjection/CompleteConfigurationTest.php b/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -93,7 +93,7 @@ public function testUserProviders()
     {
         $container = $this->getContainer('container1');
 
-        $providers = array_values(array_filter($container->getServiceIds(), function ($key) { return str_starts_with($key, 'security.user.provider.concrete'); }));
+        $providers = array_values(array_filter($container->getServiceIds(), fn ($key) => str_starts_with($key, 'security.user.provider.concrete')));
 
         $expectedProviders = [
             'security.user.provider.concrete.default',
diff --git a/Tests/Functional/Bundle/AuthenticatorBundle/ApiAuthenticator.php b/Tests/Functional/Bundle/AuthenticatorBundle/ApiAuthenticator.php
@@ -46,7 +46,7 @@ public function authenticate(Request $request): Passport
 
         $userLoader = null;
         if ($this->selfLoadingUser) {
-            $userLoader = function ($username) { return new InMemoryUser($username, 'test', ['ROLE_USER']); };
+            $userLoader = fn ($username) => new InMemoryUser($username, 'test', ['ROLE_USER']);
         }
 
         return new SelfValidatingPassport(new UserBadge($email, $userLoader));
diff --git a/Tests/LoginLink/FirewallAwareLoginLinkHandlerTest.php b/Tests/LoginLink/FirewallAwareLoginLinkHandlerTest.php
@@ -69,14 +69,10 @@ private function createLocator(array $linkers)
         $locator = $this->createMock(ContainerInterface::class);
         $locator->expects($this->any())
             ->method('has')
-            ->willReturnCallback(function ($firewallName) use ($linkers) {
-                return isset($linkers[$firewallName]);
-            });
+            ->willReturnCallback(fn ($firewallName) => isset($linkers[$firewallName]));
         $locator->expects($this->any())
             ->method('get')
-            ->willReturnCallback(function ($firewallName) use ($linkers) {
-                return $linkers[$firewallName];
-            });
+            ->willReturnCallback(fn ($firewallName) => $linkers[$firewallName]);
 
         return $locator;
     }

Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,7 @@ private function sortFirewallContextListeners(Definition $definition, ContainerB`
`45`	`45`	`$prioritiesByServiceId = $this->getListenerPriorities($listenerIteratorArgument, $container);`
`46`	`46`
`47`	`47`	`$listeners = $listenerIteratorArgument->getValues();`
`48`		`- usort($listeners, function (Reference $a, Reference $b) use ($prioritiesByServiceId) {`
`49`		`- return $prioritiesByServiceId[(string) $b] <=> $prioritiesByServiceId[(string) $a];`
`50`		`- });`
	`48`	`+ usort($listeners, fn (Reference $a, Reference $b) => $prioritiesByServiceId[(string) $b] <=> $prioritiesByServiceId[(string) $a]);`
`51`	`49`
`52`	`50`	`$listenerIteratorArgument->setValues(array_values($listeners));`
`53`	`51`	`}`