Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit cc25cdd695db · 2021-10-16T15:59:16.000+02:00
* 5.4:
  [HttpClient] fix RetryableHttpClient when a response is canceled
  Deprecate passing null as $requestIp to IpUtils::checkIp(), checkIp4() and checkIp6()
  [Uid] fix 4 missing bits of entropy in UUIDv4
  Add a warning in WDT if using symfony/symfony
  [Notifier][Twilio] Ensure from/sender is valid via regex
  Lower log level in case of retry
  GuardEvent::getTransition() cannot return null
  [String] Add `trimSuffix()` and `trimPrefix()` methods
  [DependencyInjection] autowire union and intersection types
  [Runtime] Drop class validation of composer "extra.runtime.class"
diff --git a/Event/GuardEvent.php b/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();`