@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | * |
| 160 | 160 | * @param mixed $offset |
| 161 | 161 | * |
| 162 | - * @return bool|mixed |
|
| 162 | + * @return string|boolean |
|
| 163 | 163 | */ |
| 164 | 164 | public function offsetGet($offset) |
| 165 | 165 | {
|
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | /** |
| 360 | 360 | * Returns error string or false if no errors occurred |
| 361 | 361 | * |
| 362 | - * @return string|bool |
|
| 362 | + * @return string|false |
|
| 363 | 363 | */ |
| 364 | 364 | public function getError() |
| 365 | 365 | {
|
@@ -460,7 +460,7 @@ discard block |
||
| 460 | 460 | * Final upload method to be called, isolated for testing purposes |
| 461 | 461 | * |
| 462 | 462 | * @param $tmp_name int the temporary location of the image file |
| 463 | - * @param $destination int upload destination |
|
| 463 | + * @param string $destination int upload destination |
|
| 464 | 464 | * |
| 465 | 465 | * @return bool |
| 466 | 466 | */ |
@@ -102,8 +102,7 @@ discard block |
||
| 102 | 102 | /** |
| 103 | 103 | * @param array $_files represents the $_FILES array passed as dependency |
| 104 | 104 | */ |
| 105 | - public function __construct(array $_files = array()) |
|
| 106 | - {
|
|
| 105 | + public function __construct(array $_files = array()) { |
|
| 107 | 106 | /* check if php_exif is enabled */ |
| 108 | 107 | if (!function_exists('exif_imagetype')) {
|
| 109 | 108 | $this->error = 'Function \'exif_imagetype\' Not found. Please enable \'php_exif\' in your PHP.ini'; |
@@ -120,8 +119,7 @@ discard block |
||
| 120 | 119 | * |
| 121 | 120 | * @return null|string |
| 122 | 121 | */ |
| 123 | - protected function getImageMime($tmp_name) |
|
| 124 | - {
|
|
| 122 | + protected function getImageMime($tmp_name) { |
|
| 125 | 123 | $mime = @$this->imageMimes[exif_imagetype($tmp_name)]; |
| 126 | 124 | |
| 127 | 125 | if (!$mime) {
|
@@ -135,23 +133,20 @@ discard block |
||
| 135 | 133 | * @param mixed $offset |
| 136 | 134 | * @param mixed $value |
| 137 | 135 | */ |
| 138 | - public function offsetSet($offset, $value) |
|
| 139 | - {
|
|
| 136 | + public function offsetSet($offset, $value) { |
|
| 140 | 137 | } |
| 141 | 138 | |
| 142 | 139 | /** |
| 143 | 140 | * @param mixed $offset |
| 144 | 141 | * @return null |
| 145 | 142 | */ |
| 146 | - public function offsetExists($offset) |
|
| 147 | - {
|
|
| 143 | + public function offsetExists($offset) { |
|
| 148 | 144 | } |
| 149 | 145 | |
| 150 | 146 | /** |
| 151 | 147 | * @param mixed $offset |
| 152 | 148 | */ |
| 153 | - public function offsetUnset($offset) |
|
| 154 | - {
|
|
| 149 | + public function offsetUnset($offset) { |
|
| 155 | 150 | } |
| 156 | 151 | |
| 157 | 152 | /** |
@@ -161,8 +156,7 @@ discard block |
||
| 161 | 156 | * |
| 162 | 157 | * @return bool|mixed |
| 163 | 158 | */ |
| 164 | - public function offsetGet($offset) |
|
| 165 | - {
|
|
| 159 | + public function offsetGet($offset) { |
|
| 166 | 160 | if ($offset == 'error') {
|
| 167 | 161 | return $this->error; |
| 168 | 162 | } |
@@ -182,8 +176,7 @@ discard block |
||
| 182 | 176 | * @param null $isNameProvided |
| 183 | 177 | * @return $this |
| 184 | 178 | */ |
| 185 | - public function setName($isNameProvided = null) |
|
| 186 | - {
|
|
| 179 | + public function setName($isNameProvided = null) { |
|
| 187 | 180 | if ($isNameProvided) {
|
| 188 | 181 | $this->name = filter_var($isNameProvided, FILTER_SANITIZE_STRING); |
| 189 | 182 | } |
@@ -198,8 +191,7 @@ discard block |
||
| 198 | 191 | * |
| 199 | 192 | * @return $this |
| 200 | 193 | */ |
| 201 | - public function setMime(array $fileTypes) |
|
| 202 | - {
|
|
| 194 | + public function setMime(array $fileTypes) { |
|
| 203 | 195 | $this->mimeTypes = $fileTypes; |
| 204 | 196 | return $this; |
| 205 | 197 | } |
@@ -212,8 +204,7 @@ discard block |
||
| 212 | 204 | * |
| 213 | 205 | * @return $this |
| 214 | 206 | */ |
| 215 | - public function setSize($min, $max) |
|
| 216 | - {
|
|
| 207 | + public function setSize($min, $max) { |
|
| 217 | 208 | $this->size = array($min, $max); |
| 218 | 209 | return $this; |
| 219 | 210 | } |
@@ -226,8 +217,7 @@ discard block |
||
| 226 | 217 | * |
| 227 | 218 | * @return $this |
| 228 | 219 | */ |
| 229 | - public function setLocation($dir = 'bulletproof', $permission = 0666) |
|
| 230 | - {
|
|
| 220 | + public function setLocation($dir = 'bulletproof', $permission = 0666) { |
|
| 231 | 221 | if (!file_exists($dir) && !is_dir($dir) && !$this->location) {
|
| 232 | 222 | $createFolder = @mkdir('' . $dir, (int)$permission, true);
|
| 233 | 223 | if (!$createFolder) {
|
@@ -248,8 +238,7 @@ discard block |
||
| 248 | 238 | * |
| 249 | 239 | * @return $this |
| 250 | 240 | */ |
| 251 | - public function setDimension($maxWidth, $maxHeight) |
|
| 252 | - {
|
|
| 241 | + public function setDimension($maxWidth, $maxHeight) { |
|
| 253 | 242 | $this->dimensions = array($maxWidth, $maxHeight); |
| 254 | 243 | return $this; |
| 255 | 244 | } |
@@ -259,8 +248,7 @@ discard block |
||
| 259 | 248 | * |
| 260 | 249 | * @return string |
| 261 | 250 | */ |
| 262 | - public function getName() |
|
| 263 | - {
|
|
| 251 | + public function getName() { |
|
| 264 | 252 | if (!$this->name) {
|
| 265 | 253 | return uniqid(true) . '_' . str_shuffle(implode(range('e', 'q')));
|
| 266 | 254 | } |
@@ -273,8 +261,7 @@ discard block |
||
| 273 | 261 | * |
| 274 | 262 | * @return string |
| 275 | 263 | */ |
| 276 | - public function getFullPath() |
|
| 277 | - {
|
|
| 264 | + public function getFullPath() { |
|
| 278 | 265 | $this->fullPath = $this->location . '/' . $this->name . '.' . $this->mime; |
| 279 | 266 | return $this->fullPath; |
| 280 | 267 | } |
@@ -284,8 +271,7 @@ discard block |
||
| 284 | 271 | * |
| 285 | 272 | * @return int |
| 286 | 273 | */ |
| 287 | - public function getSize() |
|
| 288 | - {
|
|
| 274 | + public function getSize() { |
|
| 289 | 275 | return (int)$this->_files['size']; |
| 290 | 276 | } |
| 291 | 277 | |
@@ -294,8 +280,7 @@ discard block |
||
| 294 | 280 | * |
| 295 | 281 | * @return int |
| 296 | 282 | */ |
| 297 | - public function getHeight() |
|
| 298 | - {
|
|
| 283 | + public function getHeight() { |
|
| 299 | 284 | if ($this->height != null) {
|
| 300 | 285 | return $this->height; |
| 301 | 286 | } |
@@ -309,8 +294,7 @@ discard block |
||
| 309 | 294 | * |
| 310 | 295 | * @return int |
| 311 | 296 | */ |
| 312 | - public function getWidth() |
|
| 313 | - {
|
|
| 297 | + public function getWidth() { |
|
| 314 | 298 | if ($this->width != null) {
|
| 315 | 299 | return $this->width; |
| 316 | 300 | } |
@@ -324,8 +308,7 @@ discard block |
||
| 324 | 308 | * |
| 325 | 309 | * @return string |
| 326 | 310 | */ |
| 327 | - public function getLocation() |
|
| 328 | - {
|
|
| 311 | + public function getLocation() { |
|
| 329 | 312 | if (!$this->location) {
|
| 330 | 313 | $this->setLocation(); |
| 331 | 314 | } |
@@ -338,8 +321,7 @@ discard block |
||
| 338 | 321 | * |
| 339 | 322 | * @return string |
| 340 | 323 | */ |
| 341 | - public function getJson() |
|
| 342 | - {
|
|
| 324 | + public function getJson() { |
|
| 343 | 325 | return json_encode($this->serialize); |
| 344 | 326 | } |
| 345 | 327 | |
@@ -348,8 +330,7 @@ discard block |
||
| 348 | 330 | * |
| 349 | 331 | * @return string |
| 350 | 332 | */ |
| 351 | - public function getMime() |
|
| 352 | - {
|
|
| 333 | + public function getMime() { |
|
| 353 | 334 | if (!$this->mime) {
|
| 354 | 335 | return $this->getImageMime($this->_files['tmp_name']); |
| 355 | 336 | } |
@@ -361,8 +342,7 @@ discard block |
||
| 361 | 342 | * |
| 362 | 343 | * @return string|bool |
| 363 | 344 | */ |
| 364 | - public function getError() |
|
| 365 | - {
|
|
| 345 | + public function getError() { |
|
| 366 | 346 | return $this->error != '' ? $this->error : false; |
| 367 | 347 | } |
| 368 | 348 | |
@@ -373,8 +353,7 @@ discard block |
||
| 373 | 353 | * |
| 374 | 354 | * @return string |
| 375 | 355 | */ |
| 376 | - protected function commonUploadErrors($e) |
|
| 377 | - {
|
|
| 356 | + protected function commonUploadErrors($e) { |
|
| 378 | 357 | return $this->common_upload_errors[$e]; |
| 379 | 358 | } |
| 380 | 359 | |
@@ -382,8 +361,7 @@ discard block |
||
| 382 | 361 | * This methods validates and uploads the image |
| 383 | 362 | * @return bool|false |
| 384 | 363 | */ |
| 385 | - public function upload() |
|
| 386 | - {
|
|
| 364 | + public function upload() { |
|
| 387 | 365 | /* modify variable names for convenience */ |
| 388 | 366 | $image = $this; |
| 389 | 367 | $files = $this->_files; |
@@ -466,8 +444,7 @@ discard block |
||
| 466 | 444 | * |
| 467 | 445 | * @return bool |
| 468 | 446 | */ |
| 469 | - public function moveUploadedFile($tmp_name, $destination) |
|
| 470 | - {
|
|
| 447 | + public function moveUploadedFile($tmp_name, $destination) { |
|
| 471 | 448 | return move_uploaded_file($tmp_name, $destination); |
| 472 | 449 | } |
| 473 | 450 | } |