floor12 / yii2-module-files

src/components/SimpleImage.php

Braces +3 added lines, -2 removed lines

@@ -118,8 +118,9 @@
     function rotate($direction)
     {
         $degrees = 90;
-        if ($direction == 2)
-            $degrees = 270;
+        if ($direction == 2) {
+                    $degrees = 270;
+        }
         $this->image = imagerotate($this->image, $degrees, 0);
     }
 

Spacing +2 added lines, -2 removed lines

@@ -25,10 +25,10 @@
             $this->image = imagecreatefromjpeg($filename);
         } elseif ($this->image_type == IMAGETYPE_GIF) {
             $this->image = imagecreatefromgif($filename);
-            imageSaveAlpha($this->image,true);
+            imageSaveAlpha($this->image, true);
         } elseif ($this->image_type == IMAGETYPE_PNG) {
             $this->image = imagecreatefrompng($filename);
-            imageSaveAlpha($this->image,true);
+            imageSaveAlpha($this->image, true);
         } elseif ($this->image_type == IMAGETYPE_WEBP) {
             $this->image = imagecreatefromwebp($filename);
         }

src/logic/FileRename.php

Braces +12 added lines, -8 removed lines

@@ -27,18 +27,21 @@ 
     public function __construct(array $data)
     {
 
-        if (!isset($data['id']))
-            throw new BadRequestHttpException('ID of file is not set.');
+        if (!isset($data['id'])) {
+                    throw new BadRequestHttpException('ID of file is not set.');
+        }
 
-        if (!isset($data['title']))
-            throw new BadRequestHttpException('Title of file is not set.');
+        if (!isset($data['title'])) {
+                    throw new BadRequestHttpException('Title of file is not set.');
+        }
 
         $this->_title = $data['title'];
 
         $this->_file = File::findOne($data['id']);
 
-        if (!$this->_file)
-            throw new NotFoundHttpException('File not found.');
+        if (!$this->_file) {
+                    throw new NotFoundHttpException('File not found.');
+        }
 
     }
 
@@ -50,8 +53,9 @@ 
     {
         $this->_file->title = $this->_title;
 
-        if (!$this->_file->save())
-            throw new BadRequestHttpException('Unable to save file.');
+        if (!$this->_file->save()) {
+                    throw new BadRequestHttpException('Unable to save file.');
+        }
 
         return $this->_title;
     }

src/logic/FileCropRotate.php

Braces +12 added lines, -8 removed lines

@@ -30,14 +30,17 @@ 
     {
         $this->_file = File::findOne($data['id']);
 
-        if (!$this->_file)
-            throw new NotFoundHttpException('File not found');
+        if (!$this->_file) {
+                    throw new NotFoundHttpException('File not found');
+        }
 
-        if ($this->_file->type != FileType::IMAGE)
-            throw new BadRequestHttpException('Requested file is not an image.');
+        if ($this->_file->type != FileType::IMAGE) {
+                    throw new BadRequestHttpException('Requested file is not an image.');
+        }
 
-        if (!file_exists($this->_file->rootPath))
-            throw new BadRequestHttpException('File not found in file storage.');
+        if (!file_exists($this->_file->rootPath)) {
+                    throw new BadRequestHttpException('File not found in file storage.');
+        }
 
         $this->_height = (int)$data['height'];
         $this->_width = (int)$data['width'];
@@ -79,8 +82,9 @@ 
         if ($this->_file->save()) {
             @unlink($oldPath);
             return $this->_file->href;
-        } else
-            throw new ErrorException("Error while saving file model.");
+        } else {
+                    throw new ErrorException("Error while saving file model.");
+        }
 
 
     }

src/logic/PathGenerator.php

Braces +15 added lines, -10 removed lines

@@ -20,14 +20,17 @@ 
     public function __construct($storagePath)
     {
 
-        if (!$storagePath)
-            throw new ErrorException('Storage path not set for path generator.');
+        if (!$storagePath) {
+                    throw new ErrorException('Storage path not set for path generator.');
+        }
 
-        if (!file_exists($storagePath))
-            mkdir($storagePath);
+        if (!file_exists($storagePath)) {
+                    mkdir($storagePath);
+        }
 
-        if (!file_exists($storagePath))
-            throw new ErrorException('Unable to create storage.');
+        if (!file_exists($storagePath)) {
+                    throw new ErrorException('Unable to create storage.');
+        }
 
         $folderName0 = rand(10, 99);
         $folderName1 = rand(10, 99);
@@ -38,10 +41,12 @@ 
         $fullPath0 = $storagePath . $path0;
         $fullPath1 = $storagePath . $path1;
 
-        if (!file_exists($fullPath0))
-            mkdir($fullPath0);
-        if (!file_exists($fullPath1))
-            mkdir($fullPath1);
+        if (!file_exists($fullPath0)) {
+                    mkdir($fullPath0);
+        }
+        if (!file_exists($fullPath1)) {
+                    mkdir($fullPath1);
+        }
 
         $this->path = $path1 . DIRECTORY_SEPARATOR . md5(rand(0, 1000) . time());
     }

