From 66ac3f7f5d1d3aa13eb459211e4a622d5e95182b Mon Sep 17 00:00:00 2001
From: Jules Pietri <heahdude@yahoo.fr>
Date: Sat, 29 Feb 2020 22:21:13 +0100
Subject: [PATCH] [SecurityBundle] Added XSD for the extension configuration

---
 .../Bundle/SecurityBundle/CHANGELOG.md        |   1 +
 .../Resources/config/schema/security-1.0.xsd  | 358 ++++++++++++++++++
 ...ess_decision_manager_customized_config.xml |   5 +-
 ...cess_decision_manager_default_strategy.xml |   5 +-
 .../xml/access_decision_manager_service.xml   |   5 +-
 ..._decision_manager_service_and_strategy.xml |   5 +-
 .../Fixtures/xml/argon2i_encoder.xml          |  11 +-
 .../Fixtures/xml/bcrypt_encoder.xml           |   9 +-
 .../Fixtures/xml/container1.xml               |   6 +-
 .../Fixtures/xml/firewall_provider.xml        |   9 +-
 .../xml/firewall_undefined_provider.xml       |   9 +-
 .../Fixtures/xml/listener_provider.xml        |   9 +-
 .../xml/listener_undefined_provider.xml       |   9 +-
 .../Fixtures/xml/logout_delete_cookies.xml    |  17 +-
 .../Fixtures/xml/merge.xml                    |   5 +-
 .../Fixtures/xml/merge_import.xml             |   5 +-
 .../Fixtures/xml/migrating_encoder.xml        |   9 +-
 .../Fixtures/xml/no_custom_user_checker.xml   |   5 +-
 .../Fixtures/xml/remember_me_options.xml      |  11 +-
 .../Fixtures/xml/sodium_encoder.xml           |   9 +-
 20 files changed, 456 insertions(+), 46 deletions(-)
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Resources/config/schema/security-1.0.xsd

diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
index de5208aa1a..5995cb1893 100644
--- a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 5.1.0
 -----
 
