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/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/ImageOptimize.php

Spacing +18 added lines, -18 removed lines

@@ -258,7 +258,7 @@ 
         Event::on(
             CraftVariable::class,
             CraftVariable::EVENT_INIT,
-            function (Event $event) {
+            function(Event $event) {
                 /** @var CraftVariable $variable */
                 $variable = $event->sender;
                 $variable->set('imageOptimize', [
@@ -272,7 +272,7 @@ 
         Event::on(
             Fields::class,
             Fields::EVENT_REGISTER_FIELD_TYPES,
-            function (RegisterComponentTypesEvent $event) {
+            function(RegisterComponentTypesEvent $event) {
                 Craft::debug(
                     'Fields::EVENT_REGISTER_FIELD_TYPES',
                     __METHOD__
@@ -286,7 +286,7 @@ 
             Event::on(
                 Utilities::class,
                 Utilities::EVENT_REGISTER_UTILITY_TYPES,
-                function (RegisterComponentTypesEvent $event) {
+                function(RegisterComponentTypesEvent $event) {
                     $event->types[] = ImageOptimizeUtility::class;
                 }
             );
@@ -322,7 +322,7 @@ 
         Event::on(
             Assets::class,
             Assets::EVENT_GET_ASSET_URL,
-            function (GetAssetUrlEvent $event) {
+            function(GetAssetUrlEvent $event) {
                 Craft::debug(
                     'Assets::EVENT_GET_ASSET_URL',
                     __METHOD__
@@ -338,7 +338,7 @@ 
         Event::on(
             Assets::class,
             Assets::EVENT_GET_ASSET_THUMB_URL,
-            function (GetAssetThumbUrlEvent $event) {
+            function(GetAssetThumbUrlEvent $event) {
                 Craft::debug(
                     'Assets::EVENT_GET_ASSET_THUMB_URL',
                     __METHOD__
@@ -354,7 +354,7 @@ 
         Event::on(
             AssetTransforms::class,
             AssetTransforms::EVENT_GENERATE_TRANSFORM,
-            function (GenerateTransformEvent $event) {
+            function(GenerateTransformEvent $event) {
                 Craft::debug(
                     'AssetTransforms::EVENT_GENERATE_TRANSFORM',
                     __METHOD__
@@ -370,7 +370,7 @@ 
         Event::on(
             AssetTransforms::class,
             AssetTransforms::EVENT_AFTER_DELETE_TRANSFORMS,
-            function (AssetTransformImageEvent $event) {
+            function(AssetTransformImageEvent $event) {
                 Craft::debug(
                     'AssetTransforms::EVENT_AFTER_DELETE_TRANSFORMS',
                     __METHOD__
@@ -386,7 +386,7 @@ 
         Event::on(
             Assets::class,
             Assets::EVENT_BEFORE_REPLACE_ASSET,
-            function (ReplaceAssetEvent $event) {
+            function(ReplaceAssetEvent $event) {
                 Craft::debug(
                     'Assets::EVENT_BEFORE_REPLACE_ASSET',
                     __METHOD__
@@ -405,7 +405,7 @@ 
         Event::on(
             Assets::class,
             Assets::EVENT_AFTER_REPLACE_ASSET,
-            function (ReplaceAssetEvent $event) {
+            function(ReplaceAssetEvent $event) {
                 Craft::debug(
                     'Assets::EVENT_AFTER_REPLACE_ASSET',
                     __METHOD__
@@ -428,7 +428,7 @@ 
         Event::on(
             Assets::class,
             Elements::EVENT_BEFORE_SAVE_ELEMENT,
-            function (ElementEvent $event) {
+            function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_BEFORE_SAVE_ELEMENT',
                     __METHOD__
@@ -449,7 +449,7 @@ 
         Event::on(
             Asset::class,
             Elements::EVENT_BEFORE_DELETE_ELEMENT,
-            function (ElementEvent $event) {
+            function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_BEFORE_DELETE_ELEMENT',
                     __METHOD__
@@ -474,7 +474,7 @@ 
         Event::on(
             Fields::class,
             Fields::EVENT_AFTER_SAVE_FIELD,
-            function (FieldEvent $event) {
+            function(FieldEvent $event) {
                 Craft::debug(
                     'Fields::EVENT_AFTER_SAVE_FIELD',
                     __METHOD__
@@ -491,7 +491,7 @@ 
         Event::on(
             Plugins::class,
             Plugins::EVENT_AFTER_SAVE_PLUGIN_SETTINGS,
-            function (PluginEvent $event) {
+            function(PluginEvent $event) {
                 if ($event->plugin === $this) {
                     Craft::debug(
                         'Plugins::EVENT_AFTER_SAVE_PLUGIN_SETTINGS',
@@ -510,7 +510,7 @@ 
         Event::on(
             Volumes::class,
             Volumes::EVENT_AFTER_SAVE_VOLUME,
-            function (VolumeEvent $event) {
+            function(VolumeEvent $event) {
                 Craft::debug(
                     'Volumes::EVENT_AFTER_SAVE_VOLUME',
                     __METHOD__
@@ -531,7 +531,7 @@ 
         Event::on(
             Plugins::class,
             Plugins::EVENT_AFTER_INSTALL_PLUGIN,
-            function (PluginEvent $event) {
+            function(PluginEvent $event) {
                 if ($event->plugin === $this) {
                     $request = Craft::$app->getRequest();
                     if ($request->isCpRequest) {
@@ -565,7 +565,7 @@ 
         Event::on(
             UrlManager::class,
             UrlManager::EVENT_REGISTER_SITE_URL_RULES,
-            function (RegisterUrlRulesEvent $event) {
+            function(RegisterUrlRulesEvent $event) {
                 Craft::debug(
                     'UrlManager::EVENT_REGISTER_SITE_URL_RULES',
                     __METHOD__
@@ -588,12 +588,12 @@ 
         Event::on(
             Plugins::class,
             Plugins::EVENT_AFTER_LOAD_PLUGINS,
-            function () {
+            function() {
                 // Install these only after all other plugins have loaded
                 Event::on(
                     View::class,
                     View::EVENT_REGISTER_CP_TEMPLATE_ROOTS,
-                    function (RegisterTemplateRootsEvent $e) {
+                    function(RegisterTemplateRootsEvent $e) {
                         // Register the root directodies
                         $allImageTransformTypes = ImageOptimize::$plugin->optimize->getAllImageTransformTypes();
                         /** @var ImageTransformInterface $imageTransformType */

src/services/OptimizedImages.php

Spacing +24 added lines, -24 removed lines

@@ -112,16 +112,16 @@ 
                             $index->fileExists = 0;
                             $transforms->storeTransformIndexData($index);
                             $volume = $asset->getVolume();
-                            $transformPath = $asset->folderPath . $transforms->getTransformSubpath($asset, $index);
+                            $transformPath = $asset->folderPath.$transforms->getTransformSubpath($asset, $index);
                             try {
                                 $volume->deleteFile($transformPath);
                             } 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;
@@ -135,16 +135,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,10 +172,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__
@@ -214,7 +214,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();
@@ -274,7 +274,7 @@ 
             if ($field->handle !== null) {
                 $asset->setFieldValue($field->handle, $field->serializeValue($model));
                 $table = $asset->getContentTable();
-                $column = $asset->getFieldColumnPrefix() . $field->handle;
+                $column = $asset->getFieldColumnPrefix().$field->handle;
                 // Special-case for Craft 3.7 or later, with the addition of a suffix to the Field content column name
                 // ref: https://github.com/craftcms/cms/issues/6922
                 if (ImageOptimize::$craft37) {
@@ -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__
                 );
             }
@@ -447,7 +447,7 @@ 
     {
         Craft::beginProfile('generatePlaceholders', __METHOD__);
         Craft::info(
-            'generatePlaceholders for: ' . print_r($model, true),
+            'generatePlaceholders for: '.print_r($model, true),
             __METHOD__
         );
         $settings = ImageOptimize::$plugin->getSettings();
@@ -506,20 +506,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)
@@ -546,7 +546,7 @@ 
             $transform
         );
         Craft::info(
-            'URL created: ' . print_r($url, true),
+            'URL created: '.print_r($url, true),
             __METHOD__
         );
         // Update the model
@@ -574,7 +574,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/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

@@ -67,7 +67,7 @@ 
             . "style='background:$color' "
             . "/>";
 
-        return $header . ImageOptimize::$plugin->optimizedImages->encodeOptimizedSVGDataUri($content);
+        return $header.ImageOptimize::$plugin->optimizedImages->encodeOptimizedSVGDataUri($content);
     }
 
     /**
@@ -88,7 +88,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));
@@ -110,7 +110,7 @@ 
     {
         Craft::beginProfile('generateColorPalette', __METHOD__);
         Craft::info(
-            'Generating color palette for: ' . $tempPath,
+            'Generating color palette for: '.$tempPath,
             __METHOD__
         );
         $colorPalette = [];
@@ -156,7 +156,7 @@ 
             $lightness /= $colorCount;
         }
 
-        return $lightness === null ? $lightness : (int)$lightness;
+        return $lightness === null ? $lightness : (int) $lightness;
     }
 
     /**
@@ -221,7 +221,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__);
 
@@ -278,7 +278,7 @@ 
             }
         } catch (\Throwable $e) {
             Craft::error(
-                'Error creating temporary image: ' . $e->getMessage(),
+                'Error creating temporary image: '.$e->getMessage(),
                 __METHOD__
             );
 
@@ -299,14 +299,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/console/controllers/OptimizeController.php

Spacing +5 added lines, -5 removed lines

@@ -56,9 +56,9 @@ 
      */
     public function actionCreate($volumeHandle = null)
     {
-        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;
@@ -79,7 +79,7 @@ 
                 /** @var Volume $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();
@@ -92,10 +92,10 @@ 
      */
     public function actionCreateAsset($id = null)
     {
-        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/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