floor12 / yii2-module-files

src/logic/FileCreateFromInstance.php

Braces +29 added lines, -20 removed lines

@@ -34,27 +34,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);
+                }
             }
 
         }
@@ -70,10 +74,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->id;
-        if ($this->_model->type == FileType::VIDEO)
-            $this->_model->video_status = 0;
+        if ($identity) {
+                    $this->_model->user_id = $identity->id;
+        }
+        if ($this->_model->type == FileType::VIDEO) {
+                    $this->_model->video_status = 0;
+        }
 
         //Генерируем полный новый адрес сохранения файла
         $this->_fullPath = Yii::$app->getModule('files')->storageFullPath . DIRECTORY_SEPARATOR . $this->_model->filename;
@@ -85,10 +91,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;
     }
 
@@ -101,10 +109,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/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/ImagePreviewer.php

Braces +30 added lines, -20 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,8 +41,9 @@ 
      */
     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 . DIRECTORY_SEPARATOR . $this->model->makeNameWithSize($this->model->filename,
                 $this->width, 0);
@@ -50,14 +52,17 @@ 
 
         $this->prepareFolder();
 
-        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;
     }
@@ -79,8 +84,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);
     }
 
@@ -99,20 +105,24 @@ 
      */
     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);
+        }
         $folders = [];
         $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);
+            }
             $folders[] = $lastFolder;
         }
     }

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/models/File.php

Braces +48 added lines, -32 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;
     }
@@ -232,8 +240,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($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]);
     }
@@ -379,8 +393,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;
     }
 
@@ -395,8 +410,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);
     }