jenskooij / cloudcontrol

src/images/IMethod.php

Indentation +10 added lines, -10 removed lines

@@ -10,14 +10,14 @@
  
 namespace CloudControl\Cms\images
 {
-	abstract class IMethod
-	{
-		/**
-		 * Method stub, use for executing the manipulation
-		 * 
-		 * @param  resource $imageResource
-		 * @return resource
-		 */
-		abstract public function Execute($imageResource);
-	}
+    abstract class IMethod
+    {
+        /**
+         * Method stub, use for executing the manipulation
+         * 
+         * @param  resource $imageResource
+         * @return resource
+         */
+        abstract public function Execute($imageResource);
+    }
 }
\ No newline at end of file

src/images/Image.php

Indentation +227 added lines, -227 removed lines

@@ -9,232 +9,232 @@
  */
 
 namespace CloudControl\Cms\images {
-	class Image
-	{
-		private $_imageResource;
-
-		/**
-		 * Load the a image resource into $this->_imageResource
-		 * automagically :-)
-		 *
-		 * @param    resource | string | path
-		 *
-		 * @throws    \Exception
-		 */
-		public function loadImage($imageContainer)
-		{
-			if (is_resource($imageContainer) && get_resource_type($imageContainer) === 'gd') {
-				$this->_imageResource = $imageContainer;
-			} elseif (is_string($imageContainer) && file_exists($imageContainer)) {
-				if ($this->getImageMimeType($imageContainer) == IMAGETYPE_BMP) {
-					$this->_imageResource = $this->createImageFromBmp($imageContainer);
-				} else {
-					$imageContent = file_get_contents($imageContainer);
-					$this->_imageResource = imagecreatefromstring($imageContent);
-				}
-			} elseif (is_string($imageContainer)) {
-				$this->_imageResource = imagecreatefromstring($imageContainer);
-			} else {
-				throw new \Exception('Could not create image resource, accepted inputs are: "resource of type (gd)", path_to_image and "string". <br /><pre>' . var_export($imageContainer, true) . '</pre>');
-			}
-		}
-
-		/**
-		 * Saves the image to a file
-		 *
-		 * @param string $path
-		 * @param int    $mimeTypeConstantValue
-		 * @param int    $quality
-		 * @param null   $imageResource If no resource is given, uses $this->_imageResource
-		 *
-		 * @return bool
-		 * @throws \Exception
-		 */
-		public function saveImage($path, $mimeTypeConstantValue, $quality = 100, $imageResource = null)
-		{
-			if ($imageResource == null) {
-				$imageResource = $this->getImageResource();
-			}
-
-			if ($mimeTypeConstantValue == IMAGETYPE_GIF) {
-				return imagegif($imageResource, $path);
-			} elseif ($mimeTypeConstantValue == IMAGETYPE_JPEG) {
-				return imagejpeg($imageResource, $path, $quality);
-			} elseif ($mimeTypeConstantValue == IMAGETYPE_PNG) {
-				return imagepng($imageResource, $path, (intval($quality / 10) - 1));
-			} else {
-				throw new \Exception('Not a valid mimetypeconstant given see function documentation');
-			}
-		}
-
-		/**
-		 * Returns either the Mime-Type Constant value
-		 * or the default extension for the detected mime-type;
-		 *
-		 * @see http://www.php.net/manual/en/function.image-type-to-mime-type.php
-		 *
-		 * @param string $imagePath
-		 * @param bool   $getExtension
-		 *
-		 * @return bool|int|string
-		 */
-		public function getImageMimeType($imagePath, $getExtension = false)
-		{
-			if (function_exists('exif_imagetype')) {
-				$exif = exif_imagetype($imagePath);
-			} else {
-				if ((list($width, $height, $type, $attr) = getimagesize($imagePath)) !== false) {
-					$exif = $type;
-				} else {
-					$exif = false;
-				}
-			}
-
-			return $getExtension ? image_type_to_extension($exif) : $exif;
-		}
-
-		/**
-		 * Create Image resource from Bitmap
-		 *
-		 * @see       http://www.php.net/manual/en/function.imagecreatefromwbmp.php#86214
-		 * @author    alexander at alexauto dot nl
-		 *
-		 * @param    string $pathToBitmapFile
-		 *
-		 * @return  resource
-		 */
-		public function createImageFromBmp($pathToBitmapFile)
-		{
-			$bitmapFileData = $this->getBitmapFileData($pathToBitmapFile);
-
-			$temp = unpack("H*", $bitmapFileData);
-			$hex = $temp[1];
-			$header = substr($hex, 0, 108);
-			list($width, $height) = $this->calculateWidthAndHeight($header);
-
-			//    Define starting X and Y 
-			$x = 0;
-			$y = 1;
-
-			$image = imagecreatetruecolor($width, $height);
-
-			//    Grab the body from the image 
-			$body = substr($hex, 108);
-
-			//    Calculate if padding at the end-line is needed. Divided by two to keep overview. 1 byte = 2 HEX-chars
-			$bodySize = (strlen($body) / 2);
-			$headerSize = ($width * $height);
-
-			//    Use end-line padding? Only when needed 
-			$usePadding = ($bodySize > ($headerSize * 3) + 4);
-			$this->loopThroughBodyAndCalculatePixels($bodySize, $x, $width, $usePadding, $y, $height, $body, $image);
-
-			unset($body);
-
-			return $image;
-		}
-
-		/**
-		 * Returns the image resource
-		 * @return resource
-		 * @throws \Exception
-		 */
-		final public function getImageResource()
-		{
-			if (is_resource($this->_imageResource) && get_resource_type($this->_imageResource) === 'gd') {
-				return $this->_imageResource;
-			} else {
-				throw new \Exception('Image resource is not set. Use $this->LoadImage to load an image into the resource');
-			}
-		}
-
-		/**
-		 * @param $pathToBitmapFile
-		 *
-		 * @return string
-		 */
-		private function getBitmapFileData($pathToBitmapFile)
-		{
-			$fileHandle = fopen($pathToBitmapFile, "rb");
-			$bitmapFileData = fread($fileHandle, 10);
-			while (!feof($fileHandle) && ($bitmapFileData <> "")) {
-				$bitmapFileData .= fread($fileHandle, 1024);
-			}
-
-			return $bitmapFileData;
-		}
-
-		/**
-		 * @param $header
-		 *
-		 * @return array
-		 */
-		private function calculateWidthAndHeight($header)
-		{
-			$width = null;
-			$height = null;
-
-			//    Structure: http://www.fastgraph.com/help/bmp_header_format.html
-			if (substr($header, 0, 4) == "424d") {
-				//    Cut it in parts of 2 bytes
-				$header_parts = str_split($header, 2);
-				//    Get the width        4 bytes
-				$width = hexdec($header_parts[19] . $header_parts[18]);
-				//    Get the height        4 bytes
-				$height = hexdec($header_parts[23] . $header_parts[22]);
-				//    Unset the header params
-				unset($header_parts);
-
-				return array($width, $height);
-			}
-
-			return array($width, $height);
-		}
-
-		/**
-		 * Loop through the data in the body of the bitmap
-		 * file and calculate each individual pixel based on the
-		 * bytes
-		 * @param $bodySize
-		 * @param $x
-		 * @param $width
-		 * @param $usePadding
-		 * @param $y
-		 * @param $height
-		 * @param $body
-		 * @param $image
-		 */
-		private function loopThroughBodyAndCalculatePixels($bodySize, $x, $width, $usePadding, $y, $height, $body, $image)
-		{
+    class Image
+    {
+        private $_imageResource;
+
+        /**
+         * Load the a image resource into $this->_imageResource
+         * automagically :-)
+         *
+         * @param    resource | string | path
+         *
+         * @throws    \Exception
+         */
+        public function loadImage($imageContainer)
+        {
+            if (is_resource($imageContainer) && get_resource_type($imageContainer) === 'gd') {
+                $this->_imageResource = $imageContainer;
+            } elseif (is_string($imageContainer) && file_exists($imageContainer)) {
+                if ($this->getImageMimeType($imageContainer) == IMAGETYPE_BMP) {
+                    $this->_imageResource = $this->createImageFromBmp($imageContainer);
+                } else {
+                    $imageContent = file_get_contents($imageContainer);
+                    $this->_imageResource = imagecreatefromstring($imageContent);
+                }
+            } elseif (is_string($imageContainer)) {
+                $this->_imageResource = imagecreatefromstring($imageContainer);
+            } else {
+                throw new \Exception('Could not create image resource, accepted inputs are: "resource of type (gd)", path_to_image and "string". <br /><pre>' . var_export($imageContainer, true) . '</pre>');
+            }
+        }
+
+        /**
+         * Saves the image to a file
+         *
+         * @param string $path
+         * @param int    $mimeTypeConstantValue
+         * @param int    $quality
+         * @param null   $imageResource If no resource is given, uses $this->_imageResource
+         *
+         * @return bool
+         * @throws \Exception
+         */
+        public function saveImage($path, $mimeTypeConstantValue, $quality = 100, $imageResource = null)
+        {
+            if ($imageResource == null) {
+                $imageResource = $this->getImageResource();
+            }
+
+            if ($mimeTypeConstantValue == IMAGETYPE_GIF) {
+                return imagegif($imageResource, $path);
+            } elseif ($mimeTypeConstantValue == IMAGETYPE_JPEG) {
+                return imagejpeg($imageResource, $path, $quality);
+            } elseif ($mimeTypeConstantValue == IMAGETYPE_PNG) {
+                return imagepng($imageResource, $path, (intval($quality / 10) - 1));
+            } else {
+                throw new \Exception('Not a valid mimetypeconstant given see function documentation');
+            }
+        }
+
+        /**
+         * Returns either the Mime-Type Constant value
+         * or the default extension for the detected mime-type;
+         *
+         * @see http://www.php.net/manual/en/function.image-type-to-mime-type.php
+         *
+         * @param string $imagePath
+         * @param bool   $getExtension
+         *
+         * @return bool|int|string
+         */
+        public function getImageMimeType($imagePath, $getExtension = false)
+        {
+            if (function_exists('exif_imagetype')) {
+                $exif = exif_imagetype($imagePath);
+            } else {
+                if ((list($width, $height, $type, $attr) = getimagesize($imagePath)) !== false) {
+                    $exif = $type;
+                } else {
+                    $exif = false;
+                }
+            }
+
+            return $getExtension ? image_type_to_extension($exif) : $exif;
+        }
+
+        /**
+         * Create Image resource from Bitmap
+         *
+         * @see       http://www.php.net/manual/en/function.imagecreatefromwbmp.php#86214
+         * @author    alexander at alexauto dot nl
+         *
+         * @param    string $pathToBitmapFile
+         *
+         * @return  resource
+         */
+        public function createImageFromBmp($pathToBitmapFile)
+        {
+            $bitmapFileData = $this->getBitmapFileData($pathToBitmapFile);
+
+            $temp = unpack("H*", $bitmapFileData);
+            $hex = $temp[1];
+            $header = substr($hex, 0, 108);
+            list($width, $height) = $this->calculateWidthAndHeight($header);
+
+            //    Define starting X and Y 
+            $x = 0;
+            $y = 1;
+
+            $image = imagecreatetruecolor($width, $height);
+
+            //    Grab the body from the image 
+            $body = substr($hex, 108);
+
+            //    Calculate if padding at the end-line is needed. Divided by two to keep overview. 1 byte = 2 HEX-chars
+            $bodySize = (strlen($body) / 2);
+            $headerSize = ($width * $height);
+
+            //    Use end-line padding? Only when needed 
+            $usePadding = ($bodySize > ($headerSize * 3) + 4);
+            $this->loopThroughBodyAndCalculatePixels($bodySize, $x, $width, $usePadding, $y, $height, $body, $image);
+
+            unset($body);
+
+            return $image;
+        }
+
+        /**
+         * Returns the image resource
+         * @return resource
+         * @throws \Exception
+         */
+        final public function getImageResource()
+        {
+            if (is_resource($this->_imageResource) && get_resource_type($this->_imageResource) === 'gd') {
+                return $this->_imageResource;
+            } else {
+                throw new \Exception('Image resource is not set. Use $this->LoadImage to load an image into the resource');
+            }
+        }
+
+        /**
+         * @param $pathToBitmapFile
+         *
+         * @return string
+         */
+        private function getBitmapFileData($pathToBitmapFile)
+        {
+            $fileHandle = fopen($pathToBitmapFile, "rb");
+            $bitmapFileData = fread($fileHandle, 10);
+            while (!feof($fileHandle) && ($bitmapFileData <> "")) {
+                $bitmapFileData .= fread($fileHandle, 1024);
+            }
+
+            return $bitmapFileData;
+        }
+
+        /**
+         * @param $header
+         *
+         * @return array
+         */
+        private function calculateWidthAndHeight($header)
+        {
+            $width = null;
+            $height = null;
+
+            //    Structure: http://www.fastgraph.com/help/bmp_header_format.html
+            if (substr($header, 0, 4) == "424d") {
+                //    Cut it in parts of 2 bytes
+                $header_parts = str_split($header, 2);
+                //    Get the width        4 bytes
+                $width = hexdec($header_parts[19] . $header_parts[18]);
+                //    Get the height        4 bytes
+                $height = hexdec($header_parts[23] . $header_parts[22]);
+                //    Unset the header params
+                unset($header_parts);
+
+                return array($width, $height);
+            }
+
+            return array($width, $height);
+        }
+
+        /**
+         * Loop through the data in the body of the bitmap
+         * file and calculate each individual pixel based on the
+         * bytes
+         * @param $bodySize
+         * @param $x
+         * @param $width
+         * @param $usePadding
+         * @param $y
+         * @param $height
+         * @param $body
+         * @param $image
+         */
+        private function loopThroughBodyAndCalculatePixels($bodySize, $x, $width, $usePadding, $y, $height, $body, $image)
+        {
 //    Using a for-loop with index-calculation instead of str_split to avoid large memory consumption
-			//    Calculate the next DWORD-position in the body
-			for ($i = 0; $i < $bodySize; $i += 3) {
-				//    Calculate line-ending and padding
-				if ($x >= $width) {
-					//    If padding needed, ignore image-padding. Shift i to the ending of the current 32-bit-block
-					if ($usePadding) {
-						$i += $width % 4;
-					}
-					//    Reset horizontal position
-					$x = 0;
-					//    Raise the height-position (bottom-up)
-					$y++;
-					//    Reached the image-height? Break the for-loop
-					if ($y > $height) {
-						break;
-					}
-				}
-				//    Calculation of the RGB-pixel (defined as BGR in image-data). Define $iPos as absolute position in the body
-				$iPos = $i * 2;
-				$r = hexdec($body[$iPos + 4] . $body[$iPos + 5]);
-				$g = hexdec($body[$iPos + 2] . $body[$iPos + 3]);
-				$b = hexdec($body[$iPos] . $body[$iPos + 1]);
-				//    Calculate and draw the pixel
-				$color = imagecolorallocate($image, $r, $g, $b);
-				imagesetpixel($image, $x, $height - $y, $color);
-				//    Raise the horizontal position
-				$x++;
-			}
-		}
-	}
+            //    Calculate the next DWORD-position in the body
+            for ($i = 0; $i < $bodySize; $i += 3) {
+                //    Calculate line-ending and padding
+                if ($x >= $width) {
+                    //    If padding needed, ignore image-padding. Shift i to the ending of the current 32-bit-block
+                    if ($usePadding) {
+                        $i += $width % 4;
+                    }
+                    //    Reset horizontal position
+                    $x = 0;
+                    //    Raise the height-position (bottom-up)
+                    $y++;
+                    //    Reached the image-height? Break the for-loop
+                    if ($y > $height) {
+                        break;
+                    }
+                }
+                //    Calculation of the RGB-pixel (defined as BGR in image-data). Define $iPos as absolute position in the body
+                $iPos = $i * 2;
+                $r = hexdec($body[$iPos + 4] . $body[$iPos + 5]);
+                $g = hexdec($body[$iPos + 2] . $body[$iPos + 3]);
+                $b = hexdec($body[$iPos] . $body[$iPos + 1]);
+                //    Calculate and draw the pixel
+                $color = imagecolorallocate($image, $r, $g, $b);
+                imagesetpixel($image, $x, $height - $y, $color);
+                //    Raise the horizontal position
+                $x++;
+            }
+        }
+    }
 }
