From ff1a332ec7196ae585aa91e5bcd5738df28b1b1d Mon Sep 17 00:00:00 2001 From: Jordi Sala Morales Date: Sat, 30 Oct 2021 16:35:02 +0200 Subject: [PATCH] Set Cloudfront class on service definition --- src/DependencyInjection/SonataMediaExtension.php | 4 ---- src/Resources/config/media.php | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/DependencyInjection/SonataMediaExtension.php b/src/DependencyInjection/SonataMediaExtension.php index 42ba5396c..2e891338b 100644 --- a/src/DependencyInjection/SonataMediaExtension.php +++ b/src/DependencyInjection/SonataMediaExtension.php @@ -15,7 +15,6 @@ use Sonata\Doctrine\Mapper\Builder\OptionsBuilder; use Sonata\Doctrine\Mapper\DoctrineCollector; -use Sonata\MediaBundle\CDN\CloudFrontVersion3; use Symfony\Component\Config\Definition\Processor; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; @@ -207,13 +206,10 @@ public function configureCdnAdapter(ContainerBuilder $container, array $config): 'secret' => $config['cdn']['cloudfront']['secret'], ]; - $cloudFrontClass = CloudFrontVersion3::class; - $container->getDefinition('sonata.media.cdn.cloudfront.client') ->replaceArgument(0, $cloudFrontConfig); $container->getDefinition('sonata.media.cdn.cloudfront') - ->setClass($cloudFrontClass) ->replaceArgument(0, new Reference('sonata.media.cdn.cloudfront.client')) ->replaceArgument(1, $config['cdn']['cloudfront']['distribution_id']) ->replaceArgument(2, $config['cdn']['cloudfront']['path']); diff --git a/src/Resources/config/media.php b/src/Resources/config/media.php index 1f85a132b..50342dae1 100644 --- a/src/Resources/config/media.php +++ b/src/Resources/config/media.php @@ -15,6 +15,7 @@ use Imagine\Gd\Imagine as GdImagine; use Imagine\Gmagick\Imagine as GmagickImagine; use Imagine\Imagick\Imagine as ImagickImagine; +use Sonata\MediaBundle\CDN\CloudFrontVersion3; use Sonata\MediaBundle\CDN\Fallback; use Sonata\MediaBundle\CDN\Server; use Sonata\MediaBundle\Resizer\CropResizer; @@ -63,8 +64,7 @@ ->set('sonata.media.cdn.cloudfront.client', CloudFrontClient::class) ->args([[]]) - // The class for "sonata.media.cdn.cloudfront" service is set dynamically at `SonataMediaExtension` - ->set('sonata.media.cdn.cloudfront') + ->set('sonata.media.cdn.cloudfront', CloudFrontVersion3::class) ->args(['', '', '']) ->set('sonata.media.cdn.fallback', Fallback::class)