floor12 / yii2-module-files

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

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/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,