jenskooij / cloudcontrol

src/components/cms/FilesRouting.php

Doc Comments +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
 	}
 
 	/**
-	 * @param $request
+	 * @param Request $request
 	 * @param CmsComponent $cmsComponent
 	 */
 	private function newRoute($request, $cmsComponent)
@@ -83,7 +83,7 @@ 
 	}
 
 	/**
-	 * @param $request
+	 * @param Request $request
 	 * @param CmsComponent $cmsComponent
 	 */
 	private function deleteRoute($request, $cmsComponent)

Spacing +8 added lines, -8 removed lines

@@ -40,20 +40,20 @@ 
 	{
 		$file = $cmsComponent->storage->getFiles()->getFileByName($slug);
 		$path = realpath($cmsComponent->storage->getFiles()->getFilesDir());
-		$quoted = sprintf('"%s"', addcslashes(basename($path . '/' . $file->file), '"\\'));
-		$size = filesize($path . '/' . $file->file);
+		$quoted = sprintf('"%s"', addcslashes(basename($path.'/'.$file->file), '"\\'));
+		$size = filesize($path.'/'.$file->file);
 
 		header('Content-Description: File Transfer');
-		header('Content-Type: ' . $file->type);
-		header('Content-Disposition: attachment; filename=' . $quoted);
+		header('Content-Type: '.$file->type);
+		header('Content-Disposition: attachment; filename='.$quoted);
 		header('Content-Transfer-Encoding: binary');
 		header('Connection: Keep-Alive');
 		header('Expires: 0');
 		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
 		header('Pragma: public');
-		header('Content-Length: ' . $size);
+		header('Content-Length: '.$size);
 
-		readfile($path . '/' . $file->file);
+		readfile($path.'/'.$file->file);
 		exit;
 	}
 
@@ -77,7 +77,7 @@ 
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_FILES);
 		if (isset($_FILES[CmsComponent::FILES_PARAMETER_FILE])) {
 			$cmsComponent->storage->getFiles()->addFile($_FILES[CmsComponent::FILES_PARAMETER_FILE]);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/files');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/files');
 			exit;
 		}
 	}
@@ -89,7 +89,7 @@ 
 	private function deleteRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->getFiles()->deleteFileByName($request::$get[CmsComponent::FILES_PARAMETER_FILE]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/files');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/files');
 		exit;
 	}
 

src/components/FormComponent.php

Doc Comments +4 added lines, -4 removed lines

@@ -180,7 +180,7 @@ 
 	}
 
 	/**
-	 * @param \cc\Request $request
+	 * @param \CloudControl\Cms\cc\Request $request
 	 * @return array
 	 */
 	private function getPostValues($request)
@@ -291,7 +291,7 @@ 
 	}
 
 	/**
-	 * @return \cc\Request
+	 * @return \CloudControl\Cms\cc\Request
 	 */
 	private function setPathBackup()
 	{
@@ -305,7 +305,7 @@ 
 	}
 
 	/**
-	 * @param \cc\Request $request
+	 * @param \CloudControl\Cms\cc\Request $request
 	 */
 	private function resetPathBackup($request)
 	{
@@ -317,7 +317,7 @@ 
 	}
 
 	/**
-	 * @param $form
+	 * @param string|null $form
 	 */
 	private function setFormParameter($form)
 	{

Spacing +3 added lines, -3 removed lines

@@ -162,7 +162,7 @@ 
 		if (isset($_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID])) {
 			$this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID];
 		} else {
-			$_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] = (string)microtime(true);
+			$_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] = (string) microtime(true);
 			$_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName]['submitted'] = false;
 			$this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID];
 		}
@@ -190,7 +190,7 @@ 
 		$postValues = $request::$post;
 		$postValues[self::PARAMETER_DOCUMENT_TYPE] = $this->documentType;
 		$postValues[self::GET_PARAMETER_PATH] = $this->responseFolder;
-		$postValues['title'] = date('r') . ' - From: ' . $request::$requestUri;
+		$postValues['title'] = date('r').' - From: '.$request::$requestUri;
 
 		return $postValues;
 	}
