@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | /** |
18 | 18 | * JsonStorage constructor. |
19 | 19 | * |
20 | - * @param $storagePath |
|
20 | + * @param string $storagePath |
|
21 | 21 | */ |
22 | 22 | public function __construct($storagePath) |
23 | 23 | { |
@@ -837,6 +837,9 @@ discard block |
||
837 | 837 | } |
838 | 838 | } |
839 | 839 | |
840 | + /** |
|
841 | + * @param string $path |
|
842 | + */ |
|
840 | 843 | private function validateFilename($filename, $path) |
841 | 844 | { |
842 | 845 | $fileParts = explode('.', $filename); |
@@ -9,8 +9,10 @@ |
||
9 | 9 | <? if (isset($dynamicBrick)) : |
10 | 10 | $fieldSlug = $field->slug; |
11 | 11 | $value = isset($dynamicBrick->fields->$fieldSlug) ? current($dynamicBrick->fields->$fieldSlug) : ''; |
12 | - else : |
|
12 | + else { |
|
13 | + : |
|
13 | 14 | $value = ''; |
15 | + } |
|
14 | 16 | endif ?> |
15 | 17 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> |
16 | 18 | <ul class="grid-wrapper sortable"> |
@@ -59,8 +59,7 @@ discard block |
||
59 | 59 | return imagejpeg($imageResource, $path, $quality); |
60 | 60 | } elseif ($mimeTypeConstantValue == IMAGETYPE_PNG) { |
61 | 61 | return imagepng($imageResource, $path, (intval($quality / 10) -1)); |
62 | - } |
|
63 | - else { |
|
62 | + } else { |
|
64 | 63 | throw new \Exception('Not a valid mimetypeconstant given see function documentation'); |
65 | 64 | } |
66 | 65 | return false; |
@@ -101,8 +100,9 @@ discard block |
||
101 | 100 | // Load the image into a string |
102 | 101 | $file = fopen($p_sFile,"rb"); |
103 | 102 | $read = fread($file,10); |
104 | - while(!feof($file)&&($read<>"")) |
|
105 | - $read .= fread($file,1024); |
|
103 | + while(!feof($file)&&($read<>"")) { |
|
104 | + $read .= fread($file,1024); |
|
105 | + } |
|
106 | 106 | |
107 | 107 | $temp = unpack("H*",$read); |
108 | 108 | $hex = $temp[1]; |
@@ -153,8 +153,9 @@ discard block |
||
153 | 153 | { |
154 | 154 | // If padding needed, ignore image-padding |
155 | 155 | // Shift i to the ending of the current 32-bit-block |
156 | - if ($usePadding) |
|
157 | - $i += $width%4; |
|
156 | + if ($usePadding) { |
|
157 | + $i += $width%4; |
|
158 | + } |
|
158 | 159 | |
159 | 160 | // Reset horizontal position |
160 | 161 | $x = 0; |
@@ -163,8 +164,9 @@ discard block |
||
163 | 164 | $y++; |
164 | 165 | |
165 | 166 | // Reached the image-height? Break the for-loop |
166 | - if ($y>$height) |
|
167 | - break; |
|
167 | + if ($y>$height) { |
|
168 | + break; |
|
169 | + } |
|
168 | 170 | } |
169 | 171 | |
170 | 172 | // Calculation of the RGB-pixel (defined as BGR in image-data) |
@@ -74,7 +74,7 @@ |
||
74 | 74 | * @see http://www.php.net/manual/en/function.image-type-to-mime-type.php |
75 | 75 | * @param string $imagePath |
76 | 76 | * @param bool $getExtension |
77 | - * @return bool|int|string |
|
77 | + * @return integer |
|
78 | 78 | */ |
79 | 79 | public function GetImageMimeType($imagePath, $getExtension = false) |
80 | 80 | { |
@@ -61,7 +61,9 @@ discard block |
||
61 | 61 | */ |
62 | 62 | protected function calculateX($imageResource) |
63 | 63 | { |
64 | - if (intval($this->_x) === $this->_x) return $this->_x; |
|
64 | + if (intval($this->_x) === $this->_x) { |
|
65 | + return $this->_x; |
|
66 | + } |
|
65 | 67 | |
66 | 68 | $x = strtolower($this->_x); |
67 | 69 | |
@@ -86,7 +88,9 @@ discard block |
||
86 | 88 | */ |
87 | 89 | public function calculateY($imageResource) |
88 | 90 | { |
89 | - if (intval($this->_y) === $this->_y) return $this->_y; |
|
91 | + if (intval($this->_y) === $this->_y) { |
|
92 | + return $this->_y; |
|
93 | + } |
|
90 | 94 | |
91 | 95 | $y = strtolower($this->_y); |
92 | 96 | |
@@ -123,7 +127,9 @@ discard block |
||
123 | 127 | */ |
124 | 128 | public function GetWatermark() |
125 | 129 | { |
126 | - if ($this->_watermark == null) throw new \Exception('A watermark is not set. Please supply a \library\image\Image using $this->SetWatermark'); |
|
130 | + if ($this->_watermark == null) { |
|
131 | + throw new \Exception('A watermark is not set. Please supply a \library\image\Image using $this->SetWatermark'); |
|
132 | + } |
|
127 | 133 | return $this->_watermark; |
128 | 134 | } |
129 | 135 |
@@ -26,7 +26,9 @@ |
||
26 | 26 | |
27 | 27 | // Define which ratio will be used, depending on which is the smallest side |
28 | 28 | $ratio = min($hRatio, $wRatio); |
29 | - if($ratio > 1) $ratio = 1; |
|
29 | + if($ratio > 1) { |
|
30 | + $ratio = 1; |
|
31 | + } |
|
30 | 32 | |
31 | 33 | // Define sizes |
32 | 34 | $this->_destWidth = floor($originalWidth * $ratio); |
@@ -40,7 +40,9 @@ |
||
40 | 40 | |
41 | 41 | // Define which ratio will be used, depending on which is the biggest side |
42 | 42 | $ratio = $wRatio < $hRatio ? $wRatio : $hRatio; |
43 | - if ($ratio < 1) $ratio = 1; |
|
43 | + if ($ratio < 1) { |
|
44 | + $ratio = 1; |
|
45 | + } |
|
44 | 46 | |
45 | 47 | // Calculate the destination width, height, x and y |
46 | 48 | $this->_destWidth = $originalWidth / $ratio; |
@@ -61,12 +61,15 @@ |
||
61 | 61 | } |
62 | 62 | |
63 | 63 | function humanFileSize($size,$unit="") { |
64 | - if( (!$unit && $size >= 1<<30) || $unit == "GB") |
|
65 | - return number_format($size/(1<<30),2)."GB"; |
|
66 | - if( (!$unit && $size >= 1<<20) || $unit == "MB") |
|
67 | - return number_format($size/(1<<20),2)."MB"; |
|
68 | - if( (!$unit && $size >= 1<<10) || $unit == "KB") |
|
69 | - return number_format($size/(1<<10),2)."KB"; |
|
64 | + if( (!$unit && $size >= 1<<30) || $unit == "GB") { |
|
65 | + return number_format($size/(1<<30),2)."GB"; |
|
66 | + } |
|
67 | + if( (!$unit && $size >= 1<<20) || $unit == "MB") { |
|
68 | + return number_format($size/(1<<20),2)."MB"; |
|
69 | + } |
|
70 | + if( (!$unit && $size >= 1<<10) || $unit == "KB") { |
|
71 | + return number_format($size/(1<<10),2)."KB"; |
|
72 | + } |
|
70 | 73 | return number_format($size)." bytes"; |
71 | 74 | } |
72 | 75 |
@@ -116,7 +116,7 @@ |
||
116 | 116 | * @param array $replace |
117 | 117 | * @param string $delimiter |
118 | 118 | * |
119 | - * @return mixed|string |
|
119 | + * @return string |
|
120 | 120 | */ |
121 | 121 | function slugify($str, $replace=array(), $delimiter='-') { |
122 | 122 | if( !empty($replace) ) { |
@@ -105,7 +105,7 @@ |
||
105 | 105 | /** |
106 | 106 | * Detect if the language is switched manually |
107 | 107 | * |
108 | - * @param $request |
|
108 | + * @param Request $request |
|
109 | 109 | */ |
110 | 110 | private function checkLanguageSwitch($request) |
111 | 111 | { |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | |
133 | 133 | /** |
134 | 134 | * Sets variables needed for rendering the form template |
135 | - * @param $storage |
|
135 | + * @param Storage $storage |
|
136 | 136 | */ |
137 | 137 | private function initialize($storage) |
138 | 138 | { |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | * submitting the form |
169 | 169 | * |
170 | 170 | * @param $postValues |
171 | - * @param $storage |
|
171 | + * @param Storage $storage |
|
172 | 172 | */ |
173 | 173 | protected function postSubmit($postValues, $storage) |
174 | 174 | {} |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | /** |
192 | 192 | * Checks if this form has been submitted |
193 | 193 | * |
194 | - * @param $request |
|
194 | + * @param \library\cc\Request $request |
|
195 | 195 | * @return bool |
196 | 196 | */ |
197 | 197 | private function isFormSubmitted($request) |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | /** |
203 | 203 | * |
204 | 204 | * |
205 | - * @param $request |
|
205 | + * @param \library\cc\Request $request |
|
206 | 206 | */ |
207 | 207 | private function getPostValues($request) |
208 | 208 | { |