floor12 / yii2-module-files

src/models/File.php

Braces +45 added lines, -30 removed lines

@@ -87,29 +87,37 @@ 
     {
         $icon = IconHelper::FILE;
 
-        if ($this->content_type == 'application/vnd.openxmlformats-officedocument.wordprocessingml.document')
-            $icon = IconHelper::FILE_WORD;
+        if ($this->content_type == 'application/vnd.openxmlformats-officedocument.wordprocessingml.document') {
+                    $icon = IconHelper::FILE_WORD;
+        }
 
-        if ($this->content_type == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
-            $icon = IconHelper::FILE_EXCEL;
+        if ($this->content_type == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet') {
+                    $icon = IconHelper::FILE_EXCEL;
+        }
 
-        if ($this->content_type == 'application/vnd.openxmlformats-officedocument.presentationml.presentation')
-            $icon = IconHelper::FILE_POWERPOINT;
+        if ($this->content_type == 'application/vnd.openxmlformats-officedocument.presentationml.presentation') {
+                    $icon = IconHelper::FILE_POWERPOINT;
+        }
 
-        if ($this->content_type == 'application/x-zip-compressed')
-            $icon = IconHelper::FILE_ARCHIVE;
+        if ($this->content_type == 'application/x-zip-compressed') {
+                    $icon = IconHelper::FILE_ARCHIVE;
+        }
 
-        if ($this->content_type == 'application/octet-stream')
-            $icon = IconHelper::FILE_ARCHIVE;
+        if ($this->content_type == 'application/octet-stream') {
+                    $icon = IconHelper::FILE_ARCHIVE;
+        }
 
-        if (preg_match('/audio/', $this->content_type))
-            $icon = IconHelper::FILE_AUDIO;
+        if (preg_match('/audio/', $this->content_type)) {
+                    $icon = IconHelper::FILE_AUDIO;
+        }
 
-        if (preg_match('/pdf/', $this->content_type))
-            $icon = IconHelper::FILE_PDF;
+        if (preg_match('/pdf/', $this->content_type)) {
+                    $icon = IconHelper::FILE_PDF;
+        }
 
-        if ($this->type == FileType::VIDEO)
-            $icon = IconHelper::FILE_VIDEO;
+        if ($this->type == FileType::VIDEO) {
+                    $icon = IconHelper::FILE_VIDEO;
+        }
 
         return $icon;
     }
@@ -233,8 +241,9 @@ 
 
     public function getRootPreviewPath()
     {
-        if ($this->isSvg())
-            return $this->getRootPath();
+        if ($this->isSvg()) {
+                    return $this->getRootPath();
+        }
 
         return Yii::$app->getModule('files')->storageFullPath . DIRECTORY_SEPARATOR . $this->filename . '.jpg';
     }
@@ -257,8 +266,9 @@ 
 
     public function getHref()
     {
-        if (Yii::$app->getModule('files')->hostStatic)
-            return Yii::$app->getModule('files')->hostStatic . $this->filename;
+        if (Yii::$app->getModule('files')->hostStatic) {
+                    return Yii::$app->getModule('files')->hostStatic . $this->filename;
+        }
         return Url::to(['/files/default/get', 'hash' => $this->hash]);
     }
 
@@ -357,14 +367,17 @@ 
      */
     public function getPreviewWebPath($width = 0, $height = 0, $webp = false)
     {
-        if (!file_exists($this->getRootPath()))
-            return null;
+        if (!file_exists($this->getRootPath())) {
+                    return null;
+        }
 
-        if ($this->type != FileType::IMAGE)
-            throw new \ErrorException('Requiested file is not an image and its implsible to resize it.');
+        if ($this->type != FileType::IMAGE) {
+                    throw new \ErrorException('Requiested file is not an image and its implsible to resize it.');
+        }
 
-        if (Yii::$app->getModule('files')->hostStatic)
-            return Yii::$app->getModule('files')->hostStatic . $this->makeNameWithSize($this->filename, $width, $height, $webp = false);
+        if (Yii::$app->getModule('files')->hostStatic) {
+                    return Yii::$app->getModule('files')->hostStatic . $this->makeNameWithSize($this->filename, $width, $height, $webp = false);
+        }
 
         return Url::toRoute(['/files/default/image', 'hash' => $this->hash, 'width' => $width, 'height' => $height, 'webp' => $webp]);
     }
@@ -381,8 +394,9 @@ 
     {
         $extension = pathinfo($this->rootPath, PATHINFO_EXTENSION);
         $rootPath = str_replace(".{$extension}", '', $name) . "_w" . $width . "h" . $height . ".{$extension}";
-        if ($webp)
-            $rootPath = str_replace($extension, 'webp', $rootPath);
+        if ($webp) {
+                    $rootPath = str_replace($extension, 'webp', $rootPath);
+        }
         return $rootPath;
     }
 
@@ -397,8 +411,9 @@ 
      */
     public function getPreviewRootPath($width = 0, $height = 0, $webp = false)
     {
-        if ($this->type != FileType::IMAGE)
-            throw new \ErrorException('Requiested file is not an image and its implsible to resize it.');
+        if ($this->type != FileType::IMAGE) {
+                    throw new \ErrorException('Requiested file is not an image and its implsible to resize it.');
+        }
         return $this->makeNameWithSize($this->rootPath, $width, $height, $webp);
     }
 

src/components/FileBehaviour.php

Braces +23 added lines, -13 removed lines

@@ -66,8 +66,10 @@ 
                     ]
                 )->execute();
 
