Merge branch '4.4' into 5.2

* 4.4:
  Leverage str_contains/str_starts_with
  Leverage str_ends_with

Author: nicolas-grekas

Process.php

@@ -1383,7 +1383,7 @@ protected function isSigchildEnabled()
         ob_start();
         phpinfo(\INFO_GENERAL);
 
-        return self::$sigchild = false !== strpos(ob_get_clean(), '--enable-sigchild');
+        return self::$sigchild = str_contains(ob_get_clean(), '--enable-sigchild');
     }
 
     /**
@@ -1570,7 +1570,7 @@ function ($m) use (&$env, &$varCache, &$varCount, $uid) {
                 if (isset($varCache[$m[0]])) {
                     return $varCache[$m[0]];
                 }
-                if (false !== strpos($value = $m[1], "\0")) {
+                if (str_contains($value = $m[1], "\0")) {
                     $value = str_replace("\0", '?', $value);
                 }
                 if (false === strpbrk($value, "\"%!\n")) {
@@ -1631,7 +1631,7 @@ private function escapeArgument(?string $argument): string
         if ('\\' !== \DIRECTORY_SEPARATOR) {
             return "'".str_replace("'", "'\\''", $argument)."'";
         }
-        if (false !== strpos($argument, "\0")) {
+        if (str_contains($argument, "\0")) {
             $argument = str_replace("\0", '?', $argument);
         }
         if (!preg_match('/[\/()%!^"<>&|\s]/', $argument)) {

Tests/ErrorProcessInitiator.php

@@ -22,7 +22,7 @@
     $process = new Process("exec $php -r \"echo 'ready'; trigger_error('error', E_USER_ERROR);\"");
     $process->start();
     $process->setTimeout(0.5);
-    while (false === strpos($process->getOutput(), 'ready')) {
+    while (!str_contains($process->getOutput(), 'ready')) {
         usleep(1000);
     }
     $process->signal(\SIGSTOP);

Tests/ProcessTest.php

@@ -39,7 +39,7 @@ public static function setUpBeforeClass(): void
 
         ob_start();
         phpinfo(\INFO_GENERAL);
-        self::$sigchild = false !== strpos(ob_get_clean(), '--enable-sigchild');
+        self::$sigchild = str_contains(ob_get_clean(), '--enable-sigchild');
     }
 
     protected function tearDown(): void
@@ -114,7 +114,7 @@ public function testStopWithTimeoutIsActuallyWorking()
         $p = $this->getProcess([self::$phpBin, __DIR__.'/NonStopableProcess.php', 30]);
         $p->start();
 
-        while ($p->isRunning() && false === strpos($p->getOutput(), 'received')) {
+        while ($p->isRunning() && !str_contains($p->getOutput(), 'received')) {
             usleep(1000);
         }
 
@@ -143,7 +143,7 @@ public function testWaitUntilSpecificOutput()
 
         $completeOutput = '';
         $result = $p->waitUntil(function ($type, $output) use (&$completeOutput) {
-            return false !== strpos($completeOutput .= $output, 'One more');
+            return str_contains($completeOutput .= $output, 'One more');
         });
         $this->assertTrue($result);
         $this->assertLessThan(20, microtime(true) - $start);
@@ -409,7 +409,7 @@ public function testIncrementalOutput($getOutput, $getIncrementalOutput, $uri)
         $p->start();
 
         foreach (['foo', 'bar'] as $s) {
-            while (false === strpos($p->$getOutput(), $s)) {
+            while (!str_contains($p->$getOutput(), $s)) {
                 usleep(1000);
             }
 
@@ -842,7 +842,7 @@ public function testIdleTimeoutNotExceededWhenOutputIsSent()
         $process->setTimeout(1);
         $process->start();
 
-        while (false === strpos($process->getOutput(), 'foo')) {
+        while (!str_contains($process->getOutput(), 'foo')) {
             usleep(1000);
         }
 
@@ -907,7 +907,7 @@ public function testSignal()
         $process = $this->getProcess([self::$phpBin, __DIR__.'/SignalListener.php']);
         $process->start();
 
-        while (false === strpos($process->getOutput(), 'Caught')) {
+        while (!str_contains($process->getOutput(), 'Caught')) {
             usleep(1000);
         }
         $process->signal(\SIGUSR1);

composer.json

@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=7.2.5",
-        "symfony/polyfill-php80": "^1.15"
+        "symfony/polyfill-php80": "^1.16"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Process\\": "" },