@@ -325,7 +325,7 @@ 
 	private function setFormParameter($form)
 	{
 		if ($this->isFormSubmitted($this->request) || $this->isSubmitAllowed() === false) {
-			$this->parameters[$this->formParameterName] = '<a name="' . $this->formId . '"></a>' . $this->thankYouMessage;
+			$this->parameters[$this->formParameterName] = '<a name="'.$this->formId.'"></a>'.$this->thankYouMessage;
 		} else {
 			$this->parameters[$this->formParameterName] = $form;
 		}

src/images/Image.php

Doc Comments +9 added lines, -9 removed lines

@@ -76,7 +76,7 @@ 
 		 * @param string $imagePath
 		 * @param bool   $getExtension
 		 *
-		 * @return bool|int|string
+		 * @return integer
 		 */
 		public function getImageMimeType($imagePath, $getExtension = false)
 		{
@@ -149,7 +149,7 @@ 
 		}
 
 		/**
-		 * @param $pathToBitmapFile
+		 * @param string $pathToBitmapFile
 		 *
 		 * @return string
 		 */
@@ -165,7 +165,7 @@ 
 		}
 
 		/**
-		 * @param $header
+		 * @param string $header
 		 *
 		 * @return array
 		 */
@@ -195,14 +195,14 @@ 
 		 * 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 integer $bodySize
+		 * @param integer $x
 		 * @param $width
-		 * @param $usePadding
-		 * @param $y
+		 * @param boolean $usePadding
+		 * @param integer $y
 		 * @param $height
-		 * @param $body
-		 * @param $image
+		 * @param string $body
+		 * @param resource $image
 		 */
 		private function loopThroughBodyAndCalculatePixels($bodySize, $x, $width, $usePadding, $y, $height, $body, $image)
 		{

Spacing +6 added lines, -6 removed lines

@@ -35,7 +35,7 @@ 
 			} 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>');
+				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>');
 			}
 		}
 
@@ -179,9 +179,9 @@ 
 				//    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]);
+				$width = hexdec($header_parts[19].$header_parts[18]);
 				//    Get the height        4 bytes
-				$height = hexdec($header_parts[23] . $header_parts[22]);
+				$height = hexdec($header_parts[23].$header_parts[22]);
 				//    Unset the header params
 				unset($header_parts);
 
@@ -226,9 +226,9 @@ 
 				}
 				//    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]);
+				$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);

src/storage/storage/ImagesStorage.php

Doc Comments +4 added lines

