nystudio107 / craft-imageoptimize

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/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/models/OptimizedImage.php

Spacing +9 added lines, -9 removed lines

@@ -547,7 +547,7 @@ 
             return $this->defaultPlaceholderImage();
         }
 
-        return Template::raw($header . rawurlencode($content));
+        return Template::raw($header.rawurlencode($content));
     }
 
     /**
@@ -625,7 +625,7 @@ 
             return $this->defaultPlaceholderImage();
         }
 
-        return Template::raw($header . $content);
+        return Template::raw($header.$content);
     }
 
     /**
@@ -753,16 +753,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.', ';
         }
 
         return 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/imagetransforms/ImageTransformInterface.php

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
      *
      * @return string|null
      */
-    public function getTransformUrl(Asset $asset, CraftImageTransformModel|string|array|null $transform): ?string;
+    public function getTransformUrl(Asset $asset, CraftImageTransformModel | string | array | null $transform): ?string;
 
     /**
      * Return a URL to the webp version of the transformed image
@@ -56,7 +56,7 @@ 
      *
      * @return ?string
      */
-    public function getWebPUrl(string $url, Asset $asset, CraftImageTransformModel|string|array|null $transform): ?string;
+    public function getWebPUrl(string $url, Asset $asset, CraftImageTransformModel | string | array | null $transform): ?string;
 
     /**
      * Return the URL that should be used to purge the Asset

src/imagetransforms/CraftImageTransform.php

Spacing +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
     /**
      * @inheritDoc
      */
-    public function getTransformUrl(Asset $asset, CraftImageTransformModel|string|array|null $transform): ?string
+    public function getTransformUrl(Asset $asset, CraftImageTransformModel | string | array | null $transform): ?string
     {
         // Generate the URLs to the optimized images
         $oldValue = Craft::$app->getConfig()->getGeneral()->generateTransformsBeforePageLoad;
@@ -74,7 +74,7 @@ 
     /**
      * @inheritDoc
      */
-    public function getWebPUrl(string $url, Asset $asset, CraftImageTransformModel|string|array|null $transform): ?string
+    public function getWebPUrl(string $url, Asset $asset, CraftImageTransformModel | string | array | null $transform): ?string
     {
         return $this->appendExtension($url, '.webp');
     }

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];
     }

src/services/ServicesTrait.php

Spacing +4 added lines, -4 removed lines

@@ -41,8 +41,8 @@ 
         // so we can't extract it from the passed in $config
         $majorVersion = '4';
         // Dev server container name & port are based on the major version of this plugin
-        $devPort = 3000 + (int)$majorVersion;
-        $versionName = 'v' . $majorVersion;
+        $devPort = 3000 + (int) $majorVersion;
+        $versionName = 'v'.$majorVersion;
         return [
             'components' => [
                 'optimize' => OptimizeService::class,
@@ -53,8 +53,8 @@ 
                     'assetClass' => ImageOptimizeAsset::class,
                     'checkDevServer' => true,
                     'class' => VitePluginService::class,
-                    'devServerInternal' => 'http://craft-imageoptimize-' . $versionName . '-buildchain-dev:' . $devPort,
-                    'devServerPublic' => 'http://localhost:' . $devPort,
+                    'devServerInternal' => 'http://craft-imageoptimize-'.$versionName.'-buildchain-dev:'.$devPort,
+                    'devServerPublic' => 'http://localhost:'.$devPort,
                     'errorEntry' => 'src/js/ImageOptimize.js',
                     'useDevServer' => true,
                 ],