Skip to content

Commit 0de12bd

Browse files
committed
Merge branch '3.0'
* 3.0: (24 commits) add @event annotation for AuthenticationEvents bumped Symfony version to 3.0.6 updated VERSION for 3.0.5 updated CHANGELOG for 3.0.5 bumped Symfony version to 2.8.6 [PropertyInfo] PHPDoc correction add @event annotation for KernelEvents Fixed typo updated VERSION for 2.8.5 updated CHANGELOG for 2.8.5 bumped Symfony version to 2.7.13 updated VERSION for 2.7.12 update CONTRIBUTORS for 2.7.12 updated CHANGELOG for 2.7.12 bumped Symfony version to 2.3.41 updated VERSION for 2.3.40 update CONTRIBUTORS for 2.3.40 updated CHANGELOG for 2.3.40 Revert "minor #18257 [Routing] Don't needlessly execute strtr's as they are fairly expensive (arjenm)" Revert "fixed CS" ...
2 parents 2c0bc23 + 8f8d9ef commit 0de12bd

File tree

1 file changed

+19
-5
lines changed

1 file changed

+19
-5
lines changed

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

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,28 @@
2424
]]></xsd:documentation>
2525
</xsd:annotation>
2626
<xsd:sequence>
27-
<xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
28-
<xsd:element name="imports" type="imports" minOccurs="0" maxOccurs="1" />
29-
<xsd:element name="parameters" type="parameters" minOccurs="0" maxOccurs="1" />
30-
<xsd:element name="services" type="services" minOccurs="0" maxOccurs="1" />
31-
<xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
27+
<xsd:group ref="foreign" />
28+
<xsd:sequence minOccurs="0">
29+
<xsd:element name="imports" type="imports" />
30+
<xsd:group ref="foreign" />
31+
</xsd:sequence>
32+
<xsd:sequence minOccurs="0">
33+
<xsd:element name="parameters" type="parameters" />
34+
<xsd:group ref="foreign" />
35+
</xsd:sequence>
36+
<xsd:sequence minOccurs="0">
37+
<xsd:element name="services" type="services" />
38+
<xsd:group ref="foreign" />
39+
</xsd:sequence>
3240
</xsd:sequence>
3341
</xsd:complexType>
3442

43+
<xsd:group name="foreign">
44+
<xsd:sequence>
45+
<xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
46+
</xsd:sequence>
47+
</xsd:group>
48+
3549
<xsd:complexType name="services">
3650
<xsd:annotation>
3751
<xsd:documentation><![CDATA[

0 commit comments

Comments
 (0)