mostafaznv / larupload

src/Storage/FFMpeg.php

Spacing +3 added lines, -3 removed lines

@@ -122,15 +122,15 @@
 
                     foreach ($output->streams as $stream) {
                         if (isset($stream->width)) {
-                            $meta['width'] = (int)$stream->width;
+                            $meta['width'] = (int) $stream->width;
                         }
 
                         if (isset($stream->height)) {
-                            $meta['height'] = (int)$stream->height;
+                            $meta['height'] = (int) $stream->height;
                         }
 
                         if (isset($stream->duration)) {
-                            $meta['duration'] = (int)$stream->duration;
+                            $meta['duration'] = (int) $stream->duration;
                         }
 
                         if (isset($stream->tags->rotate)) {

Braces +11 added lines, -22 removed lines

@@ -141,13 +141,11 @@ 
                     if ($rotate == 90 or $rotate == 270) {
                         list($meta['height'], $meta['width']) = array($meta['width'], $meta['height']);
                     }
-                }
-                else {
+                } else {
                     $process->addErrorOutput('ffprobe output is null');
                     throw new Exception($process->getErrorOutput());
                 }
-            }
-            else {
+            } else {
                 throw new Exception($process->getErrorOutput());
             }
 
@@ -186,12 +184,10 @@ 
         if ($mode == LaruploadEnum::CROP_STYLE_MODE) {
             if ($width and $height) {
                 $cmd = escapeshellcmd("{$this->ffmpeg} -ss $fromSecond -i $path -vframes 1 -filter scale=$scaleType,crop=$width:$height");
-            }
-            else {
+            } else {
                 $cmd = escapeshellcmd("{$this->ffmpeg} -ss $fromSecond -i $path -vframes 1 -filter scale=$scaleType,crop=$scale:$scale");
             }
-        }
-        else {
+        } else {
             $cmd = escapeshellcmd("{$this->ffmpeg} -ss $fromSecond -i $path -vframes 1 -filter scale=$scaleType");
         }
 
@@ -217,12 +213,10 @@ 
         if ($mode == LaruploadEnum::CROP_STYLE_MODE) {
             if ($scale) {
                 $cmd = escapeshellcmd("{$this->ffmpeg} -i $path -vf scale=$scale,crop=$width:$height,setsar=1");
-            }
-            else {
+            } else {
                 $cmd = escapeshellcmd("{$this->ffmpeg} -i $path -vf crop=$width:$height,setsar=1");
             }
-        }
-        else {
+        } else {
             $cmd = escapeshellcmd("{$this->ffmpeg} -i $path -vf scale=$scale,setsar=1");
         }
 
@@ -316,8 +310,7 @@ 
                     }
 
                     $scale = "$scale:-2";
-                }
-                else {
+                } else {
                     $scale = ceil(($meta['height'] * $width) / $meta['width']);
 
                     if ($scale < $height) {
@@ -326,12 +319,10 @@ 
 
                     $scale = "-2:$scale";
                 }
-            }
-            else {
+            } else {
                 $scale = '';
             }
-        }
-        else {
+        } else {
             $scale = $width ? "$width:-2" : ($height ? "-2:$height" : (self::DEFAULT_SCALE . ':-2'));
         }
 
@@ -364,8 +355,7 @@ 
             }
 
             throw new Exception($process->getErrorOutput());
-        }
-        else {
+        } else {
             list($path, $name) = $this->splitPath($saveTo);
 
             $tempDir = $this->tempDir();
@@ -414,8 +404,7 @@ 
             }
 
             throw new Exception($process->getErrorOutput());
-        }
-        else {
+        } else {
             $name = basename($streamPath);
             $temp = $name . '-' . time();
 

src/Storage/Image.php

Spacing +2 added lines, -2 removed lines

@@ -92,8 +92,8 @@
         $size = $this->image->getSize();
 
         return [
-            'width'  => (int)$size->getWidth(),
-            'height' => (int)$size->getHeight(),
+            'width'  => (int) $size->getWidth(),
+            'height' => (int) $size->getHeight(),
         ];
     }
 

Braces +3 added lines, -6 removed lines

