floor12 / yii2-module-files

src/logic/ImagePreviewer.php

Braces +33 added lines, -22 removed lines

@@ -30,8 +30,9 @@ 
         $this->width = $width;
         $this->webp = $webp;
 
-        if (!$this->model->isImage() && !$this->model->isVideo())
-            throw new ErrorException('File is not an image or video.');
+        if (!$this->model->isImage() && !$this->model->isVideo()) {
+                    throw new ErrorException('File is not an image or video.');
+        }
     }
 
     /**
@@ -41,8 +42,9 @@ 
      */
     public function getUrl()
     {
-        if ($this->model->isSvg())
-            return $this->model->getRootPath();
+        if ($this->model->isSvg()) {
+                    return $this->model->getRootPath();
+        }
 
         $cachePath = Yii::$app->getModule('files')->cacheFullPath;
         $jpegName = $this->model->makeNameWithSize($this->model->filename, $this->width);
@@ -56,21 +58,25 @@ 
         $sourceImagePath = $this->model->rootPath;
         if ($this->model->isVideo()) {
             $sourceImagePath = $this->fileName . '.jpeg';
-            if (!is_file($sourceImagePath))
-                Yii::createObject(VideoFrameExtractor::class, [
+            if (!is_file($sourceImagePath)) {
+                            Yii::createObject(VideoFrameExtractor::class, [
                     $this->model->rootPath,
                     $sourceImagePath
                 ])->extract();
+            }
         }
 
-        if (!is_file($this->fileName) || filesize($this->fileName) == 0)
-            $this->createPreview($sourceImagePath);
+        if (!is_file($this->fileName) || filesize($this->fileName) == 0) {
+                    $this->createPreview($sourceImagePath);
+        }
 
-        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;
     }
@@ -80,19 +86,23 @@ 
      */
     protected function prepareFolder()
     {
-        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);
+        }
         $lastFolder = '/';
         $explodes = explode('/', $this->fileName);
         array_pop($explodes);
-        if (empty($explodes))
-            return;
+        if (empty($explodes)) {
+                    return;
+        }
         foreach ($explodes as $folder) {
-            if (empty($folder))
-                continue;
+            if (empty($folder)) {
+                            continue;
+            }
             $lastFolder = $lastFolder . $folder . '/';
-            if (!file_exists($lastFolder))
-                mkdir($lastFolder);
+            if (!file_exists($lastFolder)) {
+                            mkdir($lastFolder);
+            }
         }
     }
 
@@ -115,8 +125,9 @@ 
         }
 
         $saveType = $img->image_type;
-        if ($saveType == IMG_WEBP || $saveType == IMG_QUADRATIC)
-            $saveType = IMG_JPEG;
+        if ($saveType == IMG_WEBP || $saveType == IMG_QUADRATIC) {
+                    $saveType = IMG_JPEG;
+        }
         $img->save($this->fileName, $saveType);
     }
 

src/logic/FileCreateFromInstance.php

Braces +29 added lines, -20 removed lines

@@ -35,27 +35,31 @@ 
 
         $this->_onlyUploaded = $onlyUploaded;
 
-        if (!isset($data['attribute']) || !$data['attribute'] || !isset($data['modelClass']) || !$data['modelClass'])
-            throw new BadRequestHttpException("Attribute or class name not set.");
+        if (!isset($data['attribute']) || !$data['attribute'] || !isset($data['modelClass']) || !$data['modelClass']) {
+                    throw new BadRequestHttpException("Attribute or class name not set.");
+        }
 
         // Загружаем полученные данные
         $this->_instance = $file;
         $this->_attribute = $data['attribute'];
 
-        if (!file_exists($this->_instance->tempName))
-            throw new ErrorException("Tmp file not found on disk.");
+        if (!file_exists($this->_instance->tempName)) {
+                    throw new ErrorException("Tmp file not found on disk.");
+        }
 
         // Инициализируем класс владельца файла для валидаций и ставим сценарий
         $this->_owner = new $data['modelClass'];
 
