[Workflow] Added Definition builder

Author: Nyholm

Command/WorkflowDumpCommand.php

@@ -66,23 +66,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
             throw new \InvalidArgumentException(sprintf('No service found for "workflow.%1$s" nor "state_machine.%1$s".', $serviceId));
         }
 
-        $definition = $this->getProperty($workflow, 'definition');
-
         $dumper = new GraphvizDumper();
-
         $marking = new Marking();
+
         foreach ($input->getArgument('marking') as $place) {
             $marking->mark($place);
         }
 
-        $output->writeln($dumper->dump($definition, $marking));
-    }
-
-    private function getProperty($object, $property)
-    {
-        $reflectionProperty = new \ReflectionProperty(Workflow::class, $property);
-        $reflectionProperty->setAccessible(true);
-
-        return $reflectionProperty->getValue($object);
+        $output->writeln($dumper->dump($workflow->getDefinition(), $marking));
     }
 }

DependencyInjection/FrameworkExtension.php

@@ -406,20 +406,32 @@ private function registerWorkflowConfiguration(array $workflows, ContainerBuilde
         foreach ($workflows as $name => $workflow) {
             $type = $workflow['type'];
 
-            $definitionDefinition = new Definition(Workflow\Definition::class);
-            $definitionDefinition->addMethodCall('addPlaces', array($workflow['places']));
+            // Create a DefinitionBuilder
+            $definitionBuilderDefinition = new Definition(Workflow\DefinitionBuilder::class);
+            $definitionBuilderDefinition->addMethodCall('addPlaces', array($workflow['places']));
             foreach ($workflow['transitions'] as $transitionName => $transition) {
                 if ($type === 'workflow') {
-                    $definitionDefinition->addMethodCall('addTransition', array(new Definition(Workflow\Transition::class, array($transitionName, $transition['from'], $transition['to']))));
+                    $definitionBuilderDefinition->addMethodCall('addTransition', array(new Definition(Workflow\Transition::class, array($transitionName, $transition['from'], $transition['to']))));
                 } elseif ($type === 'state_machine') {
                     foreach ($transition['from'] as $from) {
                         foreach ($transition['to'] as $to) {
-                            $definitionDefinition->addMethodCall('addTransition', array(new Definition(Workflow\Transition::class, array($transitionName, $from, $to))));
+                            $definitionBuilderDefinition->addMethodCall('addTransition', array(new Definition(Workflow\Transition::class, array($transitionName, $from, $to))));
                         }
                     }
                 }
             }
 
+            // Create a Definition
+            $definitionDefinition = new Definition(Workflow\Definition::class);
+            $definitionDefinition->setPublic(false);
+            $definitionDefinition->setFactory(array($definitionBuilderDefinition, 'build'));
+            $definitionDefinition->addTag('workflow.definition', array(
+                'name' => $name,
+                'type' => $type,
+                'marking_store' => isset($workflow['marking_store']['type']) ? $workflow['marking_store']['type'] : null,
+            ));
+
+            // Create MarkingStore
             if (isset($workflow['marking_store']['type'])) {
                 $markingStoreDefinition = new DefinitionDecorator('workflow.marking_store.'.$workflow['marking_store']['type']);
                 foreach ($workflow['marking_store']['arguments'] as $argument) {
@@ -429,25 +441,20 @@ private function registerWorkflowConfiguration(array $workflows, ContainerBuilde
                 $markingStoreDefinition = new Reference($workflow['marking_store']['service']);
             }
 
-            $definitionDefinition->addTag('workflow.definition', array(
-                'name' => $name,
-                'type' => $type,
-                'marking_store' => isset($workflow['marking_store']['type']) ? $workflow['marking_store']['type'] : null,
-            ));
-            $definitionDefinition->setPublic(false);
-
+            // Create Workflow
             $workflowDefinition = new DefinitionDecorator(sprintf('%s.abstract', $type));
             $workflowDefinition->replaceArgument(0, $definitionDefinition);
             if (isset($markingStoreDefinition)) {
                 $workflowDefinition->replaceArgument(1, $markingStoreDefinition);
             }
             $workflowDefinition->replaceArgument(3, $name);
 
+            // Store to container
             $workflowId = sprintf('%s.%s', $type, $name);
-
-            $container->setDefinition(sprintf('%s.definition', $workflowId), $definitionDefinition);
             $container->setDefinition($workflowId, $workflowDefinition);
+            $container->setDefinition(sprintf('%s.definition', $workflowId), $definitionDefinition);
 
+            // Add workflow to Registry
             foreach ($workflow['supports'] as $supportedClass) {
                 $registryDefinition->addMethodCall('add', array(new Reference($workflowId), $supportedClass));
             }