Browse Source

made XSD less strict when possible

Fabien Potencier 14 years ago
parent
commit
0b0c15b7b6

+ 15 - 15
src/Symfony/Bundle/DoctrineBundle/Resources/config/schema/doctrine-1.0.xsd

@@ -8,9 +8,9 @@
     <xsd:element name="dbal" type="dbal" />
 
     <xsd:complexType name="dbal">
-        <xsd:sequence>
+        <xsd:all>
             <xsd:element name="connections" type="connections" minOccurs="0" maxOccurs="1" />
-        </xsd:sequence>
+        </xsd:all>
 
         <xsd:attribute name="default-connection" type="xsd:string" />
         <xsd:attribute name="dbname" type="xsd:string" />
@@ -29,9 +29,9 @@
     </xsd:complexType>
 
     <xsd:complexType name="connections">
-        <xsd:sequence>
-            <xsd:element name="connection" type="connection" minOccurs="1" maxOccurs="unbounded" />
-        </xsd:sequence>
+        <xsd:choice minOccurs="1" maxOccurs="unbounded">
+            <xsd:element name="connection" type="connection" />
+        </xsd:choice>
     </xsd:complexType>
 
     <xsd:complexType name="connection">
@@ -66,17 +66,17 @@
     </xsd:complexType>
 
     <xsd:complexType name="mappings">
-        <xsd:sequence>
-            <xsd:element name="mapping" type="mapping" minOccurs="1" maxOccurs="unbounded" />
-        </xsd:sequence>
+        <xsd:choice minOccurs="1" maxOccurs="unbounded">
+            <xsd:element name="mapping" type="mapping" />
+        </xsd:choice>
     </xsd:complexType>
 
     <xsd:complexType name="orm">
-        <xsd:sequence>
+        <xsd:all>
             <xsd:element name="entity-managers" type="entity_managers" minOccurs="0" maxOccurs="1" />
             <xsd:element name="mappings" type="mappings" minOccurs="0" maxOccurs="1" />
             <xsd:element name="auto-generate-proxy-classes" type="xsd:string" minOccurs="0" maxOccurs="1" />
-        </xsd:sequence>
+        </xsd:all>
 
         <xsd:attribute name="default-entity-manager" type="xsd:string" />
         <xsd:attribute name="metadata-driver" type="xsd:string" />
@@ -84,15 +84,15 @@
     </xsd:complexType>
 
     <xsd:complexType name="entity_managers">
-        <xsd:sequence>
-            <xsd:element name="entity-manager" type="entity_manager" minOccurs="1" maxOccurs="unbounded" />
-        </xsd:sequence>
+        <xsd:choice minOccurs="1" maxOccurs="unbounded">
+            <xsd:element name="entity-manager" type="entity_manager" />
+        </xsd:choice>
     </xsd:complexType>
 
     <xsd:complexType name="entity_manager">
-        <xsd:sequence>
+        <xsd:all>
             <xsd:element name="mappings" type="mappings" minOccurs="0" maxOccurs="1" />
-        </xsd:sequence>
+        </xsd:all>
 
         <xsd:attribute name="connection" type="xsd:string" />
     </xsd:complexType>

+ 2 - 2
src/Symfony/Bundle/SwiftmailerBundle/Resources/config/schema/swiftmailer-1.0.xsd

@@ -8,9 +8,9 @@
   <xsd:element name="config" type="config" />
 
   <xsd:complexType name="config">
-    <xsd:sequence>
+    <xsd:all>
       <xsd:element name="spool" type="spool" minOccurs="0" maxOccurs="1" />
-    </xsd:sequence>
+    </xsd:all>
 
     <xsd:attribute name="username" type="xsd:string" />
     <xsd:attribute name="password" type="xsd:string" />

+ 3 - 3
src/Symfony/Bundle/TwigBundle/Resources/config/schema/twig-1.0.xsd

@@ -24,9 +24,9 @@
     </xsd:complexType>
 
     <xsd:complexType name="form">
-        <xsd:sequence>
-            <xsd:element name="resource" type="xsd:string" minOccurs="1" maxOccurs="unbounded" />
-        </xsd:sequence>
+        <xsd:choice minOccurs="1" maxOccurs="unbounded">
+            <xsd:element name="resource" type="xsd:string" />
+        </xsd:choice>
     </xsd:complexType>
 
     <xsd:complexType name="global" mixed="true">

+ 2 - 2
src/Symfony/Bundle/ZendBundle/Resources/config/schema/zend-1.0.xsd

@@ -8,9 +8,9 @@
     <xsd:element name="config" type="config" />
 
     <xsd:complexType name="config">
-        <xsd:sequence>
+        <xsd:all>
             <xsd:element name="logger" type="logger" minOccurs="0" maxOccurs="1" />
-        </xsd:sequence>
+        </xsd:all>
     </xsd:complexType>
 
     <xsd:complexType name="logger">

+ 18 - 18
src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd

@@ -39,9 +39,9 @@
         Enclosing element for the definition of all interface injectors
       ]]></xsd:documentation>
     </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="interface" type="interface" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="interface" type="interface" />
+    </xsd:choice>
   </xsd:complexType>
 
   <xsd:complexType name="services">
@@ -50,9 +50,9 @@
         Enclosing element for the definition of all services
       ]]></xsd:documentation>
     </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="service" type="service" minOccurs="1" maxOccurs="unbounded" />
-    </xsd:sequence>
+    <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:element name="service" type="service" />
+    </xsd:choice>
   </xsd:complexType>
 
   <xsd:complexType name="imports">
@@ -61,9 +61,9 @@
         Enclosing element for the import elements
       ]]></xsd:documentation>
     </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="import" type="import" minOccurs="1" maxOccurs="unbounded" />
-    </xsd:sequence>
+    <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:element name="import" type="import" />
+    </xsd:choice>
   </xsd:complexType>
 
   <xsd:complexType name="import">
@@ -85,9 +85,9 @@
   </xsd:complexType>
 
   <xsd:complexType name="interface">
-    <xsd:sequence maxOccurs="unbounded">
-      <xsd:element name="call" type="call" minOccurs="1" maxOccurs="unbounded" />
-    </xsd:sequence>
+    <xsd:choice  minOccurs="1" maxOccurs="unbounded">
+      <xsd:element name="call" type="call" />
+    </xsd:choice>
     <xsd:attribute name="class" type="xsd:string" use="required" />
   </xsd:complexType>
 
@@ -114,17 +114,17 @@
   </xsd:complexType>
 
   <xsd:complexType name="parameters">
-    <xsd:sequence>
-      <xsd:element name="parameter" type="parameter" minOccurs="1" maxOccurs="unbounded" />
-    </xsd:sequence>
+    <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:element name="parameter" type="parameter" />
+    </xsd:choice>
     <xsd:attribute name="type" type="parameter_type" />
     <xsd:attribute name="key" type="xsd:string" />
   </xsd:complexType>
 
   <xsd:complexType name="parameter" mixed="true">
-    <xsd:sequence>
-      <xsd:element name="parameter" type="parameter" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="parameter" type="parameter" />
+    </xsd:choice>
     <xsd:attribute name="type" type="parameter_type" />
     <xsd:attribute name="id" type="xsd:string" />
     <xsd:attribute name="key" type="xsd:string" />