[FrameworkBundle] [Workflow] Fixed initial place config

HeahDude · HeahDude · commit f2b36b1fc1d4 · 2016-11-11T16:42:49.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -281,6 +281,7 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode)
                                     ->end()
                                 ->end()
                             ->end()
+                            ->scalarNode('initial_place')->defaultNull()->end()
                             ->arrayNode('places')
                                 ->isRequired()
                                 ->requiresAtLeastOneElement()
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -420,15 +420,19 @@ private function registerWorkflowConfiguration(array $workflows, ContainerBuilde
             }
 
             // Create a Definition
-            $definitionDefinition = new Definition(Workflow\Definition::class);
-            $definitionDefinition->setPublic(false);
-            $definitionDefinition->addArgument($workflow['places']);
-            $definitionDefinition->addArgument($transitions);
-            $definitionDefinition->addTag('workflow.definition', array(
-                'name' => $name,
-                'type' => $type,
-                'marking_store' => isset($workflow['marking_store']['type']) ? $workflow['marking_store']['type'] : null,
-            ));
+            $definitionDefinition = (new Definition(Workflow\Definition::class))
+                ->setPublic(false)
+                ->addArgument($workflow['places'])
+                ->addArgument($transitions)
+                ->addTag('workflow.definition', array(
+                    'name' => $name,
+                    'type' => $type,
+                    'marking_store' => isset($workflow['marking_store']['type']) ? $workflow['marking_store']['type'] : null,
+                ))
+            ;
+            if (isset($workflow['initial_place'])) {
+                $definitionDefinition->addArgument($workflow['initial_place']);
+            }
 
             // Create MarkingStore
             if (isset($workflow['marking_store']['type'])) {
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
@@ -238,6 +238,7 @@
         <xsd:sequence>
             <xsd:element name="marking-store" type="marking_store" />
             <xsd:element name="supports" type="xsd:string" minOccurs="1" maxOccurs="unbounded" />
+            <xsd:element name="initial_place" type="xsd:string" />
             <xsd:element name="places" type="xsd:string" minOccurs="1" maxOccurs="unbounded" />
             <xsd:element name="transitions" type="transitions" />
         </xsd:sequence>
