[Workflow] Expose the Metadata Store in the DIC

lyrixx · lyrixx · commit aa7a444c869d · 2020-08-28T16:51:18.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -742,6 +742,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
                 }
             }
             $metadataStoreDefinition->replaceArgument(2, $transitionsMetadataDefinition);
+            $container->setDefinition(sprintf('%s.metadata_store', $workflowId), $metadataStoreDefinition);
 
             // Create places
             $places = array_column($workflow['places'], 'name');
@@ -753,7 +754,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
             $definitionDefinition->addArgument($places);
             $definitionDefinition->addArgument($transitions);
             $definitionDefinition->addArgument($initialMarking);
-            $definitionDefinition->addArgument($metadataStoreDefinition);
+            $definitionDefinition->addArgument(new Reference(sprintf('%s.metadata_store', $workflowId)));
             $definitionDefinition->addTag('workflow.definition', [
                 'name' => $name,
                 'type' => $type,
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -265,8 +265,11 @@ public function testWorkflows()
         $this->assertCount(9, $stateMachineDefinition->getArgument(1));
         $this->assertSame(['start'], $stateMachineDefinition->getArgument(2));
 
-        $metadataStoreDefinition = $stateMachineDefinition->getArgument(3);
-        $this->assertInstanceOf(Definition::class, $metadataStoreDefinition);
+        $metadataStoreReference = $stateMachineDefinition->getArgument(3);
+        $this->assertInstanceOf(Reference::class, $metadataStoreReference);
+        $this->assertSame('state_machine.pull_request.metadata_store', (string) $metadataStoreReference);
+
+        $metadataStoreDefinition = $container->getDefinition('state_machine.pull_request.metadata_store');
         $this->assertSame(Workflow\Metadata\InMemoryMetadataStore::class, $metadataStoreDefinition->getClass());
 
         $workflowMetadata = $metadataStoreDefinition->getArgument(0);
