Merge pull request #157 from CyberSecutor/master

Catch the correct exception when using properties of a specific exception
yireo · Sep 27, 2023 · fc479d3 · fc479d3
2 parents af52815 + 5e9d6bf
commit fc479d3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.13.4] - 26 September 2023
+### Fixed
+- Catch the correct exception when using properties of a specific exception.
+
 ## [0.13.3] - 22 September 2023
 ### Fixed
 - Properly check for MIME-typed (fix of #149)

diff --git a/Convertor/ConvertWrapper.php b/Convertor/ConvertWrapper.php
@@ -48,15 +48,18 @@ public function __construct(
     public function convert(string $sourceImageFilename, string $destinationImageFilename): void
     {
         $options = $this->getOptions();
-        foreach ($this->config->getConvertors() as $convertor) {
+        foreach ($this->config->getConvertors() as $convertor){
             $options['converter'] = $convertor;
             try {
                 WebPConvert::convert($sourceImageFilename, $destinationImageFilename, $options);
-                break;
-            } catch (Exception $e) {
+            } catch (ConversionFailedException $e) {
+                $this->logger->debug($e->getMessage() . ' - ' . $e->description, $e->getTrace());
+                continue;
+            } catch (\Exception $e) {
                 $this->logger->debug($e->getMessage(), $e->getTrace());
                 continue;
             }
+            break;
         }
     }