22202319160

Committed 19 Feb 2026 10:13PM UTC coverage: 90.204% (-0.07%) from 90.276%

Build # 22202319160

Build Type

Pull #10

github

Committed by

web-flow

Commit Message

Merge e81d12ee5 into 142ac29cb

Pull Request Pull Request #10: add support for avif format

Run Details

0 of 16 new or added lines in 3 files covered. (0.0%)

1 existing line in 1 file now uncovered.

884 of 980 relevant lines covered (90.2%)

340.36 hits per line

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

72.97

/src/Controller/LiipImagineController.php

<?php

/*
 * This file is part of the Progressive Image Bundle.
 *
 * (c) Jozef Môstka <https://github.com/tito10047/progressive-image-bundle>
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */
declare(strict_types=1);

namespace Tito10047\ProgressiveImageBundle\Controller;

use Liip\ImagineBundle\Config\Controller\ControllerConfig;
use Liip\ImagineBundle\Exception\Binary\Loader\NotLoadableException;
use Liip\ImagineBundle\Exception\Imagine\Filter\NonExistingFilterException;
use Liip\ImagineBundle\Imagine\Cache\Helper\PathHelper;
use Liip\ImagineBundle\Imagine\Data\DataManager;
use Liip\ImagineBundle\Imagine\Filter\FilterConfiguration;
use Liip\ImagineBundle\Service\FilterService;
use Liip\ImagineBundle\Service\FormatNegotiator;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\UriSigner;
use Symfony\Component\HttpKernel\Attribute\MapQueryParameter;
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Tito10047\ProgressiveImageBundle\Service\LiipImagineRuntimeConfigGeneratorInterface;
use Tito10047\ProgressiveImageBundle\Service\MetadataReaderInterface;

final class LiipImagineController
{
    public function __construct(
        private readonly UriSigner $signer,
        private readonly FilterService $filterService,
        private readonly DataManager $dataManager,
        private readonly FilterConfiguration $filterConfiguration,
        private readonly ControllerConfig $controllerConfig,
        private readonly LiipImagineRuntimeConfigGeneratorInterface $runtimeConfigGenerator,
        private readonly MetadataReaderInterface $metadataReader,
        private readonly ?FormatNegotiator $formatNegotiator = null,
        private readonly array $alternativeFormats = [],
    ) {
    }

    public function index(
        Request $request,
        #[MapQueryParameter] string $path,
        #[MapQueryParameter] int $width,
        #[MapQueryParameter] int $height,
        #[MapQueryParameter] ?string $filter = null,
        #[MapQueryParameter] ?string $pointInterest = null,
    ): Response {
        $path = PathHelper::urlPathToFilePath($path);

        $context = $request->query->all();
        unset($context['path'], $context['width'], $context['height'], $context['filter'], $context['pointInterest'], $context['_hash'], $context['_expiration']);

        $origWidth = null;
        $origHeight = null;
        if ($pointInterest) {
            $metadata = $this->metadataReader->getMetadata($path);
            $origWidth = $metadata->width;
            $origHeight = $metadata->height;
        }

        $result = $this->runtimeConfigGenerator->generate($width, $height, $filter, $pointInterest, $origWidth, $origHeight, $context);
        $filterName = $result['filterName'];
        $config = $result['config'];

        $this->filterConfiguration->set($filterName, $config);

        if (true !== $this->signer->checkRequest($request) && $request->attributes->get('_route') !== null) {
            throw new BadRequestHttpException(\sprintf('Signed url does not pass the sign check for path "%s" and filter "%s"', $path, $filter));
        }

        return $this->createRedirectResponse(function () use ($path, $filterName, $request) {
            return $this->filterService->getUrlOfFilteredImage(
                $path,
                $filterName,
                null,
                false,
                $this->getAlternativeFormats($request)
            );
        }, $path, $filterName);
    }

    private function getAlternativeFormats(Request $request): array
    {
        if (null === $this->formatNegotiator) {
            return false !== mb_stripos($request->headers->get('accept', ''), 'image/webp') ? ['webp'] : [];
        }

        return $this->formatNegotiator->negotiate($request, $this->alternativeFormats);
    }

    private function createRedirectResponse(\Closure $url, string $path, string $filter): RedirectResponse
    {
        try {
            return new RedirectResponse($url(), $this->controllerConfig->getRedirectResponseCode());
        } catch (NotLoadableException $exception) {
            if (null !== $this->dataManager->getDefaultImageUrl($filter)) {
                return new RedirectResponse($this->dataManager->getDefaultImageUrl($filter));
            }

            throw new NotFoundHttpException(\sprintf('Source image for path "%s" could not be found', $path), $exception);
        } catch (NonExistingFilterException $exception) {
            throw new NotFoundHttpException(\sprintf('Requested non-existing filter "%s"', $filter), $exception);
        } catch (\RuntimeException $exception) {
            throw new \RuntimeException(\sprintf('Unable to create image for path "%s" and filter "%s". Message was "%s"', $path, $filter, $exception->getMessage()), 0, $exception);
        }
    }
}