\ No newline at end of file

src/images/ImageResizer.php

Indentation +132 added lines, -132 removed lines

@@ -5,144 +5,144 @@
     use CloudControl\Cms\cc\StringUtil;
 
     /**
-	 * Class ImageResizer
-	 * @package CloudControl\Cms\images
-	 */
-	class ImageResizer
-	{
-		protected $imageSet;
+     * Class ImageResizer
+     * @package CloudControl\Cms\images
+     */
+    class ImageResizer
+    {
+        protected $imageSet;
 
-		/**
-		 * ImageResizer constructor.
-		 *
-		 * @param $imageSet
-		 */
-		public function __construct($imageSet)
-		{
-			$this->imageSet = $imageSet;
-		}
+        /**
+         * ImageResizer constructor.
+         *
+         * @param $imageSet
+         */
+        public function __construct($imageSet)
+        {
+            $this->imageSet = $imageSet;
+        }
 
-		/**
-		 * @param $imagePath
-		 *
-		 * @return array
-		 * @throws \Exception
-		 */
-		public function applyImageSetToImage($imagePath)
-		{
-			$returnFileNames = array();
-			$filename = '';
-			if (file_exists($imagePath)) {
-				foreach ($this->imageSet as $set) {
-					if ($set->method == 'resize') {
-						$filename = $this->resize($imagePath, $set->width, $set->height);
-					} elseif ($set->method == 'smartcrop') {
-						$filename = $this->smartcrop($imagePath, $set->width, $set->height);
-					} elseif ($set->method == 'boxcrop') {
-						$filename = $this->boxcrop($imagePath, $set->width, $set->height);
-					}
-					$returnFileNames[$set->slug] = $filename;
-				}
-				return $returnFileNames;
-			} else {
-				throw new \Exception('Image doesnt exist: ' . $imagePath);
-			}
-		}
+        /**
+         * @param $imagePath
+         *
+         * @return array
+         * @throws \Exception
+         */
+        public function applyImageSetToImage($imagePath)
+        {
+            $returnFileNames = array();
+            $filename = '';
+            if (file_exists($imagePath)) {
+                foreach ($this->imageSet as $set) {
+                    if ($set->method == 'resize') {
+                        $filename = $this->resize($imagePath, $set->width, $set->height);
+                    } elseif ($set->method == 'smartcrop') {
+                        $filename = $this->smartcrop($imagePath, $set->width, $set->height);
+                    } elseif ($set->method == 'boxcrop') {
+                        $filename = $this->boxcrop($imagePath, $set->width, $set->height);
+                    }
+                    $returnFileNames[$set->slug] = $filename;
+                }
+                return $returnFileNames;
+            } else {
+                throw new \Exception('Image doesnt exist: ' . $imagePath);
+            }
+        }
 
-		/**
-		 * @param string $imagePath
-		 * @param string $width
-		 * @param string $height
-		 * @return string
-		 * @throws \Exception
-		 */
-		public function resize($imagePath='', $width='',$height='')
-		{
-			$modifier = '-r' . $width . 'x' . $height;
-			return $this->applyMethod('Resize', $imagePath, $width,$height, $modifier);
-		}
+        /**
+         * @param string $imagePath
+         * @param string $width
+         * @param string $height
+         * @return string
+         * @throws \Exception
+         */
+        public function resize($imagePath='', $width='',$height='')
+        {
+            $modifier = '-r' . $width . 'x' . $height;
+            return $this->applyMethod('Resize', $imagePath, $width,$height, $modifier);
+        }
 
-		/**
-		 * @param string $imagePath
-		 * @param string $width
-		 * @param string $height
-		 * @return string
-		 * @throws \Exception
-		 */
-		public function smartcrop($imagePath='', $width='',$height='')
-		{
-			$modifier = '-s' . $width . 'x' . $height;
-			return $this->applyMethod('SmartCrop', $imagePath, $width,$height, $modifier);
-		}
+        /**
+         * @param string $imagePath
+         * @param string $width
+         * @param string $height
+         * @return string
+         * @throws \Exception
+         */
+        public function smartcrop($imagePath='', $width='',$height='')
+        {
+            $modifier = '-s' . $width . 'x' . $height;
+            return $this->applyMethod('SmartCrop', $imagePath, $width,$height, $modifier);
+        }
 
-		/**
-		 * @param string $imagePath
-		 * @param string $width
-		 * @param string $height
-		 * @return string
-		 * @throws \Exception
-		 */
-		public function boxcrop($imagePath='', $width='',$height='')
-		{
-			$modifier = '-b' . $width . 'x' . $height;
-			return $this->applyMethod('BoxCrop', $imagePath, $width,$height, $modifier);
-		}
+        /**
+         * @param string $imagePath
+         * @param string $width
+         * @param string $height
+         * @return string
+         * @throws \Exception
+         */
+        public function boxcrop($imagePath='', $width='',$height='')
+        {
+            $modifier = '-b' . $width . 'x' . $height;
+            return $this->applyMethod('BoxCrop', $imagePath, $width,$height, $modifier);
+        }
 
-		/**
-		 * @param        $imagePath
-		 * @param string $modifier
-		 *
-		 * @return string
-		 */
-		private function modifyName($imagePath, $modifier='')
-		{
-			$filename = basename($imagePath);
-			$path = dirname($imagePath);
-			$fileParts = explode('.', $filename);
-			if (count($fileParts) > 1) {
-				$extension = end($fileParts);
-				array_pop($fileParts);
-				$fileNameWithoutExtension = implode('-', $fileParts);
-				$fileNameWithoutExtension = StringUtil::slugify($fileNameWithoutExtension);
-				$filename = $fileNameWithoutExtension . $modifier  . '.' . $extension;
-			} else {
-				$filename = StringUtil::slugify($filename);
-			}
+        /**
+         * @param        $imagePath
+         * @param string $modifier
+         *
+         * @return string
+         */
+        private function modifyName($imagePath, $modifier='')
+        {
+            $filename = basename($imagePath);
+            $path = dirname($imagePath);
+            $fileParts = explode('.', $filename);
+            if (count($fileParts) > 1) {
+                $extension = end($fileParts);
+                array_pop($fileParts);
+                $fileNameWithoutExtension = implode('-', $fileParts);
+                $fileNameWithoutExtension = StringUtil::slugify($fileNameWithoutExtension);
+                $filename = $fileNameWithoutExtension . $modifier  . '.' . $extension;
+            } else {
+                $filename = StringUtil::slugify($filename);
+            }
 
-			if (file_exists($path . '/' . $filename)) {
-				$fileParts = explode('.', $filename);
-				if (count($fileParts) > 1) {
-					$extension = end($fileParts);
-					array_pop($fileParts);
-					$fileNameWithoutExtension = implode('-', $fileParts);
-					$fileNameWithoutExtension .= '-copy';
-					$filename = $fileNameWithoutExtension . '.' . $extension;
-				} else {
-					$filename .= '-copy';
-				}
-				return $this->modifyName($path . '/' . $filename);
-			}
-			return $path . '/' . $filename;
-		}
+            if (file_exists($path . '/' . $filename)) {
+                $fileParts = explode('.', $filename);
+                if (count($fileParts) > 1) {
+                    $extension = end($fileParts);
+                    array_pop($fileParts);
+                    $fileNameWithoutExtension = implode('-', $fileParts);
+                    $fileNameWithoutExtension .= '-copy';
+                    $filename = $fileNameWithoutExtension . '.' . $extension;
+                } else {
+                    $filename .= '-copy';
+                }
+                return $this->modifyName($path . '/' . $filename);
+            }
+            return $path . '/' . $filename;
+        }
 
-		private function applyMethod($method, $imagePath, $width, $height, $modifier)
-		{
-			$method = 'CloudControl\Cms\\images\\methods\\' . $method;
-			$destination = $this->modifyName($imagePath, $modifier);
-			if (file_exists($imagePath)) {
-				$image = new Image();
-				$image->loadImage($imagePath);
-				$resize = new $method();
-				$resize->SetWidth($width);
-				$resize->SetHeight($height);
-				$resizedImageResource = $resize->Execute($image->getImageResource());
-				$resizedImage = new Image();
-				$resizedImage->loadImage($resizedImageResource);
-				$resizedImage->saveImage($destination, $resizedImage->getImageMimeType($imagePath), 80);
-				return basename($destination);
-			} else {
-				throw new \Exception('Image doesnt exist: ' . $imagePath);
-			}
-		}
-	}
+        private function applyMethod($method, $imagePath, $width, $height, $modifier)
+        {
+            $method = 'CloudControl\Cms\\images\\methods\\' . $method;
+            $destination = $this->modifyName($imagePath, $modifier);
+            if (file_exists($imagePath)) {
+                $image = new Image();
+                $image->loadImage($imagePath);
+                $resize = new $method();
+                $resize->SetWidth($width);
+                $resize->SetHeight($height);
+                $resizedImageResource = $resize->Execute($image->getImageResource());
+                $resizedImage = new Image();
+                $resizedImage->loadImage($resizedImageResource);
+                $resizedImage->saveImage($destination, $resizedImage->getImageMimeType($imagePath), 80);
+                return basename($destination);
+            } else {
+                throw new \Exception('Image doesnt exist: ' . $imagePath);
+            }
+        }
+    }
 }
