floor12 / yii2-module-files

src/components/FileBehaviour.php

Braces +21 added lines, -13 removed lines

@@ -68,9 +68,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;
@@ -105,8 +107,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']);
+            }
         }
     }
 
@@ -123,8 +126,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') {
@@ -132,6 +135,7 @@ 
 
                         if (is_string($params)) {
                             $field = $params;
+        }
                             $params = [];
                         }
 
@@ -167,8 +171,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);
         }
     }
@@ -189,8 +195,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);
     }
@@ -216,8 +223,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,
@@ -226,7 +233,7 @@ 
                             ])
                         ->orderBy('ordering ASC')
                         ->all();
-                else {
+                } else {
                     $this->cachedFiles[$att_name] = File::find()
                         ->where(
                             [
@@ -251,8 +258,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/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/models/File.php

Braces +45 added lines, -30 removed lines

@@ -86,29 +86,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;
     }
@@ -224,8 +232,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';
     }
@@ -256,8 +265,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]);
     }
 
@@ -333,8 +343,9 @@ 
             isset($this->behaviors['files']) &&
             isset($this->behaviors['files']->attributes[$this->field]) &&
             isset($this->behaviors['files']->attributes[$this->field]['watermark'])
-        )
-            $this->behaviors['files']->attributes[$this->field]['watermark'];
+        ) {
+                    $this->behaviors['files']->attributes[$this->field]['watermark'];
+        }
     }
 
     /**
@@ -355,14 +366,17 @@ 
      */
     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 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]);
     }
@@ -406,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/PictureWidget.php

Braces +3 added lines, -2 removed lines

@@ -26,8 +26,9 @@
      */
     public function run(): ?string
     {
-        if (!in_array($this->model->type, [FileType::IMAGE, FileType::VIDEO]))
-            return null;
+        if (!in_array($this->model->type, [FileType::IMAGE, FileType::VIDEO])) {
+                    return null;
+        }
         return $this->render('pictureWidget', [
             'model' => $this->model,
             'width' => $this->width,

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

src/actions/GetPreviewAction.php

Braces +12 added lines, -8 removed lines

@@ -46,14 +46,17 @@ 
     private function loadAndCheckModel(string $hash): void
     {
         $this->model = File::findOne(['hash' => $hash]);
-        if (!$this->model)
-            throw new NotFoundHttpException("Запрашиваемый файл не найден");
+        if (!$this->model) {
+                    throw new NotFoundHttpException("Запрашиваемый файл не найден");
+        }
 
-        if (!$this->model->isImage() && !$this->model->isVideo())
-            throw new NotFoundHttpException("Запрашиваемый файл не является изображением");
+        if (!$this->model->isImage() && !$this->model->isVideo()) {
+                    throw new NotFoundHttpException("Запрашиваемый файл не является изображением");
+        }
 
-        if (!file_exists($this->model->rootPath))
-            throw new NotFoundHttpException('Запрашиваемый файл не найден на диске.');
+        if (!file_exists($this->model->rootPath)) {
+                    throw new NotFoundHttpException('Запрашиваемый файл не найден на диске.');
+        }
     }
 
     /**
@@ -65,8 +68,9 @@ 
     {
         $filename = Yii::createObject(ImagePreviewer::class, [$this->model, $width, $webp])->getUrl();
 
-        if (!file_exists($filename))
-            throw new NotFoundHttpException('Запрашиваемый файл не найден на диске.');
+        if (!file_exists($filename)) {
+                    throw new NotFoundHttpException('Запрашиваемый файл не найден на диске.');
+        }
 
         $response = Yii::$app->response;
         $response->format = Response::FORMAT_RAW;

src/actions/GetFileAction.php

Braces +6 added lines, -4 removed lines

@@ -14,11 +14,13 @@
     {
         $model = File::findOne(['hash' => $hash]);
 
-        if (!$model)
-            throw new NotFoundHttpException("Запрашиваемый файл не найден");
+        if (!$model) {
+                    throw new NotFoundHttpException("Запрашиваемый файл не найден");
+        }
 
-        if (!file_exists($model->rootPath))
-            throw new NotFoundHttpException('Запрашиваемый файл не найден на диске.');
+        if (!file_exists($model->rootPath)) {
+                    throw new NotFoundHttpException('Запрашиваемый файл не найден на диске.');
+        }
 
         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));

src/controllers/DefaultController.php

Braces +18 added lines, -12 removed lines

@@ -72,8 +72,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.');
+        }
     }
 
     /**
@@ -86,12 +87,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");
@@ -163,8 +166,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,
@@ -190,8 +194,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;
@@ -200,8 +205,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->rootPreviewPath))
-            throw new NotFoundHttpException('Preview not found.');
+        if (!file_exists($model->rootPreviewPath)) {
+                    throw new NotFoundHttpException('Preview not found.');
+        }
 
         $response->sendFile($model->rootPreviewPath, 'preview.jpg');
 

src/logic/VideoFrameExtractor.php

Braces +12 added lines, -8 removed lines

@@ -18,14 +18,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;
@@ -38,8 +41,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));
+        }
     }
 
 }