| @@ -356,7 +356,7 @@ discard block | ||
| 356 | 356 | /** | 
| 357 | 357 | * Validate directory/permission before creating a folder. | 
| 358 | 358 | * | 
| 359 | - * @param $dir string the folder name to check | |
| 359 | + * @param string $dir string the folder name to check | |
| 360 | 360 | * | 
| 361 | 361 | * @return bool | 
| 362 | 362 | */ | 
| @@ -459,7 +459,7 @@ discard block | ||
| 459 | 459 | * Final upload method to be called, isolated for testing purposes. | 
| 460 | 460 | * | 
| 461 | 461 | * @param $tmp_name int the temporary storage of the image file | 
| 462 | - * @param $destination int upload destination | |
| 462 | + * @param string $destination int upload destination | |
| 463 | 463 | * | 
| 464 | 464 | * @return bool | 
| 465 | 465 | */ | 
| @@ -96,8 +96,7 @@ discard block | ||
| 96 | 96 | /** | 
| 97 | 97 | * @param array $_files represents the $_FILES array passed as dependency | 
| 98 | 98 | */ | 
| 99 | - public function __construct(array $_files = array()) | |
| 100 | -    { | |
| 99 | +    public function __construct(array $_files = array()) { | |
| 101 | 100 | |
| 102 | 101 | /* check if php_exif is enabled */ | 
| 103 | 102 |          if (!function_exists('exif_imagetype')) { | 
| @@ -137,8 +136,7 @@ discard block | ||
| 137 | 136 | * | 
| 138 | 137 | * @return string|bool | 
| 139 | 138 | */ | 
| 140 | - public function offsetGet($offset) | |
| 141 | -    { | |
| 139 | +    public function offsetGet($offset) { | |
| 142 | 140 | /* return false if $image['key'] isn't found */ | 
| 143 | 141 |          if (!isset($this->_files[$offset])) { | 
| 144 | 142 |            $this->error = sprintf('No file input found with name: (%s)', $offset); | 
| @@ -164,8 +162,7 @@ discard block | ||
| 164 | 162 | * | 
| 165 | 163 | * @return $this | 
| 166 | 164 | */ | 
| 167 | - public function setDimension($maxWidth, $maxHeight) | |
| 168 | -    { | |
| 165 | +    public function setDimension($maxWidth, $maxHeight) { | |
| 169 | 166 | $this->dimensions = array($maxWidth, $maxHeight); | 
| 170 | 167 | |
| 171 | 168 | return $this; | 
| @@ -176,8 +173,7 @@ discard block | ||
| 176 | 173 | * | 
| 177 | 174 | * @return string | 
| 178 | 175 | */ | 
| 179 | - public function getPath() | |
| 180 | -    { | |
| 176 | +    public function getPath() { | |
| 181 | 177 | return $this->path = $this->getStorage() . '/' . $this->getName() . '.' . $this->getMime(); | 
| 182 | 178 | } | 
| 183 | 179 | |
| @@ -186,8 +182,7 @@ discard block | ||
| 186 | 182 | * | 
| 187 | 183 | * @return int | 
| 188 | 184 | */ | 
| 189 | - public function getSize() | |
| 190 | -    { | |
| 185 | +    public function getSize() { | |
| 191 | 186 | return (int) $this->_files['size']; | 
| 192 | 187 | } | 
| 193 | 188 | |
| @@ -199,8 +194,7 @@ discard block | ||
| 199 | 194 | * | 
| 200 | 195 | * @return $this | 
| 201 | 196 | */ | 
| 202 | - public function setSize($min, $max) | |
| 203 | -    { | |
| 197 | +    public function setSize($min, $max) { | |
| 204 | 198 | $this->size = array($min, $max); | 
| 205 | 199 | return $this; | 
| 206 | 200 | } | 
| @@ -210,8 +204,7 @@ discard block | ||
| 210 | 204 | * | 
| 211 | 205 | * @return string | 
| 212 | 206 | */ | 
| 213 | - public function getJson() | |
| 214 | -    { | |
| 207 | +    public function getJson() { | |
| 215 | 208 | return json_encode( | 
| 216 | 209 | array( | 
| 217 | 210 | 'name' => $this->name, | 
| @@ -230,8 +223,7 @@ discard block | ||
| 230 | 223 | * | 
| 231 | 224 | * @return null|string | 
| 232 | 225 | */ | 
| 233 | - public function getMime() | |
| 234 | -    { | |
| 226 | +    public function getMime() { | |
| 235 | 227 |        if (!$this->mime) { | 
| 236 | 228 | $this->mime = $this->getImageMime($this->_files['tmp_name']); | 
| 237 | 229 | } | 
| @@ -246,8 +238,7 @@ discard block | ||
| 246 | 238 | * | 
| 247 | 239 | * @return $this | 
| 248 | 240 | */ | 
| 249 | - public function setMime(array $fileTypes) | |
| 250 | -    { | |
| 241 | +    public function setMime(array $fileTypes) { | |
| 251 | 242 | $this->mimeTypes = $fileTypes; | 
| 252 | 243 | return $this; | 
| 253 | 244 | } | 
| @@ -259,8 +250,7 @@ discard block | ||
| 259 | 250 | * | 
| 260 | 251 | * @return null|string | 
| 261 | 252 | */ | 
| 262 | - protected function getImageMime($tmp_name) | |
| 263 | -    { | |
| 253 | +    protected function getImageMime($tmp_name) { | |
| 264 | 254 | $this->mime = @$this->acceptedMimes[exif_imagetype($tmp_name)]; | 
| 265 | 255 |        if (!$this->mime) { | 
| 266 | 256 | return null; | 
| @@ -274,8 +264,7 @@ discard block | ||
| 274 | 264 | * | 
| 275 | 265 | * @return string | 
| 276 | 266 | */ | 
| 277 | - public function getError() | |
| 278 | -    { | |
| 267 | +    public function getError() { | |
| 279 | 268 | return $this->error; | 
| 280 | 269 | } | 
| 281 | 270 | |
| @@ -284,8 +273,7 @@ discard block | ||
| 284 | 273 | * | 
| 285 | 274 | * @return string | 
| 286 | 275 | */ | 
| 287 | - public function getName() | |
| 288 | -    { | |
| 276 | +    public function getName() { | |
| 289 | 277 | return $this->name; | 
| 290 | 278 | } | 
| 291 | 279 | |
| @@ -296,11 +284,10 @@ discard block | ||
| 296 | 284 | * | 
| 297 | 285 | * @return $this | 
| 298 | 286 | */ | 
| 299 | - public function setName($isNameProvided = null) | |
| 300 | -    { | |
| 287 | +    public function setName($isNameProvided = null) { | |
| 301 | 288 |        if ($isNameProvided) { | 
| 302 | 289 | $this->name = filter_var($isNameProvided, FILTER_SANITIZE_STRING); | 
| 303 | -      }else{ | |
| 290 | +      } else{ | |
| 304 | 291 |          $this->name = uniqid('', true) . '_' . str_shuffle(implode(range('e', 'q'))); | 
| 305 | 292 | } | 
| 306 | 293 | |
| @@ -312,8 +299,7 @@ discard block | ||
| 312 | 299 | * | 
| 313 | 300 | * @return int | 
| 314 | 301 | */ | 
| 315 | - public function getWidth() | |
| 316 | -    { | |
| 302 | +    public function getWidth() { | |
| 317 | 303 |        if ($this->width != null) { | 
| 318 | 304 | return $this->width; | 
| 319 | 305 | } | 
| @@ -328,8 +314,7 @@ discard block | ||
| 328 | 314 | * | 
| 329 | 315 | * @return int | 
| 330 | 316 | */ | 
| 331 | - public function getHeight() | |
| 332 | -    { | |
| 317 | +    public function getHeight() { | |
| 333 | 318 |        if ($this->height != null) { | 
| 334 | 319 | return $this->height; | 
| 335 | 320 | } | 
| @@ -344,8 +329,7 @@ discard block | ||
| 344 | 329 | * | 
| 345 | 330 | * @return string | 
| 346 | 331 | */ | 
| 347 | - public function getStorage() | |
| 348 | -    { | |
| 332 | +    public function getStorage() { | |
| 349 | 333 |        if (!$this->storage) { | 
| 350 | 334 | $this->setStorage(); | 
| 351 | 335 | } | 
| @@ -360,8 +344,7 @@ discard block | ||
| 360 | 344 | * | 
| 361 | 345 | * @return bool | 
| 362 | 346 | */ | 
| 363 | - private function isDirectoryValid($dir) | |
| 364 | -    { | |
| 347 | +    private function isDirectoryValid($dir) { | |
| 365 | 348 | return !file_exists($dir) && !is_dir($dir) || is_writable($dir); | 
| 366 | 349 | } | 
| 367 | 350 | |
| @@ -373,8 +356,7 @@ discard block | ||
| 373 | 356 | * | 
| 374 | 357 | * @return $this | 
| 375 | 358 | */ | 
| 376 | - public function setStorage($dir = 'uploads', $permission = 0666) | |
| 377 | -    { | |
| 359 | +    public function setStorage($dir = 'uploads', $permission = 0666) { | |
| 378 | 360 | $isDirectoryValid = $this->isDirectoryValid($dir); | 
| 379 | 361 | |
| 380 | 362 |        if (!$isDirectoryValid) { | 
| @@ -399,8 +381,7 @@ discard block | ||
| 399 | 381 | * | 
| 400 | 382 | * @return boolean | 
| 401 | 383 | */ | 
| 402 | - protected function constraintValidator() | |
| 403 | -    { | |
| 384 | +    protected function constraintValidator() { | |
| 404 | 385 | /* check image for valid mime types and return mime */ | 
| 405 | 386 | $this->getImageMime($this->_files['tmp_name']); | 
| 406 | 387 | |
| @@ -441,8 +422,7 @@ discard block | ||
| 441 | 422 | * | 
| 442 | 423 | * @return false|Image | 
| 443 | 424 | */ | 
| 444 | - public function upload() | |
| 445 | -    { | |
| 425 | +    public function upload() { | |
| 446 | 426 |        if ($this->error !== '') { | 
| 447 | 427 | return false; | 
| 448 | 428 | } | 
| @@ -463,8 +443,7 @@ discard block | ||
| 463 | 443 | * | 
| 464 | 444 | * @return bool | 
| 465 | 445 | */ | 
| 466 | - protected function isSaved($tmp_name, $destination) | |
| 467 | -    { | |
| 446 | +    protected function isSaved($tmp_name, $destination) { | |
| 468 | 447 | return move_uploaded_file($tmp_name, $destination); | 
| 469 | 448 | } | 
| 470 | 449 | } | 
| 471 | 450 | \ No newline at end of file |