@@ -39,16 +39,16 @@ |
||
39 | 39 | |
40 | 40 | // Primary getter functions |
41 | 41 | $fieldObject->addStringField('src') |
42 | - ->arguments(function (\markhuot\CraftQL\Builders\Field $field) { |
|
42 | + ->arguments(function(\markhuot\CraftQL\Builders\Field $field) { |
|
43 | 43 | $field->addIntArgument('width'); |
44 | 44 | }) |
45 | - ->resolve(function ($root, $args) { |
|
45 | + ->resolve(function($root, $args) { |
|
46 | 46 | return $root->src(@$args['width'] ?: 0); |
47 | 47 | }); |
48 | 48 | $fieldObject->addField('srcUrls') |
49 | 49 | ->lists() |
50 | 50 | ->type($srcObject) |
51 | - ->resolve(function ($root, $args) { |
|
51 | + ->resolve(function($root, $args) { |
|
52 | 52 | $result = []; |
53 | 53 | foreach ($root->optimizedImageUrls as $width => $url) { |
54 | 54 | $result[] = ['width' => $width, 'url' => $url]; |
@@ -58,9 +58,9 @@ discard block |
||
58 | 58 | */ |
59 | 59 | public static function RGBToHSL(array $rgb): array |
60 | 60 | { |
61 | - $r = ((float)$rgb['r']) / 255.0; |
|
62 | - $g = ((float)$rgb['g']) / 255.0; |
|
63 | - $b = ((float)$rgb['b']) / 255.0; |
|
61 | + $r = ((float) $rgb['r']) / 255.0; |
|
62 | + $g = ((float) $rgb['g']) / 255.0; |
|
63 | + $b = ((float) $rgb['b']) / 255.0; |
|
64 | 64 | |
65 | 65 | $maxC = max($r, $g, $b); |
66 | 66 | $minC = min($r, $g, $b); |
@@ -88,9 +88,9 @@ discard block |
||
88 | 88 | $h /= 6.0; |
89 | 89 | } |
90 | 90 | |
91 | - $h = (int)round(360.0 * $h); |
|
92 | - $s = (int)round(100.0 * $s); |
|
93 | - $l = (int)round(100.0 * $l); |
|
91 | + $h = (int) round(360.0 * $h); |
|
92 | + $s = (int) round(100.0 * $s); |
|
93 | + $l = (int) round(100.0 * $l); |
|
94 | 94 | |
95 | 95 | return ['h' => $h, 's' => $s, 'l' => $l]; |
96 | 96 | } |
@@ -188,12 +188,12 @@ |
||
188 | 188 | ?: GqlEntityRegistry::createEntity($typeName, new OptimizedImagesType([ |
189 | 189 | 'name' => $typeName, |
190 | 190 | 'description' => 'This entity has all the OptimizedImages properties', |
191 | - 'fields' => function () use ($optimizedImagesFields) { |
|
191 | + 'fields' => function() use ($optimizedImagesFields) { |
|
192 | 192 | return $optimizedImagesFields; |
193 | 193 | }, |
194 | 194 | ])); |
195 | 195 | |
196 | - TypeLoader::registerType($typeName, function () use ($optimizedImagesType) { |
|
196 | + TypeLoader::registerType($typeName, function() use ($optimizedImagesType) { |
|
197 | 197 | return $optimizedImagesType; |
198 | 198 | }); |
199 | 199 |
@@ -51,8 +51,8 @@ |
||
51 | 51 | // It takes a bit of time, so if you never plan to use it, you can turn it off |
52 | 52 | 'createColorPalette' => true, |
53 | 53 | |
54 | - // Controls whether SVG placeholder silhouettes should be created for image variants |
|
55 | - // It takes a bit of time, so if you never plan to use them, you can turn it off |
|
54 | + // Controls whether SVG placeholder silhouettes should be created for image variants |
|
55 | + // It takes a bit of time, so if you never plan to use them, you can turn it off |
|
56 | 56 | 'createPlaceholderSilhouettes' => false, |
57 | 57 | |
58 | 58 | // Controls whether retina images are automatically created with reduced quality |
@@ -208,7 +208,7 @@ |
||
208 | 208 | if (ImageHelper::canManipulateAsImage($asset->getExtension())) { |
209 | 209 | $transform = new AssetTransform([ |
210 | 210 | 'width' => $event->width, |
211 | - 'height' => $event->height, |
|
211 | + 'height' => $event->height, |
|
212 | 212 | 'interlace' => 'line', |
213 | 213 | ]); |
214 | 214 | /** @var ImageTransform $transformMethod */ |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | $vars, |
278 | 278 | $minifier |
279 | 279 | ); |
280 | - $content = (string)$content; |
|
280 | + $content = (string) $content; |
|
281 | 281 | if ($scriptAttrs !== null) { |
282 | 282 | $attrs = array_merge([ |
283 | 283 | ], |
@@ -312,7 +312,7 @@ discard block |
||
312 | 312 | $vars, |
313 | 313 | $minifier |
314 | 314 | ); |
315 | - $content = (string)$content; |
|
315 | + $content = (string) $content; |
|
316 | 316 | if ($scriptAttrs !== null) { |
317 | 317 | $attrs = array_merge([ |
318 | 318 | ], |
@@ -376,7 +376,7 @@ discard block |
||
376 | 376 | .'%'; |
377 | 377 | Craft::info($message, __METHOD__); |
378 | 378 | if (Craft::$app instanceof ConsoleApplication) { |
379 | - echo $message . PHP_EOL; |
|
379 | + echo $message.PHP_EOL; |
|
380 | 380 | } |
381 | 381 | // Create any image variants |
382 | 382 | $this->createImageVariants( |
@@ -531,7 +531,7 @@ discard block |
||
531 | 531 | .'%'; |
532 | 532 | Craft::info($message, __METHOD__); |
533 | 533 | if (Craft::$app instanceof ConsoleApplication) { |
534 | - echo $message . PHP_EOL; |
|
534 | + echo $message.PHP_EOL; |
|
535 | 535 | } |
536 | 536 | // Copy the image variant into place |
537 | 537 | $this->copyImageVariantToVolume( |
@@ -630,9 +630,9 @@ discard block |
||
630 | 630 | // Handle auto-sharpening scaled down images |
631 | 631 | if ($settings->autoSharpenScaledImages) { |
632 | 632 | // See if the image has been scaled >= 50% |
633 | - $widthScale = (int)(($image->getWidth() / $asset->getWidth()) * 100); |
|
634 | - $heightScale = (int)(($image->getHeight() / $asset->getHeight()) * 100); |
|
635 | - if (($widthScale >= (int)$settings->sharpenScaledImagePercentage) || ($heightScale >= (int)$settings->sharpenScaledImagePercentage)) { |
|
633 | + $widthScale = (int) (($image->getWidth() / $asset->getWidth()) * 100); |
|
634 | + $heightScale = (int) (($image->getHeight() / $asset->getHeight()) * 100); |
|
635 | + if (($widthScale >= (int) $settings->sharpenScaledImagePercentage) || ($heightScale >= (int) $settings->sharpenScaledImagePercentage)) { |
|
636 | 636 | $imagineImage->effects() |
637 | 637 | ->sharpen(); |
638 | 638 | Craft::debug( |
@@ -148,14 +148,14 @@ discard block |
||
148 | 148 | { |
149 | 149 | $path = $this->decomposeUrl($pathOrUrl); |
150 | 150 | $path_parts = pathinfo($path['path']); |
151 | - $new_path = ($path_parts['filename'] ?? '') . '.' . ($path_parts['extension'] ?? '') . $extension; |
|
151 | + $new_path = ($path_parts['filename'] ?? '').'.'.($path_parts['extension'] ?? '').$extension; |
|
152 | 152 | if (!empty($path_parts['dirname']) && $path_parts['dirname'] !== '.') { |
153 | 153 | $dirname = $path_parts['dirname']; |
154 | 154 | $dirname = $dirname === '/' ? '' : $dirname; |
155 | - $new_path = $dirname . DIRECTORY_SEPARATOR . $new_path; |
|
155 | + $new_path = $dirname.DIRECTORY_SEPARATOR.$new_path; |
|
156 | 156 | $new_path = preg_replace('/([^:])(\/{2,})/', '$1/', $new_path); |
157 | 157 | } |
158 | - $output = $path['prefix'] . $new_path . $path['suffix']; |
|
158 | + $output = $path['prefix'].$new_path.$path['suffix']; |
|
159 | 159 | |
160 | 160 | return $output; |
161 | 161 | } |
@@ -176,14 +176,14 @@ discard block |
||
176 | 176 | |
177 | 177 | if (filter_var($pathOrUrl, FILTER_VALIDATE_URL)) { |
178 | 178 | $url_parts = parse_url($pathOrUrl); |
179 | - $result['prefix'] = $url_parts['scheme'] . '://' . $url_parts['host']; |
|
179 | + $result['prefix'] = $url_parts['scheme'].'://'.$url_parts['host']; |
|
180 | 180 | if (!empty($url_parts['port'])) { |
181 | - $result['prefix'] .= ':' . $url_parts['port']; |
|
181 | + $result['prefix'] .= ':'.$url_parts['port']; |
|
182 | 182 | } |
183 | 183 | $result['path'] = $url_parts['path']; |
184 | 184 | $result['suffix'] = ''; |
185 | - $result['suffix'] .= empty($url_parts['query']) ? '' : '?' . $url_parts['query']; |
|
186 | - $result['suffix'] .= empty($url_parts['fragment']) ? '' : '#' . $url_parts['fragment']; |
|
185 | + $result['suffix'] .= empty($url_parts['query']) ? '' : '?'.$url_parts['query']; |
|
186 | + $result['suffix'] .= empty($url_parts['fragment']) ? '' : '#'.$url_parts['fragment']; |
|
187 | 187 | } else { |
188 | 188 | $result['prefix'] = ''; |
189 | 189 | $result['path'] = $pathOrUrl; |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | ); |
89 | 89 | $result = ''; |
90 | 90 | $width = self::PLACEHOLDER_WIDTH; |
91 | - $height = (int)($width / $aspectRatio); |
|
91 | + $height = (int) ($width / $aspectRatio); |
|
92 | 92 | $placeholderPath = $this->createImageFromPath($tempPath, $width, $height, self::PLACEHOLDER_QUALITY, $position); |
93 | 93 | if (!empty($placeholderPath)) { |
94 | 94 | $result = base64_encode(file_get_contents($placeholderPath)); |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | { |
111 | 111 | Craft::beginProfile('generateColorPalette', __METHOD__); |
112 | 112 | Craft::info( |
113 | - 'Generating color palette for: ' . $tempPath, |
|
113 | + 'Generating color palette for: '.$tempPath, |
|
114 | 114 | __METHOD__ |
115 | 115 | ); |
116 | 116 | $colorPalette = []; |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | $lightness /= $colorCount; |
157 | 157 | } |
158 | 158 | |
159 | - return $lightness === null ? $lightness : (int)$lightness; |
|
159 | + return $lightness === null ? $lightness : (int) $lightness; |
|
160 | 160 | } |
161 | 161 | /** |
162 | 162 | * Generate an SVG image via Potrace |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | __METHOD__ |
220 | 220 | ); |
221 | 221 | $width = self::TEMP_PLACEHOLDER_WIDTH; |
222 | - $height = (int)($width / $aspectRatio); |
|
222 | + $height = (int) ($width / $aspectRatio); |
|
223 | 223 | $tempPath = $this->createImageFromAsset($asset, $width, $height, self::TEMP_PLACEHOLDER_QUALITY, $position); |
224 | 224 | Craft::endProfile('createTempPlaceholderImage', __METHOD__); |
225 | 225 |
@@ -91,8 +91,8 @@ discard block |
||
91 | 91 | while ($currentElement < $totalElements) { |
92 | 92 | $elements = $paginator->getPageResults(); |
93 | 93 | if (Craft::$app instanceof ConsoleApplication) { |
94 | - echo 'Query ' . $paginator->getCurrentPage() . '/' . $paginator->getTotalPages() |
|
95 | - . ' - assets: ' . $paginator->getTotalResults() |
|
94 | + echo 'Query '.$paginator->getCurrentPage().'/'.$paginator->getTotalPages() |
|
95 | + . ' - assets: '.$paginator->getTotalResults() |
|
96 | 96 | . PHP_EOL; |
97 | 97 | } |
98 | 98 | /** @var ElementInterface $element */ |
@@ -107,9 +107,9 @@ discard block |
||
107 | 107 | if ($field instanceof OptimizedImagesField && $element instanceof Asset) { |
108 | 108 | if ($this->fieldId === null || $field->id == $this->fieldId) { |
109 | 109 | if (Craft::$app instanceof ConsoleApplication) { |
110 | - echo $currentElement . '/' . $totalElements |
|
111 | - . ' - processing asset: ' . $element->title |
|
112 | - . ' from field: ' . $field->name . PHP_EOL; |
|
110 | + echo $currentElement.'/'.$totalElements |
|
111 | + . ' - processing asset: '.$element->title |
|
112 | + . ' from field: '.$field->name.PHP_EOL; |
|
113 | 113 | } |
114 | 114 | try { |
115 | 115 | ImageOptimize::$plugin->optimizedImages->updateOptimizedImageFieldData($field, $element, $this->force); |
@@ -119,9 +119,9 @@ discard block |
||
119 | 119 | echo '[error]: ' |
120 | 120 | . $e->getMessage() |
121 | 121 | . ' while processing ' |
122 | - . $currentElement . '/' . $totalElements |
|
123 | - . ' - processing asset: ' . $element->title |
|
124 | - . ' from field: ' . $field->name . PHP_EOL; |
|
122 | + . $currentElement.'/'.$totalElements |
|
123 | + . ' - processing asset: '.$element->title |
|
124 | + . ' from field: '.$field->name.PHP_EOL; |
|
125 | 125 | } |
126 | 126 | } |
127 | 127 | } |
@@ -63,7 +63,7 @@ |
||
63 | 63 | array $params = [], |
64 | 64 | string $minifier = null |
65 | 65 | ): string { |
66 | - $template = 'image-optimize/' . $templatePath; |
|
66 | + $template = 'image-optimize/'.$templatePath; |
|
67 | 67 | $oldMode = Craft::$app->view->getTemplateMode(); |
68 | 68 | // Look for the template on the frontend first |
69 | 69 | try { |