bug #43393 GuardEvent::getTransition() cannot return null (toby-griffiths)

derrabus · derrabus · commit d468bfdde226 · 2021-10-14T00:23:29.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- GuardEvent::getTransition() cannot return null | Q | A | ------------- | --- | Branch? | 5.4? | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | n/a | License | MIT | Doc PR | n/a Since $transition is required on the constructor, we can type thint that getTransition always return the `Transition`, rather than `Transition|null`. This is a purely annotation change so no change to CHANGELOG or tests, but please let me know if this is desired, or I should target a different branch. I'm also happy to update the other events that are only ever called with with a concrete Transition, if this is acceptable, however I need guidance on whether there's a change these could be called without the Transition in other uses, somehow, or not. Commits ------- 75bc96d GuardEvent::getTransition() cannot return null
diff --git a/src/Symfony/Component/Workflow/Event/GuardEvent.php b/src/Symfony/Component/Workflow/Event/GuardEvent.php
@@ -35,6 +35,11 @@ public function __construct(object $subject, Marking $marking, Transition $trans
         $this->transitionBlockerList = new TransitionBlockerList();
     }
 
+    public function getTransition(): Transition
+    {
+        return parent::getTransition();
+    }
+
     public function isBlocked(): bool
     {
         return !$this->transitionBlockerList->isEmpty();

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,11 @@ public function __construct(object $subject, Marking $marking, Transition $trans`
`35`	`35`	`$this->transitionBlockerList = new TransitionBlockerList();`
`36`	`36`	`}`
`37`	`37`
	`38`	`+ public function getTransition(): Transition`
	`39`	`+ {`
	`40`	`+ return parent::getTransition();`
	`41`	`+ }`
	`42`	`+`
`38`	`43`	`public function isBlocked(): bool`
`39`	`44`	`{`
`40`	`45`	`return !$this->transitionBlockerList->isEmpty();`