nystudio107 / craft-imageoptimize

src/console/controllers/OptimizeController.php

Spacing +5 added lines, -5 removed lines

@@ -72,9 +72,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;
@@ -95,7 +95,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;
             }
         }
         if (!$this->queue) {
@@ -110,10 +110,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);

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();

src/services/OptimizedImages.php

Spacing +26 added lines, -26 removed lines

@@ -104,7 +104,7 @@ 
                 // Only try the transform if it's possible
                 if (Image::canManipulateAsImage($finalFormat)
                     && Image::canManipulateAsImage($asset->getExtension())
-                    && (int)$asset->height > 0) {
+                    && (int) $asset->height > 0) {
                     // Create the transform based on the variant
                     /** @var AssetTransform $transform */
                     list($transform, $aspectRatio) = $this->getTransformFromVariant($asset, $variant, $retinaSize);
@@ -116,16 +116,16 @@ 
                             $index->fileExists = false;
                             $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) {
                             }
                         } catch (Throwable $e) {
-                            $msg = 'Failed to update transform: ' . $e->getMessage();
+                            $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;
@@ -139,16 +139,16 @@ 
                     }
                 } else {
                     $canManipulate = Image::canManipulateAsImage($asset->getExtension());
-                    $msg = 'Could not create transform for: ' . $asset->title
-                        . ' - Final format: ' . $finalFormat
-                        . ' - Element extension: ' . $asset->getExtension()
-                        . ' - canManipulateAsImage: ' . $canManipulate;
+                    $msg = 'Could not create transform for: '.$asset->title
+                        . ' - Final format: '.$finalFormat
+                        . ' - Element extension: '.$asset->getExtension()
+                        . ' - canManipulateAsImage: '.$canManipulate;
                     Craft::error(
                         $msg,
                         __METHOD__
                     );
                     if (Craft::$app instanceof ConsoleApplication) {
-                        echo $msg . PHP_EOL;
+                        echo $msg.PHP_EOL;
                     }
                     if ($canManipulate) {
                         // Add the error message to the stickyErrors for the model
@@ -162,7 +162,7 @@ 
         if (empty($model->optimizedImageUrls)) {
             $finalFormat = $asset->getExtension();
             if (Image::canManipulateAsImage($finalFormat)
-                && (int)$asset->height > 0) {
+                && (int) $asset->height > 0) {
                 $variant = [
                     'width' => $asset->width,
                     'useAspectRatio' => false,
@@ -175,10 +175,10 @@ 
                 $this->addVariantImageToModel($asset, $model, $transform, $variant, $aspectRatio);
             } else {
                 $canManipulate = Image::canManipulateAsImage($asset->getExtension());
-                $msg = 'Could not create transform for: ' . $asset->title
-                    . ' - Final format: ' . $finalFormat
-                    . ' - Element extension: ' . $asset->getExtension()
-                    . ' - canManipulateAsImage: ' . $canManipulate;
+                $msg = 'Could not create transform for: '.$asset->title
+                    . ' - Final format: '.$finalFormat
+                    . ' - Element extension: '.$asset->getExtension()
+                    . ' - canManipulateAsImage: '.$canManipulate;
                 Craft::error(
                     $msg,
                     __METHOD__
@@ -217,7 +217,7 @@ 
                                 $folder = $asset->getFolder();
                                 while ($folder !== null && !$createVariants) {
                                     if ($folder->uid === $subfolder || $folder->name === $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();
@@ -277,7 +277,7 @@ 
             if ($field->handle !== null) {
                 $asset->setFieldValue($field->handle, $field->serializeValue($model));
                 $table = $asset->getContentTable();
-                $column = $asset->getFieldColumnPrefix() . $field->handle;
+                $column = $asset->getFieldColumnPrefix().$field->handle;
                 // Special-case for Craft 3.7 or later, with the addition of a suffix to the Field content column name
                 // ref: https://github.com/craftcms/cms/issues/6922
                 if (ImageOptimize::$craft37) {
@@ -344,7 +344,7 @@ 
             } catch (SiteNotFoundException $e) {
                 $siteId = 0;
                 Craft::error(
-                    'Failed to get primary site: ' . $e->getMessage(),
+                    'Failed to get primary site: '.$e->getMessage(),
                     __METHOD__
                 );
             }
@@ -450,7 +450,7 @@ 
     {
         Craft::beginProfile('generatePlaceholders', __METHOD__);
         Craft::info(
-            'generatePlaceholders for: ' . print_r($model, true),
+            'generatePlaceholders for: '.print_r($model, true),
             __METHOD__
         );
         /** @var Settings $settings */
@@ -511,20 +511,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)
@@ -551,7 +551,7 @@ 
             $transform
         );
         Craft::info(
-            'URL created: ' . print_r($url, true),
+            'URL created: '.print_r($url, true),
             __METHOD__
         );
         // Update the model
@@ -579,7 +579,7 @@ 
                 $this->generatePlaceholders($asset, $model, $aspectRatio);
             }
             Craft::info(
-                'Created transforms for variant: ' . print_r($variant, true),
+                'Created transforms for variant: '.print_r($variant, true),
                 __METHOD__
             );
         }

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/gql/types/generators/OptimizedImagesGenerator.php

Spacing +1 added lines, -1 removed lines

@@ -279,6 +279,6 @@
     public static function getName($context = null): string
     {
         /** @var OptimizedImages $context */
-        return $context->handle . '_OptimizedImages';
+        return $context->handle.'_OptimizedImages';
     }
 }

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 {