From f411e7fd0f407deaa4ae6780837620174e979264 Mon Sep 17 00:00:00 2001 From: Ilija Tovilo Date: Mon, 17 Nov 2025 15:18:14 +0100 Subject: [PATCH] Fix 32-bit failure of ext-zip oo_setcompression.phpt (GH-20511) --- ext/zip/tests/oo_setcompression.phpt | 14 ----------- ext/zip/tests/oo_setcompression_64bit.phpt | 29 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 14 deletions(-) create mode 100644 ext/zip/tests/oo_setcompression_64bit.phpt diff --git a/ext/zip/tests/oo_setcompression.phpt b/ext/zip/tests/oo_setcompression.phpt index 3d90d1e985c..1b7e817688d 100644 --- a/ext/zip/tests/oo_setcompression.phpt +++ b/ext/zip/tests/oo_setcompression.phpt @@ -34,24 +34,12 @@ try { echo $e->getMessage(), PHP_EOL; } -try { - $zip->setCompressionName('entry5.txt', PHP_INT_MAX); -} catch (\ValueError $e) { - echo $e->getMessage(), PHP_EOL; -} - try { $zip->setCompressionIndex(4, PHP_INT_MIN); } catch (\ValueError $e) { echo $e->getMessage(), PHP_EOL; } -try { - $zip->setCompressionIndex(4, PHP_INT_MAX); -} catch (\ValueError $e) { - echo $e->getMessage(), PHP_EOL; -} - var_dump($zip->setCompressionIndex(4, ZipArchive::CM_STORE)); var_dump($zip->setCompressionIndex(5, ZipArchive::CM_DEFLATE)); var_dump($zip->setCompressionIndex(6, ZipArchive::CM_DEFAULT)); @@ -82,8 +70,6 @@ bool(true) bool(true) bool(true) ZipArchive::setCompressionName(): Argument #2 ($method) must be between -1 and %d -ZipArchive::setCompressionName(): Argument #2 ($method) must be between -1 and %d -ZipArchive::setCompressionIndex(): Argument #2 ($method) must be between -1 and %d ZipArchive::setCompressionIndex(): Argument #2 ($method) must be between -1 and %d bool(true) bool(true) diff --git a/ext/zip/tests/oo_setcompression_64bit.phpt b/ext/zip/tests/oo_setcompression_64bit.phpt new file mode 100644 index 00000000000..cb093e8ccfc --- /dev/null +++ b/ext/zip/tests/oo_setcompression_64bit.phpt @@ -0,0 +1,29 @@ +--TEST-- +setCompressionName and setCompressionIndex methods +--EXTENSIONS-- +zip +--SKIPIF-- + +--FILE-- +setCompressionName('entry5.txt', PHP_INT_MAX); +} catch (\ValueError $e) { + echo $e->getMessage(), PHP_EOL; +} + +try { + $zip->setCompressionIndex(4, PHP_INT_MAX); +} catch (\ValueError $e) { + echo $e->getMessage(), PHP_EOL; +} + +?> +--EXPECTF-- +ZipArchive::setCompressionName(): Argument #2 ($method) must be between -1 and %d +ZipArchive::setCompressionIndex(): Argument #2 ($method) must be between -1 and %d