properly inject Optimizer instance

Author: codemasher

src/Imagetiler.php

@@ -14,7 +14,6 @@
 
 use chillerlan\Traits\ContainerInterface;
 use ImageOptimizer\Optimizer;
-use ImageOptimizer\OptimizerFactory;
 use Imagick;
 use Psr\Log\{LoggerAwareInterface, LoggerAwareTrait, LoggerInterface, NullLogger};
 
@@ -26,22 +25,32 @@ class Imagetiler implements LoggerAwareInterface{
 	 */
 	protected $options;
 
+	/**
+	 * @var \ImageOptimizer\Optimizer
+	 */
+	protected $optimizer;
+
 	/**
 	 * Imagetiler constructor.
 	 *
 	 * @param \chillerlan\Traits\ContainerInterface|null $options
+	 * @param \ImageOptimizer\Optimizer                  $optimizer
 	 * @param \Psr\Log\LoggerInterface|null              $logger
 	 *
 	 * @throws \chillerlan\Imagetiler\ImagetilerException
 	 */
-	public function __construct(ContainerInterface $options = null, LoggerInterface $logger = null){
+	public function __construct(ContainerInterface $options = null, Optimizer $optimizer = null, LoggerInterface $logger = null){
 
 		if(!extension_loaded('imagick')){
 			throw new ImagetilerException('Imagick extension is not available');
 		}
 
 		$this->setOptions($options ?? new ImagetilerOptions);
 		$this->setLogger($logger ?? new NullLogger);
+
+		if($optimizer instanceof Optimizer){
+			$this->setOptimizer($optimizer);
+		}
 	}
 
 	/**
@@ -81,6 +90,17 @@ public function setOptions(ContainerInterface $options):Imagetiler{
 		return $this;
 	}
 
+	/**
+	 * @param \ImageOptimizer\Optimizer $optimizer
+	 *
+	 * @return \chillerlan\Imagetiler\Imagetiler
+	 */
+	public function setOptimizer(Optimizer $optimizer):Imagetiler{
+		$this->optimizer = $optimizer;
+
+		return $this;
+	}
+
 	/**
 	 * @param string $image_path
 	 * @param string $out_path
@@ -102,13 +122,6 @@ public function process(string $image_path, string $out_path):Imagetiler{
 
 		}
 
-		// load the optional image optimizer
-		$optimizer = null;
-
-		if($this->options->optimize_output){
-			$optimizer = (new OptimizerFactory($this->options->optimizer_settings, $this->logger))->get();
-		}
-
 		// prepare the zoom base images
 		$this->prepareZoomBaseImages($image_path, $out_path);
 
@@ -122,7 +135,7 @@ public function process(string $image_path, string $out_path):Imagetiler{
 				throw new ImagetilerException('cannot read base image '.$base_image.' for zoom '.$zoom);
 			}
 
-			$this->createTilesForZoom(new Imagick($base_image), $zoom, $out_path, $optimizer);
+			$this->createTilesForZoom(new Imagick($base_image), $zoom, $out_path);
 		}
 
 		// clean up base images
@@ -269,12 +282,11 @@ protected function createTilesForZoom(Imagick $im, int $zoom, string $out_path,
 	 *
 	 * @param Imagick                   $image
 	 * @param string                    $dest full path with file name
-	 * @param \ImageOptimizer\Optimizer $optimizer
 	 *
 	 * @return void
 	 * @throws \chillerlan\Imagetiler\ImagetilerException
 	 */
-	protected function saveImage(Imagick $image, string $dest, Optimizer $optimizer = null):void{
+	protected function saveImage(Imagick $image, string $dest):void{
 		$dir = dirname($dest);
 
 		if(!is_dir($dir)){
@@ -292,8 +304,8 @@ protected function saveImage(Imagick $image, string $dest, Optimizer $optimizer
 			throw new ImagetilerException('cannot save image '.$dest);
 		}
 
-		if($optimizer instanceof Optimizer){
-			$optimizer->optimize($dest);
+		if($this->options->optimize_output && $this->optimizer instanceof Optimizer){
+			$this->optimizer->optimize($dest);
 		}
 
 	}

src/ImagetilerOptions.php

@@ -34,7 +34,6 @@
  * @property bool $overwrite_tile_image
  * @property bool $clean_up
  * @property bool $optimize_output
- * @property array $optimizer_settings
  */
 class ImagetilerOptions extends ContainerAbstract{
 	use ImagetilerOptionsTrait;

src/ImagetilerOptionsTrait.php

@@ -152,8 +152,4 @@ trait ImagetilerOptionsTrait{
 	 */
 	protected $optimize_output = false;
 
-	/**
-	 * @var array
-	 */
-	protected $optimizer_settings = [];
 }