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)

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)
 	{

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)
 		{

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

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;

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;

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);