floor12 / yii2-module-files

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/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/components/SimpleImage.php

Spacing +2 added lines, -2 removed lines

@@ -25,10 +25,10 @@
             $this->image = imagecreatefromjpeg($filename);
         } elseif ($this->image_type == IMAGETYPE_GIF) {
             $this->image = imagecreatefromgif($filename);
-            imageSaveAlpha($this->image,true);
+            imageSaveAlpha($this->image, true);
         } elseif ($this->image_type == IMAGETYPE_PNG) {
             $this->image = imagecreatefrompng($filename);
-            imageSaveAlpha($this->image,true);
+            imageSaveAlpha($this->image, true);
         } elseif ($this->image_type == IMAGETYPE_WEBP) {
             $this->image = imagecreatefromwebp($filename);
         }

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