20660774589

Committed 02 Jan 2026 03:17PM UTC coverage: 88.816% (+0.8%) from 88.049%

Build # 20660774589

Build Type

push

github

Committed by

tito10047

Commit Message

add transparent HTML caching: implement caching for rendered image components, update services, configuration, tests, and documentation

Run Details

39 of 40 new or added lines in 4 files covered. (97.5%)

63 existing lines in 6 files now uncovered.

540 of 608 relevant lines covered (88.82%)

160.76 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

71.17

/src/DependencyInjection/ProgressiveImageExtension.php

<?php

namespace Tito10047\ProgressiveImageBundle\DependencyInjection;

use Symfony\Component\Config\FileLocator;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Extension\Extension;
use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Contracts\Cache\CacheInterface;
use Tito10047\ProgressiveImageBundle\Resolver\AssetMapperResolver;
use Tito10047\ProgressiveImageBundle\Resolver\FileSystemResolver;
use Tito10047\ProgressiveImageBundle\Service\MetadataReader;
use Tito10047\ProgressiveImageBundle\Service\PreloadCollector;
use Tito10047\ProgressiveImageBundle\Service\ResponsiveAttributeGenerator;
use Tito10047\ProgressiveImageBundle\Twig\TransparentCacheExtension;
use Tito10047\ProgressiveImageBundle\Event\TransparentImageCacheSubscriber;
use Tito10047\ProgressiveImageBundle\Twig\Components\Image;
use Tito10047\ProgressiveImageBundle\UrlGenerator\ResponsiveImageUrlGeneratorInterface;
use function Symfony\Component\DependencyInjection\Loader\Configurator\service;

class ProgressiveImageExtension extends Extension implements PrependExtensionInterface {

    public function getAlias(): string
    {
        return 'progressive_image';
    }

        public function prepend(ContainerBuilder $builder): void
        {
                $builder->prependExtensionConfig('framework', [
                        'asset_mapper' => [
                                'paths' => [
                                        __DIR__.'/../../assets' => 'tito10047/progressive-image-bundle',
                                ],
                        ],
                ]);
                $builder->prependExtensionConfig('twig_component', [
                        'defaults' => [
                                'Tito10047\ProgressiveImageBundle\Twig\Components\\' => [
                                        'template_directory' => '@ProgressiveImage/components/',
                                        'name_prefix' => 'pgi',
                                ],
                        ],
                ]);

                $configs = $builder->getExtensionConfig($this->getAlias());
                $configs = $this->processConfiguration(new Configuration(), $configs);

                if (isset($configs['responsive_strategy']['breakpoints'])) {
                        $breakpoints = $configs['responsive_strategy']['breakpoints'];
                        $liipConfigs = $builder->getExtensionConfig('liip_imagine');

                        $newFilterSets = [];
                        foreach ($liipConfigs as $liipConfig) {
                                if (isset($liipConfig['filter_sets'])) {
                                        foreach ($liipConfig['filter_sets'] as $setName => $setConfig) {
                                                foreach ($breakpoints as $breakpointName => $width) {
                                                        $newSetName = $setName . '_' . $breakpointName;
                                                        if (isset($newFilterSets[$newSetName])) {
                                                                continue;
                                                        }
                                                        $newSetConfig = $setConfig;

                                                        if (isset($newSetConfig['filters']['thumbnail']['size'])) {
                                                                [$origWidth, $origHeight] = $newSetConfig['filters']['thumbnail']['size'];
                                                                if ($origWidth > 0 && $origHeight > 0) {
                                                                        $ratio = $origHeight / $origWidth;
                                                                        $newHeight = (int) round($width * $ratio);
                                                                        $newSetConfig['filters']['thumbnail']['size'] = [$width, $newHeight];
                                                                } else {
                                                                        $newSetConfig['filters']['thumbnail']['size'] = [$width, $width];
                                                                }
                                                        }

                                                        $newFilterSets[$newSetName] = $newSetConfig;
                                                }
                                        }
                                }
                        }

                        if (!empty($newFilterSets)) {
                                $builder->prependExtensionConfig('liip_imagine', [
                                        'filter_sets' => $newFilterSets,
                                ]);
                        }
                }
        }



