nystudio107 / craft-imageoptimize

src/services/Placeholder.php

Spacing +10 added lines, -10 removed lines

@@ -70,7 +70,7 @@ 
             . "style='background:$color' "
             . "/>";
 
-        return $header . ImageOptimize::$plugin->optimizedImages->encodeOptimizedSVGDataUri($content);
+        return $header.ImageOptimize::$plugin->optimizedImages->encodeOptimizedSVGDataUri($content);
     }
 
     /**
@@ -91,7 +91,7 @@ 
         );
         $result = '';
         $width = self::PLACEHOLDER_WIDTH;
-        $height = (int)($width / $aspectRatio);
+        $height = (int) ($width / $aspectRatio);
         $placeholderPath = $this->createImageFromPath($tempPath, $width, $height, self::PLACEHOLDER_QUALITY, $position);
         if (!empty($placeholderPath)) {
             $result = base64_encode(file_get_contents($placeholderPath));
@@ -113,7 +113,7 @@ 
     {
         Craft::beginProfile('generateColorPalette', __METHOD__);
         Craft::info(
-            'Generating color palette for: ' . $tempPath,
+            'Generating color palette for: '.$tempPath,
             __METHOD__
         );
         $colorPalette = [];
@@ -141,7 +141,7 @@ 
      *
      * @return float|int|null
      */
-    public function calculateLightness(array $colors): float|int|null
+    public function calculateLightness(array $colors): float | int | null
     {
         $lightness = null;
         if (!empty($colors)) {
@@ -159,7 +159,7 @@ 
             $lightness /= $colorCount;
         }
 
-        return $lightness === null ? $lightness : (int)$lightness;
+        return $lightness === null ? $lightness : (int) $lightness;
     }
 
     /**
@@ -225,7 +225,7 @@ 
             __METHOD__
         );
         $width = self::TEMP_PLACEHOLDER_WIDTH;
-        $height = (int)($width / $aspectRatio);
+        $height = (int) ($width / $aspectRatio);
         $tempPath = $this->createImageFromAsset($asset, $width, $height, self::TEMP_PLACEHOLDER_QUALITY, $position);
         Craft::endProfile('createTempPlaceholderImage', __METHOD__);
 
@@ -280,7 +280,7 @@ 
             }
         } catch (Throwable $e) {
             Craft::error(
-                'Error creating temporary image: ' . $e->getMessage(),
+                'Error creating temporary image: '.$e->getMessage(),
                 __METHOD__
             );
 
@@ -304,14 +304,14 @@ 
 
 
         // Save the image out to a temp file, then return its contents
-        $tempFilename = uniqid(pathinfo($pathParts['filename'], PATHINFO_FILENAME), true) . '.' . 'jpg';
-        $tempPath = Craft::$app->getPath()->getTempPath() . DIRECTORY_SEPARATOR . $tempFilename;
+        $tempFilename = uniqid(pathinfo($pathParts['filename'], PATHINFO_FILENAME), true).'.'.'jpg';
+        $tempPath = Craft::$app->getPath()->getTempPath().DIRECTORY_SEPARATOR.$tempFilename;
         clearstatcache(true, $tempPath);
         try {
             $image->saveAs($tempPath);
         } catch (Throwable $e) {
             Craft::error(
-                'Error saving temporary image: ' . $e->getMessage(),
+                'Error saving temporary image: '.$e->getMessage(),
                 __METHOD__
             );
         }

src/services/OptimizedImages.php

Spacing +24 added lines, -24 removed lines

@@ -113,7 +113,7 @@ 
                 }
                 $variant['format'] = $variantFormat;
                 // Only try the transform if it's possible
-                if ((int)$asset->height > 0
+                if ((int) $asset->height > 0
                     && Image::canManipulateAsImage($finalFormat)
                     && Image::canManipulateAsImage($asset->getExtension())
                 ) {
@@ -133,10 +133,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;
@@ -150,16 +150,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
@@ -172,7 +172,7 @@ 
         // If no image variants were created, populate it with the image itself
         if (empty($model->optimizedImageUrls)) {
             $finalFormat = $asset->getExtension();
-            if ((int)$asset->height > 0
+            if ((int) $asset->height > 0
                 && Image::canManipulateAsImage($finalFormat)
             ) {
                 $variant = [
@@ -188,10 +188,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__
@@ -230,7 +230,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();
@@ -348,7 +348,7 @@ 
             } catch (SiteNotFoundException $e) {
                 $siteId = 0;
                 Craft::error(
-                    'Failed to get primary site: ' . $e->getMessage(),
+                    'Failed to get primary site: '.$e->getMessage(),
                     __METHOD__
                 );
             }
@@ -452,7 +452,7 @@ 
     {
         Craft::beginProfile('generatePlaceholders', __METHOD__);
         Craft::info(
-            'generatePlaceholders for: ' . print_r($model, true),
+            'generatePlaceholders for: '.print_r($model, true),
             __METHOD__
         );
         /** @var Settings $settings */
@@ -512,20 +512,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)
@@ -552,7 +552,7 @@ 
             $transform
         );
         Craft::info(
-            'URL created: ' . print_r($url, true),
+            'URL created: '.print_r($url, true),
             __METHOD__
         );
         // Update the model
@@ -580,7 +580,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/ImageOptimize.php

Spacing +1 added lines, -1 removed lines

@@ -139,7 +139,7 @@
     /**
      * @inheritdoc
      */
-    public function getSettingsResponse(): TemplateResponseBehavior|Response
+    public function getSettingsResponse(): TemplateResponseBehavior | Response
     {
         $view = Craft::$app->getView();
         $namespace = $view->getNamespace();

src/helpers/PluginTemplate.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
         array  $params = [],
         string $minifier = null,
     ): string {
-        $template = 'image-optimize/' . $templatePath;
+        $template = 'image-optimize/'.$templatePath;
         $oldMode = Craft::$app->view->getTemplateMode();
         // Look for the template on the frontend first
         try {

src/services/ServicesTrait.php

Spacing +4 added lines, -4 removed lines

@@ -41,8 +41,8 @@ 
         // so we can't extract it from the passed in $config
         $majorVersion = '5';
         // Dev server container name & port are based on the major version of this plugin
-        $devPort = 3000 + (int)$majorVersion;
-        $versionName = 'v' . $majorVersion;
+        $devPort = 3000 + (int) $majorVersion;
+        $versionName = 'v'.$majorVersion;
         return [
             'components' => [
                 'optimize' => OptimizeService::class,
@@ -53,8 +53,8 @@ 
                     'assetClass' => ImageOptimizeAsset::class,
                     'checkDevServer' => true,
                     'class' => VitePluginService::class,
-                    'devServerInternal' => 'http://craft-imageoptimize-' . $versionName . '-buildchain-dev:' . $devPort,
-                    'devServerPublic' => 'http://localhost:' . $devPort,
+                    'devServerInternal' => 'http://craft-imageoptimize-'.$versionName.'-buildchain-dev:'.$devPort,
+                    'devServerPublic' => 'http://localhost:'.$devPort,
                     'errorEntry' => 'src/js/ImageOptimize.js',
                     'useDevServer' => true,
                 ],

src/fields/OptimizedImages.php

Spacing +17 added lines, -17 removed lines

@@ -147,7 +147,7 @@ 
     /**
      * @inheritdoc
      */
-    public static function dbType(): array|string|null
+    public static function dbType(): array | string | null
     {
         return Schema::TYPE_TEXT;
     }
@@ -212,7 +212,7 @@ 
      * @inheritdoc
      * @since 1.6.2
      */
-    public function getContentGqlType(): Type|array
+    public function getContentGqlType(): Type | array
     {
         $typeArray = OptimizedImagesGenerator::generateTypes($this);
 
@@ -293,7 +293,7 @@ 
     /**
      * @inheritdoc
      */
-    public function getSettingsHtml(): null|string
+    public function getSettingsHtml(): null | string
     {
         $namespace = Craft::$app->getView()->getNamespace();
         if (str_contains($namespace, Matrix::class)) {
@@ -329,14 +329,14 @@ 
         $sizesWrapperId = Craft::$app->getView()->namespaceInputId('sizes-wrapper');
         $view = Craft::$app->getView();
         $view->registerJs(
-            'document.addEventListener("vite-script-loaded", function (e) {' .
-            'if (e.detail.path === "../src/web/assets/src/js/OptimizedImagesField.js") {' .
-            'new Craft.OptimizedImagesInput(' .
-            '"' . $namespacedId . '", ' .
-            '"' . $namespacePrefix . '",' .
-            '"' . $sizesWrapperId . '"' .
-            ');' .
-            '}' .
+            'document.addEventListener("vite-script-loaded", function (e) {'.
+            'if (e.detail.path === "../src/web/assets/src/js/OptimizedImagesField.js") {'.
+            'new Craft.OptimizedImagesInput('.
+            '"'.$namespacedId.'", '.
+            '"'.$namespacePrefix.'",'.
+            '"'.$sizesWrapperId.'"'.
+            ');'.
+            '}'.
             '});'
         );
 
@@ -405,12 +405,12 @@ 
             $jsonVars = Json::encode($jsonVars);
             $view = Craft::$app->getView();
             $view->registerJs(
-                'document.addEventListener("vite-script-loaded", function (e) {' .
-                'if (e.detail.path === "../src/web/assets/src/js/OptimizedImagesField.js") {' .
-                "$('#{$nameSpaceId}-field').ImageOptimizeOptimizedImages(" .
-                $jsonVars .
-                ");" .
-                '}' .
+                'document.addEventListener("vite-script-loaded", function (e) {'.
+                'if (e.detail.path === "../src/web/assets/src/js/OptimizedImagesField.js") {'.
+                "$('#{$nameSpaceId}-field').ImageOptimizeOptimizedImages(".
+                $jsonVars.
+                ");".
+                '}'.
                 '});'
             );
 

src/models/OptimizedImage.php

Spacing +6 added lines, -6 removed lines

@@ -424,7 +424,7 @@ 
             return $this->defaultPlaceholderImage();
         }
 
-        return Template::raw($header . rawurlencode($content));
+        return Template::raw($header.rawurlencode($content));
     }
 
     /**
@@ -502,7 +502,7 @@ 
             return $this->defaultPlaceholderImage();
         }
 
-        return Template::raw($header . $content);
+        return Template::raw($header.$content);
     }
 
     /**
@@ -590,16 +590,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, ', ');

src/models/BaseImageTag.php

Spacing +2 added lines, -2 removed lines

@@ -31,14 +31,14 @@
     {
         // 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'])) {
             if (empty($attrs['style'])) {
                 $attrs['style'] = [];
             }
-            $attrs['style']['background-image'] = 'url(' . $this->getLazyLoadSrc($placeHolder) . ')';
+            $attrs['style']['background-image'] = 'url('.$this->getLazyLoadSrc($placeHolder).')';
             $attrs['style']['background-size'] = 'cover';
         }
         // Handle attributes that lazy  and lazySizesFallback have in common

src/imagetransforms/ImageTransform.php

Spacing +11 added lines, -11 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;
     }
@@ -99,14 +99,14 @@ 
     public function getAssetUri(Asset $asset): ?string
     {
         $volume = $asset->getVolume();
-        $assetPath = $volume->getSubpath() . $asset->getPath();
+        $assetPath = $volume->getSubpath().$asset->getPath();
 
         // Account for volume types with a subfolder setting
         // e.g. craftcms/aws-s3, craftcms/google-cloud
         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;