Remove dev dependency on sonata-project/formatter-bundle (#1836)

sonata-project · Oct 9, 2020 · 5a8de01 · 5a8de01
1 parent 53576fd
commit 5a8de01
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -84,7 +84,6 @@
         "sonata-project/block-bundle": "^3.17",
         "sonata-project/datagrid-bundle": "^2.5",
         "sonata-project/doctrine-orm-admin-bundle": "^3.14",
-        "sonata-project/formatter-bundle": "^3.4 || ^4.0",
         "sonata-project/notification-bundle": "^3.3",
         "sonata-project/seo-bundle": "^2.5",
         "symfony/browser-kit": "^4.4 || ^5.1",

diff --git a/src/DependencyInjection/SonataMediaExtension.php b/src/DependencyInjection/SonataMediaExtension.php
@@ -72,10 +72,6 @@ public function load(array $configs, ContainerBuilder $container)
             $loader->load('consumer.xml');
         }
 
-        if (isset($bundles['SonataFormatterBundle'])) {
-            $loader->load('formatter.xml');
-        }
-
         if (isset($bundles['SonataBlockBundle'])) {
             $loader->load('block.xml');
         }

diff --git a/src/Resources/config/formatter.xml b/src/Resources/config/formatter.xml
diff --git a/src/Resources/config/twig.xml b/src/Resources/config/twig.xml
@@ -9,5 +9,8 @@
         <service id="sonata.media.twig.global" class="Sonata\MediaBundle\Twig\GlobalVariables">
             <argument type="service" id="service_container"/>
         </service>
+        <service id="sonata.media.formatter.twig" class="Sonata\MediaBundle\Twig\Extension\FormatterMediaExtension" public="true">
+            <argument type="service" id="sonata.media.twig.extension"/>
+        </service>
     </services>
 </container>