+ * Added XSD for configuration
  * Added security configuration for priority-based access decision strategy
 
 5.0.0
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/schema/security-1.0.xsd b/src/Symfony/Bundle/SecurityBundle/Resources/config/schema/security-1.0.xsd
new file mode 100644
index 0000000000..8ff0d5e46d
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/schema/security-1.0.xsd
@@ -0,0 +1,358 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xsd:schema xmlns="http://symfony.com/schema/dic/security"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://symfony.com/schema/dic/security"
+    elementFormDefault="qualified">
+
+    <xsd:element name="config" type="config" />
+
+    <xsd:complexType name="config">
+        <xsd:choice maxOccurs="unbounded">
+            <xsd:element name="access-decision-manager" type="access_decision_manager" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="encoders" type="encoders" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="encoder" type="encoder" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="providers" type="providers" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="provider" type="provider" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="firewalls" type="firewalls" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="firewall" type="firewall" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="rule" type="rule" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="role" type="role" minOccurs="0" maxOccurs="unbounded" />
+        </xsd:choice>
+        <xsd:attribute name="access-denied-url" type="xsd:string" />
+        <xsd:attribute name="session-fixation-strategy" type="session_fixation_strategy" />
+        <xsd:attribute name="hide-user-not-found" type="xsd:boolean" />
+        <xsd:attribute name="always-authenticate-before-granting" type="xsd:boolean" />
+        <xsd:attribute name="erase-credentials" type="xsd:boolean" />
+    </xsd:complexType>
+
+    <xsd:complexType name="encoders">
+        <xsd:sequence>
+            <xsd:element name="encoder" type="encoder" minOccurs="1" maxOccurs="unbounded" />
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="providers">
+        <xsd:sequence>
+            <xsd:element name="provider" type="provider" minOccurs="1" maxOccurs="unbounded" />
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="firewalls">
+        <xsd:sequence>
+            <xsd:element name="firewall" type="firewall" minOccurs="1" maxOccurs="unbounded" />
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:simpleType name="session_fixation_strategy">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="none" />
+            <xsd:enumeration value="migrate" />
+            <xsd:enumeration value="invalidate" />
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:complexType name="access_decision_manager">
+        <xsd:attribute name="strategy" type="access_decision_manager_strategy" />
+        <xsd:attribute name="service" type="xsd:string" />
+        <xsd:attribute name="allow-if-all-abstain" type="xsd:boolean" />
+        <xsd:attribute name="allow-if-equal-granted-denied" type="xsd:boolean" />
+    </xsd:complexType>
+
+    <xsd:simpleType name="access_decision_manager_strategy">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="affirmative" />
+            <xsd:enumeration value="consensus" />
+            <xsd:enumeration value="unanimous" />
+            <xsd:enumeration value="priority" />
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:complexType name="encoder">
+        <xsd:sequence>
+            <xsd:element name="migrate-from" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
+        </xsd:sequence>
+        <xsd:attribute name="class" type="xsd:string" use="required" />
+        <xsd:attribute name="algorithm" type="xsd:string" />
+        <xsd:attribute name="hash-algorithm" type="xsd:string" />
+        <xsd:attribute name="key-length" type="xsd:string" />
+        <xsd:attribute name="ignore-case" type="xsd:boolean" />
+        <xsd:attribute name="encode-as-base64" type="xsd:boolean" />
+        <xsd:attribute name="iterations" type="xsd:string" />
+        <xsd:attribute name="cost" type="xsd:integer" />
+        <xsd:attribute name="memory-cost" type="xsd:string" />
+        <xsd:attribute name="time-cost" type="xsd:string" />
+        <xsd:attribute name="id" type="xsd:string" />
+    </xsd:complexType>
+
+    <xsd:complexType name="provider">
+        <xsd:choice minOccurs="0" maxOccurs="1">
+            <xsd:element name="chain" type="chain" />
+            <xsd:element name="memory" type="memory" />
+            <xsd:element name="ldap" type="ldap" />
+            <!-- allow factories to use dynamic elements -->
+            <xsd:any processContents="lax" />
+        </xsd:choice>
+        <xsd:attribute name="name" type="xsd:string" use="required" />
+        <xsd:attribute name="id" type="xsd:string" />
+    </xsd:complexType>
+
+    <xsd:complexType name="chain">
+        <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+            <xsd:element name="provider" type="xsd:string" />
+        </xsd:sequence>
+        <xsd:attribute name="providers" type="xsd:string" />
+    </xsd:complexType>
+
+    <xsd:complexType name="memory">
+        <xsd:sequence>
+            <xsd:element name="user" type="user" minOccurs="1" maxOccurs="unbounded" />
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="user">
+        <xsd:attribute name="name" type="xsd:string" use="required" />
+        <xsd:attribute name="password" type="xsd:string" />
+        <xsd:attribute name="roles" type="xsd:string" />
+    </xsd:complexType>
+
+    <xsd:complexType name="ldap">
+        <xsd:choice minOccurs="0" maxOccurs="unbounded">
+            <xsd:element name="extra-field" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="default-role" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
+        </xsd:choice>
+        <xsd:attribute name="service" type="xsd:string" use="required" />
+        <xsd:attribute name="base-dn" type="xsd:string" use="required" />
+        <xsd:attribute name="search-dn" type="xsd:string" />
+        <xsd:attribute name="search-password" type="xsd:string" />
+        <xsd:attribute name="uid-key" type="xsd:string" />
+        <xsd:attribute name="filter" type="xsd:string" />
+        <xsd:attribute name="password-attribute" type="xsd:string" />
+    </xsd:complexType>
+
+    <xsd:complexType name="firewall">
+        <xsd:choice maxOccurs="unbounded">
+            <xsd:element name="logout" type="logout" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="switch-user" type="switch_user" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="anonymous" type="anonymous" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="form-login" type="form_login" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="form-login-ldap" type="form_login_ldap" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="guard" type="guard" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="http-basic" type="http_basic" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="http-basic-ldap" type="http_basic_ldap" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="json-login" type="json_login" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="json-login-ldap" type="json_login_ldap" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="remember-me" type="remember_me" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="remote-user" type="remote_user" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="x509" type="x509" minOccurs="0" maxOccurs="1" />
+            <!-- allow factories to use dynamic elements -->
+            <xsd:any processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+        </xsd:choice>
+        <xsd:attribute name="name" type="xsd:string" use="required" />
+        <xsd:attribute name="pattern" type="xsd:string" />
+        <xsd:attribute name="host" type="xsd:string" />
+        <xsd:attribute name="methods" type="xsd:string" />
+        <xsd:attribute name="security" type="xsd:boolean" />
+        <xsd:attribute name="user-checker" type="xsd:string" />
+        <xsd:attribute name="request-matcher" type="xsd:string" />
+        <xsd:attribute name="access-denied-url" type="xsd:string" />
+        <xsd:attribute name="access-denied-handler" type="xsd:string" />
+        <xsd:attribute name="entry-point" type="xsd:string" />
+        <xsd:attribute name="provider" type="xsd:string" />
+        <xsd:attribute name="stateless" type="xsd:boolean" />
+        <xsd:attribute name="context" type="xsd:string" />
+        <!-- allow factories to use dynamic elements -->
+        <xsd:anyAttribute processContents="lax" />
+    </xsd:complexType>
+
+    <xsd:complexType name="logout">
+        <xsd:sequence>
+            <xsd:element name="delete-cookie" type="delete_cookie" minOccurs="0" maxOccurs="unbounded" />
+        </xsd:sequence>
+        <xsd:attribute name="csrf-parameter" type="xsd:string" />
+        <xsd:attribute name="csrf-token-generator" type="xsd:string" />
+        <xsd:attribute name="csrf-token-id" type="xsd:string" />
+        <xsd:attribute name="path" type="xsd:string" />
+        <xsd:attribute name="target" type="xsd:string" />
+        <xsd:attribute name="success-handler" type="xsd:string" />
+        <xsd:attribute name="invalidate-session" type="xsd:boolean" />
+    </xsd:complexType>
+
+    <xsd:complexType name="delete_cookie">
+        <xsd:attribute name="name" type="xsd:string" use="required" />
+        <xsd:attribute name="path" type="xsd:string" />
+        <xsd:attribute name="domain" type="xsd:string" />
+    </xsd:complexType>
+
+    <xsd:complexType name="switch_user">
+        <xsd:attribute name="provider" type="xsd:string" />
+        <xsd:attribute name="parameter" type="xsd:string" />
+        <xsd:attribute name="role" type="xsd:string" />
+    </xsd:complexType>
+
+    <xsd:complexType name="anonymous">
+        <xsd:attribute name="lazy" type="xsd:boolean" />
+        <xsd:attribute name="secret" type="xsd:string" />
+    </xsd:complexType>
+
+    <xsd:complexType name="factory" abstract="true">
+        <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:complexType>
+
+    <xsd:attributeGroup name="success-handler-options">
+        <xsd:attribute name="always-use-default-target-path" type="xsd:boolean" />
+        <xsd:attribute name="default-target-path" type="xsd:string" />
+        <xsd:attribute name="target-path-parameter" type="xsd:string" />
+        <xsd:attribute name="use-referer" type="xsd:boolean" />
+    </xsd:attributeGroup>
+
+    <xsd:attributeGroup name="failure-handler-options">
+        <xsd:attribute name="failure-path" type="xsd:string" />
+        <xsd:attribute name="failure-forward" type="xsd:boolean" />
+        <xsd:attribute name="failure-path-parameter" type="xsd:string" />
+    </xsd:attributeGroup>
+
+    <xsd:attributeGroup name="ldap-factory">
+        <xsd:attribute name="service" type="xsd:string" />
+        <xsd:attribute name="dn-string" type="xsd:string" />
+        <xsd:attribute name="query-string" type="xsd:string" />
+        <xsd:attribute name="search-dn" type="xsd:string" />
+        <xsd:attribute name="search-password" type="xsd:string" />
+    </xsd:attributeGroup>
+
+    <xsd:complexType name="form_login">
+        <xsd:complexContent>
+            <xsd:extension base="factory">
+                <xsd:attribute name="login-path" type="xsd:string" />
+                <xsd:attribute name="username-parameter" type="xsd:string" />
+                <xsd:attribute name="password-parameter" type="xsd:string" />
+                <xsd:attribute name="csrf-parameter" type="xsd:string" />
+                <xsd:attribute name="csrf-token-id" type="xsd:string" />
+                <xsd:attribute name="post-only" type="xsd:boolean" />
+                <xsd:attribute name="csrf-token-generator" type="xsd:string" />
+                <xsd:attributeGroup ref="success-handler-options" />
+                <xsd:attributeGroup ref="failure-handler-options" />
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="form_login_ldap">
+        <xsd:complexContent>
+            <xsd:extension base="form_login">
+                <xsd:attributeGroup ref="ldap-factory" />
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="guard">
+        <xsd:sequence>
+            <xsd:element name="authenticator" type="xsd:string" minOccurs="1" maxOccurs="unbounded" />
+        </xsd:sequence>
+        <xsd:attribute name="provider" type="xsd:string" />
+        <xsd:attribute name="entry-point" type="xsd:string" />
+    </xsd:complexType>
+
+    <xsd:complexType name="http_basic">
+        <xsd:attribute name="provider" type="xsd:string" />
+        <xsd:attribute name="realm" type="xsd:string" />
+    </xsd:complexType>
+
+    <xsd:complexType name="http_basic_ldap">
+        <xsd:complexContent>
+            <xsd:extension base="http_basic">
+                <xsd:attributeGroup ref="ldap-factory" />
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="json_login">
+        <xsd:complexContent>
+            <xsd:extension base="factory">
+                <xsd:attribute name="username-path" type="xsd:string" />
+                <xsd:attribute name="password-path" type="xsd:string" />
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="json_login_ldap">
+        <xsd:complexContent>
+            <xsd:extension base="json_login">
+                <xsd:attributeGroup ref="ldap-factory" />
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="remember_me">
+        <xsd:choice minOccurs="0" maxOccurs="unbounded">
+            <xsd:element name="user-provider" type="xsd:string" />
+        </xsd:choice>
+        <xsd:attribute name="name" type="xsd:string" />
+        <xsd:attribute name="lifetime" type="xsd:integer" />
+        <xsd:attribute name="path" type="xsd:string" />
+        <xsd:attribute name="domain" type="xsd:string" />
+        <xsd:attribute name="http-only" type="xsd:boolean" />
+        <xsd:attribute name="always-remember-me" type="xsd:boolean" />
+        <xsd:attribute name="remember-me-parameter" type="xsd:string" />
+        <xsd:attribute name="secret" type="xsd:string" use="required" />
+        <xsd:attribute name="service" type="xsd:string" />
+        <xsd:attribute name="token-provider" type="xsd:string" />
+        <xsd:attribute name="catch-exceptions" type="xsd:boolean" />
+        <xsd:attribute name="secure" type="remember_me_secure" />
+        <xsd:attribute name="samesite" type="remember_me_samesite" />
+    </xsd:complexType>
+
+    <xsd:simpleType name="remember_me_secure">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="true" />
+            <xsd:enumeration value="false" />
+            <xsd:enumeration value="auto" />
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="remember_me_samesite">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="null" />
+            <xsd:enumeration value="lax" />
+            <xsd:enumeration value="strict" />
+            <xsd:enumeration value="none" />
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:complexType name="remote_user">
+        <xsd:attribute name="provider" type="xsd:string" />
+        <xsd:attribute name="user" type="xsd:string" />
+    </xsd:complexType>
+
+    <xsd:complexType name="x509">
+        <xsd:attribute name="provider" type="xsd:string" />
+        <xsd:attribute name="user" type="xsd:string" />
+        <xsd:attribute name="credentials" type="xsd:string" />
+    </xsd:complexType>
+
+    <xsd:complexType name="rule">
+        <xsd:choice>
+            <xsd:element name="ip" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="method" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="role" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="allow-if" type="xsd:string" minOccurs="0" maxOccurs="1" />
+        </xsd:choice>
+        <xsd:attribute name="requires-channel" type="xsd:string" />
+        <xsd:attribute name="path" type="xsd:string" />
+        <xsd:attribute name="host" type="xsd:string" />
+        <xsd:attribute name="port" type="xsd:integer" />
+        <xsd:attribute name="role" type="xsd:string" />
+        <xsd:attribute name="methods" type="xsd:string" />
+        <xsd:attribute name="allow-if" type="xsd:string" />
+    </xsd:complexType>
+
+    <xsd:complexType name="role">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+                <xsd:attribute name="id" type="xsd:string" use="required" />
+                <xsd:attribute name="value" type="xsd:string" />
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+</xsd:schema>
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_customized_config.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_customized_config.xml
index 0b6861fd9c..b58028b2fb 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_customized_config.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_customized_config.xml
@@ -2,7 +2,10 @@
 <srv:container xmlns="http://symfony.com/schema/dic/security"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    xsi:schemaLocation="http://symfony.com/schema/dic/services
