Skip to content

Commit adc30c3

Browse files
committed
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. ...
2 parents dfb2860 + 86557f2 commit adc30c3

File tree

8 files changed

+7
-8
lines changed

8 files changed

+7
-8
lines changed

Resources/config/schema/security-1.0.xsd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@
208208
<xsd:attribute name="check-path" type="xsd:string" />
209209
<xsd:attribute name="use-forward" type="xsd:boolean" />
210210
<xsd:attribute name="require-previous-session" type="xsd:boolean" />
211+
<xsd:attribute name="provider" type="xsd:string" />
211212
</xsd:complexType>
212213

213214
<xsd:attributeGroup name="success-handler-options">

Security/FirewallAwareTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ private function getForFirewall(): object
4444
if (!$this->locator->has($firewallName)) {
4545
$message = 'No '.$serviceIdentifier.' found for this firewall.';
4646
if (\defined(static::class.'::FIREWALL_OPTION')) {
47-
$message .= sprintf('Did you forget to add a "'.static::FIREWALL_OPTION.'" key under your "%s" firewall?', $firewallName);
47+
$message .= sprintf(' Did you forget to add a "'.static::FIREWALL_OPTION.'" key under your "%s" firewall?', $firewallName);
4848
}
4949

5050
throw new \LogicException($message);

Tests/DependencyInjection/Fixtures/xml/container1.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,8 @@
6464
<http-basic />
6565
</firewall>
6666

67-
<firewall name="with_user_checker" provider="default">
67+
<firewall name="with_user_checker" provider="default" user-checker="app.user_checker">
6868
<http-basic />
69-
<user-checker>app.user_checker</user-checker>
7069
</firewall>
7170

7271
<role id="ROLE_ADMIN">ROLE_USER</role>

Tests/DependencyInjection/Fixtures/xml/firewall_provider.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<sec:firewalls>
1717
<sec:firewall name="main" provider="with-dash">
18-
<sec:form_login />
18+
<sec:form-login />
1919
</sec:firewall>
2020
</sec:firewalls>
2121
</sec:config>

Tests/DependencyInjection/Fixtures/xml/firewall_undefined_provider.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<sec:firewalls>
1717
<sec:firewall name="main" provider="undefined">
18-
<sec:form_login />
18+
<sec:form-login />
1919
</sec:firewall>
2020
</sec:firewalls>
2121
</sec:config>

Tests/DependencyInjection/Fixtures/xml/listener_provider.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<sec:firewalls>
1717
<sec:firewall name="main">
18-
<sec:form_login provider="default" />
18+
<sec:form-login provider="default" />
1919
</sec:firewall>
2020
</sec:firewalls>
2121
</sec:config>

Tests/DependencyInjection/Fixtures/xml/listener_undefined_provider.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<sec:firewalls>
1717
<sec:firewall name="main">
18-
<sec:form_login provider="undefined" />
18+
<sec:form-login provider="undefined" />
1919
</sec:firewall>
2020
</sec:firewalls>
2121
</sec:config>

Tests/DependencyInjection/Fixtures/xml/no_custom_user_checker.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<switch-user />
2323
<x509 />
2424
<remote-user />
25-
<user-checker />
2625
<logout />
2726
<remember-me secret="TheSecret"/>
2827
</firewall>

0 commit comments

Comments
 (0)