Merge branch 'PHP-8.1' into PHP-8.2

iluuu1994 · iluuu1994 · commit 88f6b5288f25 · 2023-09-22T11:33:36.000+02:00
* PHP-8.1: support running testsuite with negative niceness (#11481)
diff --git a/ext/standard/tests/general_functions/proc_nice_basic.phpt b/ext/standard/tests/general_functions/proc_nice_basic.phpt
@@ -19,7 +19,7 @@ if ($exit_code !== 0) {
     function getNice($id)
     {
         $res = shell_exec('ps -p ' . $id .' -o "pid,nice"');
-        preg_match('/^\s*\w+\s+\w+\s*(\d+)\s+(\d+)/m', $res, $matches);
+        preg_match('/^\s*\w+\s+\w+\s*(\d+)\s+(-?\d+)/m', $res, $matches);
         if (count($matches) > 2)
             return $matches[2];
         else

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ if ($exit_code !== 0) {`
`19`	`19`	`function getNice($id)`
`20`	`20`	`{`
`21`	`21`	`$res = shell_exec('ps -p ' . $id .' -o "pid,nice"');`
`22`		`- preg_match('/^\s\w+\s+\w+\s(\d+)\s+(\d+)/m', $res, $matches);`
	`22`	`+ preg_match('/^\s\w+\s+\w+\s(\d+)\s+(-?\d+)/m', $res, $matches);`
`23`	`23`	`if (count($matches) > 2)`
`24`	`24`	`return $matches[2];`
`25`	`25`	`else`