bug #24620 [FrameworkBundle][Workflow] Fix deprectation when checking workflow.registry service in dump command (Jean-Beru)

fabpot · fabpot · commit dc0116aa3412 · 2017-10-20T13:32:57.000-07:00
This PR was squashed before being merged into the 3.4 branch (closes #24620). Discussion ---------- [FrameworkBundle][Workflow] Fix deprectation when checking workflow.registry service in dump command | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no  | BC breaks? | no | Deprecations? | no  | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | This PR will declare `workflow.registry` as a public service to avoid deprecation when `WorkflowDumpCommand` checks its existence. It only concerns 3.4 since this `isEnabled` method will be removed in 4.0. Commits ------- 9e75847 [FrameworkBundle][Workflow] Fix deprectation when checking workflow.registry service in dump command
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php
@@ -27,16 +27,6 @@ class WorkflowDumpCommand extends ContainerAwareCommand
 {
     protected static $defaultName = 'workflow:dump';
 
-    /**
-     * {@inheritdoc}
-     *
-     * BC to be removed in 4.0
-     */
-    public function isEnabled()
-    {
-        return $this->getContainer()->has('workflow.registry');
-    }
-
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -619,9 +619,7 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
     private function registerWorkflowConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
         if (!$config['enabled']) {
-            if (!class_exists(Workflow\Workflow::class)) {
-                $container->removeDefinition(WorkflowDumpCommand::class);
-            }
+            $container->removeDefinition(WorkflowDumpCommand::class);
 
             return;
         }

Original file line number	Diff line number	Diff line change
`@@ -619,9 +619,7 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $`
`619`	`619`	`private function registerWorkflowConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)`
`620`	`620`	`{`
`621`	`621`	`if (!$config['enabled']) {`
`622`		`- if (!class_exists(Workflow\Workflow::class)) {`
`623`		`- $container->removeDefinition(WorkflowDumpCommand::class);`
`624`		`- }`
	`622`	`+ $container->removeDefinition(WorkflowDumpCommand::class);`
`625`	`623`
`626`	`624`	`return;`
`627`	`625`	`}`