chillerlan / php-imagetiler

src/ImagetilerException.php

Spacing +1 added lines, -1 removed lines

@@ -12,6 +12,6 @@
 
 namespace chillerlan\Imagetiler;
 
-class ImagetilerException extends \Exception{
+class ImagetilerException extends \Exception {
 
 }

src/ImagetilerOptions.php

Spacing +1 added lines, -1 removed lines

@@ -38,6 +38,6 @@
  * @property bool $optimize_output
  * @property bool $no_temp_baseimages
  */
-class ImagetilerOptions extends SettingsContainerAbstract{
+class ImagetilerOptions extends SettingsContainerAbstract {
 	use ImagetilerOptionsTrait;
 }

src/ImagetilerOptionsTrait.php

Spacing +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
 
 use function in_array, max, strtolower;
 
-trait ImagetilerOptionsTrait{
+trait ImagetilerOptionsTrait {
 
 	/**
 	 * width/height of a single tile
@@ -213,11 +213,11 @@ 
 	protected function getExtension(string $format):string{
 		$format = strtolower($format);
 
-		if(in_array($format, ['jpeg', 'jp2', 'jpc', 'jxr'], true)){
+		if (in_array($format, [ 'jpeg', 'jp2', 'jpc', 'jxr' ], true)) {
 			return 'jpg';
 		}
 
-		if(in_array($format, ['png', 'png00', 'png8', 'png24', 'png32', 'png64'], true)){
+		if (in_array($format, [ 'png', 'png00', 'png8', 'png24', 'png32', 'png64' ], true)) {
 			return 'png';
 		}
 

src/Imagetiler.php

Spacing +41 added lines, -41 removed lines

@@ -20,7 +20,7 @@ 
 use function ceil, dirname, extension_loaded, function_exists, ini_get, ini_set, is_dir,
 	is_file, is_readable, is_writable, mkdir, putenv, round, sprintf, unlink;
 
-class Imagetiler implements LoggerAwareInterface{
+class Imagetiler implements LoggerAwareInterface {
 	use LoggerAwareTrait;
 
 	/**
@@ -42,16 +42,16 @@ 
 	 *
 	 * @throws \chillerlan\Imagetiler\ImagetilerException
 	 */
-	public function __construct(SettingsContainerInterface $options = null, Optimizer $optimizer = null, LoggerInterface $logger = null){
+	public function __construct(SettingsContainerInterface $options = null, Optimizer $optimizer = null, LoggerInterface $logger = null) {
 
-		if(!extension_loaded('imagick')){
+		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){
+		if ($optimizer instanceof Optimizer) {
 			$this->setOptimizer($optimizer);
 		}
 	}
@@ -65,11 +65,11 @@ 
 	public function setOptions(SettingsContainerInterface $options):Imagetiler{
 		$this->options = $options;
 
-		if(ini_set('memory_limit', $this->options->memory_limit) === false){
+		if (ini_set('memory_limit', $this->options->memory_limit) === false) {
 			throw new ImagetilerException('could not alter ini settings');
 		}
 
-		if(ini_get('memory_limit') !== (string)$this->options->memory_limit){
+		if (ini_get('memory_limit') !== (string)$this->options->memory_limit) {
 			throw new ImagetilerException('ini settings differ from options');
 		}
 
@@ -96,13 +96,13 @@ 
 	 */
 	public function process(string $image_path, string $out_path):Imagetiler{
 
-		if(!is_file($image_path) || !is_readable($image_path)){
+		if (!is_file($image_path) || !is_readable($image_path)) {
 			throw new ImagetilerException('cannot read image '.$image_path);
 		}
 
-		if(!is_dir($out_path) || !is_writable($out_path)){
+		if (!is_dir($out_path) || !is_writable($out_path)) {
 
-			if(!mkdir($out_path, 0755, true)){
+			if (!mkdir($out_path, 0755, true)) {
 				throw new ImagetilerException('output path is not writable');
 			}
 
@@ -113,15 +113,15 @@ 
 		// prepare the zoom base images
 		$base_images = $this->prepareZoomBaseImages($image_path, $out_path);
 
-		if($this->options->no_temp_baseimages === true){
+		if ($this->options->no_temp_baseimages === true) {
 			return $this;
 		}
 
 		// create the tiles
-		foreach($base_images as $zoom => $base_image){
+		foreach ($base_images as $zoom => $base_image) {
 
 			//load image
-			if(!is_file($base_image) || !is_readable($base_image)){
+			if (!is_file($base_image) || !is_readable($base_image)) {
 				throw new ImagetilerException('cannot read base image '.$base_image.' for zoom '.$zoom);
 			}
 
@@ -129,13 +129,13 @@ 
 		}
 
 		// clean up base images
-		if($this->options->clean_up){
+		if ($this->options->clean_up) {
 
-			for($zoom = $this->options->zoom_min; $zoom <= $this->options->zoom_max; $zoom++){
+			for ($zoom = $this->options->zoom_min; $zoom <= $this->options->zoom_max; $zoom++) {
 				$lvl_file = $out_path.'/'.$zoom.'.'.$this->options->tile_ext;
 
-				if(is_file($lvl_file)){
-					if(unlink($lvl_file)){
+				if (is_file($lvl_file)) {
+					if (unlink($lvl_file)) {
 						$this->logger->info('deleted base image for zoom level '.$zoom.': '.$lvl_file);
 					}
 				}
@@ -155,23 +155,23 @@ 
 	 * @return array
 	 */
 	protected function prepareZoomBaseImages(string $image_path, string $out_path):array{
-		$base_images = [];
+		$base_images = [ ];
 
 		// create base image file names
-		for($zoom = $this->options->zoom_max; $zoom >= $this->options->zoom_min; $zoom--){
+		for ($zoom = $this->options->zoom_max; $zoom >= $this->options->zoom_min; $zoom--) {
 			$base_image = $out_path.'/'.$zoom.'.'.$this->options->tile_ext;
 			// check if the base image already exists
-			if(!$this->options->overwrite_base_image && is_file($base_image)){
+			if (!$this->options->overwrite_base_image && is_file($base_image)) {
 				$this->logger->info('base image for zoom level '.$zoom.' already exists: '.$base_image);
 
 				continue;
 			}
 
-			$base_images[$zoom] = $base_image;
+			$base_images[ $zoom ] = $base_image;
 		}
 
-		if(empty($base_images)){
-			return [];
+		if (empty($base_images)) {
+			return [ ];
 		}
 
 		$im = new Imagick($image_path);
@@ -183,16 +183,16 @@ 
 
 		$this->logger->info('input image loaded: ['.$width.'x'.$height.'] '.$image_path);
 
-		foreach($base_images as $zoom => $base_image){
-			[$w, $h] = $this->getSize($width, $height, $zoom);
+		foreach ($base_images as $zoom => $base_image) {
+			[ $w, $h ] = $this->getSize($width, $height, $zoom);
 
 			// clone the original image and fit it to the current zoom level
 			$il = clone $im;
 
-			if($zoom > $this->options->zoom_normalize){
+			if ($zoom > $this->options->zoom_normalize) {
 				$this->scale($il, $w, $h, $this->options->fast_resize_upsample, $this->options->resize_filter_upsample, $this->options->resize_blur_upsample);
 			}
-			elseif($zoom < $this->options->zoom_normalize){
+			elseif ($zoom < $this->options->zoom_normalize) {
 				$this->scale($il, $w, $h, $this->options->fast_resize_downsample, $this->options->resize_filter_downsample, $this->options->resize_blur_downsample);
 			}
 
@@ -245,7 +245,7 @@ 
 		$y  = (int)ceil($h / $ts);
 
 		// width
-		for($ix = 0; $ix < $x; $ix++){
+		for ($ix = 0; $ix < $x; $ix++) {
 			$cx = $ix * $ts;
 
 			// create a stripe tile_size * height
@@ -253,11 +253,11 @@ 
 			$ci->cropImage($ts, $h, $cx, 0);
 
 			// height
-			for($iy = 0; $iy < $y; $iy++){
+			for ($iy = 0; $iy < $y; $iy++) {
 				$tile = $out_path.'/'.sprintf($this->options->store_structure, $zoom, $ix, $iy).'.'.$this->options->tile_ext;
 
 				// check if tile already exists
-				if(!$this->options->overwrite_tile_image && is_file($tile)){
+				if (!$this->options->overwrite_tile_image && is_file($tile)) {
 					$this->logger->info('tile '.$zoom.'/'.$ix.'/'.$iy.' already exists: '.$tile);
 
 					continue;
@@ -273,7 +273,7 @@ 
 				$ti->cropImage($ts, $ts, 0, $cy);
 
 				// check if the current tile is smaller than the tile size (leftover edges on the input image)
-				if($ti->getImageWidth() < $ts || $ti->getimageheight() < $ts){
+				if ($ti->getImageWidth() < $ts || $ti->getimageheight() < $ts) {
 
 					$th = $this->options->tms ? $h - $ts : 0;
 
@@ -306,22 +306,22 @@ 
 	protected function saveImage(Imagick $image, string $dest, bool $optimize):void{
 		$dir = dirname($dest);
 
-		if(!is_dir($dir)){
-			if(!mkdir($dir, 0755, true)){
+		if (!is_dir($dir)) {
+			if (!mkdir($dir, 0755, true)) {
 				throw new ImagetilerException('cannot create folder '.$dir);
 			}
 		}
 
-		if($this->options->tile_format === 'jpeg'){
+		if ($this->options->tile_format === 'jpeg') {
 			$image->setCompression(Imagick::COMPRESSION_JPEG2000);
 			$image->setCompressionQuality($this->options->quality_jpeg);
 		}
 
-		if(!$image->writeImage($dest)){
+		if (!$image->writeImage($dest)) {
 			throw new ImagetilerException('cannot save image '.$dest);
 		}
 
-		if($this->options->optimize_output && $optimize && $this->optimizer instanceof Optimizer){
+		if ($this->options->optimize_output && $optimize && $this->optimizer instanceof Optimizer) {
 			$this->optimizer->optimize($dest);
 		}
 
@@ -336,7 +336,7 @@ 
 	 */
 	protected function clearImage(Imagick $image = null):bool{
 
-		if($image instanceof Imagick){
+		if ($image instanceof Imagick) {
 			$image->clear();
 
 			return $image->destroy();
@@ -357,19 +357,19 @@ 
 	protected function getSize(int $width, int $height, int $zoom):array{
 		$zoom_normalize = $this->options->zoom_normalize ?? $this->options->zoom_max;
 
-		if($this->options->zoom_max > $zoom_normalize && $zoom > $zoom_normalize){
+		if ($this->options->zoom_max > $zoom_normalize && $zoom > $zoom_normalize) {
 			$zd = 2 ** ($zoom - $zoom_normalize);
 
-			return [$zd * $width, $zd * $height];
+			return [ $zd * $width, $zd * $height ];
 		}
 
-		if($zoom < $zoom_normalize){
+		if ($zoom < $zoom_normalize) {
 			$zd = 2 ** ($zoom_normalize - $zoom);
 
-			return [(int)round($width / $zd), (int)round($height / $zd)];
+			return [ (int)round($width / $zd), (int)round($height / $zd) ];
 		}
 
-		return [$width, $height];
+		return [ $width, $height ];
 	}
 
 }

Braces +1 added lines, -2 removed lines

@@ -191,8 +191,7 @@
 
 			if($zoom > $this->options->zoom_normalize){
 				$this->scale($il, $w, $h, $this->options->fast_resize_upsample, $this->options->resize_filter_upsample, $this->options->resize_blur_upsample);
-			}
-			elseif($zoom < $this->options->zoom_normalize){
+			} elseif($zoom < $this->options->zoom_normalize){
 				$this->scale($il, $w, $h, $this->options->fast_resize_downsample, $this->options->resize_filter_downsample, $this->options->resize_blur_downsample);
 			}