8000 [FrameworkBundle][Workflow] fix guard expressions by destillat · Pull Request #28018 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[FrameworkBundle][Workflow] fix guard expressions #28018

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 11 commits into from
Closed

[FrameworkBundle][Workflow] fix guard expressions #28018

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
29d6588
[FrameworkBundle] fixed guard event names for transitions
destillat Jul 19, 2018
49ceb2c
[FrameworkBundle][Workflow] register guard expression per every trans…
destillat Jul 20, 2018
5d5f2fb
[FrameworkBundle] workflow guard expressions tests
destillat Jul 20, 2018
5a44ca2
[Workflow] test with guard expression bound to exact transitions
destillat Jul 20, 2018
3dda5ee
[FrameworkBundle][Workflow] Add transitions to service container and …
destillat Jul 26, 2018
1ef1e3b
[CS] remove docblocks in guard expression class
destillat Jul 26, 2018
f93381d
[CS] remove unused keys
destillat Jul 26, 2018
1f2b8d7
[CS] apply coding standards recommendations
destillat Jul 26, 2018
05506c4
[CS] add license header
destillat Jul 26, 2018
720f943
[Workflow] remove duplicate test
destillat Jul 26, 2018
ac835a8
[CS] apply cs recommendations
destillat Jul 26, 2018
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
[CS] remove unused keys
  • Loading branch information
@destillat
destillat committed Jul 26, 2018
commit f93381d3e4ecccc0fb96faef8c4571df7dce53d0
8 changes: 6 additions & 2 deletions src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,12 +521,14 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
$transitionId = sprintf('%s.transition.%s', $workflowId, $transitionCounter++);
$container->setDefinition($transitionId, $transitionDefinition);
$transitions[] = new Reference($transitionId);

if ($transition['metadata']) {
$transitionsMetadataDefinition->addMethodCall('attach', array(
$transitionDefinition,
$transition['metadata'],
));
}

if (isset($transition['guard'])) {
$configuration = new Definition(Workflow\EventListener\GuardExpression::class);
$configuration->addArgument(new Reference($transitionId));
Expand All @@ -535,18 +537,20 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
$guardsConfiguration[$eventName][] = $configuration;
}
} elseif ('state_machine' === $type) {
foreach ($transition['from'] as $keyFrom => $from) {
foreach ($transition['to'] as $keyTo => $to) {
foreach ($transition['from'] as $from) {
foreach ($transition['to'] as $to) {
$transitionDefinition = new Definition(Workflow\Transition::class, array($transition['name'], $from, $to));
$transitionId = sprintf('%s.transition.%s', $workflowId, $transitionCounter++);
$container->setDefinition($transitionId, $transitionDefinition);
$transitions[] = new Reference($transitionId);

if ($transition['metadata']) {
$transitionsMetadataDefinition->addMethodCall('attach', array(
$transitionDefinition,
$transition['metadata'],
));
}

if (isset($transition['guard'])) {
$configuration = new Definition(Workflow\EventListener\GuardExpression::class);
$configuration->addArgument(new Reference($transitionId));
Expand Down
0