Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

[FrameworkBundle][Workflow] Fix deprectation when checking workflow.registry service in dump command #24620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

[FrameworkBundle][Workflow] Fix deprectation when checking workflow.registry service in dump command #24620

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
387ec98
[Workflow] Fix deprectation when checking workflow.registry service i…
Jean-Beru Oct 19, 2017
d27abc5
Move workflow command definition in workflow.xml
Jean-Beru Oct 19, 2017
5a07500
Remove useless Command deletion
Jean-Beru Oct 20, 2017
40321a8
Remove command if workflow is disabled
Jean-Beru Oct 20, 2017
7021405
Remove useless test
Jean-Beru Oct 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove command if workflow is disabled
  • Loading branch information
@Jean-Beru
Jean-Beru committed Oct 20, 2017
commit 40321a8bf6536c20d4b89b9db98f9768c3e01462
5 changes: 5 additions & 0 deletions 5 src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
use Symfony\Bundle\FrameworkBundle\Command\RouterMatchCommand;
use Symfony\Bundle\FrameworkBundle\Command\TranslationDebugCommand;
use Symfony\Bundle\FrameworkBundle\Command\TranslationUpdateCommand;
use Symfony\Bundle\FrameworkBundle\Command\WorkflowDumpCommand;
use Symfony\Bundle\FrameworkBundle\Command\XliffLintCommand;
use Symfony\Bundle\FrameworkBundle\Command\YamlLintCommand;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
Expand Down Expand Up @@ -623,6 +624,10 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
private function registerWorkflowConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
{
if (!$config['enabled']) {
if ($container->hasDefinition(WorkflowDumpCommand::class)) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the "if" can be removed: removeDefinition already does it internally

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct. Thks @nicolas-grekas !

$container->removeDefinition(WorkflowDumpCommand::class);
}

return;
}

Expand Down
4 changes: 4 additions & 0 deletions 4 src/Symfony/Bundle/FrameworkBundle/Resources/config/console.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@
<tag name="console.command" command="translation:update" />
</service>

<service id="Symfony\Bundle\FrameworkBundle\Command\WorkflowDumpCommand">
<tag name="console.command" command="workflow:dump" />
</service>

<service id="Symfony\Bundle\FrameworkBundle\Command\XliffLintCommand">
<tag name="console.command" command="lint:xliff" />
</service>
Expand Down
4 changes: 0 additions & 4 deletions 4 src/Symfony/Bundle/FrameworkBundle/Resources/config/workflow.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,5 @@
<service id="Symfony\Component\Workflow\Registry" alias="workflow.registry" />

<service id="workflow.security.expression_language" class="Symfony\Component\Workflow\EventListener\ExpressionLanguage" />

<service id="Symfony\Bundle\FrameworkBundle\Command\WorkflowDumpCommand">
<tag name="console.command" command="workflow:dump" />
</service>
</services>
</container>
Morty Proxy This is a proxified and sanitized view of the page, visit original site.