[php-src] PHP-8.6: Merge branch 'PHP-8.4' into PHP-8.5
| From: | Weilin Du | Date: | Wed, 30 Sep 2026 11:08:25 +0000 |
| Subject: | [php-src] PHP-8.6: Merge branch 'PHP-8.4' into PHP-8.5 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-141763@lists.php.net to get a copy of this message | ||
Author: Weilin Du (LamentXU123)
Date: 2026-09-30T19:04:17+08:00
Commit: https://github.com/php/php-src/commit/e97d5f6405e12c77c3afdfecf275ac72c8b8cb1b
Raw diff: https://github.com/php/php-src/commit/e97d5f6405e12c77c3afdfecf275ac72c8b8cb1b.diff
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
Fix GH-24006: Skip gh18431.phpt when libzip lacks progress callbacks (#24009)
Changed paths:
M ext/zip/tests/gh18431.phpt
Diff:
diff --git a/ext/zip/tests/gh18431.phpt b/ext/zip/tests/gh18431.phpt
index d4eb89c36c6b..b4225238ac38 100644
--- a/ext/zip/tests/gh18431.phpt
+++ b/ext/zip/tests/gh18431.phpt
@@ -2,6 +2,12 @@
GH-18431 (Registering ZIP progress callback twice doesn't work)
--EXTENSIONS--
zip
+--SKIPIF--
+<?php
+if (!method_exists(ZipArchive::class, 'registerProgressCallback')) {
+ die('skip progress callbacks are not supported');
+}
+?>
--FILE--
<?php
$file = __DIR__ . '/gh18431.zip';