@@ -13,6 +13,10 @@
 {
     protected $imagesDir;
 
+    /**
+     * @param \CloudControl\Cms\storage\Repository $repository
+     * @param string $imagesDir
+     */
     public function __construct($repository, $imagesDir)
     {
         parent::__construct($repository);

Indentation +120 added lines, -120 removed lines

@@ -11,124 +11,124 @@
 
 class ImagesStorage extends AbstractStorage
 {
-    protected $imagesDir;
-
-    public function __construct($repository, $imagesDir)
-    {
-        parent::__construct($repository);
-        $this->imagesDir = $imagesDir;
-    }
-
-
-    /**
-     * @var ImageSetStorage
-     */
-    protected $imageSet;
-
-    /**
-     * Get all images
-     *
-     * @return array
-     */
-    public function getImages()
-    {
-        return $this->repository->images;
-    }
-
-    /**
-     * @param $postValues
-     *
-     * @throws \Exception
-     */
-    public function addImage($postValues)
-    {
-        $destinationPath = $this->getDestinationPath();
-
-        $filename = $this->validateFilename($postValues['name'], $destinationPath);
-        $destination = $destinationPath . DIRECTORY_SEPARATOR . $filename;
-
-        if ($postValues['error'] != '0') {
-            throw new \Exception('Error uploading file. Error code: ' . $postValues['error']);
-        }
-
-        if (move_uploaded_file($postValues['tmp_name'], $destination)) {
-            $imageResizer = new ImageResizer($this->getImageSet()->getImageSet());
-            $fileNames = $imageResizer->applyImageSetToImage($destination);
-            $fileNames['original'] = $filename;
-            $imageObject = ImageFactory::createImageFromPostValues($postValues, $filename, $fileNames);
-
-            $images = $this->repository->images;
-            $images[] = $imageObject;
-            $this->repository->images = $images;
-
-            $this->save();
-        } else {
-            throw new \Exception('Error moving uploaded file');
-        }
-    }
-
-    /**
-     * Delete image by name
-     * @param $filename
-     */
-    public function deleteImageByName($filename)
-    {
-        $destinationPath = $this->getDestinationPath();
-
-        $images = $this->getImages();
-
-        foreach ($images as $key => $image) {
-            if ($image->file == $filename) {
-                foreach ($image->set as $imageSetFilename) {
-                    $destination = $destinationPath . '/' . $imageSetFilename;
-                    if (file_exists($destination)) {
-                        unlink($destination);
-                    } else {
-                        dump($destination);
-                    }
-                }
-                unset($images[$key]);
-            }
-        }
-
-        $this->repository->images = $images;
-        $this->save();
-    }
-
-    /**
-     * @param $filename
-     *
-     * @return null
-     */
-    public function getImageByName($filename)
-    {
-        $images = $this->getImages();
-        foreach ($images as $image) {
-            if ($image->file == $filename) {
-                return $image;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * @return \CloudControl\Cms\storage\storage\ImageSetStorage
-     */
-    private function getImageSet()
-    {
-        if (!$this->imageSet instanceof ImageSetStorage) {
-            $this->imageSet = new ImageSetStorage($this->repository);
-        }
-        return $this->imageSet;
-    }
-
-    /**
-     * @return bool|string
-     */
-    private function getDestinationPath()
-    {
-        $destinationPath = realpath($this->imagesDir . DIRECTORY_SEPARATOR);
-        return $destinationPath;
-    }
+	protected $imagesDir;
+
+	public function __construct($repository, $imagesDir)
+	{
+		parent::__construct($repository);
+		$this->imagesDir = $imagesDir;
+	}
+
+
+	/**
+	 * @var ImageSetStorage
+	 */
+	protected $imageSet;
+
+	/**
+	 * Get all images
+	 *
+	 * @return array
+	 */
+	public function getImages()
+	{
+		return $this->repository->images;
+	}
+
+	/**
+	 * @param $postValues
+	 *
+	 * @throws \Exception
+	 */
+	public function addImage($postValues)
+	{
+		$destinationPath = $this->getDestinationPath();
+
+		$filename = $this->validateFilename($postValues['name'], $destinationPath);
+		$destination = $destinationPath . DIRECTORY_SEPARATOR . $filename;
+
+		if ($postValues['error'] != '0') {
+			throw new \Exception('Error uploading file. Error code: ' . $postValues['error']);
+		}
+
+		if (move_uploaded_file($postValues['tmp_name'], $destination)) {
+			$imageResizer = new ImageResizer($this->getImageSet()->getImageSet());
+			$fileNames = $imageResizer->applyImageSetToImage($destination);
+			$fileNames['original'] = $filename;
+			$imageObject = ImageFactory::createImageFromPostValues($postValues, $filename, $fileNames);
+
+			$images = $this->repository->images;
+			$images[] = $imageObject;
+			$this->repository->images = $images;
+
+			$this->save();
+		} else {
+			throw new \Exception('Error moving uploaded file');
+		}
+	}
+
+	/**
+	 * Delete image by name
+	 * @param $filename
+	 */
+	public function deleteImageByName($filename)
+	{
+		$destinationPath = $this->getDestinationPath();
+
+		$images = $this->getImages();
+
+		foreach ($images as $key => $image) {
+			if ($image->file == $filename) {
+				foreach ($image->set as $imageSetFilename) {
+					$destination = $destinationPath . '/' . $imageSetFilename;
+					if (file_exists($destination)) {
+						unlink($destination);
+					} else {
+						dump($destination);
+					}
+				}
+				unset($images[$key]);
+			}
+		}
+
+		$this->repository->images = $images;
+		$this->save();
+	}
+
+	/**
+	 * @param $filename
+	 *
+	 * @return null
+	 */
+	public function getImageByName($filename)
+	{
+		$images = $this->getImages();
+		foreach ($images as $image) {
+			if ($image->file == $filename) {
+				return $image;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * @return \CloudControl\Cms\storage\storage\ImageSetStorage
+	 */
+	private function getImageSet()
+	{
+		if (!$this->imageSet instanceof ImageSetStorage) {
+			$this->imageSet = new ImageSetStorage($this->repository);
+		}
+		return $this->imageSet;
+	}
+
+	/**
+	 * @return bool|string
+	 */
+	private function getDestinationPath()
+	{
+		$destinationPath = realpath($this->imagesDir . DIRECTORY_SEPARATOR);
+		return $destinationPath;
+	}
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -45,10 +45,10 @@ 
         $destinationPath = $this->getDestinationPath();
 
         $filename = $this->validateFilename($postValues['name'], $destinationPath);
-        $destination = $destinationPath . DIRECTORY_SEPARATOR . $filename;
+        $destination = $destinationPath.DIRECTORY_SEPARATOR.$filename;
 
         if ($postValues['error'] != '0') {
-            throw new \Exception('Error uploading file. Error code: ' . $postValues['error']);
+            throw new \Exception('Error uploading file. Error code: '.$postValues['error']);
         }
 
         if (move_uploaded_file($postValues['tmp_name'], $destination)) {
@@ -80,7 +80,7 @@ 
         foreach ($images as $key => $image) {
             if ($image->file == $filename) {
                 foreach ($image->set as $imageSetFilename) {
-                    $destination = $destinationPath . '/' . $imageSetFilename;
+                    $destination = $destinationPath.'/'.$imageSetFilename;
                     if (file_exists($destination)) {
                         unlink($destination);
                     } else {
@@ -128,7 +128,7 @@ 
      */
     private function getDestinationPath()
     {
-        $destinationPath = realpath($this->imagesDir . DIRECTORY_SEPARATOR);
+        $destinationPath = realpath($this->imagesDir.DIRECTORY_SEPARATOR);
         return $destinationPath;
     }
 }
\ No newline at end of file

src/install/_index.php

Indentation +1 added lines, -1 removed lines

@@ -25,5 +25,5 @@
 \CloudControl\Cms\CloudControl::run();
 
 if (php_sapi_name() != "cli") {
-    ob_end_flush();
+	ob_end_flush();
 }
\ No newline at end of file

src/images/methods/Watermark.php

Indentation +3 added lines, -3 removed lines

@@ -12,10 +12,10 @@
 namespace CloudControl\Cms\images\methods
 {
 
-    use CloudControl\Cms\images\Image;
-    use CloudControl\Cms\images\IMethod;
+	use CloudControl\Cms\images\Image;
+	use CloudControl\Cms\images\IMethod;
 
-    class Watermark extends IMethod
+	class Watermark extends IMethod
 	{
 		protected $_x = 0;
 		protected $_y = 0;

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 +4 added lines, -4 removed lines

@@ -11,9 +11,9 @@ 
 namespace CloudControl\Cms\images\methods
 {
 
-    use CloudControl\Cms\images\IMethod;
+	use CloudControl\Cms\images\IMethod;
 
-    class Crop extends IMethod
+	class Crop extends IMethod
 	{
 		protected $_width;
 		protected $_height;
@@ -116,8 +116,8 @@ 
 
 			// Preserve transparency
 			imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
-            imagealphablending($new, false);
-            imagesavealpha($new, true);
+			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);
 			

src/images/methods/Resize.php

Indentation +2 added lines, -2 removed lines

@@ -11,9 +11,9 @@
 namespace CloudControl\Cms\images\methods
 {
 
-    use CloudControl\Cms\images\IMethod;
+	use CloudControl\Cms\images\IMethod;
 
-    class Resize extends IMethod
+	class Resize extends IMethod
 	{
 		protected $_width;
 		protected $_height;

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 			
 			// Define the ratio and adjust the width and height
 			if ($this->_preserveAspectRatio) {
-				$ratio = min($this->_width/$originalWidth, $this->_height/$originalHeight);
+				$ratio = min($this->_width / $originalWidth, $this->_height / $originalHeight);
 				$this->_width = $originalWidth * $ratio;
 				$this->_height = $originalHeight * $ratio;
 			}

src/images/methods/SmartCrop.php

Indentation +2 added lines, -2 removed lines

@@ -62,8 +62,8 @@
 
 			// Preserve transparency
 			imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
-            imagealphablending($new, false);
-            imagesavealpha($new, true);
+			imagealphablending($new, false);
+			imagesavealpha($new, true);
 			
 			imagecopyresampled($new, $imageResource, $this->_destX, $this->_destY, $this->_x, $this->_y, $this->_destWidth, $this->_destHeight, $originalWidth, $originalHeight);
 			

Braces +3 added lines, -1 removed lines

@@ -40,7 +40,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;