\ No newline at end of file

src/images/methods/Resize.php

Indentation +60 added lines, -60 removed lines

@@ -14,73 +14,73 @@
     use CloudControl\Cms\images\IMethod;
 
     class Resize extends IMethod
-	{
-		protected $_width;
-		protected $_height;
-		protected $_preserveAspectRatio = true;
+    {
+        protected $_width;
+        protected $_height;
+        protected $_preserveAspectRatio = true;
 		
-		/**
-		 * Set the width
-		 *
-		 * @param  int $width
-		 * @return self
-		 */
-		public function SetWidth($width)
-		{
-			$this->_width = intval($width);
-			return $this;
-		}
+        /**
+         * Set the width
+         *
+         * @param  int $width
+         * @return self
+         */
+        public function SetWidth($width)
+        {
+            $this->_width = intval($width);
+            return $this;
+        }
 		
-		/**
-		 * Set the height
-		 *
-		 * @param  int $height
-		 * @return self
-		 */
-		public function SetHeight($height)
-		{
-			$this->_height = intval($height);
-			return $this;
-		}
+        /**
+         * Set the height
+         *
+         * @param  int $height
+         * @return self
+         */
+        public function SetHeight($height)
+        {
+            $this->_height = intval($height);
+            return $this;
+        }
 		
-		/**
-		 * Sets wheter or not the aspect ratio of the original
-		 * image needs to preserved
-		 *
-		 * @param  bool $bool
-		 * @return self
-		 */
-		public function SetPreserveAspectRatio($bool)
-		{
-			$this->_preserveAspectRatio = (bool) $bool;
-			return $this;
-		}
+        /**
+         * Sets wheter or not the aspect ratio of the original
+         * image needs to preserved
+         *
+         * @param  bool $bool
+         * @return self
+         */
+        public function SetPreserveAspectRatio($bool)
+        {
+            $this->_preserveAspectRatio = (bool) $bool;
+            return $this;
+        }
 		
-		public function Execute($imageResource)
-		{
-			// Define the origial width and height
-			$originalWidth = imagesx($imageResource);
-			$originalHeight = imagesy($imageResource);
+        public function Execute($imageResource)
+        {
+            // Define the origial width and height
+            $originalWidth = imagesx($imageResource);
+            $originalHeight = imagesy($imageResource);
 			
-			// Define the ratio and adjust the width and height
-			if ($this->_preserveAspectRatio) {
-				$ratio = min($this->_width/$originalWidth, $this->_height/$originalHeight);
-				$this->_width = $originalWidth * $ratio;
-				$this->_height = $originalHeight * $ratio;
-			}
+            // Define the ratio and adjust the width and height
+            if ($this->_preserveAspectRatio) {
+                $ratio = min($this->_width/$originalWidth, $this->_height/$originalHeight);
+                $this->_width = $originalWidth * $ratio;
+                $this->_height = $originalHeight * $ratio;
+            }
 			
-			// Create the new image
-			$new = imagecreatetruecolor($this->_width, $this->_height);
+            // Create the new image
+            $new = imagecreatetruecolor($this->_width, $this->_height);
 			
-			// Preserve transparency
-			imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
-			imagealphablending($new, false);
-			imagesavealpha($new, true);
+            // Preserve transparency
+            imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
+            imagealphablending($new, false);
+            imagesavealpha($new, true);
 			
-			// Do the actual resizing
-			imagecopyresampled($new, $imageResource, 0, 0, 0, 0, $this->_width, $this->_height, $originalWidth, $originalHeight);
+            // Do the actual resizing
+            imagecopyresampled($new, $imageResource, 0, 0, 0, 0, $this->_width, $this->_height, $originalWidth, $originalHeight);
 			
-			return $new;
-		}
-	}
+            return $new;
+        }
+    }
 }