+        https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/security
+        https://symfony.com/schema/dic/security/security-1.0.xsd">
 
     <config>
         <access-decision-manager allow-if-all-abstain="true" allow-if-equal-granted-denied="false" />
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_default_strategy.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_default_strategy.xml
index 657f3c4986..5bffea64f5 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_default_strategy.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_default_strategy.xml
@@ -2,7 +2,10 @@
 <srv:container xmlns="http://symfony.com/schema/dic/security"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    xsi:schemaLocation="http://symfony.com/schema/dic/services
+        https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/security
+        https://symfony.com/schema/dic/security/security-1.0.xsd">
 
     <config>
         <provider name="default">
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_service.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_service.xml
index fb51a7413a..9f9f9d5a34 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_service.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_service.xml
@@ -2,7 +2,10 @@
 <srv:container xmlns="http://symfony.com/schema/dic/security"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    xsi:schemaLocation="http://symfony.com/schema/dic/services
+        https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/security
+        https://symfony.com/schema/dic/security/security-1.0.xsd">
 
     <config>
         <access-decision-manager service="app.access_decision_manager" />
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_service_and_strategy.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_service_and_strategy.xml
index 460b44cda0..06ee3435e5 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_service_and_strategy.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/access_decision_manager_service_and_strategy.xml
@@ -2,7 +2,10 @@
 <srv:container xmlns="http://symfony.com/schema/dic/security"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    xsi:schemaLocation="http://symfony.com/schema/dic/services
