diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS index 33632968368c..e35557e71f46 100644 --- a/UPGRADING.INTERNALS +++ b/UPGRADING.INTERNALS @@ -48,6 +48,7 @@ PHP 8.6 INTERNALS UPGRADE NOTES . The WRONG_PARAM_COUNT and ZEND_WRONG_PARAM_COUNT() macros have been removed. Call zend_wrong_param_count(); followed by RETURN_THROWS(); instead. + . PHP_HAVE_STREAMS macro removed from . ======================== 2. Build system changes diff --git a/ext/zip/tests/oo_setcompression.phpt b/ext/zip/tests/oo_setcompression.phpt index 3d90d1e985cd..1b7e817688dd 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 000000000000..cb093e8ccfc9 --- /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 diff --git a/main/php.h b/main/php.h index 8bb47ed27582..32222cfca94e 100644 --- a/main/php.h +++ b/main/php.h @@ -23,7 +23,6 @@ #endif #define PHP_API_VERSION 20250926 -#define PHP_HAVE_STREAMS #define YYDEBUG 0 #define PHP_DEFAULT_CHARSET "UTF-8"