minor #52011 [FrameworkBundle] Fix registering workflow.registry (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit ba7f78a345fb · 2023-10-12T15:16:52.000+02:00
This PR was merged into the 6.4 branch. Discussion ---------- [FrameworkBundle] Fix registering workflow.registry | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT Forgotten in #51976 I guess /cc `@lyrixx` Commits ------- 1a74769 [FrameworkBundle] Fix registering workflow.registry
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -929,7 +929,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
 
         $loader->load('workflow.php');
 
-        $registryDefinition = $container->getDefinition('.workflow.registry');
+        $registryDefinition = $container->getDefinition('workflow.registry');
 
         foreach ($config['workflows'] as $name => $workflow) {
             $type = $workflow['type'];
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
@@ -385,8 +385,8 @@ public function testWorkflows()
         $this->assertInstanceOf(Reference::class, $markingStoreRef);
         $this->assertEquals('workflow_service', (string) $markingStoreRef);
 
-        $this->assertTrue($container->hasDefinition('.workflow.registry'), 'Workflow registry is registered as a service');
-        $registryDefinition = $container->getDefinition('.workflow.registry');
+        $this->assertTrue($container->hasDefinition('workflow.registry'), 'Workflow registry is registered as a service');
+        $registryDefinition = $container->getDefinition('workflow.registry');
         $this->assertGreaterThan(0, \count($registryDefinition->getMethodCalls()));
     }
 
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
@@ -128,7 +128,7 @@ public function process(ContainerBuilder $container)
             $container->getDefinition('twig.extension.expression')->addTag('twig.extension');
         }
 
-        if (!class_exists(Workflow::class) || !$container->has('.workflow.registry')) {
+        if (!class_exists(Workflow::class) || !$container->has('workflow.registry')) {
             $container->removeDefinition('workflow.twig_extension');
         } else {
             $container->getDefinition('workflow.twig_extension')->addTag('twig.extension');

Original file line number	Diff line number	Diff line change
`@@ -385,8 +385,8 @@ public function testWorkflows()`
`385`	`385`	`$this->assertInstanceOf(Reference::class, $markingStoreRef);`
`386`	`386`	`$this->assertEquals('workflow_service', (string) $markingStoreRef);`
`387`	`387`
`388`		`- $this->assertTrue($container->hasDefinition('.workflow.registry'), 'Workflow registry is registered as a service');`
`389`		`- $registryDefinition = $container->getDefinition('.workflow.registry');`
	`388`	`+ $this->assertTrue($container->hasDefinition('workflow.registry'), 'Workflow registry is registered as a service');`
	`389`	`+ $registryDefinition = $container->getDefinition('workflow.registry');`
`390`	`390`	`$this->assertGreaterThan(0, \count($registryDefinition->getMethodCalls()));`
`391`	`391`	`}`
`392`	`392`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public function process(ContainerBuilder $container)`
`128`	`128`	`$container->getDefinition('twig.extension.expression')->addTag('twig.extension');`
`129`	`129`	`}`
`130`	`130`
`131`		`- if (!class_exists(Workflow::class) \|\| !$container->has('.workflow.registry')) {`
	`131`	`+ if (!class_exists(Workflow::class) \|\| !$container->has('workflow.registry')) {`
`132`	`132`	`$container->removeDefinition('workflow.twig_extension');`
`133`	`133`	`} else {`
`134`	`134`	`$container->getDefinition('workflow.twig_extension')->addTag('twig.extension');`