Ignore call of setter if translator is not available and remove not n…

…ecessary nullable of setter parameter
symfony · Sep 2, 2020 · 485e59f · 485e59f
1 parent 4291f7f
commit 485e59f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
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;
     }