Skip to content

Commit d29950c

Browse files
committed
Convert switch cases to match expression
1 parent 7996efe commit d29950c

File tree

2 files changed

+11
-18
lines changed

2 files changed

+11
-18
lines changed

DependencyInjection/SecurityExtension.php

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -179,18 +179,13 @@ public function load(array $configs, ContainerBuilder $container)
179179
*/
180180
private function createStrategyDefinition(string $strategy, bool $allowIfAllAbstainDecisions, bool $allowIfEqualGrantedDeniedDecisions): Definition
181181
{
182-
switch ($strategy) {
183-
case MainConfiguration::STRATEGY_AFFIRMATIVE:
184-
return new Definition(AffirmativeStrategy::class, [$allowIfAllAbstainDecisions]);
185-
case MainConfiguration::STRATEGY_CONSENSUS:
186-
return new Definition(ConsensusStrategy::class, [$allowIfAllAbstainDecisions, $allowIfEqualGrantedDeniedDecisions]);
187-
case MainConfiguration::STRATEGY_UNANIMOUS:
188-
return new Definition(UnanimousStrategy::class, [$allowIfAllAbstainDecisions]);
189-
case MainConfiguration::STRATEGY_PRIORITY:
190-
return new Definition(PriorityStrategy::class, [$allowIfAllAbstainDecisions]);
191-
}
192-
193-
throw new \InvalidArgumentException(sprintf('The strategy "%s" is not supported.', $strategy));
182+
return match ($strategy) {
183+
MainConfiguration::STRATEGY_AFFIRMATIVE => new Definition(AffirmativeStrategy::class, [$allowIfAllAbstainDecisions]),
184+
MainConfiguration::STRATEGY_CONSENSUS => new Definition(ConsensusStrategy::class, [$allowIfAllAbstainDecisions, $allowIfEqualGrantedDeniedDecisions]),
185+
MainConfiguration::STRATEGY_UNANIMOUS => new Definition(UnanimousStrategy::class, [$allowIfAllAbstainDecisions]),
186+
MainConfiguration::STRATEGY_PRIORITY => new Definition(PriorityStrategy::class, [$allowIfAllAbstainDecisions]),
187+
default => throw new \InvalidArgumentException(sprintf('The strategy "%s" is not supported.', $strategy)),
188+
};
194189
}
195190

196191
private function createRoleHierarchy(array $config, ContainerBuilder $container)

Tests/Functional/Bundle/AccessTokenBundle/Security/Handler/AccessTokenHandler.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@ public function __construct()
2222

2323
public function getUserIdentifierFrom(string $accessToken): string
2424
{
25-
switch ($accessToken) {
26-
case 'VALID_ACCESS_TOKEN':
27-
return 'dunglas';
28-
default:
29-
throw new BadCredentialsException('Invalid credentials.');
30-
}
25+
return match ($accessToken) {
26+
'VALID_ACCESS_TOKEN' => 'dunglas',
27+
default => throw new BadCredentialsException('Invalid credentials.'),
28+
};
3129
}
3230
}

0 commit comments

Comments
 (0)