#58 - fix for ZipArchive calls.

Author: Roman Syroeshko

src/Reader/Word2007.php

@@ -55,7 +55,7 @@ public function canRead($pFilename)
 
         $return = false;
         // Load file
-        $zip = new ZipArchive();
+        $zip = new \ZipArchive();
         if ($zip->open($pFilename) === true) {
             // check if it is an OOXML archive
             $rels = simplexml_load_string($this->getFromZipArchive($zip, "_rels/.rels"));
@@ -120,7 +120,7 @@ public function load($pFilename)
 
         // Initialisations
         $word = new PhpWord();
-        $zip = new ZipArchive();
+        $zip = new \ZipArchive();
         $zip->open($pFilename);
 
         // Read properties and documents

src/Shared/ZipStreamWrapper.php

@@ -99,7 +99,7 @@ public function stream_open($path, $mode, $options, &$opened_path)
         }
 
         // Open archive
-        $this->_archive = new ZipArchive();
+        $this->_archive = new \ZipArchive();
         $this->_archive->open($url['host']);
 
         $this->_fileNameInArchive = $url['fragment'];

src/Template.php

@@ -35,7 +35,7 @@ class Template
     /**
      * ZipArchive
      *
-     * @var ZipArchive
+     * @var \ZipArchive
      */
     private $_objZip;
 
@@ -72,7 +72,7 @@ public function __construct($strFilename)
             throw new Exception("Could not copy the template from {$strFilename} to {$this->_tempFileName}.");
         }
 
-        $this->_objZip = new ZipArchive();
+        $this->_objZip = new \ZipArchive();
         $this->_objZip->open($this->_tempFileName);
 
         $this->_documentXML = $this->_objZip->getFromName('word/document.xml');

src/Writer/ODText.php

@@ -115,17 +115,17 @@ public function save($pFilename = null)
             // Create drawing dictionary
 
             // Create new ZIP file and open it for writing
-            $objZip = new ZipArchive();
+            $objZip = new \ZipArchive();
 
             // Try opening the ZIP file
-            if ($objZip->open($pFilename, ZIPARCHIVE::OVERWRITE) !== true) {
-                if ($objZip->open($pFilename, ZIPARCHIVE::CREATE) !== true) {
+            if ($objZip->open($pFilename, \ZipArchive::OVERWRITE) !== true) {
+                if ($objZip->open($pFilename, \ZipArchive::CREATE) !== true) {
                     throw new \Exception("Could not open " . $pFilename . " for writing.");
                 }
             }
 
             // Add mimetype to ZIP file
-            //@todo Not in ZIPARCHIVE::CM_STORE mode
+            //@todo Not in \ZipArchive::CM_STORE mode
             $objZip->addFromString('mimetype', $this->getWriterPart('mimetype')->writeMimetype($this->_document));
 
             // Add content.xml to ZIP file
@@ -151,7 +151,7 @@ public function save($pFilename = null)
                         $imagePath = substr($imagePath, 6);
                         $imagePathSplitted = explode('#', $imagePath);
 
-                        $imageZip = new ZipArchive();
+                        $imageZip = new \ZipArchive();
                         $imageZip->open($imagePathSplitted[0]);
                         $imageContents = $imageZip->getFromName($imagePathSplitted[1]);
                         $imageZip->close();

src/Writer/Word2007.php

@@ -86,11 +86,11 @@ public function save($pFilename = null)
             }
 
             // Create new ZIP file and open it for writing
-            $objZip = new ZipArchive();
+            $objZip = new \ZipArchive();
 
             // Try opening the ZIP file
-            if ($objZip->open($pFilename, ZIPARCHIVE::OVERWRITE) !== true) {
-                if ($objZip->open($pFilename, ZIPARCHIVE::CREATE) !== true) {
+            if ($objZip->open($pFilename, \ZipArchive::OVERWRITE) !== true) {
+                if ($objZip->open($pFilename, \ZipArchive::CREATE) !== true) {
                     throw new Exception("Could not open " . $pFilename . " for writing.");
                 }
             }