jenskooij / cloudcontrol

src/CloudControl.php

Spacing +23 added lines, -23 removed lines

@@ -40,9 +40,9 @@ 
         $event->getIO()->write("");
 
         $vendorDir = $event->getComposer()->getConfig()->get('vendor-dir');
-        $rootDir = realpath($vendorDir . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR);
+        $rootDir = realpath($vendorDir.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR);
 
-        $baseConfigTargetPath = $rootDir . DIRECTORY_SEPARATOR . 'config.json';
+        $baseConfigTargetPath = $rootDir.DIRECTORY_SEPARATOR.'config.json';
         $configObject = self::getConfig($event, $baseConfigTargetPath);
 
         $configObject->{'vendorDir'} = realpath($vendorDir);
@@ -50,13 +50,13 @@ 
         $configObject->{'templateDir'} = self::createDir($event, $rootDir, 'templates');
         $configObject->{'storageDir'} = self::createDir($event, $rootDir, $configObject->{'storageDir'});
         $configObject->{'publicDir'} = self::createDir($event, $rootDir, 'public');
-        $configObject->{'jsDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'js');
-        $configObject->{'cssDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'css');
-        $configObject->{'imagesDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'images');
-        $configObject->{'filesDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'files');
+        $configObject->{'jsDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'}.'js');
+        $configObject->{'cssDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'}.'css');
+        $configObject->{'imagesDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'}.'images');
+        $configObject->{'filesDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'}.'files');
 
-        $baseStorageDefaultPath = __DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_storage.json';
-        $baseStorageSqlPath = __DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_storage.sql';
+        $baseStorageDefaultPath = __DIR__.DIRECTORY_SEPARATOR.'install'.DIRECTORY_SEPARATOR.'_storage.json';
+        $baseStorageSqlPath = __DIR__.DIRECTORY_SEPARATOR.'install'.DIRECTORY_SEPARATOR.'_storage.sql';
 
         self::createStorage($configObject->{'storageDir'}, $baseStorageDefaultPath, $baseStorageSqlPath);
         self::saveConfig($event, $baseConfigTargetPath, $configObject);
@@ -87,12 +87,12 @@ 
     private static function saveConfig(Event $event, $baseConfigTargetPath, $configObject)
     {
         file_put_contents($baseConfigTargetPath, json_encode($configObject));
-        $event->getIO()->write("[INFO] Saved config to: " . $baseConfigTargetPath);
+        $event->getIO()->write("[INFO] Saved config to: ".$baseConfigTargetPath);
     }
 
     private static function copyInstallFile(Event $event, $sourceFileName, $destinationPath, $destinationFileName = null)
     {
-        $sourceFilePath = realpath(__DIR__ . DIRECTORY_SEPARATOR . 'install/_' . $sourceFileName);
+        $sourceFilePath = realpath(__DIR__.DIRECTORY_SEPARATOR.'install/_'.$sourceFileName);
 
 
         if ($destinationFileName === null) {
@@ -100,15 +100,15 @@ 
         }
 
         if (file_exists($sourceFilePath) && realpath($destinationPath) !== false) {
-            $destinationFullPath = realpath($destinationPath) . DIRECTORY_SEPARATOR . $destinationFileName;
+            $destinationFullPath = realpath($destinationPath).DIRECTORY_SEPARATOR.$destinationFileName;
             if (file_exists($destinationFullPath)) {
-                $event->getIO()->write("[INFO] File already exists: " . $destinationFullPath);
+                $event->getIO()->write("[INFO] File already exists: ".$destinationFullPath);
             } else {
                 copy($sourceFilePath, $destinationFullPath);
-                $event->getIO()->write("[INSTALL] Copied file: " . $sourceFileName . ' to ' . $destinationPath);
+                $event->getIO()->write("[INSTALL] Copied file: ".$sourceFileName.' to '.$destinationPath);
             }
         } else {
-            $event->getIO()->write("[ERROR] Couldnt copy file: " . $sourceFileName . ' to ' . $destinationPath);
+            $event->getIO()->write("[ERROR] Couldnt copy file: ".$sourceFileName.' to '.$destinationPath);
         }
     }
 
