diff --git a/reference/zip/functions/zip-entry-close.xml b/reference/zip/functions/zip-entry-close.xml
index 644b18cba1..0ee6042a7f 100644
--- a/reference/zip/functions/zip-entry-close.xml
+++ b/reference/zip/functions/zip-entry-close.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>zip_entry_close</methodname>
-   <methodparam><type>resource</type><parameter>zip_entry</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>zip_ent</parameter></methodparam>
   </methodsynopsis>
   <para>
    Closes the specified directory entry.
@@ -21,7 +21,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>zip_entry</parameter></term>
+     <term><parameter>zip_ent</parameter></term>
      <listitem>
       <para>
        A directory entry previously opened <function>zip_entry_open</function>.
@@ -73,7 +73,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/functions/zip-entry-compressedsize.xml b/reference/zip/functions/zip-entry-compressedsize.xml
index 6f48e3e187..3714e6cc90 100644
--- a/reference/zip/functions/zip-entry-compressedsize.xml
+++ b/reference/zip/functions/zip-entry-compressedsize.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>int</type><methodname>zip_entry_compressedsize</methodname>
+   <type class="union"><type>int</type><type>false</type></type><methodname>zip_entry_compressedsize</methodname>
    <methodparam><type>resource</type><parameter>zip_entry</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -34,7 +34,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The compressed size.
+   The compressed size, &return.falseforfailure;.
   </para>
  </refsect1>
 
@@ -74,7 +74,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/functions/zip-entry-compressionmethod.xml b/reference/zip/functions/zip-entry-compressionmethod.xml
index b98525dc44..0947e11485 100644
--- a/reference/zip/functions/zip-entry-compressionmethod.xml
+++ b/reference/zip/functions/zip-entry-compressionmethod.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>string</type><methodname>zip_entry_compressionmethod</methodname>
+   <type class="union"><type>string</type><type>false</type></type><methodname>zip_entry_compressionmethod</methodname>
    <methodparam><type>resource</type><parameter>zip_entry</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -35,7 +35,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The compression method.
+   The compression method, &return.falseforfailure;.
   </para>
  </refsect1>
 
@@ -75,7 +75,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/functions/zip-entry-filesize.xml b/reference/zip/functions/zip-entry-filesize.xml
index 818eef7553..625c757a27 100644
--- a/reference/zip/functions/zip-entry-filesize.xml
+++ b/reference/zip/functions/zip-entry-filesize.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>int</type><methodname>zip_entry_filesize</methodname>
+   <type class="union"><type>int</type><type>false</type></type><methodname>zip_entry_filesize</methodname>
    <methodparam><type>resource</type><parameter>zip_entry</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -34,7 +34,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The size of the directory entry.
+   The size of the directory entry, &return.falseforfailure;.
   </para>
  </refsect1>
 
@@ -74,7 +74,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/functions/zip-entry-name.xml b/reference/zip/functions/zip-entry-name.xml
index be1caa0792..abb0dab070 100644
--- a/reference/zip/functions/zip-entry-name.xml
+++ b/reference/zip/functions/zip-entry-name.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>string</type><methodname>zip_entry_name</methodname>
+   <type class="union"><type>string</type><type>false</type></type><methodname>zip_entry_name</methodname>
    <methodparam><type>resource</type><parameter>zip_entry</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -34,7 +34,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The name of the directory entry.
+   The name of the directory entry, &return.falseforfailure;.
   </para>
  </refsect1>
 
@@ -74,7 +74,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/functions/zip-entry-open.xml b/reference/zip/functions/zip-entry-open.xml
index 9835099656..008eb96c2e 100644
--- a/reference/zip/functions/zip-entry-open.xml
+++ b/reference/zip/functions/zip-entry-open.xml
@@ -9,10 +9,10 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>bool</type><methodname>zip_entry_open</methodname>      
-   <methodparam><type>resource</type><parameter>zip</parameter></methodparam>
+   <type>bool</type><methodname>zip_entry_open</methodname>
+   <methodparam><type>resource</type><parameter>zip_dp</parameter></methodparam>
    <methodparam><type>resource</type><parameter>zip_entry</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>mode</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>mode</parameter><initializer>"rb"</initializer></methodparam>
   </methodsynopsis>
   <para>
    Opens a directory entry in a zip file for reading.