\ No newline at end of file

src/images/methods/Watermark.php

Indentation +145 added lines, -145 removed lines

@@ -16,174 +16,174 @@
     use CloudControl\Cms\images\IMethod;
 
     class Watermark extends IMethod
-	{
-		protected $_x = 0;
-		protected $_y = 0;
-		protected $_transparency = 100;
+    {
+        protected $_x = 0;
+        protected $_y = 0;
+        protected $_transparency = 100;
 		
-		/**
-		 * @var Image
-		 */
-		protected $_watermark;
+        /**
+         * @var Image
+         */
+        protected $_watermark;
 	
-		protected function init()
-		{}
+        protected function init()
+        {}
 		
-		/**
-		 * Sets transparency for watermark
-		 *
-		 * @param  int $transparency
-		 * @return self
-		 */
-		public function SetTransparency($transparency)
-		{
-			$this->_transparency = intval($transparency);
-			return $this;
-		}
+        /**
+         * Sets transparency for watermark
+         *
+         * @param  int $transparency
+         * @return self
+         */
+        public function SetTransparency($transparency)
+        {
+            $this->_transparency = intval($transparency);
+            return $this;
+        }
 		
-		/**
-		 * Use build-in logic to position the watermark
-		 *
-		 * @param 	string $x
-		 * @param 	string $y
-		 * @return 	self
-		 */
-		public function SetPosition($x, $y)
-		{
-			$this->SetX($x);
-			$this->SetY($y);
-			return $this;
-		}
+        /**
+         * Use build-in logic to position the watermark
+         *
+         * @param 	string $x
+         * @param 	string $y
+         * @return 	self
+         */
+        public function SetPosition($x, $y)
+        {
+            $this->SetX($x);
+            $this->SetY($y);
+            return $this;
+        }
 		
-		/**
-		 * Use build-in logic to position the x of watermark
-		 *
-		 * @param 	resource $imageResource
-		 * @return 	self
-		 */
-		protected function calculateX($imageResource)
-		{
-			if (intval($this->_x) === $this->_x) return $this->_x;
+        /**
+         * Use build-in logic to position the x of watermark
+         *
+         * @param 	resource $imageResource
+         * @return 	self
+         */
+        protected function calculateX($imageResource)
+        {
+            if (intval($this->_x) === $this->_x) return $this->_x;
 			
-			$x = strtolower($this->_x);
+            $x = strtolower($this->_x);
 			
-			$imageWidth = imagesx($imageResource);
-			$watermarkWidth = imagesx($this->GetWatermark()->getImageResource());
+            $imageWidth = imagesx($imageResource);
+            $watermarkWidth = imagesx($this->GetWatermark()->getImageResource());
 			
-			if ($x == 'left') {
-				$x = 0;
-			} elseif ($x == 'center') {
-				$x = $imageWidth / 2 - ($watermarkWidth / 2);
-			} elseif ($x == 'right') {
-				$x = $imageWidth - $watermarkWidth;
-			}
-			return intval($x);
-		}
+            if ($x == 'left') {
+                $x = 0;
+            } elseif ($x == 'center') {
+                $x = $imageWidth / 2 - ($watermarkWidth / 2);
+            } elseif ($x == 'right') {
+                $x = $imageWidth - $watermarkWidth;
+            }
+            return intval($x);
+        }
 		
-		/**
-		 * Use build-in logic to position the y of watermark
-		 *
-		 * @param 	resource $imageResource
-		 * @return 	self
-		 */
-		public function calculateY($imageResource)
-		{
-			if (intval($this->_y) === $this->_y) return $this->_y;
+        /**
+         * Use build-in logic to position the y of watermark
+         *
+         * @param 	resource $imageResource
+         * @return 	self
+         */
+        public function calculateY($imageResource)
+        {
+            if (intval($this->_y) === $this->_y) return $this->_y;
 		
-			$y = strtolower($this->_y);
+            $y = strtolower($this->_y);
 			
-			$imageHeight = imagesy($imageResource);
-			$watermarkHeight = imagesy($this->GetWatermark()->getImageResource());
+            $imageHeight = imagesy($imageResource);
+            $watermarkHeight = imagesy($this->GetWatermark()->getImageResource());
 			
-			if ($y == 'top') {
-				$y = 0;
-			} elseif ($y == 'center') {
-				$y = $imageHeight / 2 - ($watermarkHeight / 2);
-			} elseif ($y == 'bottom') {
-				$y = $imageHeight - $watermarkHeight;
-			}
-			return intval($y);
-		}
+            if ($y == 'top') {
+                $y = 0;
+            } elseif ($y == 'center') {
+                $y = $imageHeight / 2 - ($watermarkHeight / 2);
+            } elseif ($y == 'bottom') {
+                $y = $imageHeight - $watermarkHeight;
+            }
+            return intval($y);
+        }
 
-		/**
-		 * Sets the image that will be used as watermark
-		 *
-		 * @param Image $image
-		 * @return Watermark
-		 */
-		public function SetWatermark(Image $image)
-		{
-			$this->_watermark = $image;
-			return $this;
-		}
+        /**
+         * Sets the image that will be used as watermark
+         *
+         * @param Image $image
+         * @return Watermark
+         */
+        public function SetWatermark(Image $image)
+        {
+            $this->_watermark = $image;
+            return $this;
+        }
 
-		/**
-		 * Returns the watermark.
-		 * Throws an Exception if it's not set or if it's not an \CloudControl\Cms\image\Image
-		 * @return \images\Image
-		 * @throws \Exception
-		 */
-		public function GetWatermark()
-		{
-			if ($this->_watermark == null) throw new \Exception('A watermark is not set. Please supply a \CloudControl\Cms\image\Image using $this->SetWatermark');
-			return $this->_watermark;
-		}
+        /**
+         * Returns the watermark.
+         * Throws an Exception if it's not set or if it's not an \CloudControl\Cms\image\Image
+         * @return \images\Image
+         * @throws \Exception
+         */
+        public function GetWatermark()
+        {
+            if ($this->_watermark == null) throw new \Exception('A watermark is not set. Please supply a \CloudControl\Cms\image\Image using $this->SetWatermark');
+            return $this->_watermark;
+        }
 		
-		/**
-		 * Set the x
-		 *
-		 * @param  int | string $x
-		 * @return self
-		 */
-		public function SetX($x)
-		{
-			$this->_x = $x;
-			return $this;
-		}
+        /**
+         * Set the x
+         *
+         * @param  int | string $x
+         * @return self
+         */
+        public function SetX($x)
+        {
+            $this->_x = $x;
+            return $this;
+        }
 		
-		/**
-		 * Set the y
-		 *
-		 * @param  int | string $y
-		 * @return self
-		 */
-		public function SetY($y)
-		{
-			$this->_y = $y;
-			return $this;
-		}
+        /**
+         * Set the y
+         *
+         * @param  int | string $y
+         * @return self
+         */
+        public function SetY($y)
+        {
+            $this->_y = $y;
+            return $this;
+        }
 		
-		public function Execute($imageResource)
-		{
-			$watermark = $this->GetWatermark();
-			$watermarkWidth  = imagesx($watermark->getImageResource());
-			$watermarkHeight = imagesy($watermark->getImageResource());
+        public function Execute($imageResource)
+        {
+            $watermark = $this->GetWatermark();
+            $watermarkWidth  = imagesx($watermark->getImageResource());
+            $watermarkHeight = imagesy($watermark->getImageResource());
 			
-			$x = $this->calculateX($imageResource);
-			$y = $this->calculateY($imageResource);
+            $x = $this->calculateX($imageResource);
+            $y = $this->calculateY($imageResource);
 			
-			$imageWidth = imagesx($imageResource);
-			$imageHeight = imagesy($imageResource);
+            $imageWidth = imagesx($imageResource);
+            $imageHeight = imagesy($imageResource);
 			
-			$new = imagecreatetruecolor($imageWidth, $imageHeight);
+            $new = imagecreatetruecolor($imageWidth, $imageHeight);
 			
-			// Preserve transparency of the image
-			imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
-			imagealphablending($new, false);
-			imagesavealpha($new, true);
+            // Preserve transparency of the image
+            imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
+            imagealphablending($new, false);
+            imagesavealpha($new, true);
 			
-			// Preserve transparency of the watermark
-			imagecolortransparent($watermark->getImageResource(), imagecolorallocatealpha($watermark->getImageResource(), 0, 0, 0, 127));
-			imagealphablending($watermark->getImageResource(), false);
-			imagesavealpha($watermark->getImageResource(), true);
+            // Preserve transparency of the watermark
+            imagecolortransparent($watermark->getImageResource(), imagecolorallocatealpha($watermark->getImageResource(), 0, 0, 0, 127));
+            imagealphablending($watermark->getImageResource(), false);
+            imagesavealpha($watermark->getImageResource(), true);
 			
-			imagealphablending($new, true);
-			imagealphablending($watermark->getImageResource(), true);
+            imagealphablending($new, true);
+            imagealphablending($watermark->getImageResource(), true);
 			
-			imagecopy($new, $imageResource, 0, 0, 0, 0, $imageWidth, $imageHeight);
-			imagecopymerge($new, $watermark->getImageResource(), $x, $y, 0, 0, $watermarkWidth, $watermarkHeight, $this->_transparency);
+            imagecopy($new, $imageResource, 0, 0, 0, 0, $imageWidth, $imageHeight);
+            imagecopymerge($new, $watermark->getImageResource(), $x, $y, 0, 0, $watermarkWidth, $watermarkHeight, $this->_transparency);
 			
-			return $new;
-		}
-	}
+            return $new;
+        }
+    }
 }
