Skip to content

Commit 4ffd028

Browse files
Merge branch '2.7' into 2.8
* 2.7: move provider after test update dataProvider function name cast substr result to string and remove empty function use rename dataset provider Add a test to prevent future regressions Switch to `empty` native function to check emptiness remove non relevant test case Switch to `is_string` native method Remove unnecessary parentheses Add a test case to prevent future regressions Move empty condition in return statement Use LF line separator fix coding standard to comply with fabbot Remove malformed EmailValidatorTest + Update UrlValidator test Add empty check on host in other methods + add unit tests [Validator] Allow checkMX() to return false when $host is empty [DI] Fix the xml schema [Translation] avoid creating cache files for fallback locales.
2 parents 1532afd + af74148 commit 4ffd028

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
@@ -145,8 +145,8 @@
145145
</xsd:complexType>
146146

147147
<xsd:complexType name="property" mixed="true">
148-
<xsd:choice minOccurs="0" maxOccurs="1">
149-
<xsd:element name="property" type="property" minOccurs="0" maxOccurs="unbounded" />
148+
<xsd:choice minOccurs="0">
149+
<xsd:element name="property" type="property" maxOccurs="unbounded" />
150150
<xsd:element name="service" type="service" />
151151
</xsd:choice>
152152
<xsd:attribute name="type" type="argument_type" />
@@ -158,8 +158,8 @@
158158
</xsd:complexType>
159159

160160
<xsd:complexType name="argument" mixed="true">
161-
<xsd:choice maxOccurs="unbounded">
162-
<xsd:element name="argument" type="argument" minOccurs="0" maxOccurs="unbounded" />
161+
<xsd:choice minOccurs="0">
162+
<xsd:element name="argument" type="argument" maxOccurs="unbounded" />
163163
<xsd:element name="service" type="service" />
164164
</xsd:choice>
165165
<xsd:attribute name="type" type="argument_type" />
@@ -170,10 +170,9 @@
170170
<xsd:attribute name="strict" type="boolean" />
171171
</xsd:complexType>
172172

173-
<xsd:complexType name="call" mixed="true">
174-
<xsd:choice maxOccurs="unbounded">
175-
<xsd:element name="argument" type="argument" minOccurs="0" maxOccurs="unbounded" />
176-
<xsd:element name="service" type="service" />
173+
<xsd:complexType name="call">
174+
<xsd:choice minOccurs="0">
175+
<xsd:element name="argument" type="argument" maxOccurs="unbounded" />
177176
</xsd:choice>
178177
<xsd:attribute name="method" type="xsd:string" />
179178
</xsd:complexType>

0 commit comments

Comments
 (0)