diff --git a/src/Builder/AbstractConfigBuilder.php b/src/Builder/AbstractConfigBuilder.php index 814e0c20..b537dfd4 100644 --- a/src/Builder/AbstractConfigBuilder.php +++ b/src/Builder/AbstractConfigBuilder.php @@ -1,5 +1,16 @@ $elementData) { - // skip inline rendered config elements if ($isInlineContext === true && array_key_exists('inline_rendered', $elementData) && $elementData['inline_rendered'] === true) { continue; @@ -139,5 +149,4 @@ private function checkColumnAdjusterField(string $brickId, ?string $tab, array $ return $editableNodes; } - } diff --git a/src/Builder/BrickConfigBuilder.php b/src/Builder/BrickConfigBuilder.php index 1dcc58bf..4544a408 100644 --- a/src/Builder/BrickConfigBuilder.php +++ b/src/Builder/BrickConfigBuilder.php @@ -1,5 +1,16 @@ $elementData) { - if ($isInlineContext === true && array_key_exists('inline_rendered', $elementData) && $elementData['inline_rendered'] === true) { continue; } diff --git a/src/Builder/BrickConfigBuilderInterface.php b/src/Builder/BrickConfigBuilderInterface.php index 59aa605a..200b72ad 100644 --- a/src/Builder/BrickConfigBuilderInterface.php +++ b/src/Builder/BrickConfigBuilderInterface.php @@ -1,5 +1,16 @@ parseConfigElements($info, $brickId, $themeOptions, $inlineConfigElements, [], false); foreach ($items as $item) { - $headlessInfo = $this->editableInfoFactory->createViaBrick($info, $editMode, $item); $renderedEditable = $this->headlessEditableRenderer->buildEditable($headlessInfo); @@ -52,7 +62,6 @@ public function buildInlineConfigurationData(Info $info, string $brickId, array $inlineConfigElements = $areaConfig['inline_config_elements'] ?? []; foreach ($inlineConfigElements as $itemName => $item) { - $item['name'] = $itemName; $headlessInfo = $this->editableInfoFactory->createViaBrick($info, false, $item); diff --git a/src/Builder/InlineConfigBuilderInterface.php b/src/Builder/InlineConfigBuilderInterface.php index 18dc8040..0934c48b 100644 --- a/src/Builder/InlineConfigBuilderInterface.php +++ b/src/Builder/InlineConfigBuilderInterface.php @@ -1,5 +1,16 @@ $customBreakPointData) { $customBreakPointDataColumns = explode('_', $customBreakPointData); $customColAmount = $customBreakPointDataColumns[$i] ?? $gridSize; - if (str_starts_with($customColAmount, 'o')) { + if (str_starts_with($customColAmount, 'o')) { $customOffset = (int) substr($customColAmount, 1); $bpPrefix = $customBreakPointName === 'xs' ? '' : $customBreakPointName . '-'; $bootstrapOffsetConfig[$customBreakPointName] = 'offset-' . $bpPrefix . $customOffset; diff --git a/src/Calculator/Bootstrap4/SlideColumnCalculator.php b/src/Calculator/Bootstrap4/SlideColumnCalculator.php index 18d6b940..36769f40 100644 --- a/src/Calculator/Bootstrap4/SlideColumnCalculator.php +++ b/src/Calculator/Bootstrap4/SlideColumnCalculator.php @@ -1,5 +1,16 @@ getDefinitions() as $definitionId => $definition) { - if (in_array($definitionId, $disabledAreaBricks, true)) { continue; } diff --git a/src/DependencyInjection/Compiler/AreaBrickRegistryPass.php b/src/DependencyInjection/Compiler/AreaBrickRegistryPass.php index 1f0c3070..a6314879 100644 --- a/src/DependencyInjection/Compiler/AreaBrickRegistryPass.php +++ b/src/DependencyInjection/Compiler/AreaBrickRegistryPass.php @@ -1,5 +1,16 @@ addMethodCall('setAreaBrickType', [AbstractBaseAreabrick::AREABRICK_TYPE_EXTERNAL]); foreach ($tags as $attributes) { - if (empty($attributes['title'])) { throw new InvalidDefinitionException(sprintf('Simple Areabrick "%s" has an invalid title', $attributes['id'])); } @@ -169,7 +178,7 @@ public function process(ContainerBuilder $container): void } } - if(count($additionalAreaBricksConfig) > 0) { + if (count($additionalAreaBricksConfig) > 0) { $configManagerDefinition = $container->getDefinition(ConfigManager::class); $configManagerDefinition->addMethodCall('addAdditionalAreaConfig', [$additionalAreaBricksConfig]); } diff --git a/src/DependencyInjection/Compiler/CalculatorRegistryPass.php b/src/DependencyInjection/Compiler/CalculatorRegistryPass.php index b3680435..6b1bbf2e 100644 --- a/src/DependencyInjection/Compiler/CalculatorRegistryPass.php +++ b/src/DependencyInjection/Compiler/CalculatorRegistryPass.php @@ -1,5 +1,16 @@ end(); return $treeBuilder; - } + protected function buildContextSettingsNode(): ArrayNodeDefinition { $treeBuilder = new ArrayNodeDefinition('settings'); @@ -274,7 +285,7 @@ protected function buildThemeConfiguration(): ArrayNodeDefinition return is_array($v) && !isset($v['wrapper_classes']); }) ->then(function ($v) { - return array('wrapper_classes' => $v); + return ['wrapper_classes' => $v]; }) ->end() ->children() @@ -307,7 +318,7 @@ protected function buildDataAttributeConfiguration(): ArrayNodeDefinition return is_array($v) && !isset($v['values']); }) ->then(function ($v) { - return array('values' => $v); + return ['values' => $v]; }) ->end() ->children() @@ -344,10 +355,9 @@ protected function buildAreasSection(): ArrayNodeDefinition ->prototype('array') ->validate() ->ifTrue(function ($v) { - $tabs = $v['tabs']; - return count($tabs) > 0 && count(array_filter($v['config_elements'], static function($configElement) use ($tabs) { + return count($tabs) > 0 && count(array_filter($v['config_elements'], static function ($configElement) use ($tabs) { return !array_key_exists($configElement['tab'], $tabs); })) > 0; }) @@ -360,10 +370,9 @@ protected function buildAreasSection(): ArrayNodeDefinition ->end() ->validate() ->ifTrue(function ($v) { - $tabs = $v['tabs']; - return count($tabs) === 0 && count(array_filter($v['config_elements'], static function($configElement) { + return count($tabs) === 0 && count(array_filter($v['config_elements'], static function ($configElement) { return $configElement['tab'] !== null; })) > 0; }) @@ -378,10 +387,10 @@ protected function buildAreasSection(): ArrayNodeDefinition return true; } } + return false; }) ->then(function ($v) { - foreach ($v['inline_config_elements'] ?? [] as $inlineConfigId => $inlineConfigElement) { if ($inlineConfigElement === '<') { $v['inline_config_elements'][$inlineConfigId] = $v['config_elements'][$inlineConfigId]; @@ -439,7 +448,7 @@ protected function buildConfigElementsSection(string $configType = 'config_eleme ->ifTrue(function ($v) { return $v['type'] !== 'block' && is_array($v['children']) && count($v['children']) > 0; }) - ->then(function($v) { + ->then(function ($v) { @trigger_error(sprintf('Type "%s" cannot have child elements', $v['type']), E_USER_ERROR); }) ->end() @@ -499,7 +508,7 @@ protected function buildHeadlessDocumentsSection(): ArrayNodeDefinition ->ifTrue(function ($v) { return $v['type'] !== 'block' && is_array($v['children']) && count($v['children']) > 0; }) - ->then(function($v) { + ->then(function ($v) { @trigger_error(sprintf('Type "%s" cannot have child elements', $v['type']), E_USER_ERROR); }) ->end() diff --git a/src/DependencyInjection/ToolboxExtension.php b/src/DependencyInjection/ToolboxExtension.php index e3a2641b..6375fc8b 100644 --- a/src/DependencyInjection/ToolboxExtension.php +++ b/src/DependencyInjection/ToolboxExtension.php @@ -1,13 +1,24 @@ getExtensionConfig($this->getAlias()) as $toolboxConfigNode) { - if (!empty($toolboxConfigNode['theme']['layout'])) { $hasTheme = true; $headlessAware = $toolboxConfigNode['theme']['layout'] === LayoutManagerInterface::TOOLBOX_LAYOUT_HEADLESS; @@ -44,7 +54,6 @@ public function prepend(ContainerBuilder $container): void } foreach ($toolboxConfigNode['enabled_core_areas'] as $areaName) { - if (in_array($areaName, $loaded, true)) { continue; } @@ -125,7 +134,7 @@ private function allocateGoogleMapsApiKey(ContainerBuilder $container): void $pimcoreGoogleBrowserApiKey = null; $pimcoreGoogleSimpleApiKey = null; - /** @phpstan-ignore-next-line */ + /* @phpstan-ignore-next-line */ if ($container->hasParameter('pimcore_google_marketing')) { $pimcoreGoogleMarketingSettings = $container->getParameter('pimcore_google_marketing'); /** @phpstan-ignore-next-line */ @@ -135,22 +144,22 @@ private function allocateGoogleMapsApiKey(ContainerBuilder $container): void } // browser api key - /** @phpstan-ignore-next-line */ + /* @phpstan-ignore-next-line */ if ($container->hasParameter('toolbox_google_service_browser_api_key')) { $googleBrowserApiKey = $container->getParameter('toolbox_google_service_browser_api_key'); - /** @phpstan-ignore-next-line */ + /* @phpstan-ignore-next-line */ } elseif ($pimcoreGoogleBrowserApiKey !== null) { $googleBrowserApiKey = $pimcoreGoogleBrowserApiKey; } //simple api key - /** @phpstan-ignore-next-line */ + /* @phpstan-ignore-next-line */ if ($container->hasParameter('pimcore_system_config.services.google.simpleapikey')) { $googleSimpleApiKey = $container->getParameter('pimcore_system_config.services.google.simpleapikey'); - /** @phpstan-ignore-next-line */ + /* @phpstan-ignore-next-line */ } elseif ($container->hasParameter('toolbox_google_service_simple_api_key')) { $googleSimpleApiKey = $container->getParameter('toolbox_google_service_simple_api_key'); - /** @phpstan-ignore-next-line */ + /* @phpstan-ignore-next-line */ } elseif ($pimcoreGoogleSimpleApiKey !== null) { $googleSimpleApiKey = $pimcoreGoogleSimpleApiKey; } @@ -187,7 +196,6 @@ private function parseContextConfigs(array $configs): array } foreach ($configs as $config) { - if (!isset($config['context'])) { continue; } @@ -199,13 +207,11 @@ private function parseContextConfigs(array $configs): array // get context data foreach ($configs as $config) { - if (!isset($config['context'])) { continue; } foreach ($config['context'] as $contextName => $contextConfig) { - if ($contextMergeCandidates[$contextName] === false) { continue; } @@ -220,7 +226,6 @@ private function parseContextConfigs(array $configs): array // get context merge data foreach ($contextMergeCandidates as $contextName => $merge) { - if ($merge === false) { continue; } diff --git a/src/Document/Areabrick/AbstractAreabrick.php b/src/Document/Areabrick/AbstractAreabrick.php index 273c01c6..db8363eb 100644 --- a/src/Document/Areabrick/AbstractAreabrick.php +++ b/src/Document/Areabrick/AbstractAreabrick.php @@ -1,5 +1,16 @@ triggerHeadlessEditableActionEvent($info, $headlessResponse); } - } public function getTemplateDirectoryName(): string @@ -128,7 +137,6 @@ public function isHeadlessLayoutAware(): bool return $themeConfig['layout'] === LayoutManagerInterface::TOOLBOX_LAYOUT_HEADLESS; } - private function checkInlineConfigElements(Document\Editable\Area\Info $info): void { $areaConfig = $this->getAreaConfig(); diff --git a/src/Document/Areabrick/ToolboxHeadlessAwareBrickInterface.php b/src/Document/Areabrick/ToolboxHeadlessAwareBrickInterface.php index 7a7e860d..2f06927b 100644 --- a/src/Document/Areabrick/ToolboxHeadlessAwareBrickInterface.php +++ b/src/Document/Areabrick/ToolboxHeadlessAwareBrickInterface.php @@ -1,5 +1,16 @@ $value) { - $keys = explode(':', $key); $currentArray = &$nestedArray; foreach ($keys as $nestedKey) { - /** @phpstan-ignore-next-line */ + /* @phpstan-ignore-next-line */ if (!isset($currentArray[self::ELEMENTS_IDENTIFIER][$nestedKey])) { $currentArray[self::ELEMENTS_IDENTIFIER][$nestedKey] = []; } @@ -64,7 +74,7 @@ private function convertNestedArray($flatArray): array $currentArray[self::ELEMENT_DATA_IDENTIFIER] = $value[3]; } - /** @phpstan-ignore-next-line */ + /* @phpstan-ignore-next-line */ return $nestedArray[self::ELEMENTS_IDENTIFIER] ?? []; } @@ -75,7 +85,6 @@ private function simplifyNestedArray(&$array): void } foreach ($array as &$value) { - if ( is_array($value) && count($value) === 1 && @@ -96,7 +105,6 @@ private function sortNestedArray(&$array): void } foreach ($array as &$item) { - if (!is_array($item)) { continue; } diff --git a/src/Document/Editable/EditableWorker.php b/src/Document/Editable/EditableWorker.php index 32c0ec51..3a73f7f4 100644 --- a/src/Document/Editable/EditableWorker.php +++ b/src/Document/Editable/EditableWorker.php @@ -2,6 +2,17 @@ declare(strict_types=1); +/* + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - DACHCOM Commercial License (DCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. + * + * @copyright Copyright (c) DACHCOM.DIGITAL AG (https://www.dachcom-digital.com) + * @license GPLv3 and DCL + */ + namespace ToolboxBundle\Document\Editable; use Pimcore\Document\Editable\Block\BlockState; @@ -138,7 +149,6 @@ private function processSimpleEditableData(HeadlessResponse $data): array $elementData = $data->getInlineConfigElementData(); foreach ($elementData as $configName => $configData) { - if (array_key_exists('property_normalizer', $config) && $config['property_normalizer'] !== null) { $configData = $this->applyNormalizer($config['property_normalizer'], $configData); } elseif (null !== $defaultNormalizer = $this->getDefaultNormalizer($editableType)) { @@ -167,10 +177,8 @@ private function processElementData(HeadlessResponse $data, string $areaName): a ]; foreach ($configBlocks as $configBlockName => $configBlockData) { - $configElements = $brickConfig[$configBlockName] ?? []; foreach ($configBlockData as $configName => $configData) { - if ($configBlockName === 'additional_property_normalizer' && array_key_exists($configName, $configElements)) { $configData = $this->applyNormalizer($configElements[$configName], $configData); } elseif ($configBlockName !== 'additional_property_normalizer') { diff --git a/src/Document/Editable/HeadlessEditableRenderer.php b/src/Document/Editable/HeadlessEditableRenderer.php index 43689106..4ad9a548 100644 --- a/src/Document/Editable/HeadlessEditableRenderer.php +++ b/src/Document/Editable/HeadlessEditableRenderer.php @@ -1,5 +1,16 @@ getType()) { - 'block' => $this->buildBlockEditable($headlessEditableInfo), - 'area' => $this->buildAreaEditable($headlessEditableInfo), + 'block' => $this->buildBlockEditable($headlessEditableInfo), + 'area' => $this->buildAreaEditable($headlessEditableInfo), 'areablock' => $this->buildAreaBlockEditable($headlessEditableInfo), - 'column' => $this->buildColumnEditable($headlessEditableInfo), - default => $this->buildStandardEditable($headlessEditableInfo), + 'column' => $this->buildColumnEditable($headlessEditableInfo), + default => $this->buildStandardEditable($headlessEditableInfo), }; } @@ -82,7 +93,6 @@ private function buildColumnEditable(HeadlessEditableInfo $headlessEditableInfo) } foreach ($headlessEditableInfo->getChildren() as $headlessColumnEditableInfo) { - $areaBlockDataResponse = null; $editable = $this->getEditable($headlessColumnEditableInfo); @@ -160,7 +170,6 @@ private function buildBlockEditable(HeadlessEditableInfo $headlessEditableInfo): $blockEditable = $this->editableRenderer->getEditable($document, 'block', $headlessEditableInfo->getName(), $config, $headlessEditableInfo->isEditMode()); foreach ($blockEditable->getIterator() as $blockIndex) { - $blockHash = $this->editableWorker->buildBlockHash($headlessEditableInfo->getName(), $blockIndex); $blockNamespace = sprintf('%s:%s', $headlessEditableInfo->getName(), $blockIndex); @@ -171,7 +180,6 @@ private function buildBlockEditable(HeadlessEditableInfo $headlessEditableInfo): $this->editableWorker->processVirtualElement(HeadlessResponse::TYPE_EDITABLE, 'block', $blockHash, $blockNamespace); foreach ($headlessEditableInfo->getChildren() as $childHeadlessEditableInfo) { - $editable = $this->getEditable($childHeadlessEditableInfo); ob_start(); @@ -206,9 +214,7 @@ private function processEditable(HeadlessEditableInfo $headlessEditableInfo, Edi $isSimple = !$headlessEditableInfo->isBlockEditable(); if ($headlessEditableInfo->isStandAlone() === true) { - if ($editMode === false) { - $simpleHeadlessResponse = new HeadlessResponse( HeadlessResponse::TYPE_EDITABLE, $type, diff --git a/src/Document/Response/HeadlessResponse.php b/src/Document/Response/HeadlessResponse.php index d88c5ce8..e2e80875 100644 --- a/src/Document/Response/HeadlessResponse.php +++ b/src/Document/Response/HeadlessResponse.php @@ -2,6 +2,17 @@ declare(strict_types=1); +/* + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - DACHCOM Commercial License (DCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. + * + * @copyright Copyright (c) DACHCOM.DIGITAL AG (https://www.dachcom-digital.com) + * @license GPLv3 and DCL + */ + namespace ToolboxBundle\Document\Response; class HeadlessResponse @@ -37,7 +48,6 @@ public function hasBrickParent(): bool return $this->brickParent !== null; } - public function getBrickParent(): ?string { return $this->brickParent; diff --git a/src/Document/SimpleAreabrick/SimpleAreaBrick.php b/src/Document/SimpleAreabrick/SimpleAreaBrick.php index 424995a3..dc2411f9 100644 --- a/src/Document/SimpleAreabrick/SimpleAreaBrick.php +++ b/src/Document/SimpleAreabrick/SimpleAreaBrick.php @@ -1,5 +1,16 @@ $this->dataAttributeService->generateDataAttributesAsArray('gallery'), 'thumbsDataAttributes' => $this->dataAttributeService->generateDataAttributesAsArray('gallery_thumbs'), diff --git a/src/Document/ToolboxAreabrick/GoogleMap/GoogleMap.php b/src/Document/ToolboxAreabrick/GoogleMap/GoogleMap.php index b9c0deff..1695d584 100644 --- a/src/Document/ToolboxAreabrick/GoogleMap/GoogleMap.php +++ b/src/Document/ToolboxAreabrick/GoogleMap/GoogleMap.php @@ -1,5 +1,16 @@ loop()) { - /** @var Editable\Relation $parallaxBackgroundElement */ $parallaxBackgroundElement = $this->getDocumentEditable($info->getDocument(), 'relation', 'background_image'); $parallaxBackgroundColor = $this->getDocumentEditable($info->getDocument(), 'select', 'background_color')->getData(); diff --git a/src/Document/ToolboxAreabrick/Separator/Separator.php b/src/Document/ToolboxAreabrick/Separator/Separator.php index 63c2b9fc..4e558b1f 100644 --- a/src/Document/ToolboxAreabrick/Separator/Separator.php +++ b/src/Document/ToolboxAreabrick/Separator/Separator.php @@ -1,9 +1,18 @@ ', - sprintf("%s%s", implode(PHP_EOL, $scripts['head']), PHP_EOL), + sprintf('%s%s', implode(PHP_EOL, $scripts['head']), PHP_EOL), $html ); diff --git a/src/EventListener/Frontend/FrontendJsListener.php b/src/EventListener/Frontend/FrontendJsListener.php index bc1cd309..72acdc49 100644 --- a/src/EventListener/Frontend/FrontendJsListener.php +++ b/src/EventListener/Frontend/FrontendJsListener.php @@ -1,11 +1,22 @@ createColumnChildren($item, $document, $editableId, $editMode, $parameters); } @@ -77,7 +87,6 @@ protected function createColumnChildren( bool $editMode, array $parameters = [] ): array { - $resolvedChildren = []; $columns = $parameters['columns'] ?? []; @@ -109,12 +118,10 @@ protected function createBlockChildren( array $parameters = [], bool $hasBrickParent = false ): array { - $resolvedChildren = []; $children = $item['children'] ?? []; foreach ($children as $childName => $childData) { - $brickParent = null; $editableConfiguration = null; diff --git a/src/HeadlessDocument/HeadlessDocumentResolver.php b/src/HeadlessDocument/HeadlessDocumentResolver.php index 14f3f4ed..3439a50e 100644 --- a/src/HeadlessDocument/HeadlessDocumentResolver.php +++ b/src/HeadlessDocument/HeadlessDocumentResolver.php @@ -1,5 +1,16 @@ configManager->getHeadlessDocumentConfig($headlessDocumentName); if (empty($headlessDocumentConfig)) { - $message = sprintf('Headless document definition "%s" not found', $headlessDocumentName); return $editMode @@ -56,7 +66,6 @@ private function buildEditModeOutput(Document $document, string $headlessDocumen $editModeEditables = []; foreach ($areas as $itemName => $item) { - $item['name'] = $itemName; if (!in_array($item['type'], ['areablock', 'area'])) { @@ -105,7 +114,6 @@ private function buildJsonOutput(Document $document, array $areas): JsonResponse $this->registerEventSubscriber(); foreach ($areas as $itemName => $item) { - $item['name'] = $itemName; $headlessInfo = $this->editableInfoFactory->createViaEditable($document, $itemName, false, $item); $this->headlessEditableRenderer->buildEditable($headlessInfo); diff --git a/src/Maintenance/AreaPermissionTask.php b/src/Maintenance/AreaPermissionTask.php index 78e3fc1e..7c8d7bcb 100644 --- a/src/Maintenance/AreaPermissionTask.php +++ b/src/Maintenance/AreaPermissionTask.php @@ -1,5 +1,16 @@ config['areas'])) { continue; } @@ -34,7 +44,6 @@ public function addAdditionalAreaConfig(array $additionalAreaConfig = []): void $this->config['areas'][$additionalAreaId] = [ 'enabled' => true ]; - } } @@ -186,7 +195,7 @@ private function parseContextConfig(string $currentContextId): array } return [ - 'config' => $parsedData, + 'config' => $parsedData, 'settings' => $contextSettings ]; } diff --git a/src/Manager/ConfigManagerInterface.php b/src/Manager/ConfigManagerInterface.php index ffac1296..d57fd0d0 100644 --- a/src/Manager/ConfigManagerInterface.php +++ b/src/Manager/ConfigManagerInterface.php @@ -1,5 +1,16 @@ downloadInfoService->getDownloadInfo($asset, true, 'optimized'); if (array_key_exists('previewImage', $normalizedDownloadInfo)) { diff --git a/src/Normalizer/GalleryRelationsNormalizer.php b/src/Normalizer/GalleryRelationsNormalizer.php index 12f4afd0..56daf55b 100644 --- a/src/Normalizer/GalleryRelationsNormalizer.php +++ b/src/Normalizer/GalleryRelationsNormalizer.php @@ -1,5 +1,16 @@ $config) { - $thumbConfig->setItems($config); $sourceAttributes = $this->getSourceTagAttributes($thumbnail, $thumbConfig, $mediaQuery, $image, $thumbnailOptions); @@ -141,7 +151,6 @@ private function getSrcset(string $fileName, Config $thumbConfig, Image $image, $srcSetValues = []; foreach ([1, 2] as $highRes) { - $thumbConfigRes = clone $thumbConfig; if ($mediaQuery) { diff --git a/src/Service/DataAttributeService.php b/src/Service/DataAttributeService.php index f29eaa00..5f80f6b5 100644 --- a/src/Service/DataAttributeService.php +++ b/src/Service/DataAttributeService.php @@ -1,5 +1,16 @@ bundleConnector->hasBundle('MembersBundle') === true && $this->bundleConnector->getBundleService(\MembersBundle\Manager\RestrictionManager::class)->elementIsInProtectedStorageFolder($download) @@ -54,7 +64,7 @@ public function getDownloadInfo( if ($showPreviewImage) { $metaPreviewImage = $download->getMetadata('previewImage'); - /** @phpstan-ignore-next-line */ + /* @phpstan-ignore-next-line */ if ($metaPreviewImage instanceof Asset\Image) { $dPreviewImage = $metaPreviewImage->getThumbnail($previewThumbName); } elseif ($download instanceof Asset\Image) { @@ -101,6 +111,7 @@ public function getOptimizedFileSize(mixed $bytes, int $precision): string $bytes = $bytes / $step; $i++; } + return round($bytes, $precision) . ' ' . ($units[$i] ?? ''); } } diff --git a/src/Tool/Install.php b/src/Tool/Install.php index 20fafc24..04b6d47c 100644 --- a/src/Tool/Install.php +++ b/src/Tool/Install.php @@ -1,5 +1,16 @@