-        if (isset($data['scenario']))
-            $this->_owner->setScenario($data['scenario']);
+        if (isset($data['scenario'])) {
+                    $this->_owner->setScenario($data['scenario']);
+        }
 
 
         if (isset($this->_owner->behaviors['files']->attributes[$this->_attribute]['validator'])) {
             foreach ($this->_owner->behaviors['files']->attributes[$this->_attribute]['validator'] as $validator) {
-                if (!$validator->validate($this->_instance, $error))
-                    throw new BadRequestHttpException($error);
+                if (!$validator->validate($this->_instance, $error)) {
+                                    throw new BadRequestHttpException($error);
+                }
             }
 
         }
@@ -71,10 +75,12 @@ 
         $this->_model->content_type = $this->_instance->type;
         $this->_model->size = $this->_instance->size;
         $this->_model->type = $this->detectType();
-        if ($identity)
-            $this->_model->user_id = $identity->getId();
-        if ($this->_model->type == FileType::VIDEO)
-            $this->_model->video_status = 0;
+        if ($identity) {
+                    $this->_model->user_id = $identity->getId();
+        }
+        if ($this->_model->type == FileType::VIDEO) {
+                    $this->_model->video_status = 0;
+        }
 
         //Генерируем полный новый адрес сохранения файла
         $this->_fullPath = Yii::$app->getModule('files')->storageFullPath . DIRECTORY_SEPARATOR . $this->_model->filename;
@@ -86,10 +92,12 @@ 
     public 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;
     }
 
