[Workflow] streamline XML schema definition

xabbuh · xabbuh · commit 769496a60eea · 2016-11-11T11:14:12.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -231,7 +231,6 @@ private function addProfilerSection(ArrayNodeDefinition $rootNode)
     private function addWorkflowSection(ArrayNodeDefinition $rootNode)
     {
         $rootNode
-            ->fixXmlConfig('workflow')
             ->children()
                 ->arrayNode('workflows')
                     ->useAttributeAsKey('name')
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -237,25 +237,19 @@
     <xsd:complexType name="workflow">
         <xsd:sequence>
             <xsd:element name="marking-store" type="marking_store" />
-            <xsd:element name="supports" type="xsd:string" minOccurs="1" maxOccurs="unbounded" />
-            <xsd:element name="places" type="xsd:string" minOccurs="1" maxOccurs="unbounded" />
-            <xsd:element name="transitions" type="transitions" />
+            <xsd:element name="support" type="xsd:string" minOccurs="1" maxOccurs="unbounded" />
+            <xsd:element name="place" type="xsd:string" minOccurs="1" maxOccurs="unbounded" />
+            <xsd:element name="transition" type="transition" minOccurs="1" maxOccurs="unbounded" />
         </xsd:sequence>
         <xsd:attribute name="name" type="xsd:string" />
     </xsd:complexType>
 
     <xsd:complexType name="marking_store">
         <xsd:sequence>
-            <xsd:element name="type" type="xsd:string" minOccurs="0" maxOccurs="1" />
-            <xsd:element name="arguments" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
-            <xsd:element name="service" type="xsd:string" minOccurs="0" maxOccurs="1" />
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:complexType name="transitions">
-        <xsd:sequence>
-            <xsd:element name="transition" type="transition" />
+            <xsd:element name="argument" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
+        <xsd:attribute name="type" type="xsd:string" use="optional" />
+        <xsd:attribute name="service" type="xsd:string" use="optional" />
     </xsd:complexType>
 
     <xsd:complexType name="transition">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow.xml
@@ -9,20 +9,17 @@
     <framework:config>
         <framework:workflows>
             <framework:workflow name="my_workflow">
-                <framework:marking-store>
-                    <framework:type>multiple_state</framework:type>
-                    <framework:arguments>a</framework:arguments>
-                    <framework:arguments>a</framework:arguments>
+                <framework:marking-store type="multiple_state">
+                    <framework:argument>a</framework:argument>
+                    <framework:argument>a</framework:argument>
                 </framework:marking-store>
-                <framework:supports>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:supports>
-                <framework:places>first</framework:places>
-                <framework:places>last</framework:places>
-                <framework:transitions>
-                    <framework:transition name="foobar">
-                        <framework:from>a</framework:from>
-                        <framework:to>a</framework:to>
-                    </framework:transition>
-                </framework:transitions>
+                <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
+                <framework:place>first</framework:place>
+                <framework:place>last</framework:place>
+                <framework:transition name="foobar">
+                    <framework:from>a</framework:from>
+                    <framework:to>a</framework:to>
+                </framework:transition>
             </framework:workflow>
         </framework:workflows>
     </framework:config>

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,6 @@ private function addProfilerSection(ArrayNodeDefinition $rootNode)`
`231`	`231`	`private function addWorkflowSection(ArrayNodeDefinition $rootNode)`
`232`	`232`	`{`
`233`	`233`	`$rootNode`
`234`		`- ->fixXmlConfig('workflow')`
`235`	`234`	`->children()`
`236`	`235`	`->arrayNode('workflows')`
`237`	`236`	`->useAttributeAsKey('name')`