Skip to content

Commit 305edfa

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: CS: Apply ternary_to_null_coalescing fixer
2 parents 0ef5749 + 15c436a commit 305edfa

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

DependencyInjection/SecurityExtension.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -318,9 +318,9 @@ private function createFirewall(ContainerBuilder $container, string $id, array $
318318
if (isset($firewall['request_matcher'])) {
319319
$matcher = new Reference($firewall['request_matcher']);
320320
} elseif (isset($firewall['pattern']) || isset($firewall['host'])) {
321-
$pattern = isset($firewall['pattern']) ? $firewall['pattern'] : null;
322-
$host = isset($firewall['host']) ? $firewall['host'] : null;
323-
$methods = isset($firewall['methods']) ? $firewall['methods'] : [];
321+
$pattern = $firewall['pattern'] ?? null;
322+
$host = $firewall['host'] ?? null;
323+
$methods = $firewall['methods'] ?? [];
324324
$matcher = $this->createRequestMatcher($container, $pattern, $host, null, $methods);
325325
}
326326

@@ -445,7 +445,7 @@ private function createFirewall(ContainerBuilder $container, string $id, array $
445445
}
446446

447447
// Determine default entry point
448-
$configuredEntryPoint = isset($firewall['entry_point']) ? $firewall['entry_point'] : null;
448+
$configuredEntryPoint = $firewall['entry_point'] ?? null;
449449

450450
// Authentication listeners
451451
$firewallAuthenticationProviders = [];
@@ -503,8 +503,8 @@ private function createFirewall(ContainerBuilder $container, string $id, array $
503503
// Exception listener
504504
$exceptionListener = new Reference($this->createExceptionListener($container, $firewall, $id, $configuredEntryPoint ?: $defaultEntryPoint, $firewall['stateless']));
505505

506-
$config->replaceArgument(8, isset($firewall['access_denied_handler']) ? $firewall['access_denied_handler'] : null);
507-
$config->replaceArgument(9, isset($firewall['access_denied_url']) ? $firewall['access_denied_url'] : null);
506+
$config->replaceArgument(8, $firewall['access_denied_handler'] ?? null);
507+
$config->replaceArgument(9, $firewall['access_denied_url'] ?? null);
508508

509509
$container->setAlias('security.user_checker.'.$id, new Alias($firewall['user_checker'], false));
510510

@@ -518,7 +518,7 @@ private function createFirewall(ContainerBuilder $container, string $id, array $
518518
}
519519

520520
$config->replaceArgument(10, $listenerKeys);
521-
$config->replaceArgument(11, isset($firewall['switch_user']) ? $firewall['switch_user'] : null);
521+
$config->replaceArgument(11, $firewall['switch_user'] ?? null);
522522

523523
return [$matcher, $listeners, $exceptionListener, null !== $logoutListenerId ? new Reference($logoutListenerId) : null];
524524
}

0 commit comments

Comments
 (0)