\ No newline at end of file

src/images/methods/Crop.php

Indentation +95 added lines, -95 removed lines

@@ -14,114 +14,114 @@
     use CloudControl\Cms\images\IMethod;
 
     class Crop extends IMethod
-	{
-		protected $_width;
-		protected $_height;
-		protected $_x;
-		protected $_y;
+    {
+        protected $_width;
+        protected $_height;
+        protected $_x;
+        protected $_y;
 		
-		protected $_destWidth;
-		protected $_destHeight;
-		protected $_destX = 0.0;
-		protected $_destY = 0.0;
+        protected $_destWidth;
+        protected $_destHeight;
+        protected $_destX = 0.0;
+        protected $_destY = 0.0;
 
-		/**
-		 * @var null|array
-		 */
-		protected $_backgroundColor = null;
+        /**
+         * @var null|array
+         */
+        protected $_backgroundColor = null;
 	
-		public function init()
-		{}
+        public function init()
+        {}
 		
-		/**
-		 * Set the width
-		 *
-		 * @param  int $width
-		 * @return self
-		 */
-		public function SetWidth($width)
-		{
-			$this->_width = intval($width);
-			$this->_destWidth = intval($width);
-			return $this;
-		}
+        /**
+         * Set the width
+         *
+         * @param  int $width
+         * @return self
+         */
+        public function SetWidth($width)
+        {
+            $this->_width = intval($width);
+            $this->_destWidth = intval($width);
+            return $this;
+        }
 		
-		/**
-		 * Set the height
-		 *
-		 * @param  int $height
-		 * @return self
-		 */
-		public function SetHeight($height)
-		{
-			$this->_height = intval($height);
-			$this->_destHeight = intval($height);
-			return $this;
-		}
+        /**
+         * Set the height
+         *
+         * @param  int $height
+         * @return self
+         */
+        public function SetHeight($height)
+        {
+            $this->_height = intval($height);
+            $this->_destHeight = intval($height);
+            return $this;
+        }
 		
-		/**
-		 * Set the x
-		 *
-		 * @param  int $x
-		 * @return self
-		 */
-		public function SetX($x)
-		{
-			$this->_x = $x;
-			return $this;
-		}
+        /**
+         * Set the x
+         *
+         * @param  int $x
+         * @return self
+         */
+        public function SetX($x)
+        {
+            $this->_x = $x;
+            return $this;
+        }
 		
-		/**
-		 * Set the y
-		 *
-		 * @param  int $y
-		 * @return self
-		 */
-		public function SetY($y)
-		{
-			$this->_y = $y;
-			return $this;
-		}
+        /**
+         * Set the y
+         *
+         * @param  int $y
+         * @return self
+         */
+        public function SetY($y)
+        {
+            $this->_y = $y;
+            return $this;
+        }
 
-		/**
-		 * If neccesary, fill the background color
-		 * with this color
-		 *
-		 * @param int $r Red
-		 * @param int $g Green
-		 * @param int $b Blue
-		 *
-		 * @return $this
-		 */
-		public function FillBackground($r, $g, $b)
-		{
-			$this->_backgroundColor = array(intval($r), intval($g), intval($b));
-			return $this;
-		}
+        /**
+         * If neccesary, fill the background color
+         * with this color
+         *
+         * @param int $r Red
+         * @param int $g Green
+         * @param int $b Blue
+         *
+         * @return $this
+         */
+        public function FillBackground($r, $g, $b)
+        {
+            $this->_backgroundColor = array(intval($r), intval($g), intval($b));
+            return $this;
+        }
 
-		/**
-		 * @param resource $imageResource
-		 *
-		 * @return resource
-		 */
-		public function Execute($imageResource)
-		{
-			// Create the new image
-			$new = imagecreatetruecolor($this->_width, $this->_height);
+        /**
+         * @param resource $imageResource
+         *
+         * @return resource
+         */
+        public function Execute($imageResource)
+        {
+            // Create the new image
+            $new = imagecreatetruecolor($this->_width, $this->_height);
 			
-			if ($this->_backgroundColor !== null) {
-				$fill = imagecolorallocate($new, $this->_backgroundColor[0], $this->_backgroundColor[1], $this->_backgroundColor[2]);
-				imagefill($new, 0, 0, $fill);
-			}
+            if ($this->_backgroundColor !== null) {
+                $fill = imagecolorallocate($new, $this->_backgroundColor[0], $this->_backgroundColor[1], $this->_backgroundColor[2]);
+                imagefill($new, 0, 0, $fill);
+            }
 
-			// Preserve transparency
-			imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
+            // Preserve transparency
+            imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
             imagealphablending($new, false);
             imagesavealpha($new, true);
 			
-			imagecopyresampled($new, $imageResource, $this->_destX, $this->_destY, $this->_x, $this->_y, $this->_destWidth, $this->_destHeight, $this->_destWidth, $this->_destHeight);
+            imagecopyresampled($new, $imageResource, $this->_destX, $this->_destY, $this->_x, $this->_y, $this->_destWidth, $this->_destHeight, $this->_destWidth, $this->_destHeight);
 			
-			return $new;
-		}
-	}
+            return $new;
+        }
+    }
 }