1	<?php
2
3	/*
4	* This file is part of the Progressive Image Bundle.
5	*
6	* (c) Jozef Môstka <https://github.com/tito10047/progressive-image-bundle>
7	*
8	* For the full copyright and license information, please view the LICENSE
9	* file that was distributed with this source code.
10	*/
11	declare(strict_types=1);
12
13	namespace Tito10047\ProgressiveImageBundle\Controller;
14
15	use Liip\ImagineBundle\Config\Controller\ControllerConfig;
16	use Liip\ImagineBundle\Exception\Binary\Loader\NotLoadableException;
17	use Liip\ImagineBundle\Exception\Imagine\Filter\NonExistingFilterException;
18	use Liip\ImagineBundle\Imagine\Cache\Helper\PathHelper;
19	use Liip\ImagineBundle\Imagine\Data\DataManager;
20	use Liip\ImagineBundle\Imagine\Filter\FilterConfiguration;
21	use Liip\ImagineBundle\Service\FilterService;
22	use Liip\ImagineBundle\Service\FormatNegotiator;
23	use Symfony\Component\HttpFoundation\RedirectResponse;
24	use Symfony\Component\HttpFoundation\Request;
25	use Symfony\Component\HttpFoundation\Response;
26	use Symfony\Component\HttpFoundation\UriSigner;
27	use Symfony\Component\HttpKernel\Attribute\MapQueryParameter;
28	use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
29	use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
30	use Tito10047\ProgressiveImageBundle\Service\LiipImagineRuntimeConfigGeneratorInterface;
31	use Tito10047\ProgressiveImageBundle\Service\MetadataReaderInterface;
32
33	final class LiipImagineController
34	{
35	public function __construct(
36	private readonly UriSigner $signer,
37	private readonly FilterService $filterService,
38	private readonly DataManager $dataManager,
39	private readonly FilterConfiguration $filterConfiguration,
40	private readonly ControllerConfig $controllerConfig,
41	private readonly LiipImagineRuntimeConfigGeneratorInterface $runtimeConfigGenerator,
42	private readonly MetadataReaderInterface $metadataReader,
43	private readonly ?FormatNegotiator $formatNegotiator = null,
44	private readonly array $alternativeFormats = [],
45	) {
46	}	154✔
47
48	public function index(
49	Request $request,
50	#[MapQueryParameter] string $path,
51	#[MapQueryParameter] int $width,
52	#[MapQueryParameter] int $height,
53	#[MapQueryParameter] ?string $filter = null,
54	#[MapQueryParameter] ?string $pointInterest = null,
55	): Response {
56	$path = PathHelper::urlPathToFilePath($path);	154✔
57
58	$context = $request->query->all();	154✔
59	unset($context['path'], $context['width'], $context['height'], $context['filter'], $context['pointInterest'], $context['_hash'], $context['_expiration']);	154✔
60
61	$origWidth = null;	154✔
62	$origHeight = null;	154✔
63	if ($pointInterest) {	154✔
64	$metadata = $this->metadataReader->getMetadata($path);	28✔
65	$origWidth = $metadata->width;	28✔
66	$origHeight = $metadata->height;	28✔
67	}
68
69	$result = $this->runtimeConfigGenerator->generate($width, $height, $filter, $pointInterest, $origWidth, $origHeight, $context);	154✔
70	$filterName = $result['filterName'];	154✔
71	$config = $result['config'];	154✔
72
73	$this->filterConfiguration->set($filterName, $config);	154✔
74
75	if (true !== $this->signer->checkRequest($request) && $request->attributes->get('_route') !== null) {	154✔
76	throw new BadRequestHttpException(\sprintf('Signed url does not pass the sign check for path "%s" and filter "%s"', $path, $filter));	×
77	}
78
79	return $this->createRedirectResponse(function () use ($path, $filterName, $request) {	154✔
80	return $this->filterService->getUrlOfFilteredImage(	154✔
81	$path,	154✔
82	$filterName,	154✔
83	null,	154✔
NEW 84	false,	154✔
NEW 85	$this->getAlternativeFormats($request)	154✔
86	);	154✔
87	}, $path, $filterName);	154✔
88	}
89
90	private function getAlternativeFormats(Request $request): array
91	{
NEW 92	if (null === $this->formatNegotiator) {	154✔
NEW 93	return false !== mb_stripos($request->headers->get('accept', ''), 'image/webp') ? ['webp'] : [];	×
94	}
95
NEW 96	return $this->formatNegotiator->negotiate($request, $this->alternativeFormats);	154✔
97	}
98
99	private function createRedirectResponse(\Closure $url, string $path, string $filter): RedirectResponse
100	{
101	try {
102	return new RedirectResponse($url(), $this->controllerConfig->getRedirectResponseCode());	154✔
103	} catch (NotLoadableException $exception) {	×
104	if (null !== $this->dataManager->getDefaultImageUrl($filter)) {	×
105	return new RedirectResponse($this->dataManager->getDefaultImageUrl($filter));	×
106	}
107
108	throw new NotFoundHttpException(\sprintf('Source image for path "%s" could not be found', $path), $exception);	×
109	} catch (NonExistingFilterException $exception) {	×
110	throw new NotFoundHttpException(\sprintf('Requested non-existing filter "%s"', $filter), $exception);	×
111	} catch (\RuntimeException $exception) {	×
112	throw new \RuntimeException(\sprintf('Unable to create image for path "%s" and filter "%s". Message was "%s"', $path, $filter, $exception->getMessage()), 0, $exception);	×
113	}
114	}
115	}

tito10047 / progressive-image-bundle / 22202319160

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