        public function load(array $configs, ContainerBuilder $container): void {

                $configs = $this->processConfiguration(new Configuration(), $configs);

                if (!isset($container->getParameter('kernel.bundles')['TwigBundle'])) {
                        throw new \LogicException('The TwigBundle is not registered in your application. Try running "composer require symfony/twig-bundle".');
                }

                $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../config'));
                $loader->load('services.php');

                $this->configureResolvers($configs, $container);

                $driver = $configs['driver'] ?? 'gd';
                $analyzerId = match ($driver) {
                        "imagick" => "progressive_image.analyzer.imagick",
                        "gd" => "progressive_image.analyzer.gd",
                        default => $driver,
                };

                $resolver   = $configs['resolver']??'default';
                $maybeService = 'progressive_image.resolver.' . $resolver;
                if ($container->hasDefinition($maybeService)) {
                        $resolverId = $maybeService;
                }else{
                        $resolverId = $resolver;
                }
                $loaderId = $configs['loader']??'progressive_image.filesystem.loader';
                $cacheId = $configs['cache']??'cache.app';
                $imageCacheServiceId = $configs['image_cache_service'] ?? 'cache.app';
                $imageCacheEnabled = $configs['image_cache_enabled'] ?? false;
                $ttl = $configs['ttl'] ?? null;

                $definition = $container->getDefinition(MetadataReader::class);
                $definition->setArgument('$analyzer', new Reference($analyzerId))
                        ->setArgument('$loader', new Reference($loaderId))
                        ->setArgument('$pathResolver', new Reference($resolverId))
                        ->setArgument('$cache', new Reference($cacheId))
            ->setArgument('$ttl', $configs['ttl'] ?? null)
            ->setArgument('$fallbackPath', $configs['fallback_image'] ?? null)
                ;
                $container->setParameter('progressive_image.image_cache_enabled', $imageCacheEnabled);
                $container->setParameter('progressive_image.ttl', $ttl);
                $container->setAlias('progressive_image.image_cache_service', $imageCacheServiceId);

                $responsiveConfig = $configs['responsive_strategy'] ?? [];
                $generatorId = $responsiveConfig['generator'] ?? null;

        if ($generatorId || class_exists(\Liip\ImagineBundle\LiipImagineBundle::class)) {
            $container->register(ResponsiveAttributeGenerator::class, ResponsiveAttributeGenerator::class)
                ->setArgument('$gridConfig', $responsiveConfig['grid'] ?? [])
                ->setArgument('$ratioConfig', $responsiveConfig['ratios'] ?? [])
                ->setArgument('$preloadCollector', new Reference(PreloadCollector::class))
                ->setArgument('$urlGenerator', $generatorId ? new Reference($generatorId) : new Reference(ResponsiveImageUrlGeneratorInterface::class))
            ;
        }

                $container->register(Image::class, Image::class)
                        ->setArgument('$analyzer', new Reference(MetadataReader::class))
                        ->setArgument('$pathDecorator', array_map(fn($id) => new Reference($id), $configs['path_decorators'] ?? []))
            ->setArgument('$responsiveAttributeGenerator', $generatorId || class_exists(\Liip\ImagineBundle\LiipImagineBundle::class) ? new Reference(ResponsiveAttributeGenerator::class) : null)
                        ->setArgument('$preloadCollector', new Reference(PreloadCollector::class))
            ->setShared(false)
                        ->addTag('twig.component')
                        ->setPublic(true);


        }