+        https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/security
+        https://symfony.com/schema/dic/security/security-1.0.xsd">
 
     <config>
         <access-decision-manager service="app.access_decision_manager" strategy="affirmative" />
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/argon2i_encoder.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/argon2i_encoder.xml
index 6a7c2a5041..a4346f824e 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/argon2i_encoder.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/argon2i_encoder.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <container xmlns="http://symfony.com/schema/dic/services"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xmlns:sec="http://symfony.com/schema/dic/security"
-   xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:sec="http://symfony.com/schema/dic/security"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services
+        https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/security
+        https://symfony.com/schema/dic/security/security-1.0.xsd">
 
     <imports>
         <import resource="container1.xml"/>
     </imports>
 
     <sec:config>
-        <sec:encoder class="JMS\FooBundle\Entity\User7" algorithm="argon2i" memory_cost="256" time_cost="1" />
+        <sec:encoder class="JMS\FooBundle\Entity\User7" algorithm="argon2i" memory-cost="256" time-cost="1" />
     </sec:config>
 
 </container>
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/bcrypt_encoder.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/bcrypt_encoder.xml
index a98400c5f0..d81f3aa73a 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/bcrypt_encoder.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/bcrypt_encoder.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <container xmlns="http://symfony.com/schema/dic/services"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xmlns:sec="http://symfony.com/schema/dic/security"
-   xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:sec="http://symfony.com/schema/dic/security"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services
+        https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/security
+        https://symfony.com/schema/dic/security/security-1.0.xsd">
 
     <imports>
         <import resource="container1.xml"/>
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml
index c919a7f276..84d68cc4fd 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml
@@ -3,7 +3,10 @@
 <srv:container xmlns="http://symfony.com/schema/dic/security"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    xsi:schemaLocation="http://symfony.com/schema/dic/services
