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/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 */