Make the Workflow support State Machines

Author: Nyholm

DependencyInjection/Compiler/ValidateWorkflowsPass.php

@@ -0,0 +1,77 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\Workflow\Validator\DefinitionValidatorInterface;
+use Symfony\Component\Workflow\Validator\SinglePlaceWorkflowValidator;
+use Symfony\Component\Workflow\Validator\StateMachineValidator;
+use Symfony\Component\Workflow\Validator\WorkflowValidator;
+
+/**
+ * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ */
+class ValidateWorkflowsPass implements CompilerPassInterface
+{
+    /**
+     * @var DefinitionValidatorInterface[]
+     */
+    private $validators = array();
+
+    public function process(ContainerBuilder $container)
+    {
+        $taggedServices = $container->findTaggedServiceIds('workflow.definition');
+        foreach ($taggedServices as $id => $tags) {
+            $definition = $container->get($id);
+            foreach ($tags as $tag) {
+                if (empty($tag['name'])) {
+                    throw new RuntimeException(sprintf('The "name" for the tag "workflow.definition" of service "%s" must be set.', $id));
+                }
+                if (empty($tag['type'])) {
+                    throw new RuntimeException(sprintf('The "type" for the tag "workflow.definition" of service "%s" must be set.', $id));
+                }
+                if (empty($tag['marking_store'])) {
+                    throw new RuntimeException(sprintf('The "marking_store" for the tag "workflow.definition" of service "%s" must be set.', $id));
+                }
+
+                $this->getValidator($tag)->validate($definition, $tag['name']);
+            }
+        }
+    }
+
+    /**
+     * @param array $tag
+     *
+     * @return DefinitionValidatorInterface
+     */
+    private function getValidator($tag)
+    {
+        if ($tag['type'] === 'state_machine') {
+            $name = 'state_machine';
+            $class = StateMachineValidator::class;
+        } elseif ($tag['marking_store'] === 'scalar') {
+            $name = 'single_place';
+            $class = SinglePlaceWorkflowValidator::class;
+        } else {
+            $name = 'workflow';
+            $class = WorkflowValidator::class;
+        }
+
+        if (empty($this->validators[$name])) {
+            $this->validators[$name] = new $class();
+        }
+
+        return $this->validators[$name];
+    }
+}

DependencyInjection/Configuration.php

@@ -236,6 +236,10 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode)
                     ->useAttributeAsKey('name')
                     ->prototype('array')
                         ->children()
+                            ->enumNode('type')
+                                ->values(array('workflow', 'state_machine'))
+                                ->defaultValue('workflow')
+                            ->end()
                             ->arrayNode('marking_store')
                                 ->isRequired()
                                 ->children()

DependencyInjection/FrameworkExtension.php

@@ -404,10 +404,20 @@ private function registerWorkflowConfiguration(array $workflows, ContainerBuilde
         $registryDefinition = $container->getDefinition('workflow.registry');
 
         foreach ($workflows as $name => $workflow) {
+            $type = $workflow['type'];
+
             $definitionDefinition = new Definition(Workflow\Definition::class);
             $definitionDefinition->addMethodCall('addPlaces', array($workflow['places']));
             foreach ($workflow['transitions'] as $transitionName => $transition) {
-                $definitionDefinition->addMethodCall('addTransition', array(new Definition(Workflow\Transition::class, array($transitionName, $transition['from'], $transition['to']))));
+                if ($type === 'workflow') {
+                    $definitionDefinition->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))));
+                        }
+                    }
+                }
             }
 
             if (isset($workflow['marking_store']['type'])) {
@@ -419,13 +429,21 @@ private function registerWorkflowConfiguration(array $workflows, ContainerBuilde
                 $markingStoreDefinition = new Reference($workflow['marking_store']['service']);
             }
 
-            $workflowDefinition = new DefinitionDecorator('workflow.abstract');
+            $definitionDefinition->addTag('workflow.definition', array(
+                'name' => $name,
+                'type' => $type,
+                'marking_store' => isset($workflow['marking_store']['type']) ? $workflow['marking_store']['type'] : null,
+            ));
+            $definitionDefinition->setPublic(false);
+
+            $workflowDefinition = new DefinitionDecorator(sprintf('%s.abstract', $type));
             $workflowDefinition->replaceArgument(0, $definitionDefinition);
             $workflowDefinition->replaceArgument(1, $markingStoreDefinition);
             $workflowDefinition->replaceArgument(3, $name);
 
-            $workflowId = 'workflow.'.$name;
+            $workflowId = sprintf('%s.%s', $type, $name);
 
+            $container->setDefinition(sprintf('%s.definition', $workflowId), $definitionDefinition);
             $container->setDefinition($workflowId, $workflowDefinition);
 
             foreach ($workflow['supports'] as $supportedClass) {

FrameworkBundle.php

@@ -35,6 +35,7 @@
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\SerializerPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\UnusedTagsPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ConfigCachePass;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ValidateWorkflowsPass;
 use Symfony\Component\Debug\ErrorHandler;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\PassConfig;
@@ -93,6 +94,7 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new PropertyInfoPass());
         $container->addCompilerPass(new ControllerArgumentValueResolverPass());
         $container->addCompilerPass(new CachePoolPass());
+        $container->addCompilerPass(new ValidateWorkflowsPass());
         $container->addCompilerPass(new CachePoolClearerPass(), PassConfig::TYPE_AFTER_REMOVING);
 
         if ($container->getParameter('kernel.debug')) {

Resources/config/workflow.xml

@@ -11,6 +11,12 @@
             <argument type="service" id="event_dispatcher" on-invalid="ignore" />
             <argument /> <!-- name -->
         </service>
+        <service id="state_machine.abstract" class="Symfony\Component\Workflow\StateMachine" abstract="true">
+            <argument /> <!-- workflow definition -->
+            <argument /> <!-- marking store -->
+            <argument type="service" id="event_dispatcher" on-invalid="ignore" />
+            <argument /> <!-- name -->
+        </service>
 
         <service id="workflow.marking_store.property_accessor" class="Symfony\Component\Workflow\MarkingStore\PropertyAccessorMarkingStore" abstract="true" />
         <service id="workflow.marking_store.scalar" class="Symfony\Component\Workflow\MarkingStore\ScalarMarkingStore" abstract="true" />