Commit daa9b09d563 for php.net

commit daa9b09d563c805fd50c96995e455b43d5b5cd72
Merge: 946d687d8d5 7727193818c
Author: ndossche <7771979+ndossche@users.noreply.github.com>
Date:   Sun May 24 19:39:49 2026 +0200

    Merge branch 'PHP-8.4' into PHP-8.5

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

diff --cc ext/zlib/tests/gzencode_variation2-win32.phpt
index 2cc1f982089,34ec5b3b366..183d67f359b
--- a/ext/zlib/tests/gzencode_variation2-win32.phpt
+++ b/ext/zlib/tests/gzencode_variation2-win32.phpt
@@@ -7,9 -7,10 +7,8 @@@ zli
  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--