v1.18.0RC1

3 files changed, 38 insertions, 14 deletions

diff --git a/PHPINFO b/PHPINFO
index e388ac5..db26b88 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,6 +2,6 @@
 zip
 
 Zip => enabled
-Zip version => 1.17.2
+Zip version => 1.18.0RC1
 Libzip headers version => 1.6.1
 Libzip library version => 1.6.1
diff --git a/REFLECTION b/REFLECTION
index b7944d7..369f457 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #101 zip version 1.17.2 ] {
+Extension [ <persistent> extension #101 zip version 1.18.0RC1 ] {
 
   - Functions {
     Function [ <internal:zip> function zip_open ] {
@@ -69,7 +69,7 @@ Extension [ <persistent> extension #101 zip version 1.17.2 ] {
   - Classes [1] {
     Class [ <internal:zip> class ZipArchive implements Countable ] {
 
-      - Constants [93] {
+      - Constants [98] {
         Constant [ public int CREATE ] { 1 }
         Constant [ public int EXCL ] { 2 }
         Constant [ public int CHECKCONS ] { 4 }
@@ -79,6 +79,11 @@ Extension [ <persistent> extension #101 zip version 1.17.2 ] {
         Constant [ public int FL_NODIR ] { 2 }
         Constant [ public int FL_COMPRESSED ] { 4 }
         Constant [ public int FL_UNCHANGED ] { 8 }
+        Constant [ public int FL_RECOMPRESS ] { 16 }
+        Constant [ public int FL_ENCRYPTED ] { 32 }
+        Constant [ public int FL_OVERWRITE ] { 8192 }
+        Constant [ public int FL_LOCAL ] { 256 }
+        Constant [ public int FL_CENTRAL ] { 512 }
         Constant [ public int FL_ENC_GUESS ] { 0 }
         Constant [ public int FL_ENC_RAW ] { 64 }
         Constant [ public int FL_ENC_STRICT ] { 128 }
@@ -179,7 +184,7 @@ Extension [ <persistent> extension #101 zip version 1.17.2 ] {
         Property [ <default> public $comment ]
       }
 
-      - Methods [44] {
+      - Methods [45] {
         Method [ <internal:zip> public method open ] {
 
           - Parameters [2] {
@@ -215,26 +220,29 @@ Extension [ <persistent> extension #101 zip version 1.17.2 ] {
 
         Method [ <internal:zip> public method addEmptyDir ] {
 
-          - Parameters [1] {
+          - Parameters [2] {
             Parameter #0 [ <required> $dirname ]
+            Parameter #1 [ <optional> $flags ]
           }
         }
 
         Method [ <internal:zip> public method addFromString ] {
 
-          - Parameters [2] {
+          - Parameters [3] {
             Parameter #0 [ <required> $name ]
             Parameter #1 [ <required> $content ]
+            Parameter #2 [ <optional> $flags ]
           }
         }
 
         Method [ <internal:zip> public method addFile ] {
 
-          - Parameters [4] {
+          - Parameters [5] {
             Parameter #0 [ <required> $filepath ]
             Parameter #1 [ <optional> $entryname ]
             Parameter #2 [ <optional> $start ]
             Parameter #3 [ <optional> $length ]
+            Parameter #4 [ <optional> $flags ]
           }
         }
 
@@ -272,6 +280,17 @@ Extension [ <persistent> extension #101 zip version 1.17.2 ] {
           }
         }
 
+        Method [ <internal:zip> public method replaceFile ] {
+
+          - Parameters [5] {
+            Parameter #0 [ <required> $filepath ]
+            Parameter #1 [ <required> $index ]
+            Parameter #2 [ <optional> $start ]
+            Parameter #3 [ <optional> $length ]
+            Parameter #4 [ <optional> $flags ]
+          }
+        }
+
         Method [ <internal:zip> public method setArchiveComment ] {
 
           - Parameters [1] {
diff --git a/php-pecl-zip.spec b/php-pecl-zip.spec
index daf2997..fd04573 100644
--- a/php-pecl-zip.spec
+++ b/php-pecl-zip.spec
@@ -18,12 +18,14 @@
 %global with_zts       0%{!?_without_zts:%{?__ztsphp:1}}
 %global pecl_name      zip
 
+%global upstream_version 1.18.0
+%global upstream_prever  RC1
+
 %if "%{php_version}" < "5.6"
 %global ini_name  %{pecl_name}.ini
 %else
 %global ini_name  40-%{pecl_name}.ini
 %endif
-#global prever    dev
 
 # Ensure we use save version as minor version may introduce new symbols
 %global buildver %(pkg-config --silence-errors --modversion libzip 2>/dev/null || echo 65536)
@@ -31,13 +33,13 @@
 Summary:      A ZIP archive management extension
 Summary(fr):  Une extension de gestion des ZIP
 Name:         %{?scl_prefix}php-pecl-zip
-Version:      1.17.2
+Version:      %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
 Release:      1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:      PHP
 Group:        Development/Languages
 URL:          https://pecl.php.net/package/zip
 
-Source:       https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
+Source0:      https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel
@@ -121,7 +123,7 @@ Paquet construit pour PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VE
 
 %prep 
 %setup -c -q
-mv %{pecl_name}-%{version}%{?prever} NTS
+mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS
 
 # Don't install/register tests
 sed -e 's/role="test"/role="src"/' \
@@ -130,9 +132,9 @@ sed -e 's/role="test"/role="src"/' \
 
 cd NTS
 # Sanity check, really often broken
-extver=$(sed -n '/#define PHP_ZIP_VERSION/{s/.* "//;s/".*$//;p}' php5/php_zip.h)
-if test "x${extver}" != "x%{version}%{?prever}"; then
-   : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever}.
+extver=$(sed -n '/#define PHP_ZIP_VERSION/{s/.* "//;s/".*$//;p}' php7/php_zip.h)
+if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
+   : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}.
    exit 1
 fi
 
@@ -261,6 +263,9 @@ fi
 #### TODO: SCLs on EL-8 still use libzip from default stream (7.2 => 1.5.1)
 
 %changelog
+* Mon Mar  2 2020 Remi Collet <remi@remirepo.net> - 1.18.0RC1-1
+- update to 1.18.0RC1
+
 * Fri Feb 28 2020 Remi Collet <remi@remirepo.net> - 1.17.2-1
 - update to 1.17.2