jenskooij / cloudcontrol

src/cc/Application.php

Doc Comments +8 added lines, -2 removed lines

@@ -83,6 +83,9 @@ 
             $this->storage = new Storage($this->getStorageDir(), $this->config->imagesDir, $this->config->filesDir);
         }
 
+        /**
+         * @param Request $request
+         */
         private function redirectMatching($request)
         {
             $redirects = $this->storage->getRedirects()->getRedirects();
@@ -112,7 +115,7 @@ 
          * Loop through sitemap items and see if one matches the requestUri.
          * If it does, add it tot the matchedSitemapItems array
          *
-         * @param $request
+         * @param Request $request
          */
         private function sitemapMatching($request)
         {
@@ -177,7 +180,7 @@ 
          * @param array $parameters
          * @param \stdClass|null $matchedSitemapItem
          *
-         * @return mixed
+         * @return Component
          * @throws \Exception
          */
         private function getComponentObject($class = '', $template = '', $parameters = array(), $matchedSitemapItem)
@@ -268,6 +271,9 @@ 
             return $this->config->templateDir;
         }
 
+        /**
+         * @return string
+         */
         public function getStorageDir()
         {
             return $this->config->storageDir;

src/components/BaseComponent.php

Doc Comments +2 added lines, -2 removed lines

@@ -141,8 +141,8 @@
 		}
 
         /**
-         * @param $template
-         * @param null $application
+         * @param string $template
+         * @param null|Application $application
          * @return string
          */
         protected function getTemplatePath($template, $application=null)

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

src/cc/StringUtil.php

Braces +9 added lines, -6 removed lines

@@ -78,12 +78,15 @@
 	 */
 	public static function humanFileSize($size, $unit = "")
 	{
-		if ((!$unit && $size >= 1 << 30) || $unit == "GB")
-			return number_format($size / (1 << 30), 2) . "GB";
-		if ((!$unit && $size >= 1 << 20) || $unit == "MB")
-			return number_format($size / (1 << 20), 2) . "MB";
-		if ((!$unit && $size >= 1 << 10) || $unit == "KB")
-			return number_format($size / (1 << 10), 2) . "KB";
+		if ((!$unit && $size >= 1 << 30) || $unit == "GB") {
+					return number_format($size / (1 << 30), 2) . "GB";
+		}
+		if ((!$unit && $size >= 1 << 20) || $unit == "MB") {
+					return number_format($size / (1 << 20), 2) . "MB";
+		}
+		if ((!$unit && $size >= 1 << 10) || $unit == "KB") {
+					return number_format($size / (1 << 10), 2) . "KB";
+		}
 
 		return number_format($size) . " bytes";
 	}

src/images/methods/Watermark.php

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/SmartCrop.php

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;