nystudio107 / craft-imageoptimize

src/helpers/PluginTemplate.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
         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/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/fields/OptimizedImages.php

Spacing +16 added lines, -16 removed lines

@@ -187,7 +187,7 @@ 
      * @inheritdoc
      * @since 1.6.2
      */
-    public function getContentGqlType(): Type|array
+    public function getContentGqlType(): Type | array
     {
         $typeArray = OptimizedImagesGenerator::generateTypes($this);
 
@@ -276,7 +276,7 @@ 
     /**
      * @inheritdoc
      */
-    public function getSettingsHtml(): null|string
+    public function getSettingsHtml(): null | string
     {
         $namespace = Craft::$app->getView()->getNamespace();
         if (str_contains($namespace, Matrix::class) || str_contains($namespace, SuperTableField::class)) {
@@ -312,14 +312,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.'"'.
+            ');'.
+            '}'.
             '});'
         );
 
@@ -387,12 +387,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/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/jobs/ResaveOptimizedImages.php

Spacing +10 added lines, -10 removed lines

@@ -75,7 +75,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
@@ -89,8 +89,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 */
@@ -103,11 +103,11 @@ 
                     /** @var  $field Field */
                     foreach ($fields as $field) {
                         if ($field instanceof OptimizedImagesField && $element instanceof Asset) {
-                            if ($this->fieldId === null || (int)$field->id === (int)$this->fieldId) {
+                            if ($this->fieldId === null || (int) $field->id === (int) $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);
@@ -117,9 +117,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/gql/types/generators/OptimizedImagesGenerator.php

Spacing +3 added lines, -3 removed lines

@@ -259,12 +259,12 @@ 
             ?: GqlEntityRegistry::createEntity($typeName, new OptimizedImagesType([
                 'name' => $typeName,
                 'description' => 'This entity has all the OptimizedImages properties',
-                'fields' => function () use ($optimizedImagesFields) {
+                'fields' => function() use ($optimizedImagesFields) {
                     return $optimizedImagesFields;
                 },
             ]));
 
-        TypeLoader::registerType($typeName, function () use ($optimizedImagesType) {
+        TypeLoader::registerType($typeName, function() use ($optimizedImagesType) {
             return $optimizedImagesType;
         });
 
@@ -277,6 +277,6 @@ 
     public static function getName($context = null): string
     {
         /** @var OptimizedImages $context */
-        return $context->handle . '_OptimizedImages';
+        return $context->handle.'_OptimizedImages';
     }
 }

src/services/Optimize.php

Spacing +20 added lines, -20 removed lines

@@ -119,7 +119,7 @@ 
      *
      * @return ?ImageTransformInterface The Image Transform
      */
-    public function createImageTransformType(string|array $config): ?ImageTransformInterface
+    public function createImageTransformType(string | array $config): ?ImageTransformInterface
     {
         if (is_string($config)) {
             $config = ['type' => $config];
@@ -388,7 +388,7 @@ 
                 . '%';
             Craft::info($message, __METHOD__);
             if (Craft::$app instanceof ConsoleApplication) {
-                echo $message . PHP_EOL;
+                echo $message.PHP_EOL;
             }
             // Create any image variants
             $this->createImageVariants(
@@ -426,14 +426,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;
     }
@@ -546,7 +546,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(
@@ -644,8 +644,8 @@ 
             // Handle auto-sharpening scaled down images
             if ($imagineImage !== null && $settings->autoSharpenScaledImages) {
                 // See if the image has been scaled >= 50%
-                $widthScale = (int)(($image->getWidth() / $asset->getWidth()) * 100);
-                $heightScale = (int)(($image->getHeight() / $asset->getHeight()) * 100);
+                $widthScale = (int) (($image->getWidth() / $asset->getWidth()) * 100);
+                $heightScale = (int) (($image->getHeight() / $asset->getHeight()) * 100);
                 if (($widthScale >= $settings->sharpenScaledImagePercentage) || ($heightScale >= $settings->sharpenScaledImagePercentage)) {
                     $imagineImage->effects()
                         ->sharpen();
@@ -700,7 +700,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']
@@ -752,7 +752,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'])) {
@@ -787,7 +787,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']
@@ -832,17 +832,17 @@ 
                         } catch (InvalidConfigException $invalidConfigException) {
                             $fs = null;
                             Craft::error(
-                                'Asset file system error: ' . $invalidConfigException->getMessage(),
+                                'Asset file system error: '.$invalidConfigException->getMessage(),
                                 __METHOD__
                             );
                         }
 
-                        $variantPath = $uri . '.' . $variantCreatorCommand['imageVariantExtension'];
+                        $variantPath = $uri.'.'.$variantCreatorCommand['imageVariantExtension'];
 
                         // Delete the variant file in case it is stale
                         $fs->deleteFile($variantPath);
                         Craft::info(
-                            'Deleted variant: ' . $variantPath,
+                            'Deleted variant: '.$variantPath,
                             __METHOD__
                         );
                     }
@@ -875,17 +875,17 @@ 
             } catch (InvalidConfigException $e) {
                 $fs = null;
                 Craft::error(
-                    'Asset volume error: ' . $e->getMessage(),
+                    'Asset volume error: '.$e->getMessage(),
                     __METHOD__
                 );
             }
 
-            $variantPath = $uri . '.' . $variantCreatorCommand['imageVariantExtension'];
+            $variantPath = $uri.'.'.$variantCreatorCommand['imageVariantExtension'];
 
             // Delete the variant file in case it is stale
             $fs->deleteFile($variantPath);
             Craft::info(
-                'Variant output path: ' . $outputPath . ' - Variant path: ' . $variantPath,
+                'Variant output path: '.$outputPath.' - Variant path: '.$variantPath,
                 __METHOD__
             );
             clearstatcache(true, $outputPath);
@@ -913,9 +913,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/services/Placeholder.php

Spacing +10 added lines, -10 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 = [];
@@ -140,7 +140,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)) {
@@ -158,7 +158,7 @@ 
             $lightness /= $colorCount;
         }
 
-        return $lightness === null ? $lightness : (int)$lightness;
+        return $lightness === null ? $lightness : (int) $lightness;
     }
 
     /**
@@ -223,7 +223,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__);
 
@@ -279,7 +279,7 @@ 
             }
         } catch (Throwable $e) {
             Craft::error(
-                'Error creating temporary image: ' . $e->getMessage(),
+                'Error creating temporary image: '.$e->getMessage(),
                 __METHOD__
             );
 
@@ -300,14 +300,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 +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__
             );
         }