nystudio107 / craft-imageoptimize

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

src/imagetransforms/ImageTransform.php

Spacing +8 added lines, -8 removed lines

@@ -112,7 +112,7 @@ 
             if (ImageOptimize::$craft31) {
                 $subfolder = Craft::parseEnv($subfolder);
             }
-            return rtrim($subfolder, '/') . '/' . $assetPath;
+            return rtrim($subfolder, '/').'/'.$assetPath;
         }
 
         return $assetPath;
@@ -148,14 +148,14 @@ 
     {
         $path = $this->decomposeUrl($pathOrUrl);
         $path_parts = pathinfo($path['path']);
-        $new_path = ($path_parts['filename'] ?? '') . '.' . ($path_parts['extension'] ?? '') . $extension;
+        $new_path = ($path_parts['filename'] ?? '').'.'.($path_parts['extension'] ?? '').$extension;
         if (!empty($path_parts['dirname']) && $path_parts['dirname'] !== '.') {
             $dirname = $path_parts['dirname'];
             $dirname = $dirname === '/' ? '' : $dirname;
-            $new_path = $dirname . DIRECTORY_SEPARATOR . $new_path;
+            $new_path = $dirname.DIRECTORY_SEPARATOR.$new_path;
             $new_path = preg_replace('/([^:])(\/{2,})/', '$1/', $new_path);
         }
-        $output = $path['prefix'] . $new_path . $path['suffix'];
+        $output = $path['prefix'].$new_path.$path['suffix'];
 
         return $output;
     }
@@ -176,14 +176,14 @@ 
 
         if (filter_var($pathOrUrl, FILTER_VALIDATE_URL)) {
             $url_parts = parse_url($pathOrUrl);
-            $result['prefix'] = $url_parts['scheme'] . '://' . $url_parts['host'];
+            $result['prefix'] = $url_parts['scheme'].'://'.$url_parts['host'];
             if (!empty($url_parts['port'])) {
-                $result['prefix'] .= ':' . $url_parts['port'];
+                $result['prefix'] .= ':'.$url_parts['port'];
             }
             $result['path'] = $url_parts['path'];
             $result['suffix'] = '';
-            $result['suffix'] .= empty($url_parts['query']) ? '' : '?' . $url_parts['query'];
-            $result['suffix'] .= empty($url_parts['fragment']) ? '' : '#' . $url_parts['fragment'];
+            $result['suffix'] .= empty($url_parts['query']) ? '' : '?'.$url_parts['query'];
+            $result['suffix'] .= empty($url_parts['fragment']) ? '' : '#'.$url_parts['fragment'];
         } else {
             $result['prefix'] = '';
             $result['path'] = $pathOrUrl;

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 @@ 
         // Constants aren't allowed in traits until PHP >= 8.2
         $majorVersion = '1';
         // 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;
         // Merge in the passed config, so it our config can be overridden by Plugins::pluginConfigs['vite']
         // ref: https://github.com/craftcms/cms/issues/1989
         $config = ArrayHelper::merge([
@@ -55,8 +55,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,
                 ],