        private function configureResolvers(array $config, ContainerBuilder $container): void
        {
                $resolvers = $config['resolvers'] ?? [];
                foreach ($resolvers as $name => $resolverConfig) {
                        $id = 'progressive_image.resolver.' . $name;

                        if ('filesystem' === $resolverConfig['type']) {
                                $container->register($id, FileSystemResolver::class)
                                        ->setArgument('$roots', $resolverConfig['roots'] ?? ["%kernel.project_dir%/public"])
                                        ->setArgument('$allowUnresolvable', $resolverConfig['allowUnresolvable'] ?? false);
                        } elseif ('asset_mapper' === $resolverConfig['type']) {
                                $container->register($id, AssetMapperResolver::class);
                        }
                        // Chain resolver logic can be added here if needed
                }

                if (isset($config['resolver']) && !isset($resolvers[$config['resolver']])) {
                        // If a default resolver type is used but not defined in resolvers array
                        if (in_array($config['resolver'], ['filesystem', 'asset_mapper'])) {
                                // handle basic types if they are used as string directly
                        }
                }

                // Register a default alias if possible
                if (isset($config['resolver']) && isset($resolvers[$config['resolver']])) {
                        $container->setAlias('progressive_image.resolver.default', 'progressive_image.resolver.' . $config['resolver']);
                } elseif (!empty($resolvers)) {
                        $firstResolver = array_key_first($resolvers);
                        $container->setAlias('progressive_image.resolver.default', 'progressive_image.resolver.' . $firstResolver);
                } else {
                        // Fallback if no resolvers defined, register a basic one to avoid ServiceNotFoundException
                        $container->register('progressive_image.resolver.default', FileSystemResolver::class)
                                ->setArgument('$roots', ['%kernel.project_dir%/public'])
                                ->setArgument('$allowUnresolvable', true);
                }
        }
}

