add zoom rule

quazardous · quazardous · commit 3af4829208ce · 2024-12-13T15:31:37.000+01:00
diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
     "keywords": ["image"],
     "license": "MIT",
     "require": {
-    	"php": "^7.1",
+        "php": "^7.1",
         "imagine/imagine": "^0.6",
         "guzzlehttp/guzzle": "^6.2",
         "doctrine/cache": "^1.6"
diff --git a/src/ImageStack/Image.php b/src/ImageStack/Image.php
@@ -84,7 +84,7 @@ public function getBinaryContent()
             // we consider that 
             $options = array_replace($this->ephemeralImagineOptions, $this->imagineOptions);
             $binaryContent = $this->getImagineImage()->get(
-                    self::get_type_from_mime_type($mimeType),
+                self::get_type_from_mime_type($mimeType),
                 $options);
             $this->setBinaryContent($binaryContent, $mimeType);
         }
diff --git a/src/ImageStack/ImageManipulator/ThumbnailRule/PatternThumbnailRule.php b/src/ImageStack/ImageManipulator/ThumbnailRule/PatternThumbnailRule.php
@@ -109,16 +109,41 @@ protected function _thumbnailImage(ImageWithImagineInterface $image, ImagePathIn
             $image->deprecateBinaryContent();
             return true;
         }
-        
+
+        $formats = (array) $format;
+
+        $handlers = [
+            [$this, 'handlerCrop'],
+            [$this, 'handlerZoom'],
+        ];
+
+        foreach ($formats as $format) {
+            $done = false;
+            foreach ($handlers as $handler) {
+                if (call_user_func($handler, $image, $format)) {
+                    $done = true;
+                    break;
+                }
+            }
+            if (!$done) {
+                throw new ThumbnailRuleException(sprintf('Unsupported rule format: %s', (string)$format), ThumbnailRuleException::UNSUPPORTED_RULE_FORMAT);
+            }
+        }
+
+		return true;
+    }
+
+    protected function handlerCrop(ImageWithImagineInterface $image, $format)
+    {
         if (preg_match('/^(\<)?([0-9]+)x([0-9]+)$/', $format, $matches)) {
-			$size = new \Imagine\Image\Box($matches[2], $matches[3]);
-			$mode = $matches[1] == '<' ? \Imagine\Image\ImageInterface::THUMBNAIL_INSET : \Imagine\Image\ImageInterface::THUMBNAIL_OUTBOUND;
-		} elseif (preg_match('/^(\<)?([0-9]+)$/', $format, $matches)) {
-			$size = new \Imagine\Image\Box($matches[2], $matches[2]);
-			$mode = $matches[1] == '<' ? \Imagine\Image\ImageInterface::THUMBNAIL_INSET : \Imagine\Image\ImageInterface::THUMBNAIL_OUTBOUND;
-		} else {
-			throw new ThumbnailRuleException(sprintf('Unsupported rule format: %s', (string)$format), ThumbnailRuleException::UNSUPPORTED_RULE_FORMAT);
-		}
+            $size = new \Imagine\Image\Box($matches[2], $matches[3]);
+            $mode = $matches[1] == '<' ? \Imagine\Image\ImageInterface::THUMBNAIL_INSET : \Imagine\Image\ImageInterface::THUMBNAIL_OUTBOUND;
+        } elseif (preg_match('/^(\<)?([0-9]+)$/', $format, $matches)) {
+            $size = new \Imagine\Image\Box($matches[2], $matches[2]);
+            $mode = $matches[1] == '<' ? \Imagine\Image\ImageInterface::THUMBNAIL_INSET : \Imagine\Image\ImageInterface::THUMBNAIL_OUTBOUND;
+        } else {
+            return false;
+        }
         
         /** @var IImage $animated */
         $animated = null;
@@ -146,7 +171,22 @@ protected function _thumbnailImage(ImageWithImagineInterface $image, ImagePathIn
             return true;
         }
         $image->setImagineImage($image->getImagineImage()->thumbnail($size, $mode, $this->filter));
-		return true;
+        return true;
+    }
+
+    protected function handlerZoom(ImageWithImagineInterface $image, $format)
+    {
+        if (preg_match('/^x([0-9]*\.?[0-9]+)$/', $format, $matches)) {
+            $scale = floatval($matches[1]);
+            $size = $image->getImagineImage()->getSize();
+            $newSize = $size->scale($scale);
+            $image->setImagineImage($image->getImagineImage()->resize($newSize)->crop(new \Imagine\Image\Point(
+                max(0, ($newSize->getWidth() - $size->getWidth()) / 2),
+                max(0, ($newSize->getHeight() - $size->getHeight()) / 2)
+            ), $size));
+            return true;
+        }
+        return false;
     }
     
     /**

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public function getBinaryContent()`
`84`	`84`	`// we consider that`
`85`	`85`	`$options = array_replace($this->ephemeralImagineOptions, $this->imagineOptions);`
`86`	`86`	`$binaryContent = $this->getImagineImage()->get(`
`87`		`- self::get_type_from_mime_type($mimeType),`
	`87`	`+ self::get_type_from_mime_type($mimeType),`
`88`	`88`	`$options);`
`89`	`89`	`$this->setBinaryContent($binaryContent, $mimeType);`
`90`	`90`	`}`