use constructor property promotion

xabbuh · xabbuh · commit 97e729b84070 · 2024-05-24T20:32:29.000+02:00
diff --git a/CacheWarmer/ExpressionCacheWarmer.php b/CacheWarmer/ExpressionCacheWarmer.php
@@ -20,16 +20,13 @@
  */
 class ExpressionCacheWarmer implements CacheWarmerInterface
 {
-    private iterable $expressions;
-    private ExpressionLanguage $expressionLanguage;
-
     /**
      * @param iterable<mixed, Expression|string> $expressions
      */
-    public function __construct(iterable $expressions, ExpressionLanguage $expressionLanguage)
-    {
-        $this->expressions = $expressions;
-        $this->expressionLanguage = $expressionLanguage;
+    public function __construct(
+        private iterable $expressions,
+        private ExpressionLanguage $expressionLanguage,
+    ) {
     }
 
     public function isOptional(): bool
diff --git a/Command/DebugFirewallCommand.php b/Command/DebugFirewallCommand.php
@@ -32,22 +32,16 @@
 #[AsCommand(name: 'debug:firewall', description: 'Display information about your security firewall(s)')]
 final class DebugFirewallCommand extends Command
 {
-    private array $firewallNames;
-    private ContainerInterface $contexts;
-    private ContainerInterface $eventDispatchers;
-    private array $authenticators;
-
     /**
      * @param string[]                   $firewallNames
      * @param AuthenticatorInterface[][] $authenticators
      */
-    public function __construct(array $firewallNames, ContainerInterface $contexts, ContainerInterface $eventDispatchers, array $authenticators)
-    {
-        $this->firewallNames = $firewallNames;
-        $this->contexts = $contexts;
-        $this->eventDispatchers = $eventDispatchers;
-        $this->authenticators = $authenticators;
-
+    public function __construct(
+        private array $firewallNames,
+        private ContainerInterface $contexts,
+        private ContainerInterface $eventDispatchers,
+        private array $authenticators,
+    ) {
         parent::__construct();
     }
 
diff --git a/DataCollector/SecurityDataCollector.php b/DataCollector/SecurityDataCollector.php
@@ -36,22 +36,16 @@
  */
 class SecurityDataCollector extends DataCollector implements LateDataCollectorInterface
 {
-    private ?TokenStorageInterface $tokenStorage;
-    private ?RoleHierarchyInterface $roleHierarchy;
-    private ?LogoutUrlGenerator $logoutUrlGenerator;
-    private ?AccessDecisionManagerInterface $accessDecisionManager;
-    private ?FirewallMapInterface $firewallMap;
-    private ?TraceableFirewallListener $firewall;
     private bool $hasVarDumper;
 
-    public function __construct(?TokenStorageInterface $tokenStorage = null, ?RoleHierarchyInterface $roleHierarchy = null, ?LogoutUrlGenerator $logoutUrlGenerator = null, ?AccessDecisionManagerInterface $accessDecisionManager = null, ?FirewallMapInterface $firewallMap = null, ?TraceableFirewallListener $firewall = null)
-    {
-        $this->tokenStorage = $tokenStorage;
-        $this->roleHierarchy = $roleHierarchy;
-        $this->logoutUrlGenerator = $logoutUrlGenerator;
-        $this->accessDecisionManager = $accessDecisionManager;
-        $this->firewallMap = $firewallMap;
-        $this->firewall = $firewall;
+    public function __construct(
+        private ?TokenStorageInterface $tokenStorage = null,
+        private ?RoleHierarchyInterface $roleHierarchy = null,
+        private ?LogoutUrlGenerator $logoutUrlGenerator = null,
+        private ?AccessDecisionManagerInterface $accessDecisionManager = null,
+        private ?FirewallMapInterface $firewallMap = null,
+        private ?TraceableFirewallListener $firewall = null,
+    ) {
         $this->hasVarDumper = class_exists(ClassStub::class);
     }
 
diff --git a/DependencyInjection/MainConfiguration.php b/DependencyInjection/MainConfiguration.php
@@ -36,16 +36,13 @@ class MainConfiguration implements ConfigurationInterface
     /** @internal */
     public const STRATEGY_PRIORITY = 'priority';
 
-    private array $factories;
-    private array $userProviderFactories;
-
     /**
      * @param array<AuthenticatorFactoryInterface> $factories
      */
-    public function __construct(array $factories, array $userProviderFactories)
-    {
-        $this->factories = $factories;
-        $this->userProviderFactories = $userProviderFactories;
+    public function __construct(
+        private array $factories,
+        private array $userProviderFactories,
+    ) {
     }
 
     /**
diff --git a/EventListener/FirewallListener.php b/EventListener/FirewallListener.php
@@ -25,14 +25,11 @@
  */
 class FirewallListener extends Firewall
 {
-    private FirewallMapInterface $map;
-    private LogoutUrlGenerator $logoutUrlGenerator;
-
-    public function __construct(FirewallMapInterface $map, EventDispatcherInterface $dispatcher, LogoutUrlGenerator $logoutUrlGenerator)
-    {
-        $this->map = $map;
-        $this->logoutUrlGenerator = $logoutUrlGenerator;
-
+    public function __construct(
+        private FirewallMapInterface $map,
+        EventDispatcherInterface $dispatcher,
+        private LogoutUrlGenerator $logoutUrlGenerator,
+    ) {
         parent::__construct($map, $dispatcher);
     }
 
diff --git a/EventListener/VoteListener.php b/EventListener/VoteListener.php
@@ -24,11 +24,9 @@
  */
 class VoteListener implements EventSubscriberInterface
 {
-    private TraceableAccessDecisionManager $traceableAccessDecisionManager;
-
-    public function __construct(TraceableAccessDecisionManager $traceableAccessDecisionManager)
-    {
-        $this->traceableAccessDecisionManager = $traceableAccessDecisionManager;
+    public function __construct(
+        private TraceableAccessDecisionManager $traceableAccessDecisionManager,
+    ) {
     }
 
     public function onVoterVote(VoteEvent $event): void
diff --git a/RememberMe/DecoratedRememberMeHandler.php b/RememberMe/DecoratedRememberMeHandler.php
@@ -24,11 +24,9 @@
  */
 final class DecoratedRememberMeHandler implements RememberMeHandlerInterface
 {
-    private RememberMeHandlerInterface $handler;
-
-    public function __construct(RememberMeHandlerInterface $handler)
-    {
-        $this->handler = $handler;
+    public function __construct(
+        private RememberMeHandlerInterface $handler,
+    ) {
     }
 
     public function createRememberMeCookie(UserInterface $user): void
diff --git a/Security/FirewallContext.php b/Security/FirewallContext.php
@@ -22,20 +22,15 @@
  */
 class FirewallContext
 {
-    private iterable $listeners;
-    private ?ExceptionListener $exceptionListener;
-    private ?LogoutListener $logoutListener;
-    private ?FirewallConfig $config;
-
     /**
      * @param iterable<mixed, callable> $listeners
      */
-    public function __construct(iterable $listeners, ?ExceptionListener $exceptionListener = null, ?LogoutListener $logoutListener = null, ?FirewallConfig $config = null)
-    {
-        $this->listeners = $listeners;
-        $this->exceptionListener = $exceptionListener;
-        $this->logoutListener = $logoutListener;
-        $this->config = $config;
+    public function __construct(
+        private iterable $listeners,
+        private ?ExceptionListener $exceptionListener = null,
+        private ?LogoutListener $logoutListener = null,
+        private ?FirewallConfig $config = null,
+    ) {
     }
 
     public function getConfig(): ?FirewallConfig
diff --git a/Security/FirewallMap.php b/Security/FirewallMap.php
@@ -24,13 +24,10 @@
  */
 class FirewallMap implements FirewallMapInterface
 {
-    private ContainerInterface $container;
-    private iterable $map;
-
-    public function __construct(ContainerInterface $container, iterable $map)
-    {
-        $this->container = $container;
-        $this->map = $map;
+    public function __construct(
+        private ContainerInterface $container,
+        private iterable $map,
+    ) {
     }
 
     public function getListeners(Request $request): array
diff --git a/Security/LazyFirewallContext.php b/Security/LazyFirewallContext.php
@@ -25,13 +25,14 @@
  */
 class LazyFirewallContext extends FirewallContext
 {
-    private TokenStorage $tokenStorage;
-
-    public function __construct(iterable $listeners, ?ExceptionListener $exceptionListener, ?LogoutListener $logoutListener, ?FirewallConfig $config, TokenStorage $tokenStorage)
-    {
+    public function __construct(
+        iterable $listeners,
+        ?ExceptionListener $exceptionListener,
+        ?LogoutListener $logoutListener,
+        ?FirewallConfig $config,
+        private TokenStorage $tokenStorage,
+    ) {
         parent::__construct($listeners, $exceptionListener, $logoutListener, $config);
-
-        $this->tokenStorage = $tokenStorage;
     }
 
     public function getListeners(): iterable

Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,9 @@`
`24`	`24`	`*/`
`25`	`25`	`class VoteListener implements EventSubscriberInterface`
`26`	`26`	`{`
`27`		`- private TraceableAccessDecisionManager $traceableAccessDecisionManager;`
`28`		`-`
`29`		`- public function __construct(TraceableAccessDecisionManager $traceableAccessDecisionManager)`
`30`		`- {`
`31`		`- $this->traceableAccessDecisionManager = $traceableAccessDecisionManager;`
	`27`	`+ public function __construct(`
	`28`	`+ private TraceableAccessDecisionManager $traceableAccessDecisionManager,`
	`29`	`+ ) {`
`32`	`30`	`}`
`33`	`31`
`34`	`32`	`public function onVoterVote(VoteEvent $event): void`