Merge and modify 'pclzip' of https://github.com/bskrtich/PHPWord to make it work with the latest develop branch

Author: ivanlanin

.travis.yml

@@ -37,7 +37,7 @@ before_script:
 
 script:
   ## PHP_CodeSniffer
-  - phpcs --standard=PSR2 -n src/
+  - phpcs --standard=PSR2 -n src/ --ignore=src/PhpWord/Shared/PCLZip
   - phpcs --standard=PSR2 -n tests/
   ## PHP Copy/Paste Detector
   #- php phpcpd.phar --verbose src/

phpunit.xml.dist

@@ -16,6 +16,9 @@
     <filter>
         <whitelist>
             <directory suffix=".php">./src</directory>
+            <exclude>
+                <directory suffix=".php">./src/PhpWord/Shared/PCLZip</directory>
+            </exclude>
         </whitelist>
     </filter>
 </phpunit>

src/PhpWord/Reader/Word2007.php

@@ -10,6 +10,7 @@
 namespace PhpOffice\PhpWord\Reader;
 
 use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\DocumentProperties;
 use PhpOffice\PhpWord\Exceptions\Exception;
 
@@ -34,7 +35,8 @@ public function canRead($pFilename)
 
         $return = false;
         // Load file
-        $zip = new \ZipArchive();
+        $zipClass = Settings::getZipClass();
+        $zip = new $zipClass();
         if ($zip->open($pFilename) === true) {
             // check if it is an OOXML archive
             $rels = simplexml_load_string($this->getFromZipArchive($zip, "_rels/.rels"));
@@ -59,7 +61,7 @@ public function canRead($pFilename)
     /**
      * Get zip content
      *
-     * @param \ZipArchive $archive
+     * @param mixed $archive
      * @param string $fileName
      * @param bool $removeNamespace
      * @return mixed
@@ -101,7 +103,8 @@ public function load($pFilename)
 
         // Initialisations
         $word = new PhpWord();
-        $zip = new \ZipArchive();
+        $zipClass = Settings::getZipClass();
+        $zip = new $zipClass();
         $zip->open($pFilename);
 
         // Read properties and documents

src/PhpWord/Section.php

@@ -17,7 +17,6 @@
 use PhpOffice\PhpWord\Section\ListItem;
 use PhpOffice\PhpWord\Section\Object;
 use PhpOffice\PhpWord\Section\PageBreak;
-use PhpOffice\PhpWord\Section\Settings;
 use PhpOffice\PhpWord\Section\Table;
 use PhpOffice\PhpWord\Section\Text;
 use PhpOffice\PhpWord\Section\TextBreak;
@@ -75,7 +74,7 @@ class Section
     public function __construct($sectionCount, $settings = null)
     {
         $this->_sectionCount = $sectionCount;
-        $this->_settings = new Settings();
+        $this->_settings = new \PhpOffice\PhpWord\Section\Settings();
         $this->setSettings($settings);
     }
 

src/PhpWord/Settings.php

@@ -14,13 +14,26 @@
  */
 class Settings
 {
+    /**    Available Zip library classes */
+    const PCLZIP     = 'PhpOffice\\PhpWord\\Shared\\ZipArchive';
+    const ZIPARCHIVE = 'ZipArchive';
+
     /**
      * Compatibility option for XMLWriter
      *
      * @var boolean
      */
     private static $_xmlWriterCompatibility = true;
 
+    /**
+     * Name of the class used for Zip file management
+     *  e.g.
+     *      ZipArchive
+     *
+     * @var string
+     */
+    private static $_zipClass = self::ZIPARCHIVE;
+
     /**
      * Set the compatibility option used by the XMLWriter
      *
@@ -45,4 +58,34 @@ public static function getCompatibility()
     {
         return self::$_xmlWriterCompatibility;
     }
+
+    /**
+     * Set the Zip handler Class that PHPWord should use for Zip file management (PCLZip or ZipArchive)
+     *
+     * @param  string $zipClass  The Zip handler class that PHPWord should use for Zip file management
+     *   e.g. Settings::PCLZip or Settings::ZipArchive
+     * @return boolean Success or failure
+     */
+    public static function setZipClass($zipClass)
+    {
+        if (($zipClass === self::PCLZIP) ||
+            ($zipClass === self::ZIPARCHIVE)) {
+            self::$_zipClass = $zipClass;
+            return true;
+        }
+        return false;
+    } // function setZipClass()
+
+    /**
+     * Return the name of the Zip handler Class that PHPWord is configured to use (PCLZip or ZipArchive)
+     *  or Zip file management
+     *
+     * @return string Name of the Zip handler Class that PHPWord is configured to use
+     *  for Zip file management
+     *  e.g. Settings::PCLZip or Settings::ZipArchive
+     */
+    public static function getZipClass()
+    {
+        return self::$_zipClass;
+    } // function getZipClass()
 }