src/controllers/ConsoleController.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
         $commands[] = "find {$module->storageFullPath}  -regextype egrep -regex \".+/.{32}\..{3,4}\.jpg\" -exec rm -rf {} \;";
         $commands[] = "find {$module->cacheFullPath}  -regextype egrep -regex \".+/.{32}\..{3,4}\.jpg\" -exec rm -rf {} \;";
 
-        array_map(function ($command) {
+        array_map(function($command) {
             exec($command);
         }, $commands);
 

Braces +15 added lines, -9 removed lines

@@ -29,9 +29,11 @@ 
     {
         $time = strtotime('- 6 hours');
         $files = File::find()->where(['object_id' => '0'])->andWhere(['<', 'created', $time])->all();
-        if ($files) foreach ($files as $file) {
+        if ($files) {
+            foreach ($files as $file) {
             $file->delete();
         }
+        }
     }
 
     /**
@@ -60,22 +62,26 @@ 
     {
         $ffmpeg = Yii::$app->getModule('files')->ffmpeg;
 
-        if (!file_exists($ffmpeg))
-            return $this->stdout("ffmpeg is not found: {$ffmpeg}" . PHP_EOL, Console::FG_RED);
+        if (!file_exists($ffmpeg)) {
+                    return $this->stdout("ffmpeg is not found: {$ffmpeg}" . PHP_EOL, Console::FG_RED);
+        }
 
-        if (!is_executable($ffmpeg))
-            return $this->stdout("ffmpeg is not executable: {$ffmpeg}" . PHP_EOL, Console::FG_RED);
+        if (!is_executable($ffmpeg)) {
+                    return $this->stdout("ffmpeg is not executable: {$ffmpeg}" . PHP_EOL, Console::FG_RED);
+        }
 
         $file = File::find()
             ->where(['type' => FileType::VIDEO, 'video_status' => VideoStatus::QUEUE])
             ->andWhere(['!=', 'object_id', 0])
             ->one();
 
-        if (!$file)
-            return $this->stdout("Convert queue is empty" . PHP_EOL, Console::FG_GREEN);
+        if (!$file) {
+                    return $this->stdout("Convert queue is empty" . PHP_EOL, Console::FG_GREEN);
+        }
 
-        if (!file_exists($file->rootPath))
-            return $this->stdout("Source file is not found: {$file->rootPath}" . PHP_EOL, Console::FG_RED);
+        if (!file_exists($file->rootPath)) {
+                    return $this->stdout("Source file is not found: {$file->rootPath}" . PHP_EOL, Console::FG_RED);
+        }
 
 
         $file->video_status = VideoStatus::CONVERTING;

src/views/default/_single.php

Braces +7 added lines, -3 removed lines

@@ -17,8 +17,9 @@ 
 use yii\helpers\Html;
 use yii\web\View;
 
-if (is_array($model))
+if (is_array($model)) {
     $model = $model[0];
+}
 
 $doc_contents = [
     'application/msword',
@@ -38,7 +39,8 @@ 
             <?= Html::hiddenInput((new ReflectionClass($model->class))->getShortName() . "[{$model->field}_ids][]", $model->id) ?>
         </div>
 
-    <?php else: ?>
+    <?php else {
+    : ?>
 
         <div data-title="<?= $model->title ?>"
              id="yii2-file-object-<?= $model->id ?>"
@@ -52,7 +54,9 @@ 
             <?php if ($model->type != FileType::IMAGE): ?>
                 <?= $model->icon ?>
                 <?= $model->title ?>
-            <?php endif; ?>
+            <?php endif;
+}
+?>
         </div>
     <?php endif; ?>
 

src/logic/FileResize.php

Braces +12 added lines, -8 removed lines

@@ -33,11 +33,13 @@ 
     {
         $this->_file = $file;
 
-        if ($this->_file->type != FileType::IMAGE)
-            throw new ErrorException('This file is not an image.');
+        if ($this->_file->type != FileType::IMAGE) {
+                    throw new ErrorException('This file is not an image.');
+        }
 
-        if (!file_exists($this->_file->rootPath))
-            throw new ErrorException('File not found on disk');
+        if (!file_exists($this->_file->rootPath)) {
+                    throw new ErrorException('File not found on disk');
+        }
 
         $this->_maxHeight = $maxHeight;
         $this->_maxWidth = $maxWidth;
@@ -51,16 +53,18 @@ 
      */
     public function execute(): bool
     {
-        if ($this->_file->content_type == 'image/svg+xml')
-            return true;
+        if ($this->_file->content_type == 'image/svg+xml') {
+                    return true;
+        }
 
         $image = new SimpleImage();
         $image->load($this->_file->rootPath);
 
         if ($image->getWidth() > $this->_maxWidth || $image->getHeight() > $this->_maxHeight) {
             $image->resizeToWidth($this->_maxWidth);
-            if ($this->_file->content_type == 'image/png')
-                $this->_imageType = IMAGETYPE_PNG;
+            if ($this->_file->content_type == 'image/png') {
+                            $this->_imageType = IMAGETYPE_PNG;
+            }
             $image->save($this->_file->rootPath, $this->_imageType, $this->_compression);
             $this->_file->size = filesize($this->_file->rootPath);
             return $this->_file->save(false, ['size']);

src/logic/FileCreateFromPath.php

Braces +27 added lines, -18 removed lines

@@ -29,17 +29,21 @@ 
 
         $this->model = $model;
 
-        if (!$filePath || !$className || !$fieldName || !$storagePath)
-            throw new ErrorException("Empty params not allowed.");
+        if (!$filePath || !$className || !$fieldName || !$storagePath) {
+                    throw new ErrorException("Empty params not allowed.");
+        }
 
-        if (!file_exists($storagePath))
-            throw new ErrorException("File storage not found on disk.");
+        if (!file_exists($storagePath)) {
+                    throw new ErrorException("File storage not found on disk.");
+        }
 
-        if (!file_exists($filePath))
-            throw new ErrorException("File not found on disk.");
+        if (!file_exists($filePath)) {
+                    throw new ErrorException("File not found on disk.");
+        }
 
-        if (!is_writable($storagePath))
-            throw new ErrorException("File storage is not writable.");
+        if (!is_writable($storagePath)) {
+                    throw new ErrorException("File storage is not writable.");
+        }
         $this->filePath = $filePath;
         $this->fileName = $fileName;
         $this->fieldName = $fieldName;
@@ -65,16 +69,19 @@ 
         $this->model->field = $this->fieldName;
         $this->model->class = $this->className;
         $this->model->filename = $filename;
-        if ($this->model->filename)
-            $this->model->title = $this->model->filename;
-        else
-            $this->model->title = rand(0, 99999); #такой прикол )
+        if ($this->model->filename) {
+                    $this->model->title = $this->model->filename;
+        } else {
+                    $this->model->title = rand(0, 99999);
+        }
+        #такой прикол )
         $this->model->content_type = $this->model->mime_content_type($new_path);
         $this->model->type = $this->detectType();
         $this->model->size = filesize($new_path);
         $this->model->created = time();
-        if ($this->model->type == FileType::VIDEO)
-            $this->model->video_status = 0;
+        if ($this->model->type == FileType::VIDEO) {
+                    $this->model->video_status = 0;
+        }
 
         if ($this->model->save()) {
 
@@ -110,10 +117,12 @@ 
     private function detectType()
     {
         $contentTypeArray = explode('/', $this->model->content_type);
-        if ($contentTypeArray[0] == 'image')
-            return FileType::IMAGE;
-        if ($contentTypeArray[0] == 'video')
-            return FileType::VIDEO;
+        if ($contentTypeArray[0] == 'image') {
+                    return FileType::IMAGE;
+        }
+        if ($contentTypeArray[0] == 'video') {
+                    return FileType::VIDEO;
+        }
         return FileType::FILE;
     }
 }

src/components/VideoWidget.php

Braces +3 added lines, -2 removed lines

@@ -21,8 +21,9 @@
      */
     public function run(): ?string
     {
-        if ($this->model->type !== FileType::VIDEO)
-            return null;
+        if ($this->model->type !== FileType::VIDEO) {
+                    return null;
+        }
         $source = Html::tag('source', null, ['src' => $this->model->getHref(), 'type' => $this->model->content_type]);
         return Html::tag('video', $source, $this->options);
     }