-                if ($ids) foreach ($ids as $id) {
+                if ($ids) {
+                    foreach ($ids as $id) {
                     $file = File::findOne($id);
+                }
                     if ($file) {
                         $file->object_id = $this->owner->id;
                         $file->ordering = $order++;
@@ -101,8 +103,9 @@ 
                 in_array($this->owner->scenario, $params['requiredOn']) &&
                 !in_array($this->owner->scenario, $params['requiredExcept']) &&
                 !isset($this->_values[$attributeIds][1])
-            )
-                $this->owner->addError($attributeName, $params['requiredMessage']);
+            ) {
+                            $this->owner->addError($attributeName, $params['requiredMessage']);
+            }
         }
     }
 
@@ -119,8 +122,8 @@ 
         $validators = $owner->validators;
 
         // Пробегаемся по валидаторам и вычисляем, какие из них касаются наших файл-полей
-        if ($validators)
-            foreach ($validators as $key => $validator) {
+        if ($validators) {
+                    foreach ($validators as $key => $validator) {
 
                 // Сначала пробегаемся по файловым валидаторам
                 if ($validator::className() == 'yii\validators\FileValidator' || $validator::className() == 'floor12\files\components\ReformatValidator') {
@@ -128,6 +131,7 @@ 
 
                         if (is_string($params)) {
                             $field = $params;
+        }
                             $params = [];
                         }
 
@@ -163,8 +167,10 @@ 
             }
 
         // Добавляем дефолтный валидатор для прилетающих айдишников
-        if ($this->attributes) foreach ($this->attributes as $fieldName => $fieldParams) {
+        if ($this->attributes) {
+            foreach ($this->attributes as $fieldName => $fieldParams) {
             $validator = Validator::createValidator('safe', $owner, ["{$fieldName}_ids"]);
+        }
             $validators->append($validator);
         }
     }
@@ -185,8 +191,9 @@ 
      */
     public function canSetProperty($name, $checkVars = true)
     {
-        if (array_key_exists($this->getRealAttributeName($name), $this->attributes))
-            return true;
+        if (array_key_exists($this->getRealAttributeName($name), $this->attributes)) {
+                    return true;
+        }
 
         return parent::canSetProperty($name, $checkVars = true);
     }
@@ -211,8 +218,8 @@ 
                 isset($this->attributes[$att_name]['validator']) &&
                 isset($this->attributes[$att_name]['validator']['yii\validators\FileValidator']) &&
                 $this->attributes[$att_name]['validator']['yii\validators\FileValidator']->maxFiles > 1
-            )
-                return File::find()
+            ) {
+                            return File::find()
                     ->where(
                         [
                             'object_id' => $this->owner->id,
@@ -221,7 +228,8 @@ 
                         ])
                     ->orderBy('ordering ASC')
                     ->all();
-            else return File::find()
+            } else {
+                return File::find()
                 ->where(
                     [
                         'object_id' => $this->owner->id,
@@ -230,6 +238,7 @@ 
                     ])
                 ->orderBy('ordering ASC')
                 ->one();
+            }
         }
     }
 
@@ -242,8 +251,9 @@ 
     {
         $attribute = $this->getRealAttributeName($name);
 
-        if (array_key_exists($attribute, $this->attributes))
-            $this->_values[$attribute] = $value;
+        if (array_key_exists($attribute, $this->attributes)) {
+                    $this->_values[$attribute] = $value;
+        }
     }
 
 

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);
     }
 