\ No newline at end of file

src/images/methods/SmartCrop.php

Indentation +46 added lines, -46 removed lines

@@ -10,62 +10,62 @@
  
 namespace CloudControl\Cms\images\methods
 {
-	class SmartCrop extends Crop
-	{
-		/**
-		 * Use build-in logic to position the smartcrop
-		 *
-		 * @param 	string $x
-		 * @param 	string $y
-		 * @return 	self
-		 */
-		public function SetPosition($x, $y)
-		{
-			$this->SetX($x);
-			$this->SetY($y);
-			return $this;
-		}
+    class SmartCrop extends Crop
+    {
+        /**
+         * Use build-in logic to position the smartcrop
+         *
+         * @param 	string $x
+         * @param 	string $y
+         * @return 	self
+         */
+        public function SetPosition($x, $y)
+        {
+            $this->SetX($x);
+            $this->SetY($y);
+            return $this;
+        }
 	
-		public function Execute($imageResource)
-		{
-			// Define the origial width and height
-			$originalWidth = imagesx($imageResource);
-			$originalHeight = imagesy($imageResource);
+        public function Execute($imageResource)
+        {
+            // Define the origial width and height
+            $originalWidth = imagesx($imageResource);
+            $originalHeight = imagesy($imageResource);
 			
-			// Define the ratios
-			$wRatio = $originalWidth / $this->_width;
-			$hRatio = $originalHeight / $this->_height;
+            // Define the ratios
+            $wRatio = $originalWidth / $this->_width;
+            $hRatio = $originalHeight / $this->_height;
 			
-			// Define which ratio will be used, depending on which is the biggest side
-			$ratio = $wRatio < $hRatio ? $wRatio : $hRatio;
-			if ($ratio < 1) $ratio = 1;
+            // Define which ratio will be used, depending on which is the biggest side
+            $ratio = $wRatio < $hRatio ? $wRatio : $hRatio;
+            if ($ratio < 1) $ratio = 1;
 			
-			// Calculate the destination width, height, x and y
-			$this->_destWidth = $originalWidth / $ratio;
-			$this->_destHeight = $originalHeight / $ratio;
-			$this->_destX = ($this->_width - $this->_destWidth) / 2;
-			$this->_destY = ($this->_height - $this->_destHeight) / 2;
+            // Calculate the destination width, height, x and y
+            $this->_destWidth = $originalWidth / $ratio;
+            $this->_destHeight = $originalHeight / $ratio;
+            $this->_destX = ($this->_width - $this->_destWidth) / 2;
+            $this->_destY = ($this->_height - $this->_destHeight) / 2;
 			
-			// Define the origial width and height
-			$originalWidth = imagesx($imageResource);
-			$originalHeight = imagesy($imageResource);
+            // Define the origial width and height
+            $originalWidth = imagesx($imageResource);
+            $originalHeight = imagesy($imageResource);
 			
-			// Create the new image
-			$new = imagecreatetruecolor($this->_width, $this->_height);
+            // Create the new image
+            $new = imagecreatetruecolor($this->_width, $this->_height);
 			
-			if ($this->_backgroundColor !== null) {
-				$fill = imagecolorallocate($new, $this->_backgroundColor[0], $this->_backgroundColor[1], $this->_backgroundColor[2]);
-				imagefill($new, 0, 0, $fill);
-			}
+            if ($this->_backgroundColor !== null) {
+                $fill = imagecolorallocate($new, $this->_backgroundColor[0], $this->_backgroundColor[1], $this->_backgroundColor[2]);
+                imagefill($new, 0, 0, $fill);
+            }
 
-			// Preserve transparency
-			imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
+            // Preserve transparency
+            imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
             imagealphablending($new, false);
             imagesavealpha($new, true);
 			
-			imagecopyresampled($new, $imageResource, $this->_destX, $this->_destY, $this->_x, $this->_y, $this->_destWidth, $this->_destHeight, $originalWidth, $originalHeight);
+            imagecopyresampled($new, $imageResource, $this->_destX, $this->_destY, $this->_x, $this->_y, $this->_destWidth, $this->_destHeight, $originalWidth, $originalHeight);
 			
-			return $new;
-		}
-	}
+            return $new;
+        }
+    }
 }