+        https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/security
+        https://symfony.com/schema/dic/security/security-1.0.xsd">
 
     <config>
         <encoder class="JMS\FooBundle\Entity\User1" algorithm="plaintext" />
@@ -54,7 +57,6 @@
             <switch-user />
             <x509 />
             <remote-user />
-            <user-checker />
             <logout />
             <remember-me secret="TheSecret"/>
         </firewall>
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_provider.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_provider.xml
index 77220a1f9d..52a64d2f42 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_provider.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_provider.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xmlns:sec="http://symfony.com/schema/dic/security"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:sec="http://symfony.com/schema/dic/security"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services
+        https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/security
+        https://symfony.com/schema/dic/security/security-1.0.xsd">
 
     <sec:config>
         <sec:providers>
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_undefined_provider.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_undefined_provider.xml
index ad209f0b0d..a61d597fad 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_undefined_provider.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/firewall_undefined_provider.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xmlns:sec="http://symfony.com/schema/dic/security"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:sec="http://symfony.com/schema/dic/security"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services
+        https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/security
+        https://symfony.com/schema/dic/security/security-1.0.xsd">
 
     <sec:config>
         <sec:providers>
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_provider.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_provider.xml
index 3ad9efc24c..1ba3c5e509 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_provider.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_provider.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xmlns:sec="http://symfony.com/schema/dic/security"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:sec="http://symfony.com/schema/dic/security"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services
+        https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/security
+        https://symfony.com/schema/dic/security/security-1.0.xsd">
 
     <sec:config>
         <sec:providers>
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_undefined_provider.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_undefined_provider.xml
index 98b3dbe2f5..314f25d263 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_undefined_provider.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/listener_undefined_provider.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xmlns:sec="http://symfony.com/schema/dic/security"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:sec="http://symfony.com/schema/dic/security"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services
+        https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/security
+        https://symfony.com/schema/dic/security/security-1.0.xsd">
 
     <sec:config>
         <sec:providers>
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/logout_delete_cookies.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/logout_delete_cookies.xml
index 34b4a429e5..e66043c359 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/logout_delete_cookies.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/logout_delete_cookies.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <srv:container xmlns="http://symfony.com/schema/dic/security"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xmlns:srv="http://symfony.com/schema/dic/services"
-               xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:srv="http://symfony.com/schema/dic/services"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services
+        https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/security
+        https://symfony.com/schema/dic/security/security-1.0.xsd">
 
     <config>
         <provider name="default" id="foo" />
