nystudio107 / craft-imageoptimize

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

Spacing +10 added lines, -10 removed lines

@@ -64,7 +64,7 @@ 
     /**
      * @inheritdoc
      */
-    public function getTransformUrl(Asset $asset, CraftImageTransformModel|string|array|null $transform): ?string
+    public function getTransformUrl(Asset $asset, CraftImageTransformModel | string | array | null $transform): ?string
     {
         return null;
     }
@@ -72,7 +72,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 $url;
     }
@@ -106,7 +106,7 @@ 
         if ($volume->getFs()->subfolder ?? null) {
             $subfolder = $volume->getFs()->subfolder;
             $subfolder = Craft::parseEnv($subfolder);
-            return rtrim($subfolder, '/') . '/' . $assetPath;
+            return rtrim($subfolder, '/').'/'.$assetPath;
         }
 
         return $assetPath;
@@ -143,15 +143,15 @@ 
     {
         $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);
         }
 
-        return $path['prefix'] . $new_path . $path['suffix'];
+        return $path['prefix'].$new_path.$path['suffix'];
     }
 
     // Protected Methods
@@ -170,14 +170,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/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,
                 ],

src/ImageOptimize.php

Spacing +19 added lines, -19 removed lines

@@ -137,7 +137,7 @@ 
     /**
      * @inheritdoc
      */
-    public function getSettingsResponse(): TemplateResponseBehavior|Response
+    public function getSettingsResponse(): TemplateResponseBehavior | Response
     {
         $view = Craft::$app->getView();
         $namespace = $view->getNamespace();
@@ -236,7 +236,7 @@ 
         Event::on(
             CraftVariable::class,
             CraftVariable::EVENT_INIT,
-            function (Event $event) {
+            function(Event $event) {
                 /** @var CraftVariable $variable */
                 $variable = $event->sender;
                 $variable->set('imageOptimize', [
@@ -250,7 +250,7 @@ 
         Event::on(
             Fields::class,
             Fields::EVENT_REGISTER_FIELD_TYPES,
-            static function (RegisterComponentTypesEvent $event) {
+            static function(RegisterComponentTypesEvent $event) {
                 Craft::debug(
                     'Fields::EVENT_REGISTER_FIELD_TYPES',
                     __METHOD__
@@ -264,7 +264,7 @@ 
             Event::on(
                 Utilities::class,
                 Utilities::EVENT_REGISTER_UTILITY_TYPES,
-                static function (RegisterComponentTypesEvent $event) {
+                static function(RegisterComponentTypesEvent $event) {
                     $event->types[] = ImageOptimizeUtility::class;
                 }
             );
@@ -309,7 +309,7 @@ 
         Event::on(
             Asset::class,
             $eventName,
-            static function (DefineAssetUrlEvent $event): void {
+            static function(DefineAssetUrlEvent $event): void {
                 Craft::debug(
                     'Asset::EVENT_DEFINE_URL',
                     __METHOD__
@@ -325,7 +325,7 @@ 
         Event::on(
             Assets::class,
             Assets::EVENT_DEFINE_THUMB_URL,
-            static function (DefineAssetThumbUrlEvent $event): void {
+            static function(DefineAssetThumbUrlEvent $event): void {
                 Craft::debug(
                     'Assets::EVENT_DEFINE_THUMB_URL',
                     __METHOD__
@@ -341,7 +341,7 @@ 
         Event::on(
             ImageTransformer::class,
             ImageTransformer::EVENT_TRANSFORM_IMAGE,
-            static function (ImageTransformerOperationEvent $event): void {
+            static function(ImageTransformerOperationEvent $event): void {
                 Craft::debug(
                     'ImageTransformer::EVENT_TRANSFORM_IMAGE',
                     __METHOD__
@@ -360,7 +360,7 @@ 
         Event::on(
             ImageTransformer::class,
             ImageTransformer::EVENT_DELETE_TRANSFORMED_IMAGE,
-            static function (ImageTransformerOperationEvent $event): void {
+            static function(ImageTransformerOperationEvent $event): void {
                 Craft::debug(
                     'ImageTransformer::EVENT_DELETE_TRANSFORMED_IMAGE',
                     __METHOD__
@@ -376,7 +376,7 @@ 
         Event::on(
             Assets::class,
             Assets::EVENT_BEFORE_REPLACE_ASSET,
-            static function (ReplaceAssetEvent $event) {
+            static function(ReplaceAssetEvent $event) {
                 Craft::debug(
                     'Assets::EVENT_BEFORE_REPLACE_ASSET',
                     __METHOD__
@@ -394,7 +394,7 @@ 
         Event::on(
             Assets::class,
             Assets::EVENT_AFTER_REPLACE_ASSET,
-            static function (ReplaceAssetEvent $event) {
+            static function(ReplaceAssetEvent $event) {
                 Craft::debug(
                     'Assets::EVENT_AFTER_REPLACE_ASSET',
                     __METHOD__
@@ -416,7 +416,7 @@ 
         Event::on(
             Assets::class,
             Elements::EVENT_BEFORE_SAVE_ELEMENT,
-            static function (ElementEvent $event) {
+            static function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_BEFORE_SAVE_ELEMENT',
                     __METHOD__
@@ -437,7 +437,7 @@ 
         Event::on(
             Asset::class,
             Elements::EVENT_BEFORE_DELETE_ELEMENT,
-            static function (ElementEvent $event) {
+            static function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_BEFORE_DELETE_ELEMENT',
                     __METHOD__
@@ -462,7 +462,7 @@ 
         Event::on(
             Fields::class,
             Fields::EVENT_AFTER_SAVE_FIELD,
-            function (FieldEvent $event) {
+            function(FieldEvent $event) {
                 Craft::debug(
                     'Fields::EVENT_AFTER_SAVE_FIELD',
                     __METHOD__
@@ -480,7 +480,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',
@@ -500,7 +500,7 @@ 
         Event::on(
             Volumes::class,
             Volumes::EVENT_AFTER_SAVE_VOLUME,
-            function (VolumeEvent $event) {
+            function(VolumeEvent $event) {
                 Craft::debug(
                     'Volumes::EVENT_AFTER_SAVE_VOLUME',
                     __METHOD__
@@ -519,7 +519,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) {
@@ -539,7 +539,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__
@@ -562,12 +562,12 @@ 
         Event::on(
             Plugins::class,
             Plugins::EVENT_AFTER_LOAD_PLUGINS,
-            static function () {
+            static function() {
                 // Install these only after all other plugins have loaded
                 Event::on(
                     View::class,
                     View::EVENT_REGISTER_CP_TEMPLATE_ROOTS,
-                    static function (RegisterTemplateRootsEvent $e) {
+                    static function(RegisterTemplateRootsEvent $e) {
                         // Register the root directodies
                         $allImageTransformTypes = ImageOptimize::$plugin->optimize->getAllImageTransformTypes();
                         /** @var ImageTransformInterface $imageTransformType */

src/console/controllers/OptimizeController.php

Spacing +5 added lines, -5 removed lines

@@ -72,9 +72,9 @@ 
      */
     public function actionCreate(?string $volumeHandle = null): void
     {
-        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;
@@ -92,7 +92,7 @@ 
             if ($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;
             }
         }
         if (!$this->queue) {
@@ -107,10 +107,10 @@ 
      */
     public function actionCreateAsset(?int $id = null): void
     {
-        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);

ecs.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 
 return static function(ECSConfig $ecsConfig): void {
     $ecsConfig->paths([
-        __DIR__ . '/src',
+        __DIR__.'/src',
         __FILE__,
     ]);
     $ecsConfig->parallel();