@@ -115,8 +115,7 @@ 
 
         if ($this->driverIsLocal) {
             $this->$method($image, $width, $height)->save($saveTo);
-        }
-        else {
+        } else {
             list($path, $name) = $this->splitPath($saveTo);
 
             $tempDir = $this->tempDir();
@@ -360,8 +359,7 @@ 
 
             if ($file instanceof UploadedFile) {
                 $path = $file->getRealPath();
-            }
-            else if (file_exists($file)) {
+            } else if (file_exists($file)) {
                 $path = $file;
             }
 
@@ -371,8 +369,7 @@ 
                     return self::toHexString($color);
                 }
             }
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             // do nothing
         }
 

src/Storage/Attachment.php

Braces +10 added lines, -20 removed lines

@@ -67,8 +67,7 @@ 
             $this->type = $this->output['type'];
 
             return true;
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -86,8 +85,7 @@ 
             $this->type = $this->output['type'];
 
             return true;
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -107,8 +105,7 @@ 
         if (isset($this->file)) {
             if ($this->file == LARUPLOAD_NULL) {
                 $this->clean($model->id);
-            }
-            else {
+            } else {
                 if (!$this->keepOldFiles) {
                     $this->clean($model->id);
                 }
@@ -121,8 +118,7 @@ 
             }
 
             $model = $this->setAttributes($model);
-        }
-        else if (isset($this->cover)) {
+        } else if (isset($this->cover)) {
             $this->setCover($model->id);
 
             $model = $this->setAttributes($model);
@@ -214,8 +210,7 @@ 
             if ($style == LaruploadEnum::COVER_FOLDER and $this->generateCover == false) {
                 $styles->{$style} = null;
                 continue;
-            }
-            else if ($style == LaruploadEnum::STREAM_FOLDER and empty($this->streams)) {
+            } else if ($style == LaruploadEnum::STREAM_FOLDER and empty($this->streams)) {
                 unset($styles->{$style});
                 continue;
             }
@@ -409,8 +404,7 @@ 
             case LaruploadEnum::VIDEO:
                 if ($this->ffmpegQueue) {
                     $this->initializeFFMpegQueue($id, $class, $standalone);
-                }
-                else {
+                } else {
                     $this->handleVideoStyles($id);
                 }
 
@@ -462,8 +456,7 @@ 
 
         if ($maxQueueNum == 0) {
             $flag = true;
-        }
-        else {
+        } else {
             $availableQueues = DB::table(LaruploadEnum::FFMPEG_QUEUE_TABLE)->where('status', 0)->count();
 
             if ($availableQueues < $maxQueueNum) {
@@ -497,8 +490,7 @@ 
 
 
             ProcessFFMpeg::dispatch($queueId, $id, $this->name, $class, $serializedClass);
-        }
-        else {
+        } else {
             throw new HttpResponseException(redirect(URL::previous())->withErrors([
                 'ffmpeg_queue_max_num' => trans('larupload::messages.max-queue-num-exceeded')
             ]));
@@ -532,8 +524,7 @@ 
             foreach ($this->output as $key => $value) {
                 $model->{"{$this->name}_file_$key"} = $value;
             }
-        }
-        else {
+        } else {
             $model->{"{$this->name}_file_name"} = $this->output['name'] ?? null;
             $model->{"{$this->name}_file_meta"} = json_encode($this->output);
         }
@@ -566,8 +557,7 @@ 
                 }
 
                 return null;
-            }
-            else if ($name and $this->styleHasFile($style)) {
+            } else if ($name and $this->styleHasFile($style)) {
                 $name = $this->fixExceptionNames($name, $style);
                 $path = $this->getBasePath($this->id, $style);
                 $path = "$path/$name";

src/Traits/Larupload.php

Braces +3 added lines, -6 removed lines

@@ -121,8 +121,7 @@ 
     {
         if ($attachment = $this->getAttachment($key)) {
             $attachment->attach($value);
-        }
-        else {
+        } else {
             parent::setAttribute($key, $value);
         }
     }
@@ -156,8 +155,7 @@ 
             }
 
             return null;