1	<?php
2
3	namespace Tito10047\ProgressiveImageBundle\DependencyInjection;
4
5	use Symfony\Component\Config\FileLocator;
6	use Symfony\Component\DependencyInjection\ContainerBuilder;
7	use Symfony\Component\DependencyInjection\Extension\Extension;
8	use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
9	use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
10	use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
11	use Symfony\Component\DependencyInjection\Reference;
12	use Symfony\Contracts\Cache\CacheInterface;
13	use Tito10047\ProgressiveImageBundle\Resolver\AssetMapperResolver;
14	use Tito10047\ProgressiveImageBundle\Resolver\FileSystemResolver;
15	use Tito10047\ProgressiveImageBundle\Service\MetadataReader;
16	use Tito10047\ProgressiveImageBundle\Service\PreloadCollector;
17	use Tito10047\ProgressiveImageBundle\Service\ResponsiveAttributeGenerator;
18	use Tito10047\ProgressiveImageBundle\Twig\TransparentCacheExtension;
19	use Tito10047\ProgressiveImageBundle\Event\TransparentImageCacheSubscriber;
20	use Tito10047\ProgressiveImageBundle\Twig\Components\Image;
21	use Tito10047\ProgressiveImageBundle\UrlGenerator\ResponsiveImageUrlGeneratorInterface;
22	use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
23
24	class ProgressiveImageExtension extends Extension implements PrependExtensionInterface {
25
26	public function getAlias(): string
27	{
28	return 'progressive_image';	303✔
29	}
30
31	public function prepend(ContainerBuilder $builder): void
32	{
33	$builder->prependExtensionConfig('framework', [	303✔
34	'asset_mapper' => [	303✔
35	'paths' => [	303✔
36	__DIR__.'/../../assets' => 'tito10047/progressive-image-bundle',	303✔
37	],	303✔
38	],	303✔
39	]);	303✔
40	$builder->prependExtensionConfig('twig_component', [	303✔
41	'defaults' => [	303✔
42	'Tito10047\ProgressiveImageBundle\Twig\Components\\' => [	303✔
43	'template_directory' => '@ProgressiveImage/components/',	303✔
44	'name_prefix' => 'pgi',	303✔
45	],	303✔
46	],	303✔
47	]);	303✔
48
49	$configs = $builder->getExtensionConfig($this->getAlias());	303✔
50	$configs = $this->processConfiguration(new Configuration(), $configs);	303✔
51
52	if (isset($configs['responsive_strategy']['breakpoints'])) {	303✔
53	$breakpoints = $configs['responsive_strategy']['breakpoints'];	×
54	$liipConfigs = $builder->getExtensionConfig('liip_imagine');	×
55
56	$newFilterSets = [];	×
57	foreach ($liipConfigs as $liipConfig) {	×
58	if (isset($liipConfig['filter_sets'])) {	×
59	foreach ($liipConfig['filter_sets'] as $setName => $setConfig) {	×
60	foreach ($breakpoints as $breakpointName => $width) {	×
61	$newSetName = $setName . '_' . $breakpointName;	×
62	if (isset($newFilterSets[$newSetName])) {	×
63	continue;	×
64	}
65	$newSetConfig = $setConfig;	×
66
67	if (isset($newSetConfig['filters']['thumbnail']['size'])) {	×
68	[$origWidth, $origHeight] = $newSetConfig['filters']['thumbnail']['size'];	×
69	if ($origWidth > 0 && $origHeight > 0) {	×
70	$ratio = $origHeight / $origWidth;	×
71	$newHeight = (int) round($width * $ratio);	×
72	$newSetConfig['filters']['thumbnail']['size'] = [$width, $newHeight];	×
73	} else {
74	$newSetConfig['filters']['thumbnail']['size'] = [$width, $width];	×
75	}
76	}
77
78	$newFilterSets[$newSetName] = $newSetConfig;	×
79	}
80	}
81	}
82	}
83
84	if (!empty($newFilterSets)) {	×
85	$builder->prependExtensionConfig('liip_imagine', [	×
86	'filter_sets' => $newFilterSets,	×
87	]);	×
88	}
89	}
90	}
91
92
93
94	public function load(array $configs, ContainerBuilder $container): void {
95
96	$configs = $this->processConfiguration(new Configuration(), $configs);	303✔
97
98	if (!isset($container->getParameter('kernel.bundles')['TwigBundle'])) {	303✔
99	throw new \LogicException('The TwigBundle is not registered in your application. Try running "composer require symfony/twig-bundle".');	×
100	}
101
102	$loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../config'));	303✔
103	$loader->load('services.php');	303✔
104
105	$this->configureResolvers($configs, $container);	303✔
106
107	$driver = $configs['driver'] ?? 'gd';	303✔
108	$analyzerId = match ($driver) {	303✔
109	"imagick" => "progressive_image.analyzer.imagick",	×
110	"gd" => "progressive_image.analyzer.gd",	303✔
111	default => $driver,	×
112	};	303✔
113
114	$resolver = $configs['resolver']??'default';	303✔
115	$maybeService = 'progressive_image.resolver.' . $resolver;	303✔
116	if ($container->hasDefinition($maybeService)) {	303✔
117	$resolverId = $maybeService;	303✔
118	}else{
119	$resolverId = $resolver;	×
120	}
121	$loaderId = $configs['loader']??'progressive_image.filesystem.loader';	303✔
122	$cacheId = $configs['cache']??'cache.app';	303✔
123	$imageCacheServiceId = $configs['image_cache_service'] ?? 'cache.app';	303✔
124	$imageCacheEnabled = $configs['image_cache_enabled'] ?? false;	303✔
125	$ttl = $configs['ttl'] ?? null;	303✔
126
127	$definition = $container->getDefinition(MetadataReader::class);	303✔
128	$definition->setArgument('$analyzer', new Reference($analyzerId))	303✔
129	->setArgument('$loader', new Reference($loaderId))	303✔
130	->setArgument('$pathResolver', new Reference($resolverId))	303✔
131	->setArgument('$cache', new Reference($cacheId))	303✔
132	->setArgument('$ttl', $configs['ttl'] ?? null)	303✔
133	->setArgument('$fallbackPath', $configs['fallback_image'] ?? null)	303✔
134	;	303✔
135	$container->setParameter('progressive_image.image_cache_enabled', $imageCacheEnabled);	303✔
136	$container->setParameter('progressive_image.ttl', $ttl);	303✔
137	$container->setAlias('progressive_image.image_cache_service', $imageCacheServiceId);	303✔
138
139	$responsiveConfig = $configs['responsive_strategy'] ?? [];	303✔
140	$generatorId = $responsiveConfig['generator'] ?? null;	303✔
141
142	if ($generatorId \|\| class_exists(\Liip\ImagineBundle\LiipImagineBundle::class)) {	303✔
UNCOV 143	$container->register(ResponsiveAttributeGenerator::class, ResponsiveAttributeGenerator::class)	294✔
UNCOV 144	->setArgument('$gridConfig', $responsiveConfig['grid'] ?? [])	294✔
UNCOV 145	->setArgument('$ratioConfig', $responsiveConfig['ratios'] ?? [])	294✔
UNCOV 146	->setArgument('$preloadCollector', new Reference(PreloadCollector::class))	294✔
UNCOV 147	->setArgument('$urlGenerator', $generatorId ? new Reference($generatorId) : new Reference(ResponsiveImageUrlGeneratorInterface::class))	294✔
UNCOV 148	;	294✔
149	}
150
151	$container->register(Image::class, Image::class)	303✔
152	->setArgument('$analyzer', new Reference(MetadataReader::class))	303✔
153	->setArgument('$pathDecorator', array_map(fn($id) => new Reference($id), $configs['path_decorators'] ?? []))	303✔
154	->setArgument('$responsiveAttributeGenerator', $generatorId \|\| class_exists(\Liip\ImagineBundle\LiipImagineBundle::class) ? new Reference(ResponsiveAttributeGenerator::class) : null)	303✔
155	->setArgument('$preloadCollector', new Reference(PreloadCollector::class))	303✔
156	->setShared(false)	303✔
157	->addTag('twig.component')	303✔
158	->setPublic(true);	303✔
159
160
161	}
162
163
164	private function configureResolvers(array $config, ContainerBuilder $container): void
165	{
166	$resolvers = $config['resolvers'] ?? [];	303✔
167	foreach ($resolvers as $name => $resolverConfig) {	303✔
168	$id = 'progressive_image.resolver.' . $name;	143✔
169
170	if ('filesystem' === $resolverConfig['type']) {	143✔
171	$container->register($id, FileSystemResolver::class)	143✔
172	->setArgument('$roots', $resolverConfig['roots'] ?? ["%kernel.project_dir%/public"])	143✔
173	->setArgument('$allowUnresolvable', $resolverConfig['allowUnresolvable'] ?? false);	143✔
174	} elseif ('asset_mapper' === $resolverConfig['type']) {	×
175	$container->register($id, AssetMapperResolver::class);	×
176	}
177	// Chain resolver logic can be added here if needed
178	}
179
180	if (isset($config['resolver']) && !isset($resolvers[$config['resolver']])) {	303✔
181	// If a default resolver type is used but not defined in resolvers array
182	if (in_array($config['resolver'], ['filesystem', 'asset_mapper'])) {	×
183	// handle basic types if they are used as string directly
184	}
185	}
186
187	// Register a default alias if possible
188	if (isset($config['resolver']) && isset($resolvers[$config['resolver']])) {	303✔
189	$container->setAlias('progressive_image.resolver.default', 'progressive_image.resolver.' . $config['resolver']);	143✔
190	} elseif (!empty($resolvers)) {	160✔
191	$firstResolver = array_key_first($resolvers);	×
192	$container->setAlias('progressive_image.resolver.default', 'progressive_image.resolver.' . $firstResolver);	×
193	} else {
194	// Fallback if no resolvers defined, register a basic one to avoid ServiceNotFoundException
195	$container->register('progressive_image.resolver.default', FileSystemResolver::class)	160✔
196	->setArgument('$roots', ['%kernel.project_dir%/public'])	160✔
197	->setArgument('$allowUnresolvable', true);	160✔
198	}
199	}
200	}

tito10047 / progressive-image-bundle / 20660774589

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous