@@ -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 | } |
@@ -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 |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | string $minifier = null |
| 63 | 63 | ): string |
| 64 | 64 | { |
| 65 | - $template = 'image-optimize/' . $templatePath; |
|
| 65 | + $template = 'image-optimize/'.$templatePath; |
|
| 66 | 66 | $oldMode = Craft::$app->view->getTemplateMode(); |
| 67 | 67 | // Look for the template on the frontend first |
| 68 | 68 | try { |
@@ -59,7 +59,7 @@ |
||
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | if (!is_file($path)) { |
| 62 | - Craft::error('Tried to load an image at ' . $path . ', but the file does not exist.', __METHOD__); |
|
| 62 | + Craft::error('Tried to load an image at '.$path.', but the file does not exist.', __METHOD__); |
|
| 63 | 63 | throw new ImageException(Craft::t('app', 'No file exists at the given path.')); |
| 64 | 64 | } |
| 65 | 65 | |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | * @inheritdoc |
| 188 | 188 | * @since 1.6.2 |
| 189 | 189 | */ |
| 190 | - public function getContentGqlType(): Type|array |
|
| 190 | + public function getContentGqlType(): Type | array |
|
| 191 | 191 | { |
| 192 | 192 | $typeArray = OptimizedImagesGenerator::generateTypes($this); |
| 193 | 193 | |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | /** |
| 277 | 277 | * @inheritdoc |
| 278 | 278 | */ |
| 279 | - public function getSettingsHtml(): null|string |
|
| 279 | + public function getSettingsHtml(): null | string |
|
| 280 | 280 | { |
| 281 | 281 | $namespace = Craft::$app->getView()->getNamespace(); |
| 282 | 282 | if (str_contains($namespace, Matrix::class) || str_contains($namespace, SuperTableField::class)) { |
@@ -312,14 +312,14 @@ discard block |
||
| 312 | 312 | $sizesWrapperId = Craft::$app->getView()->namespaceInputId('sizes-wrapper'); |
| 313 | 313 | $view = Craft::$app->getView(); |
| 314 | 314 | $view->registerJs( |
| 315 | - 'document.addEventListener("vite-script-loaded", function (e) {' . |
|
| 316 | - 'if (e.detail.path === "../src/web/assets/src/js/OptimizedImagesField.js") {' . |
|
| 317 | - 'new Craft.OptimizedImagesInput(' . |
|
| 318 | - '"' . $namespacedId . '", ' . |
|
| 319 | - '"' . $namespacePrefix . '",' . |
|
| 320 | - '"' . $sizesWrapperId . '"' . |
|
| 321 | - ');' . |
|
| 322 | - '}' . |
|
| 315 | + 'document.addEventListener("vite-script-loaded", function (e) {'. |
|
| 316 | + 'if (e.detail.path === "../src/web/assets/src/js/OptimizedImagesField.js") {'. |
|
| 317 | + 'new Craft.OptimizedImagesInput('. |
|
| 318 | + '"'.$namespacedId.'", '. |
|
| 319 | + '"'.$namespacePrefix.'",'. |
|
| 320 | + '"'.$sizesWrapperId.'"'. |
|
| 321 | + ');'. |
|
| 322 | + '}'. |
|
| 323 | 323 | '});' |
| 324 | 324 | ); |
| 325 | 325 | |
@@ -387,12 +387,12 @@ discard block |
||
| 387 | 387 | $jsonVars = Json::encode($jsonVars); |
| 388 | 388 | $view = Craft::$app->getView(); |
| 389 | 389 | $view->registerJs( |
| 390 | - 'document.addEventListener("vite-script-loaded", function (e) {' . |
|
| 391 | - 'if (e.detail.path === "../src/web/assets/src/js/OptimizedImagesField.js") {' . |
|
| 392 | - "$('#{$nameSpaceId}-field').ImageOptimizeOptimizedImages(" . |
|
| 393 | - $jsonVars . |
|
| 394 | - ");" . |
|
| 395 | - '}' . |
|
| 390 | + 'document.addEventListener("vite-script-loaded", function (e) {'. |
|
| 391 | + 'if (e.detail.path === "../src/web/assets/src/js/OptimizedImagesField.js") {'. |
|
| 392 | + "$('#{$nameSpaceId}-field').ImageOptimizeOptimizedImages(". |
|
| 393 | + $jsonVars. |
|
| 394 | + ");". |
|
| 395 | + '}'. |
|
| 396 | 396 | '});' |
| 397 | 397 | ); |
| 398 | 398 | |
@@ -41,7 +41,7 @@ |
||
| 41 | 41 | $model->addError( |
| 42 | 42 | $attribute, |
| 43 | 43 | Craft::t('image-optimize', 'Object failed to validate') |
| 44 | - . '-' . $attributeError . ' - ' . $valueError |
|
| 44 | + . '-'.$attributeError.' - '.$valueError |
|
| 45 | 45 | ); |
| 46 | 46 | } |
| 47 | 47 | } |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | Craft::configure($query, $this->criteria); |
| 76 | 76 | } |
| 77 | 77 | if (Craft::$app instanceof ConsoleApplication) { |
| 78 | - echo $this->description . PHP_EOL; |
|
| 78 | + echo $this->description.PHP_EOL; |
|
| 79 | 79 | } |
| 80 | 80 | // Use craft\db\Paginator to paginate the results so we don't exceed any memory limits |
| 81 | 81 | // See batch() and each() discussion here: https://github.com/yiisoft/yii2/issues/8420 |
@@ -89,8 +89,8 @@ discard block |
||
| 89 | 89 | while ($currentElement < $totalElements) { |
| 90 | 90 | $elements = $paginator->getPageResults(); |
| 91 | 91 | if (Craft::$app instanceof ConsoleApplication) { |
| 92 | - echo 'Query ' . $paginator->getCurrentPage() . '/' . $paginator->getTotalPages() |
|
| 93 | - . ' - assets: ' . $paginator->getTotalResults() |
|
| 92 | + echo 'Query '.$paginator->getCurrentPage().'/'.$paginator->getTotalPages() |
|
| 93 | + . ' - assets: '.$paginator->getTotalResults() |
|
| 94 | 94 | . PHP_EOL; |
| 95 | 95 | } |
| 96 | 96 | /** @var ElementInterface $element */ |
@@ -103,11 +103,11 @@ discard block |
||
| 103 | 103 | /** @var $field Field */ |
| 104 | 104 | foreach ($fields as $field) { |
| 105 | 105 | if ($field instanceof OptimizedImagesField && $element instanceof Asset) { |
| 106 | - if ($this->fieldId === null || (int)$field->id === (int)$this->fieldId) { |
|
| 106 | + if ($this->fieldId === null || (int) $field->id === (int) $this->fieldId) { |
|
| 107 | 107 | if (Craft::$app instanceof ConsoleApplication) { |
| 108 | - echo $currentElement . '/' . $totalElements |
|
| 109 | - . ' - processing asset: ' . $element->title |
|
| 110 | - . ' from field: ' . $field->name . PHP_EOL; |
|
| 108 | + echo $currentElement.'/'.$totalElements |
|
| 109 | + . ' - processing asset: '.$element->title |
|
| 110 | + . ' from field: '.$field->name.PHP_EOL; |
|
| 111 | 111 | } |
| 112 | 112 | try { |
| 113 | 113 | ImageOptimize::$plugin->optimizedImages->updateOptimizedImageFieldData($field, $element, $this->force); |
@@ -117,9 +117,9 @@ discard block |
||
| 117 | 117 | echo '[error]: ' |
| 118 | 118 | . $e->getMessage() |
| 119 | 119 | . ' while processing ' |
| 120 | - . $currentElement . '/' . $totalElements |
|
| 121 | - . ' - processing asset: ' . $element->title |
|
| 122 | - . ' from field: ' . $field->name . PHP_EOL; |
|
| 120 | + . $currentElement.'/'.$totalElements |
|
| 121 | + . ' - processing asset: '.$element->title |
|
| 122 | + . ' from field: '.$field->name.PHP_EOL; |
|
| 123 | 123 | } |
| 124 | 124 | } |
| 125 | 125 | } |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | /** |
| 167 | 167 | * @inheritdoc |
| 168 | 168 | */ |
| 169 | - public function getSettingsResponse(): TemplateResponseBehavior|Response |
|
| 169 | + public function getSettingsResponse(): TemplateResponseBehavior | Response |
|
| 170 | 170 | { |
| 171 | 171 | $view = Craft::$app->getView(); |
| 172 | 172 | $namespace = $view->getNamespace(); |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | Event::on( |
| 266 | 266 | CraftVariable::class, |
| 267 | 267 | CraftVariable::EVENT_INIT, |
| 268 | - function (Event $event) { |
|
| 268 | + function(Event $event) { |
|
| 269 | 269 | /** @var CraftVariable $variable */ |
| 270 | 270 | $variable = $event->sender; |
| 271 | 271 | $variable->set('imageOptimize', [ |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | Event::on( |
| 280 | 280 | Fields::class, |
| 281 | 281 | Fields::EVENT_REGISTER_FIELD_TYPES, |
| 282 | - static function (RegisterComponentTypesEvent $event) { |
|
| 282 | + static function(RegisterComponentTypesEvent $event) { |
|
| 283 | 283 | Craft::debug( |
| 284 | 284 | 'Fields::EVENT_REGISTER_FIELD_TYPES', |
| 285 | 285 | __METHOD__ |
@@ -293,7 +293,7 @@ discard block |
||
| 293 | 293 | Event::on( |
| 294 | 294 | Utilities::class, |
| 295 | 295 | Utilities::EVENT_REGISTER_UTILITY_TYPES, |
| 296 | - static function (RegisterComponentTypesEvent $event) { |
|
| 296 | + static function(RegisterComponentTypesEvent $event) { |
|
| 297 | 297 | $event->types[] = ImageOptimizeUtility::class; |
| 298 | 298 | } |
| 299 | 299 | ); |
@@ -328,7 +328,7 @@ discard block |
||
| 328 | 328 | Event::on( |
| 329 | 329 | Asset::class, |
| 330 | 330 | Asset::EVENT_DEFINE_URL, |
| 331 | - static function (DefineAssetUrlEvent $event): void { |
|
| 331 | + static function(DefineAssetUrlEvent $event): void { |
|
| 332 | 332 | Craft::debug( |
| 333 | 333 | 'Asset::EVENT_GET_ASSET_URL', |
| 334 | 334 | __METHOD__ |
@@ -344,7 +344,7 @@ discard block |
||
| 344 | 344 | Event::on( |
| 345 | 345 | Assets::class, |
| 346 | 346 | Assets::EVENT_DEFINE_THUMB_URL, |
| 347 | - static function (DefineAssetThumbUrlEvent $event): void { |
|
| 347 | + static function(DefineAssetThumbUrlEvent $event): void { |
|
| 348 | 348 | Craft::debug( |
| 349 | 349 | 'Assets::EVENT_DEFINE_THUMB_URL', |
| 350 | 350 | __METHOD__ |
@@ -360,7 +360,7 @@ discard block |
||
| 360 | 360 | Event::on( |
| 361 | 361 | ImageTransformer::class, |
| 362 | 362 | ImageTransformer::EVENT_TRANSFORM_IMAGE, |
| 363 | - static function (ImageTransformerOperationEvent $event): void { |
|
| 363 | + static function(ImageTransformerOperationEvent $event): void { |
|
| 364 | 364 | Craft::debug( |
| 365 | 365 | 'ImageTransformer::EVENT_TRANSFORM_IMAGE', |
| 366 | 366 | __METHOD__ |
@@ -376,7 +376,7 @@ discard block |
||
| 376 | 376 | Event::on( |
| 377 | 377 | ImageTransformer::class, |
| 378 | 378 | ImageTransformer::EVENT_DELETE_TRANSFORMED_IMAGE, |
| 379 | - static function (ImageTransformerOperationEvent $event): void { |
|
| 379 | + static function(ImageTransformerOperationEvent $event): void { |
|
| 380 | 380 | Craft::debug( |
| 381 | 381 | 'ImageTransformer::EVENT_DELETE_TRANSFORMED_IMAGE', |
| 382 | 382 | __METHOD__ |
@@ -392,7 +392,7 @@ discard block |
||
| 392 | 392 | Event::on( |
| 393 | 393 | Assets::class, |
| 394 | 394 | Assets::EVENT_BEFORE_REPLACE_ASSET, |
| 395 | - static function (ReplaceAssetEvent $event) { |
|
| 395 | + static function(ReplaceAssetEvent $event) { |
|
| 396 | 396 | Craft::debug( |
| 397 | 397 | 'Assets::EVENT_BEFORE_REPLACE_ASSET', |
| 398 | 398 | __METHOD__ |
@@ -410,7 +410,7 @@ discard block |
||
| 410 | 410 | Event::on( |
| 411 | 411 | Assets::class, |
| 412 | 412 | Assets::EVENT_AFTER_REPLACE_ASSET, |
| 413 | - static function (ReplaceAssetEvent $event) { |
|
| 413 | + static function(ReplaceAssetEvent $event) { |
|
| 414 | 414 | Craft::debug( |
| 415 | 415 | 'Assets::EVENT_AFTER_REPLACE_ASSET', |
| 416 | 416 | __METHOD__ |
@@ -432,7 +432,7 @@ discard block |
||
| 432 | 432 | Event::on( |
| 433 | 433 | Assets::class, |
| 434 | 434 | Elements::EVENT_BEFORE_SAVE_ELEMENT, |
| 435 | - static function (ElementEvent $event) { |
|
| 435 | + static function(ElementEvent $event) { |
|
| 436 | 436 | Craft::debug( |
| 437 | 437 | 'Elements::EVENT_BEFORE_SAVE_ELEMENT', |
| 438 | 438 | __METHOD__ |
@@ -453,7 +453,7 @@ discard block |
||
| 453 | 453 | Event::on( |
| 454 | 454 | Asset::class, |
| 455 | 455 | Elements::EVENT_BEFORE_DELETE_ELEMENT, |
| 456 | - static function (ElementEvent $event) { |
|
| 456 | + static function(ElementEvent $event) { |
|
| 457 | 457 | Craft::debug( |
| 458 | 458 | 'Elements::EVENT_BEFORE_DELETE_ELEMENT', |
| 459 | 459 | __METHOD__ |
@@ -478,7 +478,7 @@ discard block |
||
| 478 | 478 | Event::on( |
| 479 | 479 | Fields::class, |
| 480 | 480 | Fields::EVENT_AFTER_SAVE_FIELD, |
| 481 | - function (FieldEvent $event) { |
|
| 481 | + function(FieldEvent $event) { |
|
| 482 | 482 | Craft::debug( |
| 483 | 483 | 'Fields::EVENT_AFTER_SAVE_FIELD', |
| 484 | 484 | __METHOD__ |
@@ -496,7 +496,7 @@ discard block |
||
| 496 | 496 | Event::on( |
| 497 | 497 | Plugins::class, |
| 498 | 498 | Plugins::EVENT_AFTER_SAVE_PLUGIN_SETTINGS, |
| 499 | - function (PluginEvent $event) { |
|
| 499 | + function(PluginEvent $event) { |
|
| 500 | 500 | if ($event->plugin === $this) { |
| 501 | 501 | Craft::debug( |
| 502 | 502 | 'Plugins::EVENT_AFTER_SAVE_PLUGIN_SETTINGS', |
@@ -516,7 +516,7 @@ discard block |
||
| 516 | 516 | Event::on( |
| 517 | 517 | Volumes::class, |
| 518 | 518 | Volumes::EVENT_AFTER_SAVE_VOLUME, |
| 519 | - function (VolumeEvent $event) { |
|
| 519 | + function(VolumeEvent $event) { |
|
| 520 | 520 | Craft::debug( |
| 521 | 521 | 'Volumes::EVENT_AFTER_SAVE_VOLUME', |
| 522 | 522 | __METHOD__ |
@@ -535,7 +535,7 @@ discard block |
||
| 535 | 535 | Event::on( |
| 536 | 536 | Plugins::class, |
| 537 | 537 | Plugins::EVENT_AFTER_INSTALL_PLUGIN, |
| 538 | - function (PluginEvent $event) { |
|
| 538 | + function(PluginEvent $event) { |
|
| 539 | 539 | if ($event->plugin === $this) { |
| 540 | 540 | $request = Craft::$app->getRequest(); |
| 541 | 541 | if ($request->isCpRequest) { |
@@ -555,7 +555,7 @@ discard block |
||
| 555 | 555 | Event::on( |
| 556 | 556 | UrlManager::class, |
| 557 | 557 | UrlManager::EVENT_REGISTER_SITE_URL_RULES, |
| 558 | - function (RegisterUrlRulesEvent $event) { |
|
| 558 | + function(RegisterUrlRulesEvent $event) { |
|
| 559 | 559 | Craft::debug( |
| 560 | 560 | 'UrlManager::EVENT_REGISTER_SITE_URL_RULES', |
| 561 | 561 | __METHOD__ |
@@ -578,12 +578,12 @@ discard block |
||
| 578 | 578 | Event::on( |
| 579 | 579 | Plugins::class, |
| 580 | 580 | Plugins::EVENT_AFTER_LOAD_PLUGINS, |
| 581 | - static function () { |
|
| 581 | + static function() { |
|
| 582 | 582 | // Install these only after all other plugins have loaded |
| 583 | 583 | Event::on( |
| 584 | 584 | View::class, |
| 585 | 585 | View::EVENT_REGISTER_CP_TEMPLATE_ROOTS, |
| 586 | - static function (RegisterTemplateRootsEvent $e) { |
|
| 586 | + static function(RegisterTemplateRootsEvent $e) { |
|
| 587 | 587 | // Register the root directodies |
| 588 | 588 | $allImageTransformTypes = ImageOptimize::$plugin->optimize->getAllImageTransformTypes(); |
| 589 | 589 | /** @var ImageTransformInterface $imageTransformType */ |
@@ -259,12 +259,12 @@ discard block |
||
| 259 | 259 | ?: GqlEntityRegistry::createEntity($typeName, new OptimizedImagesType([ |
| 260 | 260 | 'name' => $typeName, |
| 261 | 261 | 'description' => 'This entity has all the OptimizedImages properties', |
| 262 | - 'fields' => function () use ($optimizedImagesFields) { |
|
| 262 | + 'fields' => function() use ($optimizedImagesFields) { |
|
| 263 | 263 | return $optimizedImagesFields; |
| 264 | 264 | }, |
| 265 | 265 | ])); |
| 266 | 266 | |
| 267 | - TypeLoader::registerType($typeName, function () use ($optimizedImagesType) { |
|
| 267 | + TypeLoader::registerType($typeName, function() use ($optimizedImagesType) { |
|
| 268 | 268 | return $optimizedImagesType; |
| 269 | 269 | }); |
| 270 | 270 | |
@@ -277,6 +277,6 @@ discard block |
||
| 277 | 277 | public static function getName($context = null): string |
| 278 | 278 | { |
| 279 | 279 | /** @var OptimizedImages $context */ |
| 280 | - return $context->handle . '_OptimizedImages'; |
|
| 280 | + return $context->handle.'_OptimizedImages'; |
|
| 281 | 281 | } |
| 282 | 282 | } |