@@ -11,11 +14,9 @@
         <firewall name="main" provider="default">
             <form-login />
             <logout>
-                <delete-cookies>
-                    <cookie1-name/>
-                    <cookie2_name/>
-                    <cookie3-long_name path="/" />
-                </delete-cookies>
+                <delete-cookie name="cookie1-name" />
+                <delete-cookie name="cookie2_name" />
+                <delete-cookie name="cookie3-long_name" path="/" />
             </logout>
         </firewall>
     </config>
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/merge.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/merge.xml
index bd03d6229c..8caaeeb153 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/merge.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/merge.xml
@@ -3,7 +3,10 @@
 <container xmlns="http://symfony.com/schema/dic/services"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:sec="http://symfony.com/schema/dic/security"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    xsi:schemaLocation="http://symfony.com/schema/dic/services
+        https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/security
+        https://symfony.com/schema/dic/security/security-1.0.xsd">
 
     <imports>
         <import resource="merge_import.xml"/>
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/merge_import.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/merge_import.xml
index 441dd6fcda..e518a7d9ac 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/merge_import.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/merge_import.xml
@@ -3,7 +3,10 @@
 <srv:container xmlns="http://symfony.com/schema/dic/security"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    xsi:schemaLocation="http://symfony.com/schema/dic/services
+        https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/security
+        https://symfony.com/schema/dic/security/security-1.0.xsd">
 
     <config>
         <firewall name="main">
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/migrating_encoder.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/migrating_encoder.xml
index d820118075..db0ca61b60 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/migrating_encoder.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/migrating_encoder.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <container xmlns="http://symfony.com/schema/dic/services"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xmlns:sec="http://symfony.com/schema/dic/security"
-   xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:sec="http://symfony.com/schema/dic/security"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services
+        https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/security
+        https://symfony.com/schema/dic/security/security-1.0.xsd">
 
     <imports>
         <import resource="container1.xml"/>
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/no_custom_user_checker.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/no_custom_user_checker.xml
index 84bdfef7fc..9dd035b7c4 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/no_custom_user_checker.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/no_custom_user_checker.xml
@@ -2,7 +2,10 @@
 <srv:container xmlns="http://symfony.com/schema/dic/security"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:srv="http://symfony.com/schema/dic/services"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    xsi:schemaLocation="http://symfony.com/schema/dic/services
+        https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/security
+        https://symfony.com/schema/dic/security/security-1.0.xsd">
 
     <config>
         <provider name="default">
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/remember_me_options.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/remember_me_options.xml
index d833cf8fde..767397ada3 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/remember_me_options.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/remember_me_options.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xmlns:sec="http://symfony.com/schema/dic/security"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:sec="http://symfony.com/schema/dic/security"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services
+    https://symfony.com/schema/dic/services/services-1.0.xsd
+    http://symfony.com/schema/dic/security
+    https://symfony.com/schema/dic/security/security-1.0.xsd">
 
     <sec:config>
         <sec:providers>
-            <sec:default id="foo"/>
+            <sec:provider name="default" id="foo"/>
         </sec:providers>
         <sec:firewall name="main">
             <sec:form-login/>
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/sodium_encoder.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/sodium_encoder.xml
index 11682f7c95..09e6cacef3 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/sodium_encoder.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/sodium_encoder.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <container xmlns="http://symfony.com/schema/dic/services"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xmlns:sec="http://symfony.com/schema/dic/security"
-   xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:sec="http://symfony.com/schema/dic/security"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services
+        https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/security
+        https://symfony.com/schema/dic/security/security-1.0.xsd">
 
     <imports>
         <import resource="container1.xml"/>