-        }
-        else {
+        } else {
             $attachments = new stdClass();
             foreach ($this->attachments as $attachment) {
                 $attachments->{$attachment->getName()} = $attachment->urls();
@@ -208,8 +206,7 @@ 
                     unset($array["{$name}_file_dominant_color"]);
                     unset($array["{$name}_file_format"]);
                     unset($array["{$name}_file_cover"]);
-                }
-                else {
+                } else {
                     unset($array["{$name}_file_meta"]);
                 }
             }

src/Database/Schema/Blueprint.php

Braces +2 added lines, -4 removed lines

@@ -30,8 +30,7 @@ 
             $table->string("{$name}_file_dominant_color", 7)->nullable();
             $table->string("{$name}_file_format", 85)->nullable();
             $table->string("{$name}_file_cover", 85)->nullable();
-        }
-        else {
+        } else {
             $table->{self::jsonColumnType()}("{$name}_file_meta")->nullable();
         }
     }
@@ -66,8 +65,7 @@ 
             $coverColumns = [
                 "{$name}_file_size", "{$name}_file_type", "{$name}_file_mime_type", "{$name}_file_width", "{$name}_file_height", "{$name}_file_duration", "{$name}_file_format", "{$name}_file_cover"
             ];
-        }
-        else {
+        } else {
             $coverColumns = [
                 "{$name}_file_size", "{$name}_file_type", "{$name}_file_mime_type", "{$name}_file_width", "{$name}_file_height", "{$name}_file_duration", "{$name}_file_format", "{$name}_file_cover"
             ];

src/Helpers/LaraTools.php

Braces +6 added lines, -12 removed lines

@@ -34,17 +34,13 @@ 
     {
         if (strstr($mime, 'image/')) {
             return LaruploadEnum::IMAGE;
-        }
-        else if (strstr($mime, 'video/')) {
+        } else if (strstr($mime, 'video/')) {
             return LaruploadEnum::VIDEO;
-        }
-        else if (strstr($mime, 'audio/')) {
+        } else if (strstr($mime, 'audio/')) {
             return LaruploadEnum::AUDIO;
-        }
-        else if ($mime == 'application/pdf') {
+        } else if ($mime == 'application/pdf') {
             return LaruploadEnum::PDF;
-        }
-        else if ($mime == 'application/zip' or $mime == 'application/x-rar-compressed') {
+        } else if ($mime == 'application/zip' or $mime == 'application/x-rar-compressed') {
             return LaruploadEnum::COMPRESSED;
         }
 
@@ -92,11 +88,9 @@ 
     {
         if (ini_get('upload_tmp_dir')) {
             $path = ini_get('upload_tmp_dir');
-        }
-        else if (getenv('temp')) {
+        } else if (getenv('temp')) {
             $path = getenv('temp');
-        }
-        else {
+        } else {
             $path = sys_get_temp_dir();
         }
 

src/Helpers/Slug.php

Braces +1 added lines, -2 removed lines

@@ -308,8 +308,7 @@
                     "\xE2\x80\xAF", "\xE2\x81\x9F", "\xE3\x80\x80", "\xEF\xBE\xA0"
                 ],
             ];
-        }
-        else {
+        } else {
             return $charsArray = [
                 '0'    => ['°', '₀', '０'],
                 '1'    => ['¹', '₁', '１'],

src/Helpers/LaraStandalone.php

Braces +1 added lines, -2 removed lines

@@ -65,8 +65,7 @@
     {
         if ($this->internalFunctionIsCallable) {
             parent::handleFFMpegQueue($isLastOne);
-        }
-        else {
+        } else {
             self::internalException();
         }
     }

src/Jobs/ProcessFFMpeg.php

Braces +2 added lines, -4 removed lines

@@ -50,8 +50,7 @@ 
         try {
             if (isset($this->standalone) and $this->standalone) {
                 $this->standalone->handleFFMpegQueue();
-            }
-            else {
+            } else {
                 $class = $this->model;
                 $modelNotSaved = true;
 
@@ -75,8 +74,7 @@ 
             }
 
             $this->updateStatus(true, false);
-        }
-        catch (FileNotFoundException | Exception $e) {
+        } catch (FileNotFoundException | Exception $e) {
             $this->updateStatus(false, false, $e->getMessage());
 
             throw new Exception($e->getMessage());