src/components/FileListWidget.php

Braces +6 added lines, -4 removed lines

@@ -44,11 +44,13 @@
 
         $this->getView()->registerJs("yiiDownloadAllLink = '" . Url::toRoute('files/default/zip') . "'", View::POS_BEGIN, 'yiiDownloadAllLink');
 
-        if ($this->passFirst && sizeof($this->files) > 0)
-            $this->files = array_slice($this->files, 1);
+        if ($this->passFirst && sizeof($this->files) > 0) {
+                    $this->files = array_slice($this->files, 1);
+        }
 
-        if (empty($this->files))
-            return null;
+        if (empty($this->files)) {
+                    return null;
+        }
 
         return $this->render('fileListWidget', [
             'files' => $this->files,

src/components/views/_fileListWidget.php

Braces +5 added lines, -2 removed lines

@@ -50,7 +50,8 @@ 
                 <?= $model->title ?>
             </div>
         </a>
-    <?php else: ?>
+    <?php else {
+    : ?>
 
 
         <div data-title="<?= $model->title ?>"
@@ -78,7 +79,9 @@ 
                         <?= Yii::t('files', 'View') ?>
                     </a>
                 </li>
-            <?php endif; ?>
+            <?php endif;
+}
+?>
         </ul>
 
     <?php endif; ?>

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/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()) {
 
@@ -114,10 +121,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;
     }
 }
\ No newline at end of file

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/ImagePreviewer.php

Braces +27 added lines, -18 removed lines

@@ -31,8 +31,9 @@ 
         $this->width = $width;
         $this->webp = $webp;
 
-        if ($this->model->type != FileType::IMAGE)
-            throw new ErrorException('File is not an image.');
+        if ($this->model->type != FileType::IMAGE) {
+                    throw new ErrorException('File is not an image.');
+        }
     }
 
     /**
@@ -40,22 +41,26 @@ 
      */
     public function getUrl()
     {
-        if ($this->model->isSvg())
-            return $this->model->getRootPath();
+        if ($this->model->isSvg()) {
+                    return $this->model->getRootPath();
+        }
 
         $this->fileName = Yii::$app->getModule('files')->cacheFullPath . $this->model->makeNameWithSize($this->model->filename, $this->width, 0);
         $this->fileNameWebp = Yii::$app->getModule('files')->cacheFullPath . $this->model->makeNameWithSize($this->model->filename, $this->width, 0, true);
 
         $this->prepareFolders();
 
-        if (!file_exists($this->fileName) || filesize($this->fileName) == 0)
-            $this->createPreview();
+        if (!file_exists($this->fileName) || filesize($this->fileName) == 0) {
+                    $this->createPreview();
+        }
 
-        if ($this->webp && !file_exists($this->fileNameWebp))
-            $this->createPreviewWebp();
+        if ($this->webp && !file_exists($this->fileNameWebp)) {
+                    $this->createPreviewWebp();
+        }
 
-        if ($this->webp)
-            return $this->fileNameWebp;
+        if ($this->webp) {
+                    return $this->fileNameWebp;
+        }
 
         return $this->fileName;
     }
@@ -65,17 +70,21 @@ 
      */
     protected function prepareFolders()
     {
-        if (!file_exists(Yii::$app->getModule('files')->cacheFullPath))
-            mkdir(Yii::$app->getModule('files')->cacheFullPath);
+        if (!file_exists(Yii::$app->getModule('files')->cacheFullPath)) {
+                    mkdir(Yii::$app->getModule('files')->cacheFullPath);
+        }
 
         preg_match('/(.+\/\d{2})\/\d{2}\//', $this->fileName, $matches);
 
-        if (!file_exists($matches[1]))
-            @mkdir($matches[1]);
-        if (!file_exists($matches[0]))
-            @mkdir($matches[0]);
-        if (!file_exists($matches[0]))
-            throw new ErrorException("Unable to create cache folder: {$matches[0]}");
+        if (!file_exists($matches[1])) {
+                    @mkdir($matches[1]);
+        }
+        if (!file_exists($matches[0])) {
+                    @mkdir($matches[0]);
+        }
+        if (!file_exists($matches[0])) {
+                    throw new ErrorException("Unable to create cache folder: {$matches[0]}");
+        }
     }
 
     /**