Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 7085623

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
bug #57467 [SecurityBundle] Add provider XML attribute to the authenticators it’s missing from (MatTheCat)
This PR was merged into the 5.4 branch. Discussion ---------- [SecurityBundle] Add `provider` XML attribute to the authenticators it’s missing from | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | N/A | License | MIT This PR fixes the issues found while investigating #57463 (but not #57463 itself as I’m not sure about its impact): - `provider` attribute is missing for several authenticators in the XSD - fixtures use a `form_login` instead of the `form-login` authenticator - fixtures use `user-checker` as a `firewall` element rather than attribute Commits ------- 5f16bbd [SecurityBundle] Add `provider` XML attribute to the authenticators it’s missing from
2 parents 43cf9e6 + 5f16bbd commit 7085623
Copy full SHA for 7085623

File tree

9 files changed

+8
-11
lines changed
Filter options

9 files changed

+8
-11
lines changed

‎src/Symfony/Bundle/SecurityBundle/Resources/config/schema/security-1.0.xsd

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Resources/config/schema/security-1.0.xsd
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@
230230
<xsd:attribute name="check-path" type="xsd:string" />
231231
<xsd:attribute name="use-forward" type="xsd:boolean" />
232232
<xsd:attribute name="require-previous-session" type="xsd:boolean" />
233+
<xsd:attribute name="provider" type="xsd:string" />
233234
</xsd:complexType>
234235

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

‎src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml
+1-2Lines 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>

‎src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_provider.xml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_provider.xml
+1-1Lines 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>

‎src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_undefined_provider.xml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_undefined_provider.xml
+1-1Lines 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>

‎src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/legacy_container1.xml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/legacy_container1.xml
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,9 @@
6666
<http-basic />
6767
</firewall>
6868

69-
<firewall name="with_user_checker" provider="default">
69+
<firewall name="with_user_checker" provider="default" user-checker="app.user_checker">
7070
<anonymous />
7171
<http-basic />
72-
<user-checker>app.user_checker</user-checker>
7372
</firewall>
7473

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

‎src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/legacy_encoders.xml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/legacy_encoders.xml
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,9 @@
6666
<http-basic />
6767
</firewall>
6868

69-
<firewall name="with_user_checker" provider="default">
69+
<firewall name="with_user_checker" provider="default" user-checker="app.user_checker">
7070
<anonymous />
7171
<http-basic />
72-
<user-checker>app.user_checker</user-checker>
7372
</firewall>
7473

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

‎src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_provider.xml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_provider.xml
+1-1Lines 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>

‎src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_undefined_provider.xml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_undefined_provider.xml
+1-1Lines 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>

‎src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/no_custom_user_checker.xml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/no_custom_user_checker.xml
-1Lines 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 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.