Merge branch 'PHP-8.4' into PHP-8.5

* PHP-8.4:
  Update zlib test to use separate file for flock()

Author: ndossche

ext/zlib/tests/data/zlib_flock.txt.gz

@@ -4,7 +4,7 @@ Test function flock on a zlib stream
 zlib
 --FILE--
 <?php
-$f = __DIR__."/data/test.txt.gz";
+$f = __DIR__."/data/zlib_flock.txt.gz";
 $h = gzopen($f,'r');
 var_dump(flock($h, LOCK_EX));
 gzclose($h);