pratiksh404 / laravel-thumbnails

src/Traits/Thumbnail.php

Spacing +6 added lines, -8 removed lines

@@ -19,8 +19,8 @@ 
             $raw_filename = pathinfo($filenamewithextension, PATHINFO_FILENAME); //Retriving Image Raw Filename only
             $filename = str_replace('-', '', $raw_filename); // Retrive Filename
             $extension = $image_file->getClientOriginalExtension(); //Retriving Image extension
-            $imageStoreNameOnly = $filename.'-'.time(); //Making Image Store name
-            $imageStoreName = $filename.'-'.time().'.'.$extension; //Making Image Store name
+            $imageStoreNameOnly = $filename . '-' . time(); //Making Image Store name
+            $imageStoreName = $filename . '-' . time() . '.' . $extension; //Making Image Store name
 
             /* ------------------------------------------------------------------- */
 
@@ -31,10 +31,10 @@ 
             ]);
             /* --------------------------------------------------------------------------------------------- */
 
-            $image = Image::cache(function ($cached_img) use ($image_file, $custom) {
+            $image = Image::cache(function($cached_img) use ($image_file, $custom) {
                 return $cached_img->make($image_file->getRealPath())->fit($custom['width'] ?? config('thumbnail.img_width', 1000), $custom['height'] ?? config('thumbnail.img_height', 800)); //Parent Image Interventing
             }, config('thumbnail.image_cached_time', 10), true);
-            $image->save(public_path('storage/'.$this->$fieldname), $custom['quality'] ?? config('thumbnail.image_quality', 80)); // Parent Image Locating Save
+            $image->save(public_path('storage/' . $this->$fieldname), $custom['quality'] ?? config('thumbnail.image_quality', 80)); // Parent Image Locating Save
 
             if (config('thumbnail.thumbnail', true)) {
                 $thumbnails = false;
@@ -42,7 +42,7 @@ 
                 $storage = $custom['storage'] ?? config('thumbnail.storage_path', 'uploads') ?? false;
                 if ($thumbnails) {
                     /* -----------------------------------------Custom Thumbnails------------------------------------------------- */
-<<<<<<< HEAD
+<< << <<< HEAD
                     $this->makeCustomThumbnails($image_file, $imageStoreNameOnly, $extension, $storage, $thumbnails);
                     /* -------------------------------------------------------------------------------------------------- */
 =======
@@ -197,6 +197,4 @@ 
             }
         }
 
-        return $images_property;
-    }
-}
+        return $images_property
\ No newline at end of file