-
Notifications
You must be signed in to change notification settings - Fork 3
NGSTACK-901 implement decorator service for variation path generator #51
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: 1.7
Are you sure you want to change the base?
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Netgen\Bundle\SiteBundle\Core\Imagine\VariationPathGenerator; | ||
|
|
||
| use eZ\Bundle\EzPublishCoreBundle\Imagine\VariationPathGenerator; | ||
| use Liip\ImagineBundle\Imagine\Filter\FilterConfiguration; | ||
|
|
||
| /** | ||
| * Decorates VariationPathGenerator with .webp extension if image variation is configured for this format. | ||
| */ | ||
| final class WebpFormatVariationPathGenerator implements VariationPathGenerator | ||
| { | ||
| private VariationPathGenerator $innerVariationPathGenerator; | ||
|
|
||
| private FilterConfiguration $filterConfiguration; | ||
|
|
||
| public function __construct( | ||
| VariationPathGenerator $innerVariationPathGenerator, | ||
| FilterConfiguration $filterConfiguration | ||
| ) { | ||
| $this->innerVariationPathGenerator = $innerVariationPathGenerator; | ||
| $this->filterConfiguration = $filterConfiguration; | ||
| } | ||
|
|
||
| public function getVariationPath($originalPath, $filter): string | ||
| { | ||
| $variationPath = $this->innerVariationPathGenerator->getVariationPath($originalPath, $filter); | ||
| $filterConfig = $this->filterConfiguration->get($filter); | ||
|
|
||
| if (!isset($filterConfig['format']) || $filterConfig['format'] !== 'webp') { | ||
| return $variationPath; | ||
| } | ||
|
|
||
| $info = pathinfo($originalPath); | ||
|
|
||
| if(empty($info['extension'])){ | ||
| return $variationPath . '.webp'; | ||
| } | ||
|
|
||
| return preg_replace("/\.{$info['extension']}$/", '.webp', $variationPath); | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Netgen\Bundle\SiteBundle\DependencyInjection\Compiler; | ||
|
|
||
| use Netgen\Bundle\SiteBundle\Core\Imagine\VariationPathGenerator\WebpFormatVariationPathGenerator; | ||
| use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; | ||
| use Symfony\Component\DependencyInjection\ContainerBuilder; | ||
| use Symfony\Component\DependencyInjection\Definition; | ||
| use Symfony\Component\DependencyInjection\Reference; | ||
|
|
||
| class WebpFormatVariationPathGeneratorDecoratorPass implements CompilerPassInterface | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do we really need the compiler pass just to register a decorator? Can't we do this through the service config in YAML files?
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Half of my life you force me to write compiler passes, now you want me to add it in the config 😆
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Compiler passes should be used when modifying eixsting services! With this, we're not modifying an existing service, but adding a new one. Besides, we're already using decorators directly in yaml files.
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let's leave it like this for consistency sake, as we will be using the compiler pass to actually decorate the existing variation path generator in Ibexa 4.x with our own service. If we are using 4.x in combination with legacy admin, then this is needed to consolidate variation path patterns to match the ones from legacy. The compiler pass in that case will replace ibexa decorator class with our own. |
||
| { | ||
| /** | ||
| * Overrides the IO resolver to disable generating absolute URIs to images. | ||
| */ | ||
| public function process(ContainerBuilder $container): void | ||
| { | ||
| if ($container->has('ezpublish.image_alias.variation_path_generator')) { | ||
|
|
||
|
iherak marked this conversation as resolved.
Outdated
|
||
| $container->register( | ||
| 'ezpublish.image_alias.webp_variation_path_generator_decorator', | ||
| WebpFormatVariationPathGenerator::class) | ||
| ->setDecoratedService('ezpublish.image_alias.variation_path_generator') | ||
| ->addArgument(new Reference('ezpublish.image_alias.webp_variation_path_generator_decorator.inner')) | ||
| ->addArgument(new Reference('liip_imagine.filter.configuration')); | ||
| } | ||
| } | ||
| } | ||
Uh oh!
There was an error while loading. Please reload this page.