@@ -23,7 +23,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>zip</parameter></term>
+     <term><parameter>zip_dp</parameter></term>
      <listitem>
       <para>
        A valid resource handle returned by <function>zip_open</function>.
@@ -107,7 +107,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/functions/zip-entry-read.xml b/reference/zip/functions/zip-entry-read.xml
index bff2a36f67..d8a94f98fe 100644
--- a/reference/zip/functions/zip-entry-read.xml
+++ b/reference/zip/functions/zip-entry-read.xml
@@ -9,9 +9,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>string</type><methodname>zip_entry_read</methodname>
+   <type class="union"><type>string</type><type>false</type></type><methodname>zip_entry_read</methodname>
    <methodparam><type>resource</type><parameter>zip_entry</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>length</parameter><initializer>1024</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>len</parameter><initializer>1024</initializer></methodparam>
   </methodsynopsis>
   <para>
    Reads from an open directory entry.
@@ -30,7 +30,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>length</parameter></term>
+     <term><parameter>len</parameter></term>
      <listitem>
       <para>
        The number of bytes to return.
@@ -89,7 +89,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/functions/zip-read.xml b/reference/zip/functions/zip-read.xml
index 5256f5d4dd..59fed56c63 100644
--- a/reference/zip/functions/zip-read.xml
+++ b/reference/zip/functions/zip-read.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource</type><methodname>zip_read</methodname>
+   <type class="union"><type>resource</type><type>false</type></type><methodname>zip_read</methodname>
    <methodparam><type>resource</type><parameter>zip</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -79,7 +79,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/addfile.xml b/reference/zip/ziparchive/addfile.xml
index 59b2020c8b..ff5ce6e065 100644
--- a/reference/zip/ziparchive/addfile.xml
+++ b/reference/zip/ziparchive/addfile.xml
@@ -9,8 +9,8 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>ZipArchive::addFile</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>entryname</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam><type>string</type><parameter>filepath</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>entryname</parameter><initializer>""</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>start</parameter><initializer>0</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>length</parameter><initializer>0</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>ZipArchive::FL_OVERWRITE</initializer></methodparam>
@@ -25,7 +25,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>filename</parameter></term>
+     <term><parameter>filepath</parameter></term>
      <listitem>
       <para>
        The path to the file to add.
@@ -36,7 +36,7 @@
      <term><parameter>entryname</parameter></term>
      <listitem>
       <para>
-       If supplied, this is the local name inside the ZIP archive that will override the <parameter>filename</parameter>.
+       If supplied and not empty, this is the local name inside the ZIP archive that will override the <parameter>filepath</parameter>.
       </para>
      </listitem>
     </varlistentry>
