Merge pull request #75 from jdecool/fix-exceptions

Fix exception code when file not found
Sybio · Jun 1, 2015 · 4105233 · 4105233
2 parents 92c8c6e + 1ba0115
commit 4105233
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/PHPImageWorkshop/ImageWorkshop.php b/src/PHPImageWorkshop/ImageWorkshop.php
@@ -55,6 +55,10 @@ class ImageWorkshop
      */
     public static function initFromPath($path, $fixOrientation = false)
     {
+        if (!file_exists($path)) {
+            throw new ImageWorkshopException(sprintf('File "%s" not exists.', $path), static::ERROR_IMAGE_NOT_FOUND);
+        }
+
         if (false === ($imageSizeInfos = @getImageSize($path))) {
             throw new ImageWorkshopException('Can\'t open the file at "'.$path.'" : file is not readable, did you check permissions (755 / 777) ?', static::ERROR_NOT_READABLE_FILE);
         }

diff --git a/tests/ImageWorkshopTest.php b/tests/ImageWorkshopTest.php
@@ -47,7 +47,7 @@ public function testInitFromPath()
 
         // test 3
 
-        $this->setExpectedException('PHPImageWorkshop\Exception\ImageWorkshopException');
+        $this->setExpectedException('PHPImageWorkshop\Exception\ImageWorkshopException', '', ImageWorkshop::ERROR_IMAGE_NOT_FOUND);
         $layer = ImageWorkshop::initFromPath('fakePath');
     }