Merge branch 'zip' into develop

Author: ivanlanin

CHANGELOG.md

@@ -49,6 +49,7 @@ This release marked the change of PHPWord license from LGPL 2.1 to LGPL 3; new r
 - Writer: Refactor writer parts using composite pattern - @ivanlanin
 - Docs: Show code quality and test code coverage badge on README
 - Style: Change behaviour of `set...` function of boolean properties; when none is defined, assumed true - @ivanlanin
+- Shared: Unify PHP ZipArchive and PCLZip features into PhpWord ZipArchive - @ivanlanin
 
 ## 0.10.0 - 4 May 2014
 

src/PhpWord/Element/Image.php

@@ -19,7 +19,7 @@
 
 use PhpOffice\PhpWord\Exception\InvalidImageException;
 use PhpOffice\PhpWord\Exception\UnsupportedImageTypeException;
-use PhpOffice\PhpWord\Settings;
+use PhpOffice\PhpWord\Shared\ZipArchive;
 use PhpOffice\PhpWord\Style\Image as ImageStyle;
 
 /**
@@ -348,8 +348,7 @@ private function getArchiveImageSize($source)
         list($zipFilename, $imageFilename) = explode('#', $source);
         $tempFilename = tempnam(sys_get_temp_dir(), 'PHPWordImage');
 
-        $zipClass = Settings::getZipClass();
-        $zip = new $zipClass();
+        $zip = new ZipArchive();
         if ($zip->open($zipFilename) !== false) {
             if ($zip->locateName($imageFilename)) {
                 $imageContent = $zip->getFromName($imageFilename);

src/PhpWord/Reader/Word2007.php

@@ -18,7 +18,7 @@
 namespace PhpOffice\PhpWord\Reader;
 
 use PhpOffice\PhpWord\PhpWord;
-use PhpOffice\PhpWord\Settings;
+use PhpOffice\PhpWord\Shared\ZipArchive;
 use PhpOffice\PhpWord\Shared\XMLReader;
 
 /**
@@ -109,8 +109,7 @@ private function readRelationships($docFile)
 
         // word/_rels/*.xml.rels
         $wordRelsPath = 'word/_rels/';
-        $zipClass = Settings::getZipClass();
-        $zip = new $zipClass();
+        $zip = new ZipArchive();
         if ($zip->open($docFile) === true) {
             for ($i = 0; $i < $zip->numFiles; $i++) {
                 $xmlFile = $zip->getNameIndex($i);

src/PhpWord/Shared/XMLReader.php

@@ -18,7 +18,7 @@
 namespace PhpOffice\PhpWord\Shared;
 
 use PhpOffice\PhpWord\Exception\Exception;
-use PhpOffice\PhpWord\Settings;
+use PhpOffice\PhpWord\Shared\ZipArchive;
 
 /**
  * XML Reader wrapper
@@ -47,20 +47,15 @@ class XMLReader
      * @param string $zipFile
      * @param string $xmlFile
      * @return \DOMDocument|false
-     * @throws \PhpOffice\PhpWord\Exception\Exception
      */
     public function getDomFromZip($zipFile, $xmlFile)
     {
         if (file_exists($zipFile) === false) {
             throw new Exception('Cannot find archive file.');
         }
 
-        $zipClass = Settings::getZipClass();
-        $zip = new $zipClass();
-        $canOpen = $zip->open($zipFile);
-        if ($canOpen === false) {
-            throw new Exception('Cannot open archive file.');
-        }
+        $zip = new ZipArchive();
+        $zip->open($zipFile);
         $contents = $zip->getFromName($xmlFile);
         $zip->close();
 

src/PhpWord/Shared/XMLWriter.php

@@ -19,12 +19,6 @@
 
 use PhpOffice\PhpWord\Settings;
 
-// @codeCoverageIgnoreStart
-if (!defined('DATE_W3C')) {
-    define('DATE_W3C', 'Y-m-d\TH:i:sP');
-}
-// @codeCoverageIgnoreEnd
-
 /**
  * XMLWriter wrapper
  *
@@ -64,6 +58,11 @@ class XMLWriter
      */
     public function __construct($tempLocation = self::STORAGE_MEMORY, $tempFolder = './')
     {
+        // Define date format
+        if (!defined('DATE_W3C')) {
+            define('DATE_W3C', 'Y-m-d\TH:i:sP');
+        }
+
         // Create internal XMLWriter
         $this->xmlWriter = new \XMLWriter();