diff options
| -rw-r--r-- | php-pecl-zip.spec | 5 | ||||
| -rw-r--r-- | zip-php8.patch | 27 |
2 files changed, 31 insertions, 1 deletions
diff --git a/php-pecl-zip.spec b/php-pecl-zip.spec index e089347..1b63a47 100644 --- a/php-pecl-zip.spec +++ b/php-pecl-zip.spec @@ -35,7 +35,7 @@ Summary: A ZIP archive management extension Summary(fr): Une extension de gestion des ZIP Name: %{?scl_prefix}php-pecl-zip Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 6%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP Group: Development/Languages URL: https://pecl.php.net/package/zip @@ -272,6 +272,9 @@ fi #### TODO: SCLs on EL-8 still use libzip from default stream (7.2 => 1.5.1) %changelog +* Wed Sep 2 2020 Remi Collet <remi@remirepo.net> - 1.19.0-6 +- rebuild for 8.0.0beta3 + * Mon Aug 17 2020 Remi Collet <remi@remirepo.net> - 1.19.0-5 - rebuild for 8.0.0beta2 diff --git a/zip-php8.patch b/zip-php8.patch index 6d14487..83ad3bd 100644 --- a/zip-php8.patch +++ b/zip-php8.patch @@ -1737,3 +1737,30 @@ index 0000000..01e0e20 + +Deprecated: Function zip_open() is deprecated in %s on line %d +Failure +From d94273e08d507ede72467ee2eb3bd229410efac0 Mon Sep 17 00:00:00 2001 +From: George Peter Banyard <girgias@php.net> +Date: Fri, 28 Aug 2020 15:41:27 +0200 +Subject: [PATCH] Improve type declarations for Zend APIs + +Voidification of Zend API which always succeeded +Use bool argument types instead of int for boolean arguments +Use bool return type for functions which return true/false (1/0) +Use zend_result return type for functions which return SUCCESS/FAILURE as they don't follow normal boolean semantics +--- + php8/php_zip.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/php8/php_zip.c b/php8/php_zip.c +index 43c2da9..c1a569a 100644 +--- a/php8/php_zip.c ++++ b/php8/php_zip.c +@@ -1290,7 +1290,8 @@ PHP_FUNCTION(zip_entry_close) + RETURN_THROWS(); + } + +- RETURN_BOOL(SUCCESS == zend_list_close(Z_RES_P(zip_entry))); ++ zend_list_close(Z_RES_P(zip_entry)); ++ RETURN_TRUE; + } + /* }}} */ + |