@@ -156,7 +156,6 @@ if ($zip->open('test.zip') === TRUE) {
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/addfromstring.xml b/reference/zip/ziparchive/addfromstring.xml
index 654bdd6e06..020dd3b6e2 100644
--- a/reference/zip/ziparchive/addfromstring.xml
+++ b/reference/zip/ziparchive/addfromstring.xml
@@ -10,7 +10,7 @@
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>ZipArchive::addFromString</methodname>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>contents</parameter></methodparam>
+   <methodparam><type>string</type><parameter>content</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>ZipArchive::FL_OVERWRITE</initializer></methodparam>
   </methodsynopsis>
   <para>
@@ -31,7 +31,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>contents</parameter></term>
+     <term><parameter>content</parameter></term>
      <listitem>
       <para>
        The contents to use to create the entry. It is used in a binary
@@ -126,7 +126,6 @@ if ($zip->open('test.zip') === TRUE) {
     </example>
    </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/addglob.xml b/reference/zip/ziparchive/addglob.xml
index 076dbb6132..45ee2a5a84 100644
--- a/reference/zip/ziparchive/addglob.xml
+++ b/reference/zip/ziparchive/addglob.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="ziparchive.addglob" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>ZipArchive::addGlob</refname>
@@ -13,7 +12,7 @@
    <modifier>public</modifier> <type class="union"><type>array</type><type>false</type></type><methodname>ZipArchive::addGlob</methodname>
    <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
+   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>[]</initializer></methodparam>
   </methodsynopsis>
   <para>
    Add files from a directory which match the glob <parameter>pattern</parameter>.
@@ -203,7 +202,6 @@ if ($ret !== TRUE) {
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/addpattern.xml b/reference/zip/ziparchive/addpattern.xml
index 4f9f318dfc..d28ff63a67 100644
--- a/reference/zip/ziparchive/addpattern.xml
+++ b/reference/zip/ziparchive/addpattern.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="ziparchive.addpattern" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>ZipArchive::addPattern</refname>
@@ -13,7 +12,7 @@
    <modifier>public</modifier> <type class="union"><type>array</type><type>false</type></type><methodname>ZipArchive::addPattern</methodname>
    <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>path</parameter><initializer>"."</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
+   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>[]</initializer></methodparam>
   </methodsynopsis>
   <para>
    Add files from a directory which match the regular expression <parameter>pattern</parameter>.
@@ -94,7 +93,6 @@ if ($ret !== TRUE) {
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/extractto.xml b/reference/zip/ziparchive/extractto.xml
index 2432863ad1..5d8336ce30 100644
--- a/reference/zip/ziparchive/extractto.xml
+++ b/reference/zip/ziparchive/extractto.xml
@@ -9,8 +9,8 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>ZipArchive::extractTo</methodname>
-   <methodparam><type>string</type><parameter>destination</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>entries</parameter></methodparam>
+   <methodparam><type>string</type><parameter>pathto</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>array</type><type>string</type><type>null</type></type><parameter>files</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Extract the complete archive or the given files to the specified
@@ -30,7 +30,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>destination</parameter></term>
+     <term><parameter>pathto</parameter></term>
      <listitem>
       <para>
        Location where to extract the files.
@@ -38,7 +38,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>entries</parameter></term>
+     <term><parameter>files</parameter></term>
      <listitem>
       <para>
        The entries to extract. It accepts either a single entry name or
@@ -94,7 +94,6 @@ if ($res === TRUE) {
     </example>
    </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/getarchivecomment.xml b/reference/zip/ziparchive/getarchivecomment.xml
index 4dd6b3b815..f4042fcd7f 100644
--- a/reference/zip/ziparchive/getarchivecomment.xml
+++ b/reference/zip/ziparchive/getarchivecomment.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>ZipArchive::getArchiveComment</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    Returns the Zip archive comment.
@@ -62,7 +62,6 @@ if ($res === TRUE) {
   </example>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/getcommentindex.xml b/reference/zip/ziparchive/getcommentindex.xml
index f4f09f4e67..e9f2ff8fed 100644
--- a/reference/zip/ziparchive/getcommentindex.xml
+++ b/reference/zip/ziparchive/getcommentindex.xml
@@ -10,7 +10,7 @@
   <methodsynopsis>
    <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>ZipArchive::getCommentIndex</methodname>
    <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    Returns the comment of an entry using the entry index.
@@ -66,7 +66,6 @@ if ($res === TRUE) {
     </example>
    </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/getcommentname.xml b/reference/zip/ziparchive/getcommentname.xml
index f4100bf48c..c783c65b98 100644
--- a/reference/zip/ziparchive/getcommentname.xml
+++ b/reference/zip/ziparchive/getcommentname.xml
@@ -10,7 +10,7 @@
   <methodsynopsis>
    <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>ZipArchive::getCommentName</methodname>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    Returns the comment of an entry using the entry name.
@@ -66,7 +66,6 @@ if ($res === TRUE) {
     </example>
    </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/getexternalattributesname.xml b/reference/zip/ziparchive/getexternalattributesname.xml
index f9c9bbf037..e54e94cd8f 100644
--- a/reference/zip/ziparchive/getexternalattributesname.xml
+++ b/reference/zip/ziparchive/getexternalattributesname.xml
@@ -8,12 +8,11 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type>
-   <methodname>ZipArchive::getExternalAttributesName</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>ZipArchive::getExternalAttributesName</methodname>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
    <methodparam><type>int</type><parameter role="reference">opsys</parameter></methodparam>
    <methodparam><type>int</type><parameter role="reference">attr</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    Retrieve the external attributes of an entry defined by its name.
@@ -66,7 +65,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -86,4 +84,4 @@ End:
 vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
--->
\ No newline at end of file
+-->
diff --git a/reference/zip/ziparchive/getfromindex.xml b/reference/zip/ziparchive/getfromindex.xml
index 9514d64001..a64e09ba9e 100644
--- a/reference/zip/ziparchive/getfromindex.xml
+++ b/reference/zip/ziparchive/getfromindex.xml
@@ -10,8 +10,8 @@
   <methodsynopsis>
    <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>ZipArchive::getFromIndex</methodname>
    <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>length</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>len</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    Returns the entry contents using its index.
@@ -30,7 +30,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>length</parameter></term>
+     <term><parameter>len</parameter></term>
      <listitem>
       <para>
        The length to be read from the entry. If <literal>0</literal>, then the
@@ -98,7 +98,6 @@ if ($zip->open('test.zip') === TRUE) {
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/getfromname.xml b/reference/zip/ziparchive/getfromname.xml
index a5b73b2f0a..83bf3254a8 100644
--- a/reference/zip/ziparchive/getfromname.xml
+++ b/reference/zip/ziparchive/getfromname.xml
@@ -10,8 +10,8 @@
   <methodsynopsis>
    <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>ZipArchive::getFromName</methodname>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>length</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>len</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    Returns the entry contents using its name.
@@ -30,7 +30,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>length</parameter></term>
+     <term><parameter>len</parameter></term>
      <listitem>
       <para>
        The length to be read from the entry. If <literal>0</literal>, then the
@@ -118,7 +118,6 @@ if ($z->open(dirname(__FILE__) . '/test_im.zip')) {
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/getnameindex.xml b/reference/zip/ziparchive/getnameindex.xml
index e69b5e6290..19119394b4 100644
--- a/reference/zip/ziparchive/getnameindex.xml
+++ b/reference/zip/ziparchive/getnameindex.xml
@@ -10,7 +10,7 @@
   <methodsynopsis>
    <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>ZipArchive::getNameIndex</methodname>
    <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    Returns the name of an entry using its index.
@@ -67,7 +67,6 @@ if ($zip->open('test.zip') == TRUE) {
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/getstatusstring.xml b/reference/zip/ziparchive/getstatusstring.xml
index 4069f338fe..f29348f6e6 100644
--- a/reference/zip/ziparchive/getstatusstring.xml
+++ b/reference/zip/ziparchive/getstatusstring.xml
@@ -8,7 +8,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>ZipArchive::getStatusString</methodname>
+   <modifier>public</modifier> <type>string</type><methodname>ZipArchive::getStatusString</methodname>
    <void/>
   </methodsynopsis>
   <para>
@@ -24,7 +24,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns a <type>string</type> with the status message on success&return.falseforfailure;.
+   Returns a <type>string</type> with the status message.
   </para>
  </refsect1>
 
@@ -46,6 +46,12 @@
         This method can be called on closed archive.
        </entry>
       </row>
+      <row>
+       <entry>8.0.0 / 1.18.0</entry>
+       <entry>
+        This method no longer returns &false; on failure.
+       </entry>
+      </row>
      </tbody>
     </tgroup>
    </informaltable>
@@ -53,7 +59,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/iscompressionmethoddupported.xml b/reference/zip/ziparchive/iscompressionmethoddupported.xml
index 0ddd6a19a1..c878be76ea 100644
--- a/reference/zip/ziparchive/iscompressionmethoddupported.xml
+++ b/reference/zip/ziparchive/iscompressionmethoddupported.xml
@@ -9,9 +9,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ZipArchive::isCompressionMethodSupported</methodname>
+   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>ZipArchive::isCompressionMethodSupported</methodname>
    <methodparam><type>int</type><parameter>method</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>encode</parameter><initializer>true</initializer></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>enc</parameter><initializer>&true;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Check if a compression method is supported by libzip.
@@ -32,7 +32,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>encode</parameter></term>
+     <term><parameter>enc</parameter></term>
      <listitem>
       <para>
        If &true; check for compression, else check for decompression.
@@ -70,7 +70,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/isencryptionmethoddupported.xml b/reference/zip/ziparchive/isencryptionmethoddupported.xml
index d989647d29..13cb3d76c4 100644
--- a/reference/zip/ziparchive/isencryptionmethoddupported.xml
+++ b/reference/zip/ziparchive/isencryptionmethoddupported.xml
@@ -9,9 +9,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ZipArchive::isEncryptionMethodSupported</methodname>
+   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>ZipArchive::isEncryptionMethodSupported</methodname>
    <methodparam><type>int</type><parameter>method</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>encode</parameter><initializer>true</initializer></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>enc</parameter><initializer>&true;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Check if a compression method is supported by libzip.
@@ -32,7 +32,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>encode</parameter></term>
+     <term><parameter>enc</parameter></term>
      <listitem>
       <para>
        If &true; check for encryption, else check for decryption.
@@ -70,7 +70,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/locatename.xml b/reference/zip/ziparchive/locatename.xml
index 056728bc3a..ce6d3845da 100644
--- a/reference/zip/ziparchive/locatename.xml
+++ b/reference/zip/ziparchive/locatename.xml
@@ -10,7 +10,7 @@
   <methodsynopsis>
    <modifier>public</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>ZipArchive::locateName</methodname>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    Locates an entry using its name.
@@ -106,7 +106,6 @@ $zip->close();
   </screen>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/open.xml b/reference/zip/ziparchive/open.xml
index 38971d82ce..4a0286a12b 100644
--- a/reference/zip/ziparchive/open.xml
+++ b/reference/zip/ziparchive/open.xml
@@ -8,9 +8,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>ZipArchive::open</methodname>
+   <modifier>public</modifier> <type class="union"><type>bool</type><type>int</type></type><methodname>ZipArchive::open</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    Opens a new or existing zip archive for reading, writing or modifying.
@@ -72,87 +72,60 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
+   Returns &true; on success, or one of the following error codes:
    <variablelist>
     <varlistentry>
-     <term><parameter>Error codes</parameter></term>
-      <listitem>
-      <para>
-       Returns &true; on success or the error code.
-       <itemizedlist>
-        <listitem>
-         <para>
-          <constant>ZipArchive::ER_EXISTS</constant>
-         </para>
-         <para>
-          File already exists.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <constant>ZipArchive::ER_INCONS</constant>
-         </para>
-         <para>
-          Zip archive inconsistent.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <constant>ZipArchive::ER_INVAL</constant>
-         </para>
-         <para>
-          Invalid argument.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <constant>ZipArchive::ER_MEMORY</constant>
-         </para>
-         <para>
-          Malloc failure.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <constant>ZipArchive::ER_NOENT</constant>
-         </para>
-         <para>
-          No such file.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <constant>ZipArchive::ER_NOZIP</constant>
-         </para>
-         <para>
-          Not a zip archive.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <constant>ZipArchive::ER_OPEN</constant>
-         </para>
-         <para>
-          Can't open file.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <constant>ZipArchive::ER_READ</constant>
-         </para>
-         <para>
-          Read error.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <constant>ZipArchive::ER_SEEK</constant>
-         </para>
-         <para>
-          Seek error.
-         </para>
-        </listitem>
-       </itemizedlist>
-      </para>
+     <term><constant>ZipArchive::ER_EXISTS</constant></term>
+     <listitem>
+      <simpara>File already exists.</simpara>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><constant>ZipArchive::ER_INCONS</constant></term>
+     <listitem>
+      <simpara>Zip archive inconsistent.</simpara>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><constant>ZipArchive::ER_INVAL</constant></term>
+     <listitem>
+      <simpara>Invalid argument.</simpara>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><constant>ZipArchive::ER_MEMORY</constant></term>
+     <listitem>
+      <simpara>Malloc failure.</simpara>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><constant>ZipArchive::ER_NOENT</constant></term>
+     <listitem>
+      <simpara>No such file.</simpara>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><constant>ZipArchive::ER_NOZIP</constant></term>
+     <listitem>
+      <simpara>Not a zip archive.</simpara>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><constant>ZipArchive::ER_OPEN</constant></term>
+     <listitem>
+      <simpara>Can't open file.</simpara>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><constant>ZipArchive::ER_READ</constant></term>
+     <listitem>
+      <simpara>Read error.</simpara>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><constant>ZipArchive::ER_SEEK</constant></term>
+     <listitem>
+      <simpara>Seek error.</simpara>
      </listitem>
     </varlistentry>
    </variablelist>
@@ -218,7 +191,6 @@ if ($res === TRUE) {
     </example>
    </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/renameindex.xml b/reference/zip/ziparchive/renameindex.xml
index 43e5fa0960..ea47b2982d 100644
--- a/reference/zip/ziparchive/renameindex.xml
+++ b/reference/zip/ziparchive/renameindex.xml
@@ -10,7 +10,7 @@
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>ZipArchive::renameIndex</methodname>
    <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam><type>string</type><parameter>newname</parameter></methodparam>
+   <methodparam><type>string</type><parameter>new_name</parameter></methodparam>
   </methodsynopsis>
   <para>
    Renames an entry defined by its index.
@@ -29,7 +29,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>newname</parameter></term>
+     <term><parameter>new_name</parameter></term>
      <listitem>
       <para>
        New name.
@@ -66,7 +66,6 @@ if ($res === TRUE) {
     </example>
    </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/renamename.xml b/reference/zip/ziparchive/renamename.xml
index 6b65e293c7..0fd31b1b66 100644
--- a/reference/zip/ziparchive/renamename.xml
+++ b/reference/zip/ziparchive/renamename.xml
@@ -10,7 +10,7 @@
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>ZipArchive::renameName</methodname>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>newname</parameter></methodparam>
+   <methodparam><type>string</type><parameter>new_name</parameter></methodparam>
   </methodsynopsis>
   <para>
    Renames an entry defined by its name.
@@ -29,7 +29,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>newname</parameter></term>
+     <term><parameter>new_name</parameter></term>
      <listitem>
       <para>
        New name.
@@ -66,7 +66,6 @@ if ($res === TRUE) {
     </example>
    </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/replacefile.xml b/reference/zip/ziparchive/replacefile.xml
index 8c3dd9f8bb..57bcddefff 100644
--- a/reference/zip/ziparchive/replacefile.xml
+++ b/reference/zip/ziparchive/replacefile.xml
@@ -9,8 +9,8 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>ZipArchive::replaceFile</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
+   <methodparam><type>string</type><parameter>filepath</parameter></methodparam>
+   <methodparam><type>string</type><parameter>index</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>start</parameter><initializer>0</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>length</parameter><initializer>0</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
@@ -25,7 +25,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>filename</parameter></term>
+     <term><parameter>filepath</parameter></term>
      <listitem>
       <para>
        The path to the file to add.
@@ -115,7 +115,6 @@ if ($zip->open('test.zip') === TRUE) {
     </para>
    </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/setcommentindex.xml b/reference/zip/ziparchive/setcommentindex.xml
index 6d612a7e0c..c6022e2e30 100644
--- a/reference/zip/ziparchive/setcommentindex.xml
+++ b/reference/zip/ziparchive/setcommentindex.xml
@@ -67,7 +67,6 @@ if ($res === TRUE) {
     </example>
    </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/setcommentname.xml b/reference/zip/ziparchive/setcommentname.xml
index 69827ed874..663bcc2f7f 100644
--- a/reference/zip/ziparchive/setcommentname.xml
+++ b/reference/zip/ziparchive/setcommentname.xml
@@ -67,7 +67,6 @@ if ($res === TRUE) {
     </example>
    </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/setcompressionindex.xml b/reference/zip/ziparchive/setcompressionindex.xml
index fd8ec45b97..c466d924e6 100644
--- a/reference/zip/ziparchive/setcompressionindex.xml
+++ b/reference/zip/ziparchive/setcompressionindex.xml
@@ -10,8 +10,8 @@
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>ZipArchive::setCompressionIndex</methodname>
    <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam><type>int</type><parameter>comp_method</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>comp_flags</parameter><initializer>0</initializer></methodparam>
+   <methodparam><type>int</type><parameter>method</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>compflags</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    Set the compression method of an entry defined by its index.
@@ -30,7 +30,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>comp_method</parameter></term>
+     <term><parameter>method</parameter></term>
      <listitem>
       <para>
        The compression method, one of the
@@ -39,7 +39,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>comp_flags</parameter></term>
+     <term><parameter>compflags</parameter></term>
      <listitem>
       <para>
        Compression level.
@@ -80,7 +80,6 @@ if ($res === TRUE) {
     </example>
    </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/setcompressionname.xml b/reference/zip/ziparchive/setcompressionname.xml
index ffee25fc79..d88421cd98 100644
--- a/reference/zip/ziparchive/setcompressionname.xml
+++ b/reference/zip/ziparchive/setcompressionname.xml
@@ -10,8 +10,8 @@
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>ZipArchive::setCompressionName</methodname>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>int</type><parameter>comp_method</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>comp_flags</parameter><initializer>0</initializer></methodparam>
+   <methodparam><type>int</type><parameter>method</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>compflags</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    Set the compression method of an entry defined by its name.
@@ -30,7 +30,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>comp_method</parameter></term>
+     <term><parameter>method</parameter></term>
      <listitem>
       <para>
        The compression method, one of the
@@ -39,7 +39,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>comp_flags</parameter></term>
+     <term><parameter>compflags</parameter></term>
      <listitem>
       <para>
        Compression level.
@@ -99,7 +99,6 @@ if ($res === TRUE) {
     </example>
    </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/setencryptionindex.xml b/reference/zip/ziparchive/setencryptionindex.xml
index 95162faac7..854e18d556 100644
--- a/reference/zip/ziparchive/setencryptionindex.xml
+++ b/reference/zip/ziparchive/setencryptionindex.xml
@@ -8,11 +8,10 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type>
-   <methodname>ZipArchive::setEncryptionIndex</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>ZipArchive::setEncryptionIndex</methodname>
    <methodparam><type>int</type><parameter>index</parameter></methodparam>
    <methodparam><type>int</type><parameter>method</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>password</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>password</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Set the encryption method of an entry defined by its index.
@@ -65,6 +64,28 @@
   </note>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>password</parameter> is now nullable.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
@@ -75,7 +96,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/setencryptionname.xml b/reference/zip/ziparchive/setencryptionname.xml
index 0228df6725..530033a2b2 100644
--- a/reference/zip/ziparchive/setencryptionname.xml
+++ b/reference/zip/ziparchive/setencryptionname.xml
@@ -8,11 +8,10 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type>
-   <methodname>ZipArchive::setEncryptionName</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>ZipArchive::setEncryptionName</methodname>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
    <methodparam><type>int</type><parameter>method</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>password</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>password</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Set the encryption method of an entry defined by its name.
@@ -55,6 +54,29 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>password</parameter> is now nullable.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
     <para>
@@ -103,7 +125,6 @@ if ($zip->open('test.zip', ZipArchive::CREATE) === TRUE) {
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/setexternalattributesindex.xml b/reference/zip/ziparchive/setexternalattributesindex.xml
index 076881a631..452cb87984 100644
--- a/reference/zip/ziparchive/setexternalattributesindex.xml
+++ b/reference/zip/ziparchive/setexternalattributesindex.xml
@@ -8,12 +8,11 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type>
-   <methodname>ZipArchive::setExternalAttributesIndex</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>ZipArchive::setExternalAttributesIndex</methodname>
    <methodparam><type>int</type><parameter>index</parameter></methodparam>
    <methodparam><type>int</type><parameter>opsys</parameter></methodparam>
    <methodparam><type>int</type><parameter>attr</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    Set the external attributes of an entry defined by its index.
@@ -65,7 +64,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -85,4 +83,4 @@ End:
 vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
--->
\ No newline at end of file
+-->
diff --git a/reference/zip/ziparchive/setexternalattributesname.xml b/reference/zip/ziparchive/setexternalattributesname.xml
index 99553bc81b..b315d0011e 100644
--- a/reference/zip/ziparchive/setexternalattributesname.xml
+++ b/reference/zip/ziparchive/setexternalattributesname.xml
@@ -8,12 +8,11 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type>
-   <methodname>ZipArchive::setExternalAttributesName</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>ZipArchive::setExternalAttributesName</methodname>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
    <methodparam><type>int</type><parameter>opsys</parameter></methodparam>
    <methodparam><type>int</type><parameter>attr</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    Set the external attributes of an entry defined by its name.
@@ -93,7 +92,6 @@ if (is_array($stat) && $zip->open('test.zip', ZipArchive::CREATE) === TRUE) {
     </example>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -113,4 +111,4 @@ End:
 vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
--->
\ No newline at end of file
+-->
diff --git a/reference/zip/ziparchive/setmtimeindex.xml b/reference/zip/ziparchive/setmtimeindex.xml
index 277b621275..0b4b374a0b 100644
--- a/reference/zip/ziparchive/setmtimeindex.xml
+++ b/reference/zip/ziparchive/setmtimeindex.xml
@@ -8,11 +8,10 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type>
-   <methodname>ZipArchive::setMtimeIndex</methodname>
+   <modifier>public</modifier> <type class="union"><type>bool</type><type>null</type></type><methodname>ZipArchive::setMtimeIndex</methodname>
    <methodparam><type>int</type><parameter>index</parameter></methodparam>
    <methodparam><type>int</type><parameter>timestamp</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    Set the modification time of an entry defined by its index.
@@ -102,7 +101,6 @@ if ($zip->open('test.zip', ZipArchive::CREATE) === TRUE) {
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/setmtimename.xml b/reference/zip/ziparchive/setmtimename.xml
index 3dfd9c7303..dd009b61a2 100644
--- a/reference/zip/ziparchive/setmtimename.xml
+++ b/reference/zip/ziparchive/setmtimename.xml
@@ -8,11 +8,10 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type>
-   <methodname>ZipArchive::setMtimeName</methodname>
+   <modifier>public</modifier> <type class="union"><type>bool</type><type>null</type></type><methodname>ZipArchive::setMtimeName</methodname>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
    <methodparam><type>int</type><parameter>timestamp</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    Set the modification time of an entry defined by its name.
@@ -102,7 +101,6 @@ if ($zip->open('test.zip', ZipArchive::CREATE) === TRUE) {
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/statindex.xml b/reference/zip/ziparchive/statindex.xml
index be86dcb858..00c60e7773 100644
--- a/reference/zip/ziparchive/statindex.xml
+++ b/reference/zip/ziparchive/statindex.xml
@@ -10,7 +10,7 @@
   <methodsynopsis>
    <modifier>public</modifier> <type class="union"><type>array</type><type>false</type></type><methodname>ZipArchive::statIndex</methodname>
    <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
     The  function  obtains  information  about the entry defined by its
@@ -86,7 +86,6 @@ Array
 
    </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/zip/ziparchive/statname.xml b/reference/zip/ziparchive/statname.xml
index 4f876bd70b..396f780108 100644
--- a/reference/zip/ziparchive/statname.xml
+++ b/reference/zip/ziparchive/statname.xml
@@ -10,7 +10,7 @@
   <methodsynopsis>
    <modifier>public</modifier> <type class="union"><type>array</type><type>false</type></type><methodname>ZipArchive::statName</methodname>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
     The function obtains information about the entry defined by its
@@ -104,7 +104,6 @@ Array
 
    </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml