From 1fb3a5e8f40ce5e2417c9d0e604b5f5f299db853 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@php.net>
Date: Wed, 18 Mar 2020 13:22:47 +0000
Subject: [PATCH] doc for zip 1.18.1

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@349489 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/zip/ziparchive/addglob.xml          | 42 +++++++++++++++++++
 .../zip/ziparchive/setcompressionindex.xml    |  8 ++--
 .../zip/ziparchive/setcompressionname.xml     |  8 ++--
 3 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/reference/zip/ziparchive/addglob.xml b/reference/zip/ziparchive/addglob.xml
index 6f5364aafa..d89a2831b2 100644
--- a/reference/zip/ziparchive/addglob.xml
+++ b/reference/zip/ziparchive/addglob.xml
@@ -87,6 +87,40 @@
          <link linkend="zip.constants">ZIP constants</link> page.
         </para>
        </listitem>
+       <listitem>
+        <para>
+         <literal>"comp_method"</literal>
+        </para>
+        <para>
+         Compression method, one of the <constant>ZipArchive::CM_*</constant>
+         constants, see <link linkend="zip.constants">ZIP constants</link> page.
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         <literal>"comp_flags"</literal>
+        </para>
+        <para>
+         Compression level.
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         <literal>"enc_method"</literal>
+        </para>
+        <para>
+         Encryption method, one of the <constant>ZipArchive::EM_*</constant>
+         constants, see <link linkend="zip.constants">ZIP constants</link> page.
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         <literal>"enc_password"</literal>
+        </para>
+        <para>
+         Password used for encryption.
+        </para>
+       </listitem>
       </itemizedlist>
      </para>
     </listitem>
@@ -119,6 +153,14 @@
         <literal>"flags"</literal> in <parameter>options</parameter> was added.
        </entry>
       </row>
+      <row>
+       <entry>8.0.0 / 1.18.1</entry>
+       <entry>
+        <literal>"comp_method"</literal>, <literal>"comp_flags"</literal>,
+        <literal>"enc_method"</literal> and <literal>"enc_password"</literal>in
+        <parameter>options</parameter> was added.
+       </entry>
+      </row>
      </tbody>
     </tgroup>
    </informaltable>
diff --git a/reference/zip/ziparchive/setcompressionindex.xml b/reference/zip/ziparchive/setcompressionindex.xml
index 3a42eac1e8..af2adacf0e 100644
--- a/reference/zip/ziparchive/setcompressionindex.xml
+++ b/reference/zip/ziparchive/setcompressionindex.xml
@@ -33,10 +33,8 @@
      <term><parameter>comp_method</parameter></term>
      <listitem>
       <para>
-       The compression method. Either
-       <constant>ZipArchive::CM_DEFAULT</constant>,
-       <constant>ZipArchive::CM_STORE</constant> or
-       <constant>ZipArchive::CM_DEFLATE</constant>.
+       The compression method, one of the
+       <constant>ZipArchive::CM_*</constant> constants.
       </para>
      </listitem>
     </varlistentry>
@@ -44,7 +42,7 @@
      <term><parameter>comp_flags</parameter></term>
      <listitem>
       <para>
-       Compression flags. Currently unused.
+       Compression level.
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/zip/ziparchive/setcompressionname.xml b/reference/zip/ziparchive/setcompressionname.xml
index 2296a18631..766d057694 100644
--- a/reference/zip/ziparchive/setcompressionname.xml
+++ b/reference/zip/ziparchive/setcompressionname.xml
@@ -33,10 +33,8 @@
      <term><parameter>comp_method</parameter></term>
      <listitem>
       <para>
-       The compression method. Either
-       <constant>ZipArchive::CM_DEFAULT</constant>,
-       <constant>ZipArchive::CM_STORE</constant> or
-       <constant>ZipArchive::CM_DEFLATE</constant>.
+       The compression method, one of the
+       <constant>ZipArchive::CM_*</constant> constants.
       </para>
      </listitem>
     </varlistentry>
@@ -44,7 +42,7 @@
      <term><parameter>comp_flags</parameter></term>
      <listitem>
       <para>
-       Compression flags. Currently unused.
+       Compression level.
       </para>
      </listitem>
     </varlistentry>