Set Cloudfront class on service definition

sonata-project · Oct 30, 2021 · ff1a332 · ff1a332
1 parent e2e5d2f
commit ff1a332
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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)