@@ -125,12 +125,12 @@ 
 
     private static function createDir(Event $event, $rootDir, $dirName)
     {
-        $dir = $rootDir . DIRECTORY_SEPARATOR . $dirName . DIRECTORY_SEPARATOR;
+        $dir = $rootDir.DIRECTORY_SEPARATOR.$dirName.DIRECTORY_SEPARATOR;
         if (!is_dir($dir)) {
             mkdir($dir);
-            $event->getIO()->write("[INSTALL] Created dir: " . $dir);
+            $event->getIO()->write("[INSTALL] Created dir: ".$dir);
         } else {
-            $event->getIO()->write("[INFO] Dir already exists: " . $dir);
+            $event->getIO()->write("[INFO] Dir already exists: ".$dir);
         }
         return self::getRelativePath($rootDir, $dir);
     }
@@ -141,7 +141,7 @@ 
      */
     private static function getConfig(Event $event, $configTargetPath)
     {
-        $baseConfigDefaultPath = realpath(__DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_config.json');
+        $baseConfigDefaultPath = realpath(__DIR__.DIRECTORY_SEPARATOR.'install'.DIRECTORY_SEPARATOR.'_config.json');
 
         if (file_exists($configTargetPath)) {
             $config = json_decode(file_get_contents($configTargetPath));
@@ -164,8 +164,8 @@ 
     private static function getRelativePath($from, $to)
     {
         // some compatibility fixes for Windows paths
-        $from = is_dir($from) ? rtrim($from, '\/') . DIRECTORY_SEPARATOR : $from;
-        $to = is_dir($to) ? rtrim($to, '\/') . DIRECTORY_SEPARATOR : $to;
+        $from = is_dir($from) ? rtrim($from, '\/').DIRECTORY_SEPARATOR : $from;
+        $to = is_dir($to) ? rtrim($to, '\/').DIRECTORY_SEPARATOR : $to;
         $from = str_replace('\\', DIRECTORY_SEPARATOR, $from);
         $to = str_replace('\\', DIRECTORY_SEPARATOR, $to);
 
@@ -185,8 +185,8 @@ 
      */
     private static function removePointerToCurrentDir($relPath)
     {
-        while (strpos($relPath, '.' . DIRECTORY_SEPARATOR . '.' . DIRECTORY_SEPARATOR) !== false) {
-            $relPath = str_replace('.' . DIRECTORY_SEPARATOR . '.' . DIRECTORY_SEPARATOR, '.' . DIRECTORY_SEPARATOR, $relPath);
+        while (strpos($relPath, '.'.DIRECTORY_SEPARATOR.'.'.DIRECTORY_SEPARATOR) !== false) {
+            $relPath = str_replace('.'.DIRECTORY_SEPARATOR.'.'.DIRECTORY_SEPARATOR, '.'.DIRECTORY_SEPARATOR, $relPath);
         }
         return $relPath;
     }
@@ -213,7 +213,7 @@ 
                     $relPath = array_pad($relPath, $padLength, '..');
                     break;
                 } else {
-                    $relPath[0] = '.' . DIRECTORY_SEPARATOR . $relPath[0];
+                    $relPath[0] = '.'.DIRECTORY_SEPARATOR.$relPath[0];
                 }
             }
         }

src/util/functions.php

Spacing +6 added lines, -6 removed lines

@@ -11,7 +11,7 @@ 
 {
     $debug_backtrace = current(debug_backtrace());
     if (PHP_SAPI == 'cli') {
-        echo 'Dump: ' . $debug_backtrace['file'] . ':' . $debug_backtrace['line'] . "\n";
+        echo 'Dump: '.$debug_backtrace['file'].':'.$debug_backtrace['line']."\n";
         foreach (func_get_args() as $data) {
             var_dump($data);
         }
@@ -29,7 +29,7 @@ 
 <body>
 END;
 
-        echo '<div>Dump: ' . $debug_backtrace['file'] . ':<b>' . $debug_backtrace['line'] . "</b></div>";
+        echo '<div>Dump: '.$debug_backtrace['file'].':<b>'.$debug_backtrace['line']."</b></div>";
         echo '<pre>';
         foreach (func_get_args() as $data) {
             echo "<code>";
@@ -55,9 +55,9 @@ 
 {
     if (!isset($_GET['unsanitized'])) {
         $search = array(
-            '/\>[^\S ]+/s',     // strip whitespaces after tags, except space
-            '/[^\S ]+\</s',     // strip whitespaces before tags, except space
-            '/(\s)+/s',         // shorten multiple whitespace sequences
+            '/\>[^\S ]+/s', // strip whitespaces after tags, except space
+            '/[^\S ]+\</s', // strip whitespaces before tags, except space
+            '/(\s)+/s', // shorten multiple whitespace sequences
             '/<!--(.|\s)*?-->/' // Remove HTML comments
         );
 
@@ -85,7 +85,7 @@ 
  */
 function utf8Convert($array)
 {
-    array_walk_recursive($array, function (&$item) {
+    array_walk_recursive($array, function(&$item) {
         if (!mb_detect_encoding($item, 'utf-8', true)) {
             $item = utf8_encode($item);
         }

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/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

Braces +9 added lines, -3 removed lines

@@ -63,7 +63,9 @@ 
 		 */
 		protected function calculateX($imageResource)
 		{
-			if (intval($this->_x) === $this->_x) return $this->_x;
+			if (intval($this->_x) === $this->_x) {
+			    return $this->_x;
+			}
 			
 			$x = strtolower($this->_x);
 			
@@ -88,7 +90,9 @@ 
 		 */
 		public function calculateY($imageResource)
 		{
-			if (intval($this->_y) === $this->_y) return $this->_y;
+			if (intval($this->_y) === $this->_y) {
+			    return $this->_y;
+			}
 		
 			$y = strtolower($this->_y);
 			
@@ -125,7 +129,9 @@ 
 		 */
 		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');
+			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;
 		}
 		

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

Braces +3 added lines, -1 removed lines

@@ -38,7 +38,9 @@
 			
 			// Define which ratio will be used, depending on which is the biggest side
 			$ratio = $wRatio < $hRatio ? $wRatio : $hRatio;
-			if ($ratio < 1) $ratio = 1;
+			if ($ratio < 1) {
+			    $ratio = 1;
+			}
 			
 			// Calculate the destination width, height, x and y
 			$this->_destWidth = $originalWidth / $ratio;

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/components/SearchComponent.php

Indentation +36 added lines, -36 removed lines

@@ -14,41 +14,41 @@
 
 class SearchComponent extends BaseComponent
 {
-	protected $searchParameterName = 'q';
-	protected $searchResultsParameterName = 'searchResults';
-
-	/**
-	 * @param \CloudControl\Cms\storage\Storage $storage
-	 */
-	public function run(Storage $storage)
-	{
-		parent::run($storage);
-
-		$this->checkParameters();
-
-		$request = $this->request;
-		if (isset($request::$get[$this->searchParameterName])) {
-			$query = $request::$get[$this->searchParameterName];
-			$filteredQuery = new CharacterFilter($query);
-			$tokenizer = new Tokenizer($filteredQuery);
-			$search = new Search($storage);
-			$results = $search->getDocumentsForTokenizer($tokenizer);
-			$this->parameters[$this->searchResultsParameterName] = $results;
-		}
-	}
-
-	/**
-	 * Checks to see if any parameters were defined in the cms and acts according
-	 */
-	private function checkParameters()
-	{
-		if (isset($this->parameters['searchParameterName'])) {
-			$this->searchParameterName = $this->parameters['searchParameterName'];
-		}
-
-		if (isset($this->parameters['searchResultsParameterName'])) {
-			$this->searchParameterName = $this->parameters['searchResultsParameterName'];
-		}
-	}
+    protected $searchParameterName = 'q';
+    protected $searchResultsParameterName = 'searchResults';
+
+    /**
+     * @param \CloudControl\Cms\storage\Storage $storage
+     */
+    public function run(Storage $storage)
+    {
+        parent::run($storage);
+
+        $this->checkParameters();
+
+        $request = $this->request;
+        if (isset($request::$get[$this->searchParameterName])) {
+            $query = $request::$get[$this->searchParameterName];
+            $filteredQuery = new CharacterFilter($query);
+            $tokenizer = new Tokenizer($filteredQuery);
+            $search = new Search($storage);
+            $results = $search->getDocumentsForTokenizer($tokenizer);
+            $this->parameters[$this->searchResultsParameterName] = $results;
+        }
+    }
+
+    /**
+     * Checks to see if any parameters were defined in the cms and acts according
+     */
+    private function checkParameters()
+    {
+        if (isset($this->parameters['searchParameterName'])) {
+            $this->searchParameterName = $this->parameters['searchParameterName'];
+        }
+
+        if (isset($this->parameters['searchResultsParameterName'])) {
+            $this->searchParameterName = $this->parameters['searchResultsParameterName'];
+        }
+    }
 
 }
\ No newline at end of file

src/components/DocumentFolderComponent.php

Indentation +35 added lines, -35 removed lines

@@ -10,39 +10,39 @@
 
 class DocumentFolderComponent extends BaseComponent
 {
-	const PARAMETER_DOCUMENT_FOLDER_PATH = 'documentFolderPath';
-	const PARAMETER_DOCUMENT_FOLDER_PARAMETER_NAME = 'documentFolderParameter';
-
-	protected $documentFolderParameterName = 'folder';
-	protected $documentFolderPath;
-
-	/**
-	 * @param Storage $storage
-	 *
-	 * @return mixed|void
-	 * @throws \Exception
-	 */
-	public function run(Storage $storage)
-	{
-		parent::run($storage);
-
-		$this->checkParameters();
-
-		$this->parameters[$this->documentFolderParameterName] = $this->storage->getDocumentFolderBySlug($this->documentFolderPath);
-	}
-
-
-	/**
-	 * Checks to see if any parameters were defined in the cms and acts according
-	 */
-	private function checkParameters()
-	{
-		if (isset($this->parameters[self::PARAMETER_DOCUMENT_FOLDER_PATH])) {
-			$this->documentFolderPath = $this->parameters[self::PARAMETER_DOCUMENT_FOLDER_PATH];
-		}
-
-		if (isset($this->parameters[self::PARAMETER_DOCUMENT_FOLDER_PARAMETER_NAME])) {
-			$this->documentFolderParameterName = $this->parameters[self::PARAMETER_DOCUMENT_FOLDER_PARAMETER_NAME];
-		}
-	}
+    const PARAMETER_DOCUMENT_FOLDER_PATH = 'documentFolderPath';
+    const PARAMETER_DOCUMENT_FOLDER_PARAMETER_NAME = 'documentFolderParameter';
+
+    protected $documentFolderParameterName = 'folder';
+    protected $documentFolderPath;
+
+    /**
+     * @param Storage $storage
+     *
+     * @return mixed|void
+     * @throws \Exception
+     */
+    public function run(Storage $storage)
+    {
+        parent::run($storage);
+
+        $this->checkParameters();
+
+        $this->parameters[$this->documentFolderParameterName] = $this->storage->getDocumentFolderBySlug($this->documentFolderPath);
+    }
+
+
+    /**
+     * Checks to see if any parameters were defined in the cms and acts according
+     */
+    private function checkParameters()
+    {
+        if (isset($this->parameters[self::PARAMETER_DOCUMENT_FOLDER_PATH])) {
+            $this->documentFolderPath = $this->parameters[self::PARAMETER_DOCUMENT_FOLDER_PATH];
+        }
+
+        if (isset($this->parameters[self::PARAMETER_DOCUMENT_FOLDER_PARAMETER_NAME])) {
+            $this->documentFolderParameterName = $this->parameters[self::PARAMETER_DOCUMENT_FOLDER_PARAMETER_NAME];
+        }
+    }
 }
\ No newline at end of file