Ignore call of setter if translator is not available and remove not necessary nullable of setter parameter

malteschlueter · malteschlueter · commit 485e59f43946 · 2020-09-02T16:59:22.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_authenticator.php b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_authenticator.php
@@ -143,7 +143,7 @@
                 abstract_arg('options'),
                 service('property_accessor')->nullOnInvalid(),
             ])
-            ->call('setTranslator', [service('translator')->nullOnInvalid()])
+            ->call('setTranslator', [service('translator')->ignoreOnInvalid()])
 
         ->set('security.authenticator.remember_me', RememberMeAuthenticator::class)
             ->abstract()
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.php b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.php
@@ -189,7 +189,7 @@
                 service('event_dispatcher')->nullOnInvalid(),
                 service('property_accessor')->nullOnInvalid(),
             ])
-            ->call('setTranslator', [service('translator')->nullOnInvalid()])
+            ->call('setTranslator', [service('translator')->ignoreOnInvalid()])
             ->tag('monolog.logger', ['channel' => 'security'])
 
         ->set('security.authentication.listener.remote_user', RemoteUserAuthenticationListener::class)
diff --git a/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php
@@ -143,7 +143,7 @@ public function isInteractive(): bool
         return true;
     }
 
-    public function setTranslator(?TranslatorInterface $translator)
+    public function setTranslator(TranslatorInterface $translator)
     {
         $this->translator = $translator;
     }
diff --git a/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordJsonAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordJsonAuthenticationListener.php
@@ -216,7 +216,7 @@ public function setSessionAuthenticationStrategy(SessionAuthenticationStrategyIn
         $this->sessionStrategy = $sessionStrategy;
     }
 
-    public function setTranslator(?TranslatorInterface $translator)
+    public function setTranslator(TranslatorInterface $translator)
     {
         $this->translator = $translator;
     }

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ public function isInteractive(): bool`
`143`	`143`	`return true;`
`144`	`144`	`}`
`145`	`145`
`146`		`- public function setTranslator(?TranslatorInterface $translator)`
	`146`	`+ public function setTranslator(TranslatorInterface $translator)`
`147`	`147`	`{`
`148`	`148`	`$this->translator = $translator;`
`149`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ public function setSessionAuthenticationStrategy(SessionAuthenticationStrategyIn`
`216`	`216`	`$this->sessionStrategy = $sessionStrategy;`
`217`	`217`	`}`
`218`	`218`
`219`		`- public function setTranslator(?TranslatorInterface $translator)`
	`219`	`+ public function setTranslator(TranslatorInterface $translator)`
`220`	`220`	`{`
`221`	`221`	`$this->translator = $translator;`
`222`	`222`	`}`