Merge pull request #146 from Sybio/backport-pr145

jdecool · web-flow · commit 4d44147cfbcd · 2023-06-13T21:11:40.000+02:00
Merge pull request #145 from Sybio/fix-issue-144
diff --git a/src/Core/ImageWorkshopLayer.php b/src/Core/ImageWorkshopLayer.php
@@ -1863,33 +1863,33 @@ public function fixOrientation()
         switch ($this->exif['Orientation']) {
             case ExifOrientations::TOP_RIGHT:
                 $this->flip('horizontal');
-            break;
+                break;
 
             case ExifOrientations::BOTTOM_RIGHT:
                 $this->rotate(180);
-            break;
+                break;
 
             case ExifOrientations::BOTTOM_LEFT:
                 $this->flip('vertical');
-            break;
+                break;
 
             case ExifOrientations::LEFT_TOP:
                 $this->rotate(-90);
                 $this->flip('vertical');
-            break;
+                break;
 
             case ExifOrientations::RIGHT_TOP:
                 $this->rotate(90);
-            break;
+                break;
 
             case ExifOrientations::RIGHT_BOTTOM:
                 $this->rotate(90);
                 $this->flip('horizontal');
-            break;
+                break;
 
             case ExifOrientations::LEFT_BOTTOM:
                 $this->rotate(-90);
-            break;
+                break;
         }
 
         $this->exif['Orientation'] = ExifOrientations::TOP_LEFT;
diff --git a/src/Core/ImageWorkshopLib.php b/src/Core/ImageWorkshopLib.php
@@ -95,11 +95,17 @@ public static function convertHexToRGB($hex)
      */
     public static function generateImage($width = 100, $height = 100, $color = 'ffffff', $opacity = 127)
     {
-        $RGBColors = ImageWorkshopLib::convertHexToRGB($color);
-
         $image = imagecreatetruecolor($width, $height);
         imagesavealpha($image, true);
+
+        if ($color === 'transparent') {
+            $color = 'ffffff';
+            $opacity = 127;
+        }
+
+        $RGBColors = ImageWorkshopLib::convertHexToRGB($color);
         $color = imagecolorallocatealpha($image, $RGBColors['R'], $RGBColors['G'], $RGBColors['B'], $opacity);
+
         imagefill($image, 0, 0, $color);
 
         return $image;
diff --git a/src/ImageWorkshop.php b/src/ImageWorkshop.php
@@ -76,19 +76,19 @@ public static function initFromPath($path, $fixOrientation = false)
                 if (function_exists('exif_read_data') && false !== ($data = @exif_read_data($path))) {
                     $exif = $data;
                 }
-            break;
+                break;
 
             case 'gif':
                 $image = imageCreateFromGIF($path);
-            break;
+                break;
 
             case 'png':
                 $image = imageCreateFromPNG($path);
-            break;
+                break;
 
             case 'webp':
                 $image = imagecreatefromwebp($path);
-            break;
+                break;
 
             default:
                 throw new ImageWorkshopException('Not an image file (jpeg/png/gif) at "'.$path.'" (given format: "'.$mimeContentType.'")', static::ERROR_NOT_AN_IMAGE_FILE);
diff --git a/tests/Core/ImageWorkshopLayerTest.php b/tests/Core/ImageWorkshopLayerTest.php
@@ -1502,7 +1502,7 @@ protected function initializeLayer($method = 1)
 
             case 1:
 
-            break;
+                break;
 
             case 2: // Add 4 sublayers in $layer stack
 
@@ -1511,7 +1511,7 @@ protected function initializeLayer($method = 1)
                 $layer->addLayer(3, $layer);
                 $layer->addLayer(4, $layer);
 
-            break;
+                break;
 
             case 3: // Add 5 sublayers in $layer stack
 
@@ -1521,7 +1521,7 @@ protected function initializeLayer($method = 1)
                 $layer->addLayer(4, $layer);
                 $layer->addLayer(5, $layer);
 
-            break;
+                break;
         }
 
         return $layer;
