Merge 4.x into 5.x

sonata-project · Oct 31, 2021 · 44af5c6 · 44af5c6
2 parents 9a594a8 + f4e3c50
commit 44af5c6
Show file tree

Hide file tree

Showing 10 changed files with 93 additions and 229 deletions.
diff --git a/UPGRADE-3.x.md b/UPGRADE-3.x.md
@@ -4,6 +4,10 @@ UPGRADE 3.x
 UPGRADE FROM 3.x to 3.x
 =======================
 
+### Deprecate PantherPortal CDN
+
+PantherPortal CDN no longer exists.
+
 ### Deprecate `null` media value on Twig functions
 
 Our custom twig functions (`sonata_media`, `sonata_thumbnail` and `sonata_path`) used to accept a null value and produce an empty result.
@@ -18,6 +22,34 @@ This command was introduced a long time ago to migrate from array to json. Make
 
 This class is deprecated because it is dead code. If you use it, please use `ProviderDataTransformer` instead.
 
+### Deprecated using `master` and `slave` words in configuration
+
+Before:
+
+```yaml
+sonata_media:
+    cdn:
+        fallback:
+            master: sonata.media.cdn.cloudfront
+    filesystem:
+        replicate:
+            master: sonata.media.adapter.filesystem.s3
+            slave: sonata.media.adapter.filesystem.local
+```
+
+After:
+
+```yaml
+sonata_media:
+    cdn:
+        fallback:
+            primary: sonata.media.cdn.cloudfront
+    filesystem:
+        replicate:
+            primary: sonata.media.adapter.filesystem.s3
+            secondary: sonata.media.adapter.filesystem.local
+```
+
 UPGRADE FROM 3.33 to 3.34
 =========================
 

diff --git a/docs/index.rst b/docs/index.rst
@@ -55,7 +55,7 @@ Available services
     - ``sonata.media.filesystem.local``: The local filesystem (default)
     - ``sonata.media.filesystem.ftp``: FTP
     - ``sonata.media.filesystem.s3``: Amazon S3
-    - ``sonata.media.filesystem.replicate``: Replicate file to a master and to a slave
+    - ``sonata.media.filesystem.replicate``: Replicate file to a primary and a secondary
 
  - CDN
 

diff --git a/docs/reference/advanced_configuration.rst b/docs/reference/advanced_configuration.rst
@@ -80,7 +80,7 @@ Full configuration options:
                 version:
 
             fallback:
-                master: sonata.media.cdn.panther
+                primary: sonata.media.cdn.panther
                 fallback: sonata.media.cdn.server
 
         filesystem:
@@ -113,8 +113,8 @@ Full configuration options:
                     key1: value1 #any amount of metas(sent as x-amz-meta-key1 = value1)
 
             replicate:
-                master: sonata.media.adapter.filesystem.s3
-                slave: sonata.media.adapter.filesystem.local
+                primary: sonata.media.adapter.filesystem.s3
+                secondary: sonata.media.adapter.filesystem.local
 
         providers:
             file:

diff --git a/src/CDN/PantherPortal.php b/src/CDN/PantherPortal.php
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -153,18 +153,6 @@ private function addCdnSection(ArrayNodeDefinition $node): void
                             ->end()
                         ->end()
 
-                        ->arrayNode('panther')
-                            ->children()
-                                ->scalarNode('path')
-                                    ->info('e.g. http://domain.pantherportal.com/uploads/media')
-                                    ->isRequired()
-                                ->end()
-                                ->scalarNode('site_id')->isRequired()->end()
-                                ->scalarNode('password')->isRequired()->end()
-                                ->scalarNode('username')->isRequired()->end()
-                            ->end()
-                        ->end()
-
                         ->arrayNode('cloudfront')
                             ->children()
                                 ->scalarNode('path')
@@ -181,7 +169,7 @@ private function addCdnSection(ArrayNodeDefinition $node): void
 
                         ->arrayNode('fallback')
                             ->children()
