Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit f80fd662f98d · 2021-07-21T14:48:45.000+02:00
* 5.4:
  Leverage str_contains/str_starts_with
  Leverage str_ends_with
diff --git a/Tests/Transport/AmqpExtIntegrationTest.php b/Tests/Transport/AmqpExtIntegrationTest.php
@@ -246,7 +246,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
`@@ -246,7 +246,7 @@ private function waitForOutput(Process $process, string $output, $timeoutInSecon`
`246`	`246`	`$timedOutTime = time() + $timeoutInSeconds;`
`247`	`247`
`248`	`248`	`while (time() < $timedOutTime) {`
`249`		`- if (0 === strpos($process->getOutput(), $output)) {`
	`249`	`+ if (str_starts_with($process->getOutput(), $output)) {`
`250`	`250`	`return;`
`251`	`251`	`}`
`252`	`252`