Skip to content

Commit af74148

Browse files
committed
bug #22280 [DI] Fix the xml schema (GuilhemN)
This PR was merged into the 2.7 branch. Discussion ---------- [DI] Fix the xml schema | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no <!-- don't forget updating src/**/CHANGELOG.md files --> | BC breaks? | no | Deprecations? | no <!-- don't forget updating UPGRADE-*.md files --> | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- f2ef1eecef [DI] Fix the xml schema
2 parents 79809e8 + a00254d commit af74148

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

Loader/schema/dic/services/services-1.0.xsd

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@
140140
</xsd:complexType>
141141

142142
<xsd:complexType name="property" mixed="true">
143-
<xsd:choice minOccurs="0" maxOccurs="1">
144-
<xsd:element name="property" type="property" minOccurs="0" maxOccurs="unbounded" />
143+
<xsd:choice minOccurs="0">
144+
<xsd:element name="property" type="property" maxOccurs="unbounded" />
145145
<xsd:element name="service" type="service" />
146146
</xsd:choice>
147147
<xsd:attribute name="type" type="argument_type" />
@@ -153,8 +153,8 @@
153153
</xsd:complexType>
154154

155155
<xsd:complexType name="argument" mixed="true">
156-
<xsd:choice maxOccurs="unbounded">
157-
<xsd:element name="argument" type="argument" minOccurs="0" maxOccurs="unbounded" />
156+
<xsd:choice minOccurs="0">
157+
<xsd:element name="argument" type="argument" maxOccurs="unbounded" />
158158
<xsd:element name="service" type="service" />
159159
</xsd:choice>
160160
<xsd:attribute name="type" type="argument_type" />
@@ -165,10 +165,9 @@
165165
<xsd:attribute name="strict" type="boolean" />
166166
</xsd:complexType>
167167

168-
<xsd:complexType name="call" mixed="true">
169-
<xsd:choice maxOccurs="unbounded">
170-
<xsd:element name="argument" type="argument" minOccurs="0" maxOccurs="unbounded" />
171-
<xsd:element name="service" type="service" />
168+
<xsd:complexType name="call">
169+
<xsd:choice minOccurs="0">
170+
<xsd:element name="argument" type="argument" maxOccurs="unbounded" />
172171
</xsd:choice>
173172
<xsd:attribute name="method" type="xsd:string" />
174173
</xsd:complexType>

0 commit comments

Comments
 (0)