Merge branch '5.4' into 6.4

* 5.4: (21 commits) [SecurityBundle] Add `provider` XML attribute to the authenticators it’s missing from [DoctrineBridge] Test reset with a true manager Sync php-cs-fixer config file with 7.2 [HttpClient] Fix parsing SSE [Notifier] Fix thread key in GoogleChat bridge [HttpKernel][Security] Fix accessing session for stateless request [Serializer] Fix `ObjectNormalizer` with property path test handling of special "value" constraint option [PhpUnitBridge] Add missing import [FrameworkBundle] Fix setting default context for certain normalizers [57251] Missing translations for Romanian (ro) [ErrorHandler] Fix rendered exception code highlighting on PHP 8.3 [String] Fix #54611 pluralization of -on ending words + singularization of -a ending foreign words [Validator] [UniqueValidator] Use correct variable as parameter in (custom) error message [Messenger] Comply with Amazon SQS requirements for message body fix cssColor HSLA test dataProvider properly handle invalid data for false/true types chore: upgrade class doc add space in error message [Messenger] [Amqp] Handle AMQPConnectionException when publishing a message. ...
symfony · Jun 21, 2024 · adc30c3 · adc30c3
2 parents dfb2860 + 86557f2
commit adc30c3
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 8 deletions.
diff --git a/Resources/config/schema/security-1.0.xsd b/Resources/config/schema/security-1.0.xsd
@@ -208,6 +208,7 @@
         <xsd:attribute name="check-path" type="xsd:string" />
         <xsd:attribute name="use-forward" type="xsd:boolean" />
         <xsd:attribute name="require-previous-session" type="xsd:boolean" />
+        <xsd:attribute name="provider" type="xsd:string" />
     </xsd:complexType>
 
     <xsd:attributeGroup name="success-handler-options">

diff --git a/Security/FirewallAwareTrait.php b/Security/FirewallAwareTrait.php
@@ -44,7 +44,7 @@ private function getForFirewall(): object
         if (!$this->locator->has($firewallName)) {
             $message = 'No '.$serviceIdentifier.' found for this firewall.';
             if (\defined(static::class.'::FIREWALL_OPTION')) {
-                $message .= sprintf('Did you forget to add a "'.static::FIREWALL_OPTION.'" key under your "%s" firewall?', $firewallName);
+                $message .= sprintf(' Did you forget to add a "'.static::FIREWALL_OPTION.'" key under your "%s" firewall?', $firewallName);
             }
 
             throw new \LogicException($message);

diff --git a/Tests/DependencyInjection/Fixtures/xml/container1.xml b/Tests/DependencyInjection/Fixtures/xml/container1.xml
@@ -64,9 +64,8 @@
             <http-basic />
         </firewall>
 
-        <firewall name="with_user_checker" provider="default">
+        <firewall name="with_user_checker" provider="default" user-checker="app.user_checker">
             <http-basic />
-            <user-checker>app.user_checker</user-checker>
         </firewall>
 
         <role id="ROLE_ADMIN">ROLE_USER</role>

diff --git a/Tests/DependencyInjection/Fixtures/xml/firewall_provider.xml b/Tests/DependencyInjection/Fixtures/xml/firewall_provider.xml
@@ -15,7 +15,7 @@
 
         <sec:firewalls>
             <sec:firewall name="main" provider="with-dash">
-                <sec:form_login />
+                <sec:form-login />
             </sec:firewall>
         </sec:firewalls>
     </sec:config>

diff --git a/Tests/DependencyInjection/Fixtures/xml/firewall_undefined_provider.xml b/Tests/DependencyInjection/Fixtures/xml/firewall_undefined_provider.xml
@@ -15,7 +15,7 @@
 
         <sec:firewalls>
             <sec:firewall name="main" provider="undefined">
-                <sec:form_login />
+                <sec:form-login />
             </sec:firewall>
         </sec:firewalls>
     </sec:config>

diff --git a/Tests/DependencyInjection/Fixtures/xml/listener_provider.xml b/Tests/DependencyInjection/Fixtures/xml/listener_provider.xml
@@ -15,7 +15,7 @@
 
         <sec:firewalls>
             <sec:firewall name="main">
-                <sec:form_login provider="default" />
+                <sec:form-login provider="default" />
             </sec:firewall>
         </sec:firewalls>
     </sec:config>

diff --git a/Tests/DependencyInjection/Fixtures/xml/listener_undefined_provider.xml b/Tests/DependencyInjection/Fixtures/xml/listener_undefined_provider.xml
@@ -15,7 +15,7 @@
 
         <sec:firewalls>
             <sec:firewall name="main">
-                <sec:form_login provider="undefined" />
+                <sec:form-login provider="undefined" />
             </sec:firewall>
         </sec:firewalls>
     </sec:config>

diff --git a/Tests/DependencyInjection/Fixtures/xml/no_custom_user_checker.xml b/Tests/DependencyInjection/Fixtures/xml/no_custom_user_checker.xml
@@ -22,7 +22,6 @@
             <switch-user />
             <x509 />
             <remote-user />
-            <user-checker />
             <logout />
             <remember-me secret="TheSecret"/>
         </firewall>