Skip to content

Commit 8f15337

Browse files
committed
Remove redundant tags
The "any" tags inside the definition for mapped superclasses and embeddables duplicate what is already done for entities. The other removed "any" tags are also redundant, as they duplicate what's already done inside the grandparent "choice" tag. Starting with version libxml 2.12, such redundant tags cause errors about the content model not being "determinist". Fixes #11117
1 parent a8632ac commit 8f15337

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

doctrine-mapping.xsd

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@
148148
<xs:choice minOccurs="0" maxOccurs="unbounded">
149149
<xs:element name="entity-result" type="orm:entity-result"/>
150150
<xs:element name="column-result" type="orm:column-result"/>
151-
<xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other"/>
152151
</xs:choice>
153152
<xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other"/>
154153
</xs:choice>
@@ -226,22 +225,13 @@
226225

227226
<xs:complexType name="mapped-superclass" >
228227
<xs:complexContent>
229-
<xs:extension base="orm:entity">
230-
<xs:choice minOccurs="0" maxOccurs="unbounded">
231-
<xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other"/>
232-
</xs:choice>
233-
<xs:anyAttribute namespace="##other"/>
234-
</xs:extension>
228+
<xs:extension base="orm:entity"/>
235229
</xs:complexContent>
236230
</xs:complexType>
237231

238232
<xs:complexType name="embeddable">
239233
<xs:complexContent>
240-
<xs:extension base="orm:entity">
241-
<xs:choice minOccurs="0" maxOccurs="unbounded">
242-
<xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other"/>
243-
</xs:choice>
244-
</xs:extension>
234+
<xs:extension base="orm:entity"/>
245235
</xs:complexContent>
246236
</xs:complexType>
247237

@@ -565,7 +555,6 @@
565555
<xs:choice minOccurs="0" maxOccurs="1">
566556
<xs:element name="join-column" type="orm:join-column"/>
567557
<xs:element name="join-columns" type="orm:join-columns"/>
568-
<xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other"/>
569558
</xs:choice>
570559
<xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other"/>
571560
</xs:choice>
@@ -583,7 +572,6 @@
583572
<xs:choice minOccurs="0" maxOccurs="1">
584573
<xs:element name="join-column" type="orm:join-column"/>
585574
<xs:element name="join-columns" type="orm:join-columns"/>
586-
<xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other"/>
587575
</xs:choice>
588576
<xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other"/>
589577
</xs:choice>

0 commit comments

Comments
 (0)