Commit34b465d

committed

Make security schema deterministic

1 parente79eea1 commit34b465dCopy full SHA for 34b465d

File tree

-3

lines changed

src/Symfony
- Bundle/SecurityBundle/Resources/config/schema
  - security-1.0.xsd
- Component/DependencyInjection/Loader
  - XmlFileLoader.php

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@`
`117`	`117`	`<xsd:elementname="memory"type="memory" />`
`118`	`118`	`<xsd:elementname="ldap"type="ldap" />`
`119`	`119`	`<!-- allow factories to use dynamic elements-->`
`120`		`- <xsd:anyprocessContents="lax" />`
	`120`	`+ <xsd:anyprocessContents="lax"namespace="##other"/>`
`121`	`121`	`</xsd:choice>`
`122`	`122`	`<xsd:attributename="name"type="xsd:string"use="required" />`
`123`	`123`	`<xsd:attributename="id"type="xsd:string" />`
`@@ -176,7 +176,7 @@`
`176`	`176`	`<xsd:elementname="x509"type="x509"minOccurs="0"maxOccurs="1" />`
`177`	`177`	`<xsd:elementname="required-badge"type="xsd:string"minOccurs="0"maxOccurs="unbounded" />`
`178`	`178`	`<!-- allow factories to use dynamic elements-->`
`179`		`- <xsd:anyprocessContents="lax"minOccurs="0"maxOccurs="unbounded" />`
	`179`	`+ <xsd:anyprocessContents="lax"minOccurs="0"maxOccurs="unbounded"namespace="##other"/>`
`180`	`180`	`</xsd:choice>`
`181`	`181`	`<xsd:attributename="name"type="xsd:string"use="required" />`
`182`	`182`	`<xsd:attributename="pattern"type="xsd:string" />`

Lines changed: 1 addition & 1 deletion

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

Comments

(0)