This commit is contained in:
Remi Collet 2021-06-07 12:30:37 +02:00
parent 33ce38961a
commit 0c3a08046d
4 changed files with 7 additions and 45 deletions

1
.gitignore vendored
View File

@ -30,3 +30,4 @@ php-pecl-zip.spec~
/zip-1.19.0.tgz
/zip-1.19.1.tgz
/zip-1.19.2.tgz
/zip-1.19.3.tgz

View File

@ -14,14 +14,14 @@
%global with_zts 0%{?__ztsphp:1}
%global ini_name 40-%{pecl_name}.ini
%global upstream_version 1.19.2
%global upstream_version 1.19.3
#global upstream_prever RC6
Summary: A ZIP archive management extension
Summary(fr): Une extension de gestion des ZIP
Name: php-pecl-zip
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
Release: 3%{?dist}
Release: 1%{?dist}
License: PHP
URL: https://pecl.php.net/package/zip
@ -166,6 +166,9 @@ TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \
%changelog
* Mon Jun 7 2020 Remi Collet <remi@remirepo.net> - 1.19.3-1
- update to 1.19.3
* Thu Mar 4 2021 Remi Collet <remi@remirepo.net> - 1.19.2-3
- rebuild for https://fedoraproject.org/wiki/Changes/php80

View File

@ -1 +1 @@
SHA512 (zip-1.19.2.tgz) = ef0971da57cd1b92a2b458e978d539e82851a65c811c4dd3ead7827db84a3c995d065bb6390ecd617273b92e47236e22c9696a4f98bc263617a2637fa30dd0bd
SHA512 (zip-1.19.3.tgz) = 3083e9b175b10201bcd7b7d8676b43fccfe8c3c04248bbc8014fb796c062d2c957904d857df3789e846293d3c78c8954697e399866e03d93e396d0d5ef41ba26

View File

@ -1,42 +0,0 @@
From a6154ce1512755b061848bc1e549118279765dc1 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 5 Jun 2020 17:08:21 +0200
Subject: [PATCH] encode param is optional
---
php8/php_zip.stub.php | 4 ++--
php8/php_zip_arginfo.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/php8/php_zip.stub.php b/php8/php_zip.stub.php
index da8e373..f85464a 100644
--- a/php8/php_zip.stub.php
+++ b/php8/php_zip.stub.php
@@ -194,9 +194,9 @@ public function registerCancelCallback(callable $callback) {}
#ifdef HAVE_METHOD_SUPPORTED
/** @return bool */
- public static function isCompressionMethodSupported(int $method, bool $enc): bool {}
+ public static function isCompressionMethodSupported(int $method, bool $enc = true): bool {}
/** @return bool */
- public static function isEncryptionMethodSupported(int $method, bool $enc): bool {}
+ public static function isEncryptionMethodSupported(int $method, bool $enc = true): bool {}
#endif
}
diff --git a/php8/php_zip_arginfo.h b/php8/php_zip_arginfo.h
index c1e8f24..5f150b9 100644
--- a/php8/php_zip_arginfo.h
+++ b/php8/php_zip_arginfo.h
@@ -271,9 +271,9 @@ ZEND_END_ARG_INFO()
#endif
#if defined(HAVE_METHOD_SUPPORTED)
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_isCompressionMethodSupported, 0, 2, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_isCompressionMethodSupported, 0, 1, _IS_BOOL, 0)
ZEND_ARG_TYPE_INFO(0, method, IS_LONG, 0)
- ZEND_ARG_TYPE_INFO(0, enc, _IS_BOOL, 0)
+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, enc, _IS_BOOL, 0, "true")
ZEND_END_ARG_INFO()
#endif