Merge remote-tracking branch 'origin/MC-19132' into 2.3.3-develop-pr68

zakdma · zakdma · commit c0833b74d323 · 2019-08-16T15:25:54.000+03:00
diff --git a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
@@ -296,8 +296,9 @@ private function _fillBackgroundColor(&$imageResourceTo)
                     imagecolortransparent($imageResourceTo, $transparentColor);
                     return $transparentColor;
                 }
+                // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
             } catch (\Exception $e) {
-                throw new \DomainException('Failed to fill image.');
+                // fallback to default background color
             }
         }
         list($r, $g, $b) = $this->_backgroundColor;

Original file line number	Diff line number	Diff line change
`@@ -296,8 +296,9 @@ private function _fillBackgroundColor(&$imageResourceTo)`
`296`	`296`	`imagecolortransparent($imageResourceTo, $transparentColor);`
`297`	`297`	`return $transparentColor;`
`298`	`298`	`}`
	`299`	`+ // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedCatch`
`299`	`300`	`} catch (\Exception $e) {`
`300`		`- throw new \DomainException('Failed to fill image.');`
	`301`	`+ // fallback to default background color`
`301`	`302`	`}`
`302`	`303`	`}`
`303`	`304`	`list($r, $g, $b) = $this->_backgroundColor;`