\ No newline at end of file

src/images/methods/Grayscale.php

Indentation +12 added lines, -12 removed lines

@@ -12,18 +12,18 @@
     use CloudControl\Cms\images\IMethod;
 
     class Grayscale extends IMethod
-	{		
-		public function Execute($imageResource)
-		{			
-			// Preserve transparency
-			imagecolortransparent($imageResource, imagecolorallocatealpha($imageResource, 0, 0, 0, 127));
-			imagealphablending($imageResource, false);
-			imagesavealpha($imageResource, true);
+    {		
+        public function Execute($imageResource)
+        {			
+            // Preserve transparency
+            imagecolortransparent($imageResource, imagecolorallocatealpha($imageResource, 0, 0, 0, 127));
+            imagealphablending($imageResource, false);
+            imagesavealpha($imageResource, true);
 			
-			// Make grayscale
-			imagefilter($imageResource, IMG_FILTER_GRAYSCALE);
+            // Make grayscale
+            imagefilter($imageResource, IMG_FILTER_GRAYSCALE);
 			
-			return $imageResource;
-		}
-	}
+            return $imageResource;
+        }
+    }
 }
\ No newline at end of file

src/images/methods/BoxCrop.php

Indentation +26 added lines, -26 removed lines

@@ -10,36 +10,36 @@
  
 namespace CloudControl\Cms\images\methods
 {
-	class BoxCrop extends Crop
-	{
-		/**
-		 * @param resource $imageResource
-		 * @return resource
+    class BoxCrop extends Crop
+    {
+        /**
+         * @param resource $imageResource
+         * @return resource
          */
-		public function Execute($imageResource)
-		{
-			// Define the origial width and height
-			$originalWidth = imagesx($imageResource);
-			$originalHeight = imagesy($imageResource);
+        public function Execute($imageResource)
+        {
+            // Define the origial width and height
+            $originalWidth = imagesx($imageResource);
+            $originalHeight = imagesy($imageResource);
 			
-			// Define the ratios
-			$wRatio = $this->_width / $originalWidth;
-			$hRatio = $this->_height / $originalHeight;
+            // Define the ratios
+            $wRatio = $this->_width / $originalWidth;
+            $hRatio = $this->_height / $originalHeight;
 			
-			// Define which ratio will be used, depending on which is the smallest side
-			$ratio = min($hRatio, $wRatio);
-			if($ratio > 1) $ratio = 1;
+            // Define which ratio will be used, depending on which is the smallest side
+            $ratio = min($hRatio, $wRatio);
+            if($ratio > 1) $ratio = 1;
 			
-			// Define sizes
-			$this->_destWidth = floor($originalWidth * $ratio);
-			$this->_destHeight = floor($originalHeight * $ratio);
+            // Define sizes
+            $this->_destWidth = floor($originalWidth * $ratio);
+            $this->_destHeight = floor($originalHeight * $ratio);
 			
-			// Define margins
-			$this->_destX = floor(($this->_width  - $this->_destWidth) / 2);
-			$this->_destY = floor(($this->_height - $this->_destHeight) / 2);
+            // Define margins
+            $this->_destX = floor(($this->_width  - $this->_destWidth) / 2);
+            $this->_destY = floor(($this->_height - $this->_destHeight) / 2);
 			
-			// Execute the Crop method with the given parameters
-			return parent::Execute($imageResource);
-		}
-	}
+            // Execute the Crop method with the given parameters
+            return parent::Execute($imageResource);
+        }
+    }
 }
\ No newline at end of file