8000 [Workflow] Method buildTransitionBlockerList returns TransitionBlockerList of expected transition by Tetragramat · Pull Request #28493 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Workflow] Method buildTransitionBlockerList returns TransitionBlockerList of expected transition #28493

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

[Workflow] Method buildTransitionBlockerList returns TransitionBlockerList of expected transition #28493

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
94142c1
method buildTransitionBlockerList returns TransitionBlockerList of ex…
Tetragramat Sep 17, 2018
009d3b2
cs fix
Tetragramat Sep 17, 2018
0b54afd
added test
Tetragramat Oct 15, 2018
6922793
added descriptions of test and fix
Tetragramat Oct 19, 2018
12a46e7
replace break with exception
xabbuh Oct 25, 2018
2181b78
fixed comments
Tetragramat Oct 25, 2018
1ccc875
applied suggested changes
Tetragramat Oct 25, 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
replace break with exception
  • Loading branch information
@xabbuh
xabbuh committed Oct 25, 2018
commit 12a46e7eeb18901bbf5015b605a3a733f574d72d
45 changes: 26 additions & 19 deletions src/Symfony/Component/Workflow/Workflow.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,11 @@ public function can($subject, $transitionName)
continue;
}

$transitionBlockerList = $this->buildTransitionBlockerListForTransition($subject, $marking, $transition);
try {
$transitionBlockerList = $this->buildTransitionBlockerListForTransition($subject, $marking, $transition);
} catch (NotEnabledTransitionException $e) {
$transitionBlockerList = $e->getTransitionBlockerList();
}

if ($transitionBlockerList->isEmpty()) {
return true;
Expand All @@ -116,17 +120,13 @@ public function buildTransitionBlockerList($subject, string $transitionName): Tr
continue;
}

$transitionBlockerList = $this->buildTransitionBlockerListForTransition($subject, $marking, $transition);
try {
$transitionBlockerList = $this->buildTransitionBlockerListForTransition($subject, $marking, $transition);

// For case of non unique transition names exit the loop on transition that is supposed to be validated.
// Else we might get different blocker list containing blockedByMarking instead of blocker from the guard event.
// Reason is if you have transition "t" from "a" to "c" and transition "t" from "b" to "c" and you are in place "a"
// transitions loop might exit in transition with "from" place "b"
// which means you would get $transitionBlockerList containing blockedByMarking instead of guard blocker or none.
foreach ($transition->getFroms() as $place) {
if ($marking->has($place)) {
break 2;
}
return $transitionBlockerList;
} catch (NotEnabledTransitionException $e) {
// a transition with the same name is defined for other places too
$transitionBlockerList = $e->getTransitionBlockerList();
}
}

Expand All @@ -153,11 +153,15 @@ public function apply($subject, $transitionName)
continue;
}

$transitionBlockerList = $this->buildTransitionBlockerListForTransition($subject, $marking, $transition);
if (!$transitionBlockerList->isEmpty()) {
continue;
try {
$transitionBlockerList = $this->buildTransitionBlockerListForTransition($subject, $marking, $transition);
} catch (NotEnabledTransitionException $e) {
$transitionBlockerList = $e->getTransitionBlockerList();
}

if ($transitionBlockerList->isEmpty()) {
$approvedTransitionQueue[] = $transition;
}
$approvedTransitionQueue[] = $transition;
}

foreach ($approvedTransitionQueue as $transition) {
Expand Down Expand Up @@ -198,7 +202,12 @@ public function getEnabledTransitions($subject)
$marking = $this->getMarking($subject);

foreach ($this->definition->getTransitions() as $transition) {
$transitionBlockerList = $this->buildTransitionBlockerListForTransition($subject, $marking, $transition);
try {
$transitionBlockerList = $this->buildTransitionBlockerListForTransition($subject, $marking, $transition);
} catch (NotEnabledTransitionException $e) {
$transitionBlockerList = $e->getTransitionBlockerList();
}

if ($transitionBlockerList->isEmpty()) {
$enabledTransitions[] = $transition;
}
Expand Down Expand Up @@ -243,9 +252,7 @@ private function buildTransitionBlockerListForTransition($subject, Marking $mark
{
foreach ($transition->getFroms() as $place) {
if (!$marking->has($place)) {
return new TransitionBlockerList(array(
TransitionBlocker::createBlockedByMarking($marking),
));
throw new NotEnabledTransitionException($subject, $transition->getName(), $this, new TransitionBlockerList(array(TransitionBlocker::createBlockedByMarking($marking))));
}
}

Expand Down
0