Merge pull request #100 from johnnyborg/master

catch the \InvalidArgumentException and use config to continue.
Gregwar · Oct 21, 2016 · 9d643be · 9d643be
2 parents ab73f5d + cf2bc22
commit 9d643be
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/Services/ImageHandling.php b/Services/ImageHandling.php
@@ -91,8 +91,19 @@ public function __construct($cacheDirectory, $cacheDirMode, $handlerClass, Conta
     public function open($file)
     {
         if (strlen($file) >= 1 && $file[0] == '@') {
-            $file = $this->fileLocator instanceof FileLocatorInterface
-                ? $this->fileLocator->locate($file) : $this->fileLocator->locateResource($file);
+            try {
+                if ($this->fileLocator instanceof FileLocatorInterface) {
+                    $file = $this->fileLocator->locate($file);
+                } else {
+                    $this->fileLocator->locateResource($file);
+                }
+            } catch (\InvalidArgumentException $exception) {
+                if ($this->throwException || false == $this->fallbackImage) {
+                    throw $exception;
+                }
+
+                $file = $this->fallbackImage;
+            }
         }
 
         return $this->createInstance($file);