@@ -13,6 +13,10 @@ |
||
13 | 13 | { |
14 | 14 | protected $imagesDir; |
15 | 15 | |
16 | + /** |
|
17 | + * @param \CloudControl\Cms\storage\Repository $repository |
|
18 | + * @param string $imagesDir |
|
19 | + */ |
|
16 | 20 | public function __construct($repository, $imagesDir) |
17 | 21 | { |
18 | 22 | parent::__construct($repository); |
@@ -14,8 +14,10 @@ |
||
14 | 14 | <? if (isset($dynamicBrick)) : |
15 | 15 | $fieldSlug = $field->slug; |
16 | 16 | $value = isset($dynamicBrick->fields->$fieldSlug) ? current($dynamicBrick->fields->$fieldSlug) : ''; |
17 | - else : |
|
17 | + else { |
|
18 | + : |
|
18 | 19 | $value = ''; |
20 | + } |
|
19 | 21 | endif ?> |
20 | 22 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> |
21 | 23 | <ul class="grid-wrapper sortable"> |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | } |
69 | 69 | |
70 | 70 | /** |
71 | - * @param $request |
|
71 | + * @param Request $request |
|
72 | 72 | * @param CmsComponent $cmsComponent |
73 | 73 | */ |
74 | 74 | private function newRoute($request, $cmsComponent) |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | } |
84 | 84 | |
85 | 85 | /** |
86 | - * @param $request |
|
86 | + * @param Request $request |
|
87 | 87 | * @param CmsComponent $cmsComponent |
88 | 88 | */ |
89 | 89 | private function deleteRoute($request, $cmsComponent) |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | * @param string $imagePath |
77 | 77 | * @param bool $getExtension |
78 | 78 | * |
79 | - * @return bool|int|string |
|
79 | + * @return integer |
|
80 | 80 | */ |
81 | 81 | public function getImageMimeType($imagePath, $getExtension = false) |
82 | 82 | { |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | } |
150 | 150 | |
151 | 151 | /** |
152 | - * @param $pathToBitmapFile |
|
152 | + * @param string $pathToBitmapFile |
|
153 | 153 | * |
154 | 154 | * @return string |
155 | 155 | */ |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | } |
166 | 166 | |
167 | 167 | /** |
168 | - * @param $header |
|
168 | + * @param string $header |
|
169 | 169 | * |
170 | 170 | * @return array |
171 | 171 | */ |
@@ -195,14 +195,14 @@ discard block |
||
195 | 195 | * Loop through the data in the body of the bitmap |
196 | 196 | * file and calculate each individual pixel based on the |
197 | 197 | * bytes |
198 | - * @param $bodySize |
|
199 | - * @param $x |
|
198 | + * @param integer $bodySize |
|
199 | + * @param integer $x |
|
200 | 200 | * @param $width |
201 | - * @param $usePadding |
|
202 | - * @param $y |
|
201 | + * @param boolean $usePadding |
|
202 | + * @param integer $y |
|
203 | 203 | * @param $height |
204 | - * @param $body |
|
205 | - * @param $image |
|
204 | + * @param string $body |
|
205 | + * @param resource $image |
|
206 | 206 | */ |
207 | 207 | private function loopThroughBodyAndCalculatePixels($bodySize, $x, $width, $usePadding, $y, $height, $body, $image) |
208 | 208 | { |
@@ -10,6 +10,10 @@ discard block |
||
10 | 10 | { |
11 | 11 | protected $filesDir; |
12 | 12 | |
13 | + /** |
|
14 | + * @param \CloudControl\Cms\storage\Repository $repository |
|
15 | + * @param string $filesDir |
|
16 | + */ |
|
13 | 17 | public function __construct($repository, $filesDir) |
14 | 18 | { |
15 | 19 | parent::__construct($repository); |
@@ -102,7 +106,7 @@ discard block |
||
102 | 106 | } |
103 | 107 | |
104 | 108 | /** |
105 | - * @return mixed |
|
109 | + * @return string |
|
106 | 110 | */ |
107 | 111 | public function getFilesDir() |
108 | 112 | { |
@@ -27,7 +27,9 @@ |
||
27 | 27 | |
28 | 28 | // Define which ratio will be used, depending on which is the smallest side |
29 | 29 | $ratio = min($hRatio, $wRatio); |
30 | - if ($ratio > 1) $ratio = 1; |
|
30 | + if ($ratio > 1) { |
|
31 | + $ratio = 1; |
|
32 | + } |
|
31 | 33 | |
32 | 34 | // Define sizes |
33 | 35 | $this->_destWidth = floor($originalWidth * $ratio); |
@@ -37,7 +37,9 @@ |
||
37 | 37 | |
38 | 38 | // Define which ratio will be used, depending on which is the biggest side |
39 | 39 | $ratio = $wRatio < $hRatio ? $wRatio : $hRatio; |
40 | - if ($ratio < 1) $ratio = 1; |
|
40 | + if ($ratio < 1) { |
|
41 | + $ratio = 1; |
|
42 | + } |
|
41 | 43 | |
42 | 44 | // Calculate the destination width, height, x and y |
43 | 45 | $this->_destWidth = $originalWidth / $ratio; |
@@ -63,7 +63,9 @@ discard block |
||
63 | 63 | */ |
64 | 64 | protected function calculateX($imageResource) |
65 | 65 | { |
66 | - if (intval($this->_x) === $this->_x) return $this->_x; |
|
66 | + if (intval($this->_x) === $this->_x) { |
|
67 | + return $this->_x; |
|
68 | + } |
|
67 | 69 | |
68 | 70 | $x = strtolower($this->_x); |
69 | 71 | |
@@ -88,7 +90,9 @@ discard block |
||
88 | 90 | */ |
89 | 91 | public function calculateY($imageResource) |
90 | 92 | { |
91 | - if (intval($this->_y) === $this->_y) return $this->_y; |
|
93 | + if (intval($this->_y) === $this->_y) { |
|
94 | + return $this->_y; |
|
95 | + } |
|
92 | 96 | |
93 | 97 | $y = strtolower($this->_y); |
94 | 98 | |
@@ -125,7 +129,9 @@ discard block |
||
125 | 129 | */ |
126 | 130 | public function GetWatermark() |
127 | 131 | { |
128 | - if ($this->_watermark == null) throw new \Exception('A watermark is not set. Please supply a \CloudControl\Cms\image\Image using $this->SetWatermark'); |
|
132 | + if ($this->_watermark == null) { |
|
133 | + throw new \Exception('A watermark is not set. Please supply a \CloudControl\Cms\image\Image using $this->SetWatermark'); |
|
134 | + } |
|
129 | 135 | return $this->_watermark; |
130 | 136 | } |
131 | 137 |
@@ -78,12 +78,15 @@ |
||
78 | 78 | */ |
79 | 79 | public static function humanFileSize($size, $unit = "") |
80 | 80 | { |
81 | - if ((!$unit && $size >= 1 << 30) || $unit == "GB") |
|
82 | - return number_format($size / (1 << 30), 2) . "GB"; |
|
83 | - if ((!$unit && $size >= 1 << 20) || $unit == "MB") |
|
84 | - return number_format($size / (1 << 20), 2) . "MB"; |
|
85 | - if ((!$unit && $size >= 1 << 10) || $unit == "KB") |
|
86 | - return number_format($size / (1 << 10), 2) . "KB"; |
|
81 | + if ((!$unit && $size >= 1 << 30) || $unit == "GB") { |
|
82 | + return number_format($size / (1 << 30), 2) . "GB"; |
|
83 | + } |
|
84 | + if ((!$unit && $size >= 1 << 20) || $unit == "MB") { |
|
85 | + return number_format($size / (1 << 20), 2) . "MB"; |
|
86 | + } |
|
87 | + if ((!$unit && $size >= 1 << 10) || $unit == "KB") { |
|
88 | + return number_format($size / (1 << 10), 2) . "KB"; |
|
89 | + } |
|
87 | 90 | |
88 | 91 | return number_format($size) . " bytes"; |
89 | 92 | } |