Make security schema deterministic

MatTheCat · MatTheCat · commit 58a29f223881 · 2024-06-22T11:50:23.000+02:00
diff --git a/UPGRADE-5.4.md b/UPGRADE-5.4.md
@@ -110,6 +110,7 @@ SecurityBundle
  * Deprecate passing an array of arrays as 1st argument to `MainConfiguration`, pass a sorted flat array of
    factories instead.
  * Deprecate the `always_authenticate_before_granting` option
+ * XML configured user providers and authenticators not coming from Symfony must now declare their own namespace
 
 Security
 --------
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
@@ -117,7 +117,7 @@
             <xsd:element name="memory" type="memory" />
             <xsd:element name="ldap" type="ldap" />
             <!-- allow factories to use dynamic elements -->
-            <xsd:any processContents="lax" />
+            <xsd:any processContents="lax" namespace="##other" />
         </xsd:choice>
         <xsd:attribute name="name" type="xsd:string" use="required" />
         <xsd:attribute name="id" type="xsd:string" />
@@ -176,7 +176,7 @@
             <xsd:element name="x509" type="x509" minOccurs="0" maxOccurs="1" />
             <xsd:element name="required-badge" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
             <!-- allow factories to use dynamic elements -->
-            <xsd:any processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:any processContents="lax" minOccurs="0" maxOccurs="unbounded" namespace="##other" />
         </xsd:choice>
         <xsd:attribute name="name" type="xsd:string" use="required" />
         <xsd:attribute name="pattern" type="xsd:string" />
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -777,6 +777,6 @@ private function loadFromExtensions(\DOMDocument $xml)
      */
     public static function convertDomElementToArray(\DOMElement $element)
     {
-        return XmlUtils::convertDomElementToArray($element);
+        return XmlUtils::convertDomElementToArray($element, false);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -777,6 +777,6 @@ private function loadFromExtensions(\DOMDocument $xml)`
`777`	`777`	`*/`
`778`	`778`	`public static function convertDomElementToArray(\DOMElement $element)`
`779`	`779`	`{`
`780`		`- return XmlUtils::convertDomElementToArray($element);`
	`780`	`+ return XmlUtils::convertDomElementToArray($element, false);`
`781`	`781`	`}`
`782`	`782`	`}`