Merge pull request #22 from PHPOffice/develop

Release 0.2.8
PHPOffice · Jul 12, 2018 · 028970e · 028970e
2 parents d5992c9 + d489595
commit 028970e
Show file tree

Hide file tree

Showing 17 changed files with 642 additions and 155 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,11 +6,13 @@ php:
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
   - hhvm
 
 matrix:
   allow_failures:
     - php: 7.1
+    - php: 7.2
     - php: hhvm
 
 env:

diff --git a/src/Common/Adapter/Zip/PclZipAdapter.php b/src/Common/Adapter/Zip/PclZipAdapter.php
@@ -15,31 +15,18 @@ class PclZipAdapter implements ZipInterface
      */
     protected $tmpDir;
 
-    /**
-     * @param $filename
-     * @return $this
-     */
     public function open($filename)
     {
         $this->oPclZip = new PclZip($filename);
         $this->tmpDir = sys_get_temp_dir();
         return $this;
     }
 
-    /**
-     * @return $this
-     */
     public function close()
     {
         return $this;
     }
 
-    /**
-     * @param $localname
-     * @param $contents
-     * @return $this
-     * @throws \Exception
-     */
     public function addFromString($localname, $contents)
     {
         $pathData = pathinfo($localname);

diff --git a/src/Common/Adapter/Zip/ZipArchiveAdapter.php b/src/Common/Adapter/Zip/ZipArchiveAdapter.php
@@ -16,11 +16,6 @@ class ZipArchiveAdapter implements ZipInterface
      */
     protected $filename;
 
-    /**
-     * @param string $filename
-     * @throws \Exception Could not open $this->filename for writing.
-     * @return mixed
-     */
     public function open($filename)
     {
         $this->filename = $filename;
@@ -35,10 +30,6 @@ public function open($filename)
         throw new \Exception("Could not open $this->filename for writing.");
     }
 
-    /**
-     * @return $this
-     * @throws \Exception Could not close zip file $this->filename.
-     */
     public function close()
     {
         if ($this->oZipArchive->close() === false) {
@@ -47,13 +38,12 @@ public function close()
         return $this;
     }
 
-    /**
-     * @param $localname
-     * @param $contents
-     * @return bool
-     */
     public function addFromString($localname, $contents)
     {
-        return $this->oZipArchive->addFromString($localname, $contents);
+        if ($this->oZipArchive->addFromString($localname, $contents) === false) {
+            throw new \Exception("Error zipping files : " . $localname);
+        }
+
+        return $this;
     }
 }
diff --git a/src/Common/Adapter/Zip/ZipInterface.php b/src/Common/Adapter/Zip/ZipInterface.php
@@ -4,7 +4,27 @@
 
 interface ZipInterface
 {
+    /**
+     * Open a ZIP file archive
+     * @param string $filename
+     * @return $this
+     * @throws \Exception
+     */
     public function open($filename);
+
+    /**
+     * Close the active archive (opened or newly created)
+     * @return $this
+     * @throws \Exception
+     */
     public function close();
+
+    /**
+     * Add a file to a ZIP archive using its contents
+     * @param string $localname The name of the entry to create.
+     * @param string $contents The contents to use to create the entry. It is used in a binary safe mode.
+     * @return $this
+     * @throws \Exception
+     */
     public function addFromString($localname, $contents);
 }
diff --git a/src/Common/File.php b/src/Common/File.php
@@ -43,13 +43,13 @@ public static function fileExists($pFilename)
                 $zip->close();
 
                 return $returnValue;
-            } else {
-                return false;
             }
-        } else {
-            // Regular file_exists
-            return file_exists($pFilename);
+
+            return false;
         }
+
+        // Regular file_exists
+        return file_exists($pFilename);
     }
     /**
      * Returns the content of a file

diff --git a/src/Common/Microsoft/OLERead.php b/src/Common/Microsoft/OLERead.php
@@ -186,26 +186,26 @@ public function getStream($stream)
             }
 
             return $streamData;
-        } else {
-            $numBlocks = $this->props[$stream]['size'] / self::BIG_BLOCK_SIZE;
-            if ($this->props[$stream]['size'] % self::BIG_BLOCK_SIZE != 0) {
-                ++$numBlocks;
-            }
+        }
 
-            if ($numBlocks == 0) {
-                return '';
-            }
+        $numBlocks = $this->props[$stream]['size'] / self::BIG_BLOCK_SIZE;
+        if ($this->props[$stream]['size'] % self::BIG_BLOCK_SIZE != 0) {
+            ++$numBlocks;
+        }
 
-            $block = $this->props[$stream]['startBlock'];
+        if ($numBlocks == 0) {
+            return '';
+        }
 
-            while ($block != -2) {
-                $pos = ($block + 1) * self::BIG_BLOCK_SIZE;
-                $streamData .= substr($this->data, $pos, self::BIG_BLOCK_SIZE);
-                $block = self::getInt4d($this->bigBlockChain, $block*4);
-            }
+        $block = $this->props[$stream]['startBlock'];
 
-            return $streamData;
+        while ($block != -2) {
+            $pos = ($block + 1) * self::BIG_BLOCK_SIZE;
+            $streamData .= substr($this->data, $pos, self::BIG_BLOCK_SIZE);
+            $block = self::getInt4d($this->bigBlockChain, $block*4);
         }
+
+        return $streamData;
     }
 
     /**
@@ -259,10 +259,10 @@ private function readPropertySets()
                         'type' => $type,
                         'startBlock' => $startBlock,
                         'size' => $size);
-                
+
                 // tmp helper to simplify checks
                 $upName = strtoupper($name);
-                
+
                 switch ($upName) {
                     case 'ROOT ENTRY':
                     case 'R':