Merge pull request #448 from tienvx/fix-non-existent-service

Fix non existent service
tienvx · Dec 12, 2019 · 1262fa9 · 1262fa9
2 parents 0b4411e + 473496a
commit 1262fa9
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/src/DependencyInjection/Compiler/ModelPass.php b/src/DependencyInjection/Compiler/ModelPass.php
@@ -33,8 +33,7 @@ public function process(ContainerBuilder $container): void
                 $modelHelperDefinition->addMethodCall('addModel', [$name, $type, new Reference($serviceId)]);
 
                 $this->mergeGuardConfiguration($container, $type, $name, $guardHelperDefinition);
-                $workflowId = sprintf('%s.%s', $type, $name);
-                $container->removeDefinition($workflowId);
+                $this->removeWorkflow($container, $type, $name);
             }
         }
         $guardHelperDefinition->addMethodCall('setExpressionLanguage', [new Reference('workflow.security.expression_language')]);
@@ -64,4 +63,21 @@ protected function mergeGuardConfiguration(ContainerBuilder $container, string $
             $container->removeDefinition($guardId);
         }
     }
+
+    protected function removeWorkflow(ContainerBuilder $container, string $type, string $name): void
+    {
+        $workflowId = sprintf('%s.%s', $type, $name);
+        $container->removeDefinition($workflowId);
+
+        $registryDefinition = $container->getDefinition('workflow.registry');
+        $calls = $registryDefinition->getMethodCalls();
+
+        foreach ($calls as $i => $call) {
+            if ('addWorkflow' === $call[0] && $workflowId === (string) $call[1][0]) {
+                unset($calls[$i]);
+                break;
+            }
+        }
+        $registryDefinition->setMethodCalls($calls);
+    }
 }