Merge branch '4.4' into 5.2

nicolas-grekas · nicolas-grekas · commit 62736870b28c · 2021-07-21T14:38:00.000+02:00
* 4.4:
  Leverage str_contains/str_starts_with
  Leverage str_ends_with
diff --git a/Tests/Transport/AmqpExtIntegrationTest.php b/Tests/Transport/AmqpExtIntegrationTest.php
@@ -208,7 +208,7 @@ private function waitForOutput(Process $process, string $output, $timeoutInSecon
         $timedOutTime = time() + $timeoutInSeconds;
 
         while (time() < $timedOutTime) {
-            if (0 === strpos($process->getOutput(), $output)) {
+            if (str_starts_with($process->getOutput(), $output)) {
                 return;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ private function waitForOutput(Process $process, string $output, $timeoutInSecon`
`208`	`208`	`$timedOutTime = time() + $timeoutInSeconds;`
`209`	`209`
`210`	`210`	`while (time() < $timedOutTime) {`
`211`		`- if (0 === strpos($process->getOutput(), $output)) {`
	`211`	`+ if (str_starts_with($process->getOutput(), $output)) {`
`212`	`212`	`return;`
`213`	`213`	`}`
`214`	`214`