@@ -102,10 +110,11 @@ 
         $path = Yii::$app->getModule('files')->storageFullPath . $this->_model->filename;
 
         if ($this->_model->save()) {
-            if (!$this->_onlyUploaded)
-                copy($this->_instance->tempName, $this->_fullPath);
-            else
-                $this->_instance->saveAs($this->_fullPath, false);
+            if (!$this->_onlyUploaded) {
+                            copy($this->_instance->tempName, $this->_fullPath);
+            } else {
+                            $this->_instance->saveAs($this->_fullPath, false);
+            }
         }
 
         if ($this->_model->type == FileType::IMAGE) {

src/logic/VideoFrameExtractor.php

Braces +12 added lines, -8 removed lines

@@ -19,14 +19,17 @@ 
     {
         $this->ffmpegBin = Yii::$app->getModule('files')->ffmpeg;
 
-        if (!file_exists($this->ffmpegBin))
-            throw new ErrorException("ffmpeg is not found: {$this->ffmpegBin}");
+        if (!file_exists($this->ffmpegBin)) {
+                    throw new ErrorException("ffmpeg is not found: {$this->ffmpegBin}");
+        }
 
-        if (!is_executable($this->ffmpegBin))
-            throw new ErrorException("ffmpeg is not executable: {$this->ffmpegBin}");
+        if (!is_executable($this->ffmpegBin)) {
+                    throw new ErrorException("ffmpeg is not executable: {$this->ffmpegBin}");
+        }
 
-        if (!is_file($videoSourceFilename))
-            throw new ErrorException('File not found on disk.');
+        if (!is_file($videoSourceFilename)) {
+                    throw new ErrorException('File not found on disk.');
+        }
 
         $this->videoSourceFilename = $videoSourceFilename;
         $this->outputImageFilename = $outputImageFilename;
@@ -39,8 +42,9 @@ 
     {
         $command = "{$this->ffmpegBin} -i {$this->videoSourceFilename}  -ss 00:00:03.000 -vframes 1  {$this->outputImageFilename}";
         exec($command, $out, $result);
-        if ($result !== 0)
-            throw new ErrorException('FFmpeg frame extracting fail:' . print_r($out, true));
+        if ($result !== 0) {
+                    throw new ErrorException('FFmpeg frame extracting fail:' . print_r($out, true));
+        }
     }
 
 }

src/controllers/DefaultController.php

Braces +18 added lines, -12 removed lines

@@ -73,8 +73,9 @@ 
      */
     private function checkFormToken()
     {
-        if (in_array($this->action->id, $this->actionsToCheck) && FileInputWidget::generateToken() != Yii::$app->request->post('_fileFormToken'))
-            throw new BadRequestHttpException('File-form token is wrong or missing.');
+        if (in_array($this->action->id, $this->actionsToCheck) && FileInputWidget::generateToken() != Yii::$app->request->post('_fileFormToken')) {
+                    throw new BadRequestHttpException('File-form token is wrong or missing.');
+        }
     }
 
     /**
@@ -87,12 +88,14 @@ 
 
         $zip = new  ZipArchive;
         $filename = Yii::getAlias("@webroot/assets/files.zip");
-        if (file_exists($filename))
-            @unlink($filename);
+        if (file_exists($filename)) {
+                    @unlink($filename);
+        }
         if (sizeof($files) && $zip->open($filename, ZipArchive::CREATE)) {
 
-            foreach ($files as $file)
-                $zip->addFile($file->rootPath, $file->title);
+            foreach ($files as $file) {
+                            $zip->addFile($file->rootPath, $file->title);
+            }
 
             $zip->close();
             header("Pragma: public");
@@ -165,8 +168,9 @@ 
 
         $view = Yii::$app->request->post('mode') == 'single' ? "_single" : "_file";
 
-        if ($ratio)
-            $this->getView()->registerJs("initCropper({$model->id}, '{$model->href}', {$ratio}, true);");
+        if ($ratio) {
+                    $this->getView()->registerJs("initCropper({$model->id}, '{$model->href}', {$ratio}, true);");
+        }
 
         return $this->renderAjax($view, [
             'model' => $model,
@@ -192,8 +196,9 @@ 
     {
         $model = File::findOne(['hash' => $hash]);
 
-        if (!$model)
-            throw new NotFoundHttpException("Запрашиваемый файл не найден в базе.");
+        if (!$model) {
+                    throw new NotFoundHttpException("Запрашиваемый файл не найден в базе.");
+        }
 
         $response = Yii::$app->response;
         $response->format = Response::FORMAT_RAW;
@@ -202,8 +207,9 @@ 
         Yii::$app->response->headers->set('Last-Modified', date("c", $model->created));
         Yii::$app->response->headers->set('Cache-Control', 'public, max-age=' . (60 * 60 * 24 * 15));
 
-        if (!file_exists($model->getRootPreviewPath()))
-            throw new NotFoundHttpException('Preview not found.');
+        if (!file_exists($model->getRootPreviewPath())) {
+                    throw new NotFoundHttpException('Preview not found.');
+        }
 
         $response->sendFile($model->getRootPreviewPath(), 'preview.jpg');
 

src/components/PictureWidget.php

Braces +6 added lines, -4 removed lines

@@ -28,11 +28,13 @@
      */
     public function run(): ?string
     {
-        if (empty($this->model) || !in_array($this->model->type, [FileType::IMAGE, FileType::VIDEO]))
-            return null;
+        if (empty($this->model) || !in_array($this->model->type, [FileType::IMAGE, FileType::VIDEO])) {
+                    return null;
+        }
 
-        if (is_array($this->width))
-            $this->view = 'mediaPictureWidget';
+        if (is_array($this->width)) {
+                    $this->view = 'mediaPictureWidget';
+        }
 
         return $this->render($this->view, [
             'model' => $this->model,

src/models/File.php

Braces +42 added lines, -28 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;
     }
@@ -225,8 +233,9 @@ 
 
     public function getRootPreviewPath()
     {
-        if ($this->isSvg())
-            return $this->getRootPath();
+        if ($this->isSvg()) {
+                    return $this->getRootPath();
+        }
 
         return Yii::$app->getModule('files')->storageFullPath . $this->filename . '.jpg';
     }
@@ -340,8 +349,9 @@ 
             isset($this->behaviors['files']) &&
             isset($this->behaviors['files']->attributes[$this->field]) &&
             isset($this->behaviors['files']->attributes[$this->field]['watermark'])
-        )
-            return $this->behaviors['files']->attributes[$this->field]['watermark'];
+        ) {
+                    return $this->behaviors['files']->attributes[$this->field]['watermark'];
+        }
     }
 
     /**
@@ -361,17 +371,20 @@ 
      */
     public function getPreviewWebPath(int $width = 0, bool $webp = false)
     {
-        if (!file_exists($this->getRootPath()))
-            return null;
+        if (!file_exists($this->getRootPath())) {
+                    return null;
+        }
 
-        if (!$this->isVideo() && !$this->isImage())
-            throw new ErrorException('Requiested file is not an image and its implsible to resize it.');
+        if (!$this->isVideo() && !$this->isImage()) {
+                    throw new ErrorException('Requiested file is not an image and its implsible to resize it.');
+        }
 
-        if (Yii::$app->getModule('files')->hostStatic)
-            return
+        if (Yii::$app->getModule('files')->hostStatic) {
+                    return
                 Yii::$app->getModule('files')->hostStatic .
                 $this->makeNameWithSize($this->filename, $width, $webp) .
                 "?hash={$this->hash}&width={$width}&webp=" . intval($webp);
+        }
 
         return Url::toRoute(['/files/default/image', 'hash' => $this->hash, 'width' => $width, 'webp' => $webp]);
     }
@@ -407,8 +420,9 @@ 
      */
     public function getPreviewRootPath($width = 0, $webp = false)
     {
-        if (!$this->isVideo() && !$this->isImage())
-            throw new ErrorException('Requiested file is not an image and its implsible to resize it.');
+        if (!$this->isVideo() && !$this->isImage()) {
+                    throw new ErrorException('Requiested file is not an image and its implsible to resize it.');
+        }
         return $this->makeNameWithSize($this->rootPath, $width, $webp);
     }
 

src/components/FileBehaviour.php

Spacing +1 added lines, -1 removed lines

@@ -205,7 +205,7 @@
         if (isset($this->_values[$att_name])) {
             unset($this->_values[$att_name][0]);
             if (sizeof($this->_values[$att_name]))
-                return array_map(function ($fileId) {
+                return array_map(function($fileId) {
                     return File::findOne($fileId);
                 }, $this->_values[$att_name]);
         } else {

Braces +24 added lines, -15 removed lines

@@ -69,9 +69,11 @@ 
                     ]
                 )->execute();
 
-                if ($ids) foreach ($ids as $id) {
+                if ($ids) {
+                    foreach ($ids as $id) {
                     if (empty($id))
                         continue;
+                }
                     $file = File::findOne($id);
                     if ($file) {
                         $file->object_id = $this->owner->id;
@@ -106,8 +108,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']);
+            }
         }
     }
 
@@ -124,8 +127,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') {
@@ -133,6 +136,7 @@ 
 
                         if (is_string($params)) {
                             $field = $params;
+        }
                             $params = [];
                         }
 
@@ -168,8 +172,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);
         }
     }
@@ -190,8 +196,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);
     }
@@ -204,9 +211,10 @@ 
     {
         if (isset($this->_values[$att_name])) {
             unset($this->_values[$att_name][0]);
-            if (sizeof($this->_values[$att_name]))
-                return array_map(function ($fileId) {
+            if (sizeof($this->_values[$att_name])) {
+                            return array_map(function ($fileId) {
                     return File::findOne($fileId);
+            }
                 }, $this->_values[$att_name]);
         } else {
             if (!isset($this->cachedFiles[$att_name])) {
@@ -214,8 +222,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
-                )
-                    $this->cachedFiles[$att_name] = File::find()
+                ) {
+                                    $this->cachedFiles[$att_name] = File::find()
                         ->where(
                             [
                                 'object_id' => $this->owner->id,
@@ -224,7 +232,7 @@ 
                             ])
                         ->orderBy('ordering ASC')
                         ->all();
-                else {
+                } else {
                     $this->cachedFiles[$att_name] = File::find()
                         ->where(
                             [
@@ -249,8 +257,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/FileListWidget.php

Braces +6 added lines, -4 removed lines

@@ -30,8 +30,9 @@ 
      */
     public function init()
     {
-        if (empty($this->files))
-            return null;
+        if (empty($this->files)) {
+                    return null;
+        }
         Yii::$app->getModule('files')->registerTranslations();
         if (empty($this->lightboxKey)) {
             $this->lightboxKey = $this->files[0]->field . '-' . $this->files[0]->object_id;
@@ -50,8 +51,9 @@ 
 
         $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);
+        }
 
 
         return $this->render('fileListWidget', [

src/components/FileInputWidget.php

Braces +3 added lines, -2 removed lines

@@ -37,8 +37,9 @@
         $this->registerTranslations();
         $this->block_id = rand(9999999, 999999999);
 
-        if (!$this->uploadButtonText)
-            $this->uploadButtonText = Yii::t('files', 'Upload');
+        if (!$this->uploadButtonText) {
+                    $this->uploadButtonText = Yii::t('files', 'Upload');
+        }
 
         $this->ratio = $this->model->getBehavior('files')->attributes[$this->attribute]['ratio'] ?? null;