daaner / convertimage

src/ConvertImageServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     {
         $this->mergeConfigFrom(__DIR__.'/../config/convert.php', 'convert');
 
-        $this->app->singleton('convert', function () {
+        $this->app->singleton('convert', function() {
             return $this->app->make(ConvertImage::class);
         });
 

src/ConvertImage.php

Braces +3 added lines, -3 removed lines

@@ -377,9 +377,9 @@
         $info = getimagesize($source);
         $isAlpha = false;
 
-        if ($info['mime'] == 'image/jpeg')
-            $image = imagecreatefromjpeg($source);
-        elseif ($isAlpha = $info['mime'] == 'image/gif') {
+        if ($info['mime'] == 'image/jpeg') {
+                    $image = imagecreatefromjpeg($source);
+        } elseif ($isAlpha = $info['mime'] == 'image/gif') {
             $image = imagecreatefromgif($source);
         } elseif ($isAlpha = $info['mime'] == 'image/png') {
             $image = imagecreatefrompng($source);

Spacing +44 added lines, -44 removed lines

@@ -67,7 +67,7 @@ 
          * Если внешний линк, возвращаем что давали
          */
         if (!config('convert.convert_external_url') && $this->isHTTP) {
-            Log::info('ConvertImage. Not allowed converted external file (config): ' . $image);
+            Log::info('ConvertImage. Not allowed converted external file (config): '.$image);
             return $image;
         }
 
@@ -88,7 +88,7 @@ 
 
 
         $link = $this->getNewName($newImagePath, $imageName);
-        $image_url = Str::replace('//', '/', public_path() . '/' . $link);
+        $image_url = Str::replace('//', '/', public_path().'/'.$link);
 
 
         $bgTransparentColor = config('convert.bg_color', '#ffffff');
@@ -102,7 +102,7 @@ 
             $jpg->insert($img);
 
             if ($resize) {
-                $jpg->resize($this->width, $this->height, function ($constraint) {
+                $jpg->resize($this->width, $this->height, function($constraint) {
                     if (config('convert.aspect_ratio'))
                     {
                         $constraint->aspectRatio();
@@ -118,7 +118,7 @@ 
             $status = $jpg->save($image_url, $this->quality, $this->format);
 
         } catch (Exception $e) {
-            Log::info('ConvertImage. Cannot save converted image: ' . $link);
+            Log::info('ConvertImage. Cannot save converted image: '.$link);
             Log::info($e->getMessage());
             $image_url = $image;
         }
@@ -131,7 +131,7 @@ 
             try {
                 $webP = $this->webpImage($image_url);
             } catch (Exception $e) {
-                Log::info('ConvertImage. Cannot create webP image: ' . $link);
+                Log::info('ConvertImage. Cannot create webP image: '.$link);
                 Log::info($e->getMessage());
             }
 
@@ -142,22 +142,22 @@ 
 
         if ($this->dev) {
 
-            $logData = "\n" . 'original: ' . $image;
-            $logData .= "\n" . 'status: ' . ($status ? 'true' : 'false');
-            $logData .= "\n" . 'converted (return): ' . $link;
-            $logData .= "\n" . 'overwrite file: ' . ($this->overwrite ? 'true' : 'false');
-            $logData .= "\n" . 'deleted original file: ' . ($deletedOriginal ? 'true' : 'false');
-            $logData .= "\n" . 'width: ' . $this->width;
-            $logData .= "\n" . 'height: ' . $this->height;
-            $logData .= "\n" . 'format: ' . $this->format;
-            $logData .= "\n" . 'quality: ' . $this->quality;
+            $logData = "\n".'original: '.$image;
+            $logData .= "\n".'status: '.($status ? 'true' : 'false');
+            $logData .= "\n".'converted (return): '.$link;
+            $logData .= "\n".'overwrite file: '.($this->overwrite ? 'true' : 'false');
+            $logData .= "\n".'deleted original file: '.($deletedOriginal ? 'true' : 'false');
+            $logData .= "\n".'width: '.$this->width;
+            $logData .= "\n".'height: '.$this->height;
+            $logData .= "\n".'format: '.$this->format;
+            $logData .= "\n".'quality: '.$this->quality;
 
-            $logData .= "\n" . 'isHTTP: ' . ($this->isHTTP ? 'true' : 'false');
-            $logData .= "\n" . 'deleteAfterConvert: ' . ($this->deleteAfterConvert ? 'true' : 'false');
+            $logData .= "\n".'isHTTP: '.($this->isHTTP ? 'true' : 'false');
+            $logData .= "\n".'deleteAfterConvert: '.($this->deleteAfterConvert ? 'true' : 'false');
 
-            $logData .= "\n" . 'create webP: ' . ($webP ? 'true' : 'false');
+            $logData .= "\n".'create webP: '.($webP ? 'true' : 'false');
 
-            Log::info('ConvertImage. Dev mode ->' . $logData);
+            Log::info('ConvertImage. Dev mode ->'.$logData);
         }
 
 
@@ -303,10 +303,10 @@ 
             try {
                 $name = strval(pathinfo($image, PATHINFO_FILENAME));
             } catch (Exception $e) {
-                $name = rand(100,999) . '-' . Str::replace('.', '', strval(microtime(true)));
+                $name = rand(100, 999).'-'.Str::replace('.', '', strval(microtime(true)));
 
                 if ($this->dev) {
-                    Log::info('ConvertImage. Error get image name: ' . $image);
+                    Log::info('ConvertImage. Error get image name: '.$image);
                     Log::info($e->getMessage());
                 }
             }
@@ -345,10 +345,10 @@ 
                 return true;
             } catch (Exception $e) {
                 try {
-                    unlink(public_path() . $source);
+                    unlink(public_path().$source);
                     return true;
                 } catch (Exception $e) {
-                    Log::info('ConvertImage. Error DELETE original image:' . $source);
+                    Log::info('ConvertImage. Error DELETE original image:'.$source);
                 }
             }
         }
@@ -367,24 +367,24 @@ 
     {
         if (!extension_loaded('gd'))
         {
-            Log::info('ConvertImage. PHP extension GD missed, image not converted: ' . $source);
+            Log::info('ConvertImage. PHP extension GD missed, image not converted: '.$source);
             return false;
         }
 
         $dir = strval(pathinfo($source, PATHINFO_DIRNAME));
-        $name = strval(pathinfo($source, PATHINFO_FILENAME)) . '.' . $this->format;
-        $destination = $dir . DIRECTORY_SEPARATOR . $name . '.webp';
+        $name = strval(pathinfo($source, PATHINFO_FILENAME)).'.'.$this->format;
+        $destination = $dir.DIRECTORY_SEPARATOR.$name.'.webp';
         $info = getimagesize($source);
         $isAlpha = false;
 
-        if ($info['mime'] == 'image/jpeg')
+        if ($info[ 'mime' ] == 'image/jpeg')
             $image = imagecreatefromjpeg($source);
-        elseif ($isAlpha = $info['mime'] == 'image/gif') {
+        elseif ($isAlpha = $info[ 'mime' ] == 'image/gif') {
             $image = imagecreatefromgif($source);
-        } elseif ($isAlpha = $info['mime'] == 'image/png') {
+        } elseif ($isAlpha = $info[ 'mime' ] == 'image/png') {
             $image = imagecreatefrompng($source);
         } else {
-            Log::info('ConvertImage. Not supported mime for convert webP: ' . $source);
+            Log::info('ConvertImage. Not supported mime for convert webP: '.$source);
             return false;
         }
 
@@ -454,20 +454,20 @@ 
         $imagePath = config('convert.dir');
 
         if ($folder) {
-            $imagePath .= '/' . $folder;
+            $imagePath .= '/'.$folder;
         }
 
         // Замена двух слешей на один
         $imagePath = Str::replace('//', '/', $imagePath);
 
-        if (!is_dir(public_path() . $imagePath)) {
+        if (!is_dir(public_path().$imagePath)) {
             try {
-                mkdir(public_path() . $imagePath, config('convert.dir_permission'), config('convert.dir_recursive'));
+                mkdir(public_path().$imagePath, config('convert.dir_permission'), config('convert.dir_recursive'));
                 if ($this->dev) {
-                    Log::info('ConvertImage. Create folder for convert image: ' . $imagePath);
+                    Log::info('ConvertImage. Create folder for convert image: '.$imagePath);
                 }
             } catch (Exception $e) {
-                Log::critical('ConvertImage. ERROR: Can not create folder: ' . $imagePath);
+                Log::critical('ConvertImage. ERROR: Can not create folder: '.$imagePath);
                 $imagePath = config('convert.dir_temp');
             }
         }
@@ -496,21 +496,21 @@ 
                 if ($getFile->successful()) {
                     $file = $getFile->body();
                 } else {
-                    Log::info('ConvertImage. Image HTTP read error: ' . $link);
+                    Log::info('ConvertImage. Image HTTP read error: '.$link);
                     return false;
                 }
             } catch (Exception $e) {
-                Log::info('ConvertImage. Error HTTP get image: ' . $link);
+                Log::info('ConvertImage. Error HTTP get image: '.$link);
                 Log::info($e->getMessage());
                 return false;
             }
         } else {
-            $imageLink = Str::replace('//', '/', public_path() . '/' . $link);
+            $imageLink = Str::replace('//', '/', public_path().'/'.$link);
 
             try {
                 $file = file_get_contents($imageLink);
             } catch (Exception $e) {
-                Log::info('ConvertImage. Image read (local) error: ' . $link);
+                Log::info('ConvertImage. Image read (local) error: '.$link);
                 Log::info($e->getMessage());
                 return false;
             }
@@ -528,14 +528,14 @@ 
      */
     protected function getNewName(string $path, string $name): string
     {
-        $link = $path . '/' . $name . '.' . $this->format;
+        $link = $path.'/'.$name.'.'.$this->format;
 
-        if (file_exists(public_path() . '/' . $link))
+        if (file_exists(public_path().'/'.$link))
         {
             if ($this->overwrite)
             {
                 // файл есть, разрешена перезапись и права на перезапись есть
-                if(is_writable(public_path() . '/' . $link))
+                if (is_writable(public_path().'/'.$link))
                 {
                     return $link;
                 }
@@ -543,9 +543,9 @@ 
 
             // Файл есть, перезапись не разрешена или нет прав.
             // Меняем имя файла
-            Log::info('ConvertImage. Change name for overwrite: ' . $link);
-            $newName = $name . '-' . Str::replace('.', '', strval(microtime(true)));
-            $link = $path . '/' . $newName . '.' . $this->format;
+            Log::info('ConvertImage. Change name for overwrite: '.$link);
+            $newName = $name.'-'.Str::replace('.', '', strval(microtime(true)));
+            $link = $path.'/'.$newName.'.'.$this->format;
         }