Merge pull request #108 from gabrielbull/develop

Use exif_imagetype to check image format instead of extension name

Classes/PHPWord/Exceptions/InvalidImageException.php

@@ -0,0 +1,15 @@
+<?php
+namespace PhpOffice\PhpWord\Exceptions;
+
+use Exception;
+
+/**
+ * InvalidImageException
+ *
+ * Exception used for when an image is not found
+ *
+ * @package PHPWord
+ */
+class InvalidImageException extends Exception
+{
+}

Classes/PHPWord/Exceptions/UnsupportedImageTypeException.php

@@ -0,0 +1,15 @@
+<?php
+namespace PhpOffice\PhpWord\Exceptions;
+
+use Exception;
+
+/**
+ * UnsupportedImageTypeException
+ *
+ * Exception used for when an image type is unsupported
+ *
+ * @package PHPWord
+ */
+class UnsupportedImageTypeException extends Exception
+{
+}

Classes/PHPWord/Section/Image.php

@@ -25,12 +25,14 @@
  * @version    0.7.0
  */
 
+use PhpOffice\PhpWord\Exceptions\InvalidImageException;
+use PhpOffice\PhpWord\Exceptions\UnsupportedImageTypeException;
+
 /**
  * Class PHPWord_Section_Image
  */
 class PHPWord_Section_Image
 {
-
     /**
      * Image Src
      *
@@ -64,42 +66,43 @@ class PHPWord_Section_Image
      * Create a new Image
      *
      * @param string $src
-     * @param mixed style
+     * @param mixed $style
+     * @param bool $isWatermark
+     * @throws InvalidImageException|UnsupportedImageTypeException
      */
     public function __construct($src, $style = null, $isWatermark = false)
     {
-        $_supportedImageTypes = array('jpg', 'jpeg', 'gif', 'png', 'bmp', 'tif', 'tiff');
+        $supportedImageTypes = array(IMAGETYPE_JPEG, IMAGETYPE_GIF, IMAGETYPE_PNG, IMAGETYPE_BMP, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM);
 
-        $inf = pathinfo($src);
+        if (!file_exists($src)) {
-        $ext = strtolower($inf['extension']);
+            throw new InvalidImageException;
+        }
 
-        if (file_exists($src) && in_array($ext, $_supportedImageTypes)) {
+        if (!in_array(exif_imagetype($src), $supportedImageTypes)) {
-            $this->_src = $src;
+            throw new UnsupportedImageTypeException;
-            $this->_isWatermark = $isWatermark;
+        }
-            $this->_style = new PHPWord_Style_Image();
 
-            if (!is_null($style) && is_array($style)) {
+        $this->_src = $src;
-                foreach ($style as $key => $value) {
+        $this->_isWatermark = $isWatermark;
-                    if (substr($key, 0, 1) != '_') {
+        $this->_style = new PHPWord_Style_Image();
-                        $key = '_' . $key;
+
-                    }
+        if (!is_null($style) && is_array($style)) {
-                    $this->_style->setStyleValue($key, $value);
+            foreach ($style as $key => $value) {
+                if (substr($key, 0, 1) != '_') {
+                    $key = '_' . $key;
                 }
+                $this->_style->setStyleValue($key, $value);
             }
+        }
 
-            if (isset($style['wrappingStyle'])) {
+        if (isset($style['wrappingStyle'])) {
-                $this->_style->setWrappingStyle($style['wrappingStyle']);
+            $this->_style->setWrappingStyle($style['wrappingStyle']);
-            }
+        }
 
-            if ($this->_style->getWidth() == null && $this->_style->getHeight() == null) {
+        if ($this->_style->getWidth() == null && $this->_style->getHeight() == null) {
-                $imgData = getimagesize($this->_src);
+            $imgData = getimagesize($this->_src);
-                $this->_style->setWidth($imgData[0]);
+            $this->_style->setWidth($imgData[0]);
-                $this->_style->setHeight($imgData[1]);
+            $this->_style->setHeight($imgData[1]);
-            }
-
-            return $this;
-        } else {
-            return false;
         }
     }
 

Tests/PHPWord/Section/ImageTest.php

@@ -33,6 +33,32 @@ class ImageTest extends \PHPUnit_Framework_TestCase
         $this->assertInstanceOf('PHPWord_Style_Image', $oImage->getStyle());
     }
 
+    public function testValidImageTypes()
+    {
+        new PHPWord_Section_Image(PHPWORD_TESTS_DIR_ROOT . "/_files/images/mars_noext_jpg");
+        new PHPWord_Section_Image(PHPWORD_TESTS_DIR_ROOT . "/_files/images/mars.jpg");
+        new PHPWord_Section_Image(PHPWORD_TESTS_DIR_ROOT . "/_files/images/mario.gif");
+        new PHPWord_Section_Image(PHPWORD_TESTS_DIR_ROOT . "/_files/images/firefox.png");
+        new PHPWord_Section_Image(PHPWORD_TESTS_DIR_ROOT . "/_files/images/duke_nukem.bmp");
+        new PHPWord_Section_Image(PHPWORD_TESTS_DIR_ROOT . "/_files/images/angela_merkel.tif");
+    }
+
+    /**
+     * @expectedException \PhpOffice\PhpWord\Exceptions\InvalidImageException
+     */
+    public function testImageNotFound()
+    {
+        new PHPWord_Section_Image(PHPWORD_TESTS_DIR_ROOT . "/_files/images/thisisnotarealimage");
+    }
+
+    /**
+     * @expectedException \PhpOffice\PhpWord\Exceptions\UnsupportedImageTypeException
+     */
+    public function testInvalidImageTypes()
+    {
+        new PHPWord_Section_Image(PHPWORD_TESTS_DIR_ROOT . "/_files/images/alexz-johnson.pcx");
+    }
+
     public function testStyle()
     {
         $oImage = new PHPWord_Section_Image(\join(