-                                ->scalarNode('master')->isRequired()->end()
+                                ->scalarNode('primary')->isRequired()->end()
                                 ->scalarNode('fallback')->isRequired()->end()
                             ->end()
                         ->end()
@@ -271,8 +259,8 @@ private function addFilesystemSection(ArrayNodeDefinition $node): void
 
                         ->arrayNode('replicate')
                             ->children()
-                                ->scalarNode('master')->isRequired()->end()
-                                ->scalarNode('slave')->isRequired()->end()
+                                ->scalarNode('primary')->isRequired()->end()
+                                ->scalarNode('secondary')->isRequired()->end()
                             ->end()
                         ->end()
                     ->end()

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;
@@ -191,16 +190,6 @@ public function configureCdnAdapter(ContainerBuilder $container, array $config):
             $container->removeDefinition('sonata.media.cdn.server');
         }
 
-        if ($container->hasDefinition('sonata.media.cdn.panther') && isset($config['cdn']['panther'])) {
-            $container->getDefinition('sonata.media.cdn.panther')
-                ->replaceArgument(0, $config['cdn']['panther']['path'])
-                ->replaceArgument(1, $config['cdn']['panther']['username'])
-                ->replaceArgument(2, $config['cdn']['panther']['password'])
-                ->replaceArgument(3, $config['cdn']['panther']['site_id']);
-        } else {
-            $container->removeDefinition('sonata.media.cdn.panther');
-        }
-
         if ($container->hasDefinition('sonata.media.cdn.cloudfront') && isset($config['cdn']['cloudfront'])) {
             $cloudFrontConfig = [];
 
@@ -217,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']);
@@ -234,7 +220,7 @@ public function configureCdnAdapter(ContainerBuilder $container, array $config):
 
         if ($container->hasDefinition('sonata.media.cdn.fallback') && isset($config['cdn']['fallback'])) {
             $container->getDefinition('sonata.media.cdn.fallback')
-                ->replaceArgument(0, new Reference($config['cdn']['fallback']['master']))
+                ->replaceArgument(0, new Reference($config['cdn']['fallback']['primary']))
                 ->replaceArgument(1, new Reference($config['cdn']['fallback']['fallback']));
         } else {
             $container->removeDefinition('sonata.media.cdn.fallback');
@@ -316,8 +302,8 @@ public function configureFilesystemAdapter(ContainerBuilder $container, array $c
 
         if ($container->hasDefinition('sonata.media.adapter.filesystem.replicate') && isset($config['filesystem']['replicate'])) {
             $container->getDefinition('sonata.media.adapter.filesystem.replicate')
-                ->replaceArgument(0, new Reference($config['filesystem']['replicate']['master']))
-                ->replaceArgument(1, new Reference($config['filesystem']['replicate']['slave']));
+                ->replaceArgument(0, new Reference($config['filesystem']['replicate']['primary']))
+                ->replaceArgument(1, new Reference($config['filesystem']['replicate']['secondary']));
         } else {
             $container->removeDefinition('sonata.media.adapter.filesystem.replicate');
             $container->removeDefinition('sonata.media.filesystem.replicate');

diff --git a/src/Resources/config/media.php b/src/Resources/config/media.php
@@ -15,8 +15,8 @@
 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\PantherPortal;
 use Sonata\MediaBundle\CDN\Server;
 use Sonata\MediaBundle\Resizer\CropResizer;
 use Sonata\MediaBundle\Resizer\SimpleResizer;
@@ -61,14 +61,10 @@
         ->set('sonata.media.cdn.server', Server::class)
             ->args([''])
 
-        ->set('sonata.media.cdn.panther', PantherPortal::class)
-            ->args(['', '', '', ''])
-
         ->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)

diff --git a/tests/CDN/PantherPortalTest.php b/tests/CDN/PantherPortalTest.php