Skip to content

Commit b0e123c

Browse files
authored
Merge pull request #58 from kblais/apply-same-min-requirement-rule
Apply the same requirement rule to symfony/event-dispatcher and other symfony components
2 parents c0041ed + b45a682 commit b0e123c

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"php": ">=5.5.9",
88
"symfony/workflow": "^3.3 || ^4.0",
99
"symfony/process": "^3.3 || ^4.0",
10-
"symfony/event-dispatcher": "^3.3 || 4.0.* || 4.1.* || 4.2.*",
10+
"symfony/event-dispatcher": "^3.3 || ^4.0",
1111
"illuminate/console": "5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.*",
1212
"illuminate/support": "5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.*"
1313
},

src/Events/WorkflowSubscriber.php

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,17 @@ public function enterEvent(Event $event)
6363

6464
public function enteredEvent(Event $event)
6565
{
66-
$places = $event->getTransition()->getTos();
67-
$workflowName = $event->getWorkflowName();
66+
if (null !== ($transition = $event->getTransition())) {
67+
$places = $transition->getTos();
68+
$workflowName = $event->getWorkflowName();
6869

69-
event(new EnteredEvent($event));
70-
event('workflow.entered', $event);
71-
event(sprintf('workflow.%s.entered', $workflowName), $event);
70+
event(new EnteredEvent($event));
71+
event('workflow.entered', $event);
72+
event(sprintf('workflow.%s.entered', $workflowName), $event);
7273

73-
foreach ($places as $place) {
74-
event(sprintf('workflow.%s.entered.%s', $workflowName, $place), $event);
74+
foreach ($places as $place) {
75+
event(sprintf('workflow.%s.entered.%s', $workflowName, $place), $event);
76+
}
7577
}
7678
}
7779

0 commit comments

Comments
 (0)