@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | * |
| 153 | 153 | * @param mixed $offset |
| 154 | 154 | * |
| 155 | - * @return bool|mixed |
|
| 155 | + * @return string|boolean |
|
| 156 | 156 | */ |
| 157 | 157 | public function offsetGet($offset) |
| 158 | 158 | {
|
@@ -364,7 +364,7 @@ discard block |
||
| 364 | 364 | /** |
| 365 | 365 | * Returns error string or false if no errors occurred |
| 366 | 366 | * |
| 367 | - * @return string|bool |
|
| 367 | + * @return string|false |
|
| 368 | 368 | */ |
| 369 | 369 | public function getError(){
|
| 370 | 370 | return $this->error != "" ? $this->error : false; |
@@ -473,7 +473,7 @@ discard block |
||
| 473 | 473 | * Final upload method to be called, isolated for testing purposes |
| 474 | 474 | * |
| 475 | 475 | * @param $tmp_name int the temporary location of the image file |
| 476 | - * @param $destination int upload destination |
|
| 476 | + * @param string $destination int upload destination |
|
| 477 | 477 | * |
| 478 | 478 | * @return bool |
| 479 | 479 | */ |
@@ -110,8 +110,7 @@ discard block |
||
| 110 | 110 | /** |
| 111 | 111 | * @param array $_files represents the $_FILES array passed as dependency |
| 112 | 112 | */ |
| 113 | - public function __construct(array $_files = array()) |
|
| 114 | - {
|
|
| 113 | + public function __construct(array $_files = array()) { |
|
| 115 | 114 | $this->_files = $_files; |
| 116 | 115 | } |
| 117 | 116 | |
@@ -122,8 +121,7 @@ discard block |
||
| 122 | 121 | * |
| 123 | 122 | * @return bool|string |
| 124 | 123 | */ |
| 125 | - protected function getImageMime($tmp_name) |
|
| 126 | - {
|
|
| 124 | + protected function getImageMime($tmp_name) { |
|
| 127 | 125 | if (isset($this->imageMimes[exif_imagetype($tmp_name)])) {
|
| 128 | 126 | return $this->imageMimes [exif_imagetype($tmp_name)]; |
| 129 | 127 | } |
@@ -154,8 +152,7 @@ discard block |
||
| 154 | 152 | * |
| 155 | 153 | * @return bool|mixed |
| 156 | 154 | */ |
| 157 | - public function offsetGet($offset) |
|
| 158 | - {
|
|
| 155 | + public function offsetGet($offset) { |
|
| 159 | 156 | if ($offset == "error") {
|
| 160 | 157 | return $this->error; |
| 161 | 158 | } |
@@ -175,8 +172,7 @@ discard block |
||
| 175 | 172 | * @param null $isNameProvided |
| 176 | 173 | * @return $this |
| 177 | 174 | */ |
| 178 | - public function setName($isNameProvided = null) |
|
| 179 | - {
|
|
| 175 | + public function setName($isNameProvided = null) { |
|
| 180 | 176 | if ($isNameProvided) {
|
| 181 | 177 | $this->name = filter_var($isNameProvided, FILTER_SANITIZE_STRING); |
| 182 | 178 | } |
@@ -191,8 +187,7 @@ discard block |
||
| 191 | 187 | * |
| 192 | 188 | * @return $this |
| 193 | 189 | */ |
| 194 | - public function setMime(array $fileTypes) |
|
| 195 | - {
|
|
| 190 | + public function setMime(array $fileTypes) { |
|
| 196 | 191 | $this->mimeTypes = $fileTypes; |
| 197 | 192 | return $this; |
| 198 | 193 | } |
@@ -205,8 +200,7 @@ discard block |
||
| 205 | 200 | * |
| 206 | 201 | * @return $this |
| 207 | 202 | */ |
| 208 | - public function setSize($min, $max) |
|
| 209 | - {
|
|
| 203 | + public function setSize($min, $max) { |
|
| 210 | 204 | $this->size = array($min, $max); |
| 211 | 205 | return $this; |
| 212 | 206 | } |
@@ -219,8 +213,7 @@ discard block |
||
| 219 | 213 | * |
| 220 | 214 | * @return $this |
| 221 | 215 | */ |
| 222 | - public function setLocation($dir = "bulletproof", $permission = 0666) |
|
| 223 | - {
|
|
| 216 | + public function setLocation($dir = "bulletproof", $permission = 0666) { |
|
| 224 | 217 | if (!file_exists($dir) && !is_dir($dir) && !$this->location) {
|
| 225 | 218 | $createFolder = @mkdir("" . $dir, (int) $permission, true);
|
| 226 | 219 | if (!$createFolder) {
|
@@ -241,8 +234,7 @@ discard block |
||
| 241 | 234 | * |
| 242 | 235 | * @return $this |
| 243 | 236 | */ |
| 244 | - public function setDimension($maxWidth, $maxHeight) |
|
| 245 | - {
|
|
| 237 | + public function setDimension($maxWidth, $maxHeight) { |
|
| 246 | 238 | $this->dimensions = array($maxWidth, $maxHeight); |
| 247 | 239 | return $this; |
| 248 | 240 | } |
@@ -254,8 +246,7 @@ discard block |
||
| 254 | 246 | * |
| 255 | 247 | * @return $this |
| 256 | 248 | */ |
| 257 | - public function setErrorMessages($new_error_messages) |
|
| 258 | - {
|
|
| 249 | + public function setErrorMessages($new_error_messages) { |
|
| 259 | 250 | if($new_array = array_replace_recursive($this->error_messages, $new_error_messages)) {
|
| 260 | 251 | $this->error_messages = $new_array; |
| 261 | 252 | }; |
@@ -267,8 +258,7 @@ discard block |
||
| 267 | 258 | * |
| 268 | 259 | * @return string |
| 269 | 260 | */ |
| 270 | - public function getName() |
|
| 271 | - {
|
|
| 261 | + public function getName() { |
|
| 272 | 262 | if (!$this->name) {
|
| 273 | 263 | return uniqid(true) . "_" . str_shuffle(implode(range("e", "q")));
|
| 274 | 264 | } |
@@ -281,8 +271,7 @@ discard block |
||
| 281 | 271 | * |
| 282 | 272 | * @return string |
| 283 | 273 | */ |
| 284 | - public function getFullPath() |
|
| 285 | - {
|
|
| 274 | + public function getFullPath() { |
|
| 286 | 275 | $this->fullPath = $this->location . "/" . $this->name . "." . $this->mime; |
| 287 | 276 | return $this->fullPath; |
| 288 | 277 | } |
@@ -292,8 +281,7 @@ discard block |
||
| 292 | 281 | * |
| 293 | 282 | * @return int |
| 294 | 283 | */ |
| 295 | - public function getSize() |
|
| 296 | - {
|
|
| 284 | + public function getSize() { |
|
| 297 | 285 | return (int) $this->_files["size"]; |
| 298 | 286 | } |
| 299 | 287 | |
@@ -302,8 +290,7 @@ discard block |
||
| 302 | 290 | * |
| 303 | 291 | * @return int |
| 304 | 292 | */ |
| 305 | - public function getHeight() |
|
| 306 | - {
|
|
| 293 | + public function getHeight() { |
|
| 307 | 294 | if ($this->height != null) {
|
| 308 | 295 | return $this->height; |
| 309 | 296 | } |
@@ -317,8 +304,7 @@ discard block |
||
| 317 | 304 | * |
| 318 | 305 | * @return int |
| 319 | 306 | */ |
| 320 | - public function getWidth() |
|
| 321 | - {
|
|
| 307 | + public function getWidth() { |
|
| 322 | 308 | if ($this->width != null) {
|
| 323 | 309 | return $this->width; |
| 324 | 310 | } |
@@ -332,8 +318,7 @@ discard block |
||
| 332 | 318 | * |
| 333 | 319 | * @return string |
| 334 | 320 | */ |
| 335 | - public function getLocation() |
|
| 336 | - {
|
|
| 321 | + public function getLocation() { |
|
| 337 | 322 | if(!$this->location){
|
| 338 | 323 | $this->setLocation(); |
| 339 | 324 | } |
@@ -346,8 +331,7 @@ discard block |
||
| 346 | 331 | * |
| 347 | 332 | * @return string |
| 348 | 333 | */ |
| 349 | - public function getJson() |
|
| 350 | - {
|
|
| 334 | + public function getJson() { |
|
| 351 | 335 | return json_encode($this->serialize); |
| 352 | 336 | } |
| 353 | 337 | |
@@ -356,8 +340,7 @@ discard block |
||
| 356 | 340 | * |
| 357 | 341 | * @return string |
| 358 | 342 | */ |
| 359 | - public function getMime() |
|
| 360 | - {
|
|
| 343 | + public function getMime() { |
|
| 361 | 344 | if(!$this->mime){
|
| 362 | 345 | return $this->getImageMime($this->_files["tmp_name"]); |
| 363 | 346 | } |
@@ -369,7 +352,7 @@ discard block |
||
| 369 | 352 | * |
| 370 | 353 | * @return string|bool |
| 371 | 354 | */ |
| 372 | - public function getError(){
|
|
| 355 | + public function getError() { |
|
| 373 | 356 | return $this->error != "" ? $this->error : false; |
| 374 | 357 | } |
| 375 | 358 | |
@@ -378,8 +361,7 @@ discard block |
||
| 378 | 361 | * |
| 379 | 362 | * @param $e int error constant |
| 380 | 363 | */ |
| 381 | - protected function uploadErrors($e) |
|
| 382 | - {
|
|
| 364 | + protected function uploadErrors($e) { |
|
| 383 | 365 | $errors = $this->error_messages['upload']; |
| 384 | 366 | return $errors[$e]; |
| 385 | 367 | } |
@@ -390,8 +372,7 @@ discard block |
||
| 390 | 372 | * @return bool|Image|null |
| 391 | 373 | * @throws ImageUploaderException |
| 392 | 374 | */ |
| 393 | - public function upload() |
|
| 394 | - {
|
|
| 375 | + public function upload() { |
|
| 395 | 376 | /* modify variable names for convenience */ |
| 396 | 377 | $image = $this; |
| 397 | 378 | $files = $this->_files; |
@@ -480,8 +461,7 @@ discard block |
||
| 480 | 461 | * |
| 481 | 462 | * @return bool |
| 482 | 463 | */ |
| 483 | - public function moveUploadedFile($tmp_name, $destination) |
|
| 484 | - {
|
|
| 464 | + public function moveUploadedFile($tmp_name, $destination) { |
|
| 485 | 465 | return move_uploaded_file($tmp_name, $destination); |
| 486 | 466 | } |
| 487 | 467 | } |