Merge branch 'PHP-8.4' into PHP-8.5

* PHP-8.4:
  zlib: fix test skipif sections (#22099)

Author: ndossche

ext/zlib/tests/bug55544-win.phpt

@@ -7,9 +7,8 @@ zlib
 if( substr(PHP_OS, 0, 3) != "WIN" ) {
   die("skip.. only for Windows");
 }
-include 'data/func.inc';
-if (version_compare(get_zlib_version(), "1.2.11") < 0) {
-    die("skip - at least zlib 1.2.11 required, got " . get_zlib_version());
+if (version_compare(ZLIB_VERSION, "1.2.11") < 0) {
+    die("skip - at least zlib 1.2.11 required, got " . ZLIB_VERSION);
 }
 ?>
 --FILE--

ext/zlib/tests/data/func.inc

@@ -4,8 +4,7 @@ Test function gzgetc() by calling it with its expected arguments zlib 1.2.5
 zlib
 --SKIPIF--
 <?php
-include 'data/func.inc';
-if (version_compare(get_zlib_version(), '1.2.5') > 0) {
+if (version_compare(ZLIB_VERSION, '1.2.5') > 0) {
     die('skip - only for zlib <= 1.2.5');
 }
 ?>

ext/zlib/tests/gzencode_variation2-win32.phpt

@@ -4,9 +4,7 @@ Test function gzgetc() by calling it with its expected arguments zlib 1.2.7
 zlib
 --SKIPIF--
 <?php
-
-include 'data/func.inc';
-if (version_compare(get_zlib_version(), '1.2.7') < 0) {
+if (version_compare(ZLIB_VERSION, '1.2.7') < 0) {
     die('skip - only for zlib >= 1.2.7');
 }
 ?>