nystudio107 / craft-imageoptimize

src/jobs/ResaveOptimizedImages.php

Spacing +8 added lines, -8 removed lines

@@ -91,8 +91,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 */
@@ -107,9 +107,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);
@@ -119,9 +119,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/ImageOptimize.php

Spacing +18 added lines, -18 removed lines

@@ -234,7 +234,7 @@ 
         Event::on(
             CraftVariable::class,
             CraftVariable::EVENT_INIT,
-            function (Event $event) {
+            function(Event $event) {
                 /** @var CraftVariable $variable */
                 $variable = $event->sender;
                 $variable->set('imageOptimize', ImageOptimizeVariable::class);
@@ -245,7 +245,7 @@ 
         Event::on(
             Fields::class,
             Fields::EVENT_REGISTER_FIELD_TYPES,
-            function (RegisterComponentTypesEvent $event) {
+            function(RegisterComponentTypesEvent $event) {
                 Craft::debug(
                     'Fields::EVENT_REGISTER_FIELD_TYPES',
                     __METHOD__
@@ -259,7 +259,7 @@ 
             Event::on(
                 Utilities::class,
                 Utilities::EVENT_REGISTER_UTILITY_TYPES,
-                function (RegisterComponentTypesEvent $event) {
+                function(RegisterComponentTypesEvent $event) {
                     $event->types[] = ImageOptimizeUtility::class;
                 }
             );
@@ -295,7 +295,7 @@ 
         Event::on(
             Assets::class,
             Assets::EVENT_GET_ASSET_URL,
-            function (GetAssetUrlEvent $event) {
+            function(GetAssetUrlEvent $event) {
                 Craft::debug(
                     'Assets::EVENT_GET_ASSET_URL',
                     __METHOD__
@@ -311,7 +311,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__
@@ -327,7 +327,7 @@ 
         Event::on(
             AssetTransforms::class,
             AssetTransforms::EVENT_GENERATE_TRANSFORM,
-            function (GenerateTransformEvent $event) {
+            function(GenerateTransformEvent $event) {
                 Craft::debug(
                     'AssetTransforms::EVENT_GENERATE_TRANSFORM',
                     __METHOD__
@@ -343,7 +343,7 @@ 
         Event::on(
             AssetTransforms::class,
             AssetTransforms::EVENT_AFTER_DELETE_TRANSFORMS,
-            function (AssetTransformImageEvent $event) {
+            function(AssetTransformImageEvent $event) {
                 Craft::debug(
                     'AssetTransforms::EVENT_AFTER_DELETE_TRANSFORMS',
                     __METHOD__
@@ -359,7 +359,7 @@ 
         Event::on(
             Assets::class,
             Assets::EVENT_BEFORE_REPLACE_ASSET,
-            function (ReplaceAssetEvent $event) {
+            function(ReplaceAssetEvent $event) {
                 Craft::debug(
                     'Assets::EVENT_BEFORE_REPLACE_ASSET',
                     __METHOD__
@@ -378,7 +378,7 @@ 
         Event::on(
             Assets::class,
             Assets::EVENT_AFTER_REPLACE_ASSET,
-            function (ReplaceAssetEvent $event) {
+            function(ReplaceAssetEvent $event) {
                 Craft::debug(
                     'Assets::EVENT_AFTER_REPLACE_ASSET',
                     __METHOD__
@@ -401,7 +401,7 @@ 
         Event::on(
             Assets::class,
             Elements::EVENT_BEFORE_SAVE_ELEMENT,
-            function (ElementEvent $event) {
+            function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_BEFORE_SAVE_ELEMENT',
                     __METHOD__
@@ -422,7 +422,7 @@ 
         Event::on(
             Asset::class,
             Elements::EVENT_BEFORE_DELETE_ELEMENT,
-            function (ElementEvent $event) {
+            function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_BEFORE_DELETE_ELEMENT',
                     __METHOD__
@@ -447,7 +447,7 @@ 
         Event::on(
             Fields::class,
             Fields::EVENT_AFTER_SAVE_FIELD,
-            function (FieldEvent $event) {
+            function(FieldEvent $event) {
                 Craft::debug(
                     'Fields::EVENT_AFTER_SAVE_FIELD',
                     __METHOD__
@@ -464,7 +464,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',
@@ -483,7 +483,7 @@ 
         Event::on(
             Volumes::class,
             Volumes::EVENT_AFTER_SAVE_VOLUME,
-            function (VolumeEvent $event) {
+            function(VolumeEvent $event) {
                 Craft::debug(
                     'Volumes::EVENT_AFTER_SAVE_VOLUME',
                     __METHOD__
@@ -504,7 +504,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) {
@@ -538,7 +538,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__
@@ -561,12 +561,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/helpers/PluginTemplate.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,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/models/OptimizedImage.php

Spacing +8 added lines, -8 removed lines

@@ -554,7 +554,7 @@ 
      */
     public function getPlaceholderImage(): string
     {
-        return (string)$this->placeholderImage();
+        return (string) $this->placeholderImage();
     }
 
     /**
@@ -591,7 +591,7 @@ 
      */
     public function getPlaceholderBox(string $color = null): string
     {
-        return (string)$this->placeholderBox($color);
+        return (string) $this->placeholderBox($color);
     }
 
     /**
@@ -632,7 +632,7 @@ 
      */
     public function getPlaceholderSilhouette(): string
     {
-        return (string)$this->placeholderSilhouette();
+        return (string) $this->placeholderSilhouette();
     }
 
     /**
@@ -744,10 +744,10 @@ 
         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 {
@@ -787,13 +787,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/services/OptimizedImages.php

Spacing +10 added lines, -10 removed lines

@@ -111,7 +111,7 @@ 
                             $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) {
@@ -120,7 +120,7 @@ 
                             $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;
@@ -143,7 +143,7 @@ 
                         __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;
@@ -209,7 +209,7 @@ 
                                 $folder = $asset->getFolder();
                                 while ($folder !== null && !$createVariants) {
                                     if ($folder->uid === $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();
@@ -491,20 +491,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)