Merge branch 'PHP-8.2' into PHP-8.3

iluuu1994 · iluuu1994 · commit aa452ed315b0 · 2023-11-14T18:37:17.000+01:00
* PHP-8.2:
  [skip ci] Further increase allowable atime deviation
diff --git a/ext/standard/tests/file/file.inc b/ext/standard/tests/file/file.inc
@@ -611,7 +611,7 @@ function compare_stats($stat1, $stat2, $fields, $op = "==", $flag = false ) {
           if ( ! in_array( $fields[$index], $stat_time_diff_keys ) ) {
             $result = false;
             echo "Error: stat1 do not match with stat2 at key value: $fields[$index]\n";
-          } elseif (abs($stat1[ $fields[$index] ] - $stat2[ $fields[$index] ]) > 1)  {
+          } elseif (abs($stat1[ $fields[$index] ] - $stat2[ $fields[$index] ]) > 2) {
             $result = false;
             echo "Error: stat1 differs too much from stat2 at key value: $fields[$index]\n";
           }

Original file line number	Diff line number	Diff line change
`@@ -611,7 +611,7 @@ function compare_stats($stat1, $stat2, $fields, $op = "==", $flag = false ) {`
`611`	`611`	`if ( ! in_array( $fields[$index], $stat_time_diff_keys ) ) {`
`612`	`612`	`$result = false;`
`613`	`613`	`echo "Error: stat1 do not match with stat2 at key value: $fields[$index]\n";`
`614`		`- } elseif (abs($stat1[ $fields[$index] ] - $stat2[ $fields[$index] ]) > 1) {`
	`614`	`+ } elseif (abs($stat1[ $fields[$index] ] - $stat2[ $fields[$index] ]) > 2) {`
`615`	`615`	`$result = false;`
`616`	`616`	`echo "Error: stat1 differs too much from stat2 at key value: $fields[$index]\n";`
`617`	`617`	`}`