nystudio107 / craft-imageoptimize

src/services/OptimizedImages.php

Spacing +22 added lines, -22 removed lines

@@ -125,10 +125,10 @@ 
                             } catch (Throwable $exception) {
                             }
                         } catch (Throwable $e) {
-                            $msg = 'Failed to update transform: ' . $e->getMessage();
+                            $msg = 'Failed to update transform: '.$e->getMessage();
                             Craft::error($msg, __METHOD__);
                             if (Craft::$app instanceof ConsoleApplication) {
-                                echo $msg . PHP_EOL;
+                                echo $msg.PHP_EOL;
                             }
                             // Add the error message to the stickyErrors for the model
                             $model->stickyErrors[] = $msg;
@@ -142,16 +142,16 @@ 
                     }
                 } else {
                     $canManipulate = Image::canManipulateAsImage($asset->getExtension());
-                    $msg = 'Could not create transform for: ' . $asset->title
-                        . ' - Final format: ' . $finalFormat
-                        . ' - Element extension: ' . $asset->getExtension()
-                        . ' - canManipulateAsImage: ' . $canManipulate;
+                    $msg = 'Could not create transform for: '.$asset->title
+                        . ' - Final format: '.$finalFormat
+                        . ' - Element extension: '.$asset->getExtension()
+                        . ' - canManipulateAsImage: '.$canManipulate;
                     Craft::error(
                         $msg,
                         __METHOD__
                     );
                     if (Craft::$app instanceof ConsoleApplication) {
-                        echo $msg . PHP_EOL;
+                        echo $msg.PHP_EOL;
                     }
                     if ($canManipulate) {
                         // Add the error message to the stickyErrors for the model
@@ -181,10 +181,10 @@ 
                 $this->addVariantImageToModel($asset, $model, $transform, $variant, $aspectRatio);
             } else {
                 $canManipulate = Image::canManipulateAsImage($asset->getExtension());
-                $msg = 'Could not create transform for: ' . $asset->title
-                    . ' - Final format: ' . $finalFormat
-                    . ' - Element extension: ' . $asset->getExtension()
-                    . ' - canManipulateAsImage: ' . $canManipulate;
+                $msg = 'Could not create transform for: '.$asset->title
+                    . ' - Final format: '.$finalFormat
+                    . ' - Element extension: '.$asset->getExtension()
+                    . ' - canManipulateAsImage: '.$canManipulate;
                 Craft::error(
                     $msg,
                     __METHOD__
@@ -223,7 +223,7 @@ 
                                 $folder = $asset->getFolder();
                                 while ($folder !== null && !$createVariants) {
                                     if ($folder->uid === $subfolder || $folder->name === $subfolder) {
-                                        Craft::info('Matched subfolder uid: ' . print_r($subfolder, true), __METHOD__);
+                                        Craft::info('Matched subfolder uid: '.print_r($subfolder, true), __METHOD__);
                                         $createVariants = true;
                                     } else {
                                         $folder = $folder->getParent();
@@ -341,7 +341,7 @@ 
             } catch (SiteNotFoundException $e) {
                 $siteId = 0;
                 Craft::error(
-                    'Failed to get primary site: ' . $e->getMessage(),
+                    'Failed to get primary site: '.$e->getMessage(),
                     __METHOD__
                 );
             }
@@ -445,7 +445,7 @@ 
     {
         Craft::beginProfile('generatePlaceholders', __METHOD__);
         Craft::info(
-            'generatePlaceholders for: ' . print_r($model, true),
+            'generatePlaceholders for: '.print_r($model, true),
             __METHOD__
         );
         $settings = ImageOptimize::$plugin->getSettings();
@@ -503,20 +503,20 @@ 
         }
         $useAspectRatio = $variant['useAspectRatio'] ?? false;
         if ($useAspectRatio) {
-            $aspectRatio = (float)$variant['aspectRatioX'] / (float)$variant['aspectRatioY'];
+            $aspectRatio = (float) $variant['aspectRatioX'] / (float) $variant['aspectRatioY'];
         } else {
-            $aspectRatio = (float)$asset->width / (float)$asset->height;
+            $aspectRatio = (float) $asset->width / (float) $asset->height;
         }
-        $width = (int)$variant['width'] * (int)$retinaSize;
+        $width = (int) $variant['width'] * (int) $retinaSize;
         $transform->width = $width;
-        $transform->height = (int)($width / $aspectRatio);
+        $transform->height = (int) ($width / $aspectRatio);
         // Image quality
-        $quality = (int)($variant['quality'] ?? null);
+        $quality = (int) ($variant['quality'] ?? null);
         if (empty($quality)) {
             $quality = null;
         }
         if ($quality !== null && $settings->lowerQualityRetinaImageVariants && $retinaSize != '1') {
-            $quality = (int)($quality * (1.5 / (int)$retinaSize));
+            $quality = (int) ($quality * (1.5 / (int) $retinaSize));
         }
         $transform->quality = $quality;
         // Interlaced (progressive JPEGs or interlaced PNGs)
@@ -543,7 +543,7 @@ 
             $transform
         );
         Craft::info(
-            'URL created: ' . print_r($url, true),
+            'URL created: '.print_r($url, true),
             __METHOD__
         );
         // Update the model
@@ -571,7 +571,7 @@ 
                 $this->generatePlaceholders($asset, $model, $aspectRatio);
             }
             Craft::info(
-                'Created transforms for variant: ' . print_r($variant, true),
+                'Created transforms for variant: '.print_r($variant, true),
                 __METHOD__
             );
         }

src/console/controllers/OptimizeController.php

Spacing +5 added lines, -5 removed lines

@@ -54,9 +54,9 @@ 
      */
     public function actionCreate(?string $volumeHandle = null): void
     {
-        echo 'Creating optimized image variants' . PHP_EOL;
+        echo 'Creating optimized image variants'.PHP_EOL;
         if ($this->force) {
-            echo 'Forcing optimized image variants creation via --force' . PHP_EOL;
+            echo 'Forcing optimized image variants creation via --force'.PHP_EOL;
         }
 
         $fieldId = null;
@@ -74,7 +74,7 @@ 
             if ($volume) {
                 ImageOptimize::$plugin->optimizedImages->resaveVolumeAssets($volume, $fieldId, $this->force);
             } else {
-                echo 'Unknown Asset Volume handle: ' . $volumeHandle . PHP_EOL;
+                echo 'Unknown Asset Volume handle: '.$volumeHandle.PHP_EOL;
             }
         }
         $this->runCraftQueue();
@@ -87,10 +87,10 @@ 
      */
     public function actionCreateAsset(?int $id = null): void
     {
-        echo 'Creating optimized image variants' . PHP_EOL;
+        echo 'Creating optimized image variants'.PHP_EOL;
 
         if ($id === null) {
-            echo 'No Asset ID specified' . PHP_EOL;
+            echo 'No Asset ID specified'.PHP_EOL;
         } else {
             // Re-save a single Asset ID
             ImageOptimize::$plugin->optimizedImages->resaveAsset($id, $this->force);

src/models/OptimizedImage.php

Spacing +9 added lines, -9 removed lines

@@ -547,7 +547,7 @@ 
             return $this->defaultPlaceholderImage();
         }
 
-        return Template::raw($header . rawurlencode($content));
+        return Template::raw($header.rawurlencode($content));
     }
 
     /**
@@ -625,7 +625,7 @@ 
             return $this->defaultPlaceholderImage();
         }
 
-        return Template::raw($header . $content);
+        return Template::raw($header.$content);
     }
 
     /**
@@ -753,16 +753,16 @@ 
         foreach ($array as $key => $value) {
             if ($dpr) {
                 $descriptor = '1x';
-                if (!empty($array[(int)$key / 2])) {
+                if (!empty($array[(int) $key / 2])) {
                     $descriptor = '2x';
                 }
-                if (!empty($array[(int)$key / 3])) {
+                if (!empty($array[(int) $key / 3])) {
                     $descriptor = '3x';
                 }
             } else {
-                $descriptor = $key . 'w';
+                $descriptor = $key.'w';
             }
-            $srcset .= $value . ' ' . $descriptor . ', ';
+            $srcset .= $value.' '.$descriptor.', ';
         }
 
         return rtrim($srcset, ', ');
@@ -796,13 +796,13 @@ 
     {
         // Set the class and loading attributes
         if (isset($attrs['class'])) {
-            $attrs['class'] = trim($attrs['class'] . ' lazyload');
+            $attrs['class'] = trim($attrs['class'].' lazyload');
         }
         // Set the style on this element to be the placeholder image as the background-image
         if (isset($attrs['style']) && !empty($attrs['src'])) {
             $attrs['style'] = trim(
-                $attrs['style'] .
-                'background-image:url(' . $this->getLazyLoadSrc($placeHolder) . '); background-size: cover;'
+                $attrs['style'].
+                'background-image:url('.$this->getLazyLoadSrc($placeHolder).'); background-size: cover;'
             );
         }
         // Handle attributes that lazy  and lazySizesFallback have in common

src/imagetransforms/ImageTransformInterface.php

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
      *
      * @return string|null
      */
-    public function getTransformUrl(Asset $asset, CraftImageTransformModel|string|array|null $transform): ?string;
+    public function getTransformUrl(Asset $asset, CraftImageTransformModel | string | array | null $transform): ?string;
 
     /**
      * Return a URL to the webp version of the transformed image
@@ -56,7 +56,7 @@ 
      *
      * @return ?string
      */
-    public function getWebPUrl(string $url, Asset $asset, CraftImageTransformModel|string|array|null $transform): ?string;
+    public function getWebPUrl(string $url, Asset $asset, CraftImageTransformModel | string | array | null $transform): ?string;
 
     /**
      * Return the URL that should be used to purge the Asset

src/imagetransforms/ImageTransform.php

Spacing +10 added lines, -10 removed lines

@@ -64,7 +64,7 @@ 
     /**
      * @inheritdoc
      */
-    public function getTransformUrl(Asset $asset, CraftImageTransformModel|string|array|null $transform): ?string
+    public function getTransformUrl(Asset $asset, CraftImageTransformModel | string | array | null $transform): ?string
     {
         return null;
     }
@@ -72,7 +72,7 @@ 
     /**
      * @inheritdoc
      */
-    public function getWebPUrl(string $url, Asset $asset, CraftImageTransformModel|string|array|null $transform): ?string
+    public function getWebPUrl(string $url, Asset $asset, CraftImageTransformModel | string | array | null $transform): ?string
     {
         return $url;
     }
@@ -106,7 +106,7 @@ 
         if ($volume->getFs()->subfolder ?? null) {
             $subfolder = $volume->getFs()->subfolder;
             $subfolder = Craft::parseEnv($subfolder);
-            return rtrim($subfolder, '/') . '/' . $assetPath;
+            return rtrim($subfolder, '/').'/'.$assetPath;
         }
 
         return $assetPath;
@@ -143,15 +143,15 @@ 
     {
         $path = $this->decomposeUrl($pathOrUrl);
         $path_parts = pathinfo($path['path']);
-        $new_path = ($path_parts['filename'] ?? '') . '.' . ($path_parts['extension'] ?? '') . $extension;
+        $new_path = ($path_parts['filename'] ?? '').'.'.($path_parts['extension'] ?? '').$extension;
         if (!empty($path_parts['dirname']) && $path_parts['dirname'] !== '.') {
             $dirname = $path_parts['dirname'];
             $dirname = $dirname === '/' ? '' : $dirname;
-            $new_path = $dirname . DIRECTORY_SEPARATOR . $new_path;
+            $new_path = $dirname.DIRECTORY_SEPARATOR.$new_path;
             $new_path = preg_replace('/([^:])(\/{2,})/', '$1/', $new_path);
         }
 
-        return $path['prefix'] . $new_path . $path['suffix'];
+        return $path['prefix'].$new_path.$path['suffix'];
     }
 
     // Protected Methods
@@ -170,14 +170,14 @@ 
 
         if (filter_var($pathOrUrl, FILTER_VALIDATE_URL)) {
             $url_parts = parse_url($pathOrUrl);
-            $result['prefix'] = $url_parts['scheme'] . '://' . $url_parts['host'];
+            $result['prefix'] = $url_parts['scheme'].'://'.$url_parts['host'];
             if (!empty($url_parts['port'])) {
-                $result['prefix'] .= ':' . $url_parts['port'];
+                $result['prefix'] .= ':'.$url_parts['port'];
             }
             $result['path'] = $url_parts['path'];
             $result['suffix'] = '';
-            $result['suffix'] .= empty($url_parts['query']) ? '' : '?' . $url_parts['query'];
-            $result['suffix'] .= empty($url_parts['fragment']) ? '' : '#' . $url_parts['fragment'];
+            $result['suffix'] .= empty($url_parts['query']) ? '' : '?'.$url_parts['query'];
+            $result['suffix'] .= empty($url_parts['fragment']) ? '' : '#'.$url_parts['fragment'];
         } else {
             $result['prefix'] = '';
             $result['path'] = $pathOrUrl;

src/imagetransforms/CraftImageTransform.php

Spacing +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
     /**
      * @inheritDoc
      */
-    public function getTransformUrl(Asset $asset, CraftImageTransformModel|string|array|null $transform): ?string
+    public function getTransformUrl(Asset $asset, CraftImageTransformModel | string | array | null $transform): ?string
     {
         // Generate the URLs to the optimized images
         $oldValue = Craft::$app->getConfig()->getGeneral()->generateTransformsBeforePageLoad;
@@ -74,7 +74,7 @@ 
     /**
      * @inheritDoc
      */
-    public function getWebPUrl(string $url, Asset $asset, CraftImageTransformModel|string|array|null $transform): ?string
+    public function getWebPUrl(string $url, Asset $asset, CraftImageTransformModel | string | array | null $transform): ?string
     {
         return $this->appendExtension($url, '.webp');
     }