nystudio107 / craft-imageoptimize

src/services/Optimize.php

Spacing +26 added lines, -26 removed lines

@@ -273,7 +273,7 @@ 
             $vars,
             $minifier
         );
-        $content = (string)$content;
+        $content = (string) $content;
         if ($scriptAttrs !== null) {
             $attrs = array_merge([
             ],
@@ -308,7 +308,7 @@ 
             $vars,
             $minifier
         );
-        $content = (string)$content;
+        $content = (string) $content;
         if ($scriptAttrs !== null) {
             $attrs = array_merge([
             ],
@@ -372,7 +372,7 @@ 
                 . '%';
             Craft::info($message, __METHOD__);
             if (Craft::$app instanceof ConsoleApplication) {
-                echo $message . PHP_EOL;
+                echo $message.PHP_EOL;
             }
             // Create any image variants
             $this->createImageVariants(
@@ -410,14 +410,14 @@ 
      */
     public function saveTransformToTempFile(AssetTransformIndex $index, Image $image): string
     {
-        $tempFilename = uniqid(pathinfo($index->filename, PATHINFO_FILENAME), true) . '.' . $index->detectedFormat;
-        $tempPath = Craft::$app->getPath()->getTempPath() . DIRECTORY_SEPARATOR . $tempFilename;
+        $tempFilename = uniqid(pathinfo($index->filename, PATHINFO_FILENAME), true).'.'.$index->detectedFormat;
+        $tempPath = Craft::$app->getPath()->getTempPath().DIRECTORY_SEPARATOR.$tempFilename;
         try {
             $image->saveAs($tempPath);
         } catch (ImageException $e) {
-            Craft::error('Transformed image save failed: ' . $e->getMessage(), __METHOD__);
+            Craft::error('Transformed image save failed: '.$e->getMessage(), __METHOD__);
         }
-        Craft::info('Transformed image saved to: ' . $tempPath, __METHOD__);
+        Craft::info('Transformed image saved to: '.$tempPath, __METHOD__);
 
         return $tempPath;
     }
@@ -529,7 +529,7 @@ 
                             . '%';
                         Craft::info($message, __METHOD__);
                         if (Craft::$app instanceof ConsoleApplication) {
-                            echo $message . PHP_EOL;
+                            echo $message.PHP_EOL;
                         }
                         // Copy the image variant into place
                         $this->copyImageVariantToVolume(
@@ -628,9 +628,9 @@ 
                 // Handle auto-sharpening scaled down images
                 if ($settings->autoSharpenScaledImages) {
                     // See if the image has been scaled >= 50%
-                    $widthScale = (int)(($image->getWidth() / $asset->getWidth()) * 100);
-                    $heightScale = (int)(($image->getHeight() / $asset->getHeight()) * 100);
-                    if (($widthScale >= (int)$settings->sharpenScaledImagePercentage) || ($heightScale >= (int)$settings->sharpenScaledImagePercentage)) {
+                    $widthScale = (int) (($image->getWidth() / $asset->getWidth()) * 100);
+                    $heightScale = (int) (($image->getHeight() / $asset->getHeight()) * 100);
+                    if (($widthScale >= (int) $settings->sharpenScaledImagePercentage) || ($heightScale >= (int) $settings->sharpenScaledImagePercentage)) {
                         $imagineImage->effects()
                             ->sharpen();
                         Craft::debug(
@@ -685,7 +685,7 @@ 
                 . escapeshellarg($tempPath);
             // Execute the command
             $shellOutput = $this->executeShellCommand($cmd);
-            Craft::info($cmd . "\n" . $shellOutput, __METHOD__);
+            Craft::info($cmd."\n".$shellOutput, __METHOD__);
         } else {
             Craft::error(
                 $thisProcessor['commandPath']
@@ -737,7 +737,7 @@ 
         // Make sure the command exists
         if (is_file($variantCreatorCommand['commandPath'])) {
             // Get the output file for this image variant
-            $outputPath .= '.' . $variantCreatorCommand['imageVariantExtension'];
+            $outputPath .= '.'.$variantCreatorCommand['imageVariantExtension'];
             // Set any options for the command
             $commandOptions = '';
             if (!empty($variantCreatorCommand['commandOptions'])) {
@@ -772,7 +772,7 @@ 
                 . escapeshellarg($tempPath);
             // Execute the command
             $shellOutput = $this->executeShellCommand($cmd);
-            Craft::info($cmd . "\n" . $shellOutput, __METHOD__);
+            Craft::info($cmd."\n".$shellOutput, __METHOD__);
         } else {
             Craft::error(
                 $variantCreatorCommand['commandPath']
@@ -810,23 +810,23 @@ 
                         } catch (InvalidConfigException $e) {
                             $volume = null;
                             Craft::error(
-                                'Asset volume error: ' . $e->getMessage(),
+                                'Asset volume error: '.$e->getMessage(),
                                 __METHOD__
                             );
                         }
                         try {
-                            $variantPath = $asset->getFolder()->path . $assetTransforms->getTransformSubpath(
+                            $variantPath = $asset->getFolder()->path.$assetTransforms->getTransformSubpath(
                                     $asset,
                                     $transformIndex
                                 );
                         } catch (InvalidConfigException $e) {
                             $variantPath = '';
                             Craft::error(
-                                'Asset folder does not exist: ' . $e->getMessage(),
+                                'Asset folder does not exist: '.$e->getMessage(),
                                 __METHOD__
                             );
                         }
-                        $variantPath .= '.' . $variantCreatorCommand['imageVariantExtension'];
+                        $variantPath .= '.'.$variantCreatorCommand['imageVariantExtension'];
                         // Delete the variant file in case it is stale
                         try {
                             $volume->deleteFile($variantPath);
@@ -834,7 +834,7 @@ 
                             // We're fine with that.
                         }
                         Craft::info(
-                            'Deleted variant: ' . $variantPath,
+                            'Deleted variant: '.$variantPath,
                             __METHOD__
                         );
                     }
@@ -864,21 +864,21 @@ 
             } catch (InvalidConfigException $e) {
                 $volume = null;
                 Craft::error(
-                    'Asset volume error: ' . $e->getMessage(),
+                    'Asset volume error: '.$e->getMessage(),
                     __METHOD__
                 );
             }
             $assetTransforms = Craft::$app->getAssetTransforms();
             try {
-                $transformPath = $asset->getFolder()->path . $assetTransforms->getTransformSubpath($asset, $index);
+                $transformPath = $asset->getFolder()->path.$assetTransforms->getTransformSubpath($asset, $index);
             } catch (InvalidConfigException $e) {
                 $transformPath = '';
                 Craft::error(
-                    'Error getting asset folder: ' . $e->getMessage(),
+                    'Error getting asset folder: '.$e->getMessage(),
                     __METHOD__
                 );
             }
-            $variantPath = $transformPath . '.' . $variantCreatorCommand['imageVariantExtension'];
+            $variantPath = $transformPath.'.'.$variantCreatorCommand['imageVariantExtension'];
 
             // Delete the variant file in case it is stale
             try {
@@ -888,7 +888,7 @@ 
             }
 
             Craft::info(
-                'Variant output path: ' . $outputPath . ' - Variant path: ' . $variantPath,
+                'Variant output path: '.$outputPath.' - Variant path: '.$variantPath,
                 __METHOD__
             );
 
@@ -926,9 +926,9 @@ 
     protected function swapPathExtension(string $path, string $extension): string
     {
         $pathParts = pathinfo($path);
-        $newPath = $pathParts['filename'] . '.' . $extension;
+        $newPath = $pathParts['filename'].'.'.$extension;
         if (!empty($pathParts['dirname']) && $pathParts['dirname'] !== '.') {
-            $newPath = $pathParts['dirname'] . DIRECTORY_SEPARATOR . $newPath;
+            $newPath = $pathParts['dirname'].DIRECTORY_SEPARATOR.$newPath;
             $newPath = preg_replace('#/+#', '/', $newPath);
         }
 

src/fields/OptimizedImages.php

Spacing +14 added lines, -14 removed lines

@@ -326,14 +326,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.'"'.
+            ');'.
+            '}'.
             '});'
         );
 
@@ -407,12 +407,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/helpers/Image.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
         }
 
         if (!is_file($path)) {
-            Craft::error('Tried to load an image at ' . $path . ', but the file does not exist.', __METHOD__);
+            Craft::error('Tried to load an image at '.$path.', but the file does not exist.', __METHOD__);
             throw new ImageException(Craft::t('app', 'No file exists at the given path.'));
         }
 

src/validators/EmbeddedModelValidator.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
                         $model->addError(
                             $attribute,
                             Craft::t('image-optimize', 'Object failed to validate')
-                            . '-' . $attributeError . ' - ' . $valueError
+                            . '-'.$attributeError.' - '.$valueError
                         );
                     }
                 }

src/services/Placeholder.php

Indentation +1 added lines, -1 removed lines

@@ -264,7 +264,7 @@
         int    $width,
         int    $height,
         int    $quality,
-               $position
+                $position
     ): string
     {
         $images = Craft::$app->getImages();

Spacing +9 added lines, -9 removed lines

@@ -69,7 +69,7 @@ 
             . "style='background:$color' "
             . "/>";
 
-        return $header . ImageOptimize::$plugin->optimizedImages->encodeOptimizedSVGDataUri($content);
+        return $header.ImageOptimize::$plugin->optimizedImages->encodeOptimizedSVGDataUri($content);
     }
 
     /**
@@ -90,7 +90,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));
@@ -112,7 +112,7 @@ 
     {
         Craft::beginProfile('generateColorPalette', __METHOD__);
         Craft::info(
-            'Generating color palette for: ' . $tempPath,
+            'Generating color palette for: '.$tempPath,
             __METHOD__
         );
         $colorPalette = [];
@@ -158,7 +158,7 @@ 
             $lightness /= $colorCount;
         }
 
-        return $lightness === null ? $lightness : (int)$lightness;
+        return $lightness === null ? $lightness : (int) $lightness;
     }
 
     /**
@@ -224,7 +224,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__
             );
 
@@ -303,14 +303,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/variables/ImageOptimizeVariable.php

Indentation +2 added lines, -2 removed lines

@@ -79,8 +79,8 @@
      */
     public function createOptimizedImages(
         Asset $asset,
-              $variants = null,
-              $generatePlaceholders = false
+                $variants = null,
+                $generatePlaceholders = false
     )
     {
         // Override our settings for lengthy operations, since we're doing this via Twig

src/jobs/ResaveOptimizedImages.php

Spacing +9 added lines, -9 removed lines

@@ -81,7 +81,7 @@ 
             Craft::configure($query, $this->criteria);
         }
         if (Craft::$app instanceof ConsoleApplication) {
-            echo $this->description . PHP_EOL;
+            echo $this->description.PHP_EOL;
         }
         // Use craft\db\Paginator to paginate the results so we don't exceed any memory limits
         // See batch() and each() discussion here: https://github.com/yiisoft/yii2/issues/8420
@@ -95,8 +95,8 @@ 
         while ($currentElement < $totalElements) {
             $elements = $paginator->getPageResults();
             if (Craft::$app instanceof ConsoleApplication) {
-                echo 'Query ' . $paginator->getCurrentPage() . '/' . $paginator->getTotalPages()
-                    . ' - assets: ' . $paginator->getTotalResults()
+                echo 'Query '.$paginator->getCurrentPage().'/'.$paginator->getTotalPages()
+                    . ' - assets: '.$paginator->getTotalResults()
                     . PHP_EOL;
             }
             /** @var ElementInterface $element */
@@ -111,9 +111,9 @@ 
                         if ($field instanceof OptimizedImagesField && $element instanceof Asset) {
                             if ($this->fieldId === null || $field->id == $this->fieldId) {
                                 if (Craft::$app instanceof ConsoleApplication) {
-                                    echo $currentElement . '/' . $totalElements
-                                        . ' - processing asset: ' . $element->title
-                                        . ' from field: ' . $field->name . PHP_EOL;
+                                    echo $currentElement.'/'.$totalElements
+                                        . ' - processing asset: '.$element->title
+                                        . ' from field: '.$field->name.PHP_EOL;
                                 }
                                 try {
                                     ImageOptimize::$plugin->optimizedImages->updateOptimizedImageFieldData($field, $element, $this->force);
@@ -123,9 +123,9 @@ 
                                         echo '[error]: '
                                             . $e->getMessage()
                                             . ' while processing '
-                                            . $currentElement . '/' . $totalElements
-                                            . ' - processing asset: ' . $element->title
-                                            . ' from field: ' . $field->name . PHP_EOL;
+                                            . $currentElement.'/'.$totalElements
+                                            . ' - processing asset: '.$element->title
+                                            . ' from field: '.$field->name.PHP_EOL;
                                     }
                                 }
                             }

src/models/OptimizedImage.php

Spacing +12 added lines, -12 removed lines

@@ -548,7 +548,7 @@ 
             return $this->defaultPlaceholderImage();
         }
 
-        return Template::raw($header . rawurlencode($content));
+        return Template::raw($header.rawurlencode($content));
     }
 
     /**
@@ -558,7 +558,7 @@ 
      */
     public function getPlaceholderImage(): string
     {
-        return (string)$this->placeholderImage();
+        return (string) $this->placeholderImage();
     }
 
     /**
@@ -595,7 +595,7 @@ 
      */
     public function getPlaceholderBox(string $color = null): string
     {
-        return (string)$this->placeholderBox($color);
+        return (string) $this->placeholderBox($color);
     }
 
     /**
@@ -626,7 +626,7 @@ 
             return $this->defaultPlaceholderImage();
         }
 
-        return Template::raw($header . $content);
+        return Template::raw($header.$content);
     }
 
     /**
@@ -636,7 +636,7 @@ 
      */
     public function getPlaceholderSilhouette(): string
     {
-        return (string)$this->placeholderSilhouette();
+        return (string) $this->placeholderSilhouette();
     }
 
     /**
@@ -752,16 +752,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.', ';
         }
         $srcset = 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/helpers/Color.php

Spacing +10 added lines, -10 removed lines

@@ -37,12 +37,12 @@ 
         }
 
         if (strlen($htmlCode) === 3) {
-            $htmlCode = $htmlCode[0] . $htmlCode[0] . $htmlCode[1] . $htmlCode[1] . $htmlCode[2] . $htmlCode[2];
+            $htmlCode = $htmlCode[0].$htmlCode[0].$htmlCode[1].$htmlCode[1].$htmlCode[2].$htmlCode[2];
         }
 
-        $r = hexdec($htmlCode[0] . $htmlCode[1]);
-        $g = hexdec($htmlCode[2] . $htmlCode[3]);
-        $b = hexdec($htmlCode[4] . $htmlCode[5]);
+        $r = hexdec($htmlCode[0].$htmlCode[1]);
+        $g = hexdec($htmlCode[2].$htmlCode[3]);
+        $b = hexdec($htmlCode[4].$htmlCode[5]);
 
         return ['r' => $r, 'g' => $g, 'b' => $b];
     }
@@ -56,9 +56,9 @@ 
      */
     public static function RGBToHSL(array $rgb): array
     {
-        $r = ((float)$rgb['r']) / 255.0;
-        $g = ((float)$rgb['g']) / 255.0;
-        $b = ((float)$rgb['b']) / 255.0;
+        $r = ((float) $rgb['r']) / 255.0;
+        $g = ((float) $rgb['g']) / 255.0;
+        $b = ((float) $rgb['b']) / 255.0;
 
         $maxC = max($r, $g, $b);
         $minC = min($r, $g, $b);
@@ -86,9 +86,9 @@ 
             $h /= 6.0;
         }
 
-        $h = (int)round(360.0 * $h);
-        $s = (int)round(100.0 * $s);
-        $l = (int)round(100.0 * $l);
+        $h = (int) round(360.0 * $h);
+        $s = (int) round(100.0 * $s);
+        $l = (int) round(100.0 * $l);
 
         return ['h' => $h, 's' => $s, 'l' => $l];
     }