From 565c0b4a9db1f2307a3040c5e48fba9c7c97ed98 Mon Sep 17 00:00:00 2001
From: Danny van Wijk <danny@insiders.nl>
Date: Tue, 12 Oct 2021 13:28:40 +0000
Subject: [PATCH] Move asset configuration

---
 .../DependencyInjection/KunstmaanAdminExtension.php      | 9 +++++++++
 src/Kunstmaan/AdminBundle/composer.json                  | 1 +
 .../DependencyInjection/KunstmaanMediaExtension.php      | 9 ---------
 src/Kunstmaan/MediaBundle/composer.json                  | 1 +
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/Kunstmaan/AdminBundle/DependencyInjection/KunstmaanAdminExtension.php b/src/Kunstmaan/AdminBundle/DependencyInjection/KunstmaanAdminExtension.php
index e9e25061c6..95260bbaa8 100644
--- a/src/Kunstmaan/AdminBundle/DependencyInjection/KunstmaanAdminExtension.php
+++ b/src/Kunstmaan/AdminBundle/DependencyInjection/KunstmaanAdminExtension.php
@@ -132,6 +132,15 @@ public function prepend(ContainerBuilder $container)
 
         // NEXT_MAJOR: Remove templating dependency
 
+        $frameworkExtensionConfig = [
+            'assets' => [
+                'packages' => [
+                    'media' => null,
+                ],
+            ],
+        ];
+        $container->prependExtensionConfig('framework', $frameworkExtensionConfig);
+
         $configs = $container->getExtensionConfig($this->getAlias());
         $this->processConfiguration(new Configuration(), $configs);
     }
diff --git a/src/Kunstmaan/AdminBundle/composer.json b/src/Kunstmaan/AdminBundle/composer.json
index 383dd0f7eb..bd08040d33 100644
--- a/src/Kunstmaan/AdminBundle/composer.json
+++ b/src/Kunstmaan/AdminBundle/composer.json
@@ -26,6 +26,7 @@
         "kunstmaan/utilities-bundle": "^5.9|^6.0",
         "symfony/swiftmailer-bundle": "^2.3|^3.0",
         "symfony/acl-bundle": "^1.0|^2.0",
+        "symfony/asset": "^3.4|^4.4",
         "symfony/cache": "^3.4|^4.4",
         "symfony/config": "^3.4|^4.4",
         "symfony/console": "^3.4|^4.4",
diff --git a/src/Kunstmaan/MediaBundle/DependencyInjection/KunstmaanMediaExtension.php b/src/Kunstmaan/MediaBundle/DependencyInjection/KunstmaanMediaExtension.php
index 5a8b1778a2..71e813b7ed 100644
--- a/src/Kunstmaan/MediaBundle/DependencyInjection/KunstmaanMediaExtension.php
+++ b/src/Kunstmaan/MediaBundle/DependencyInjection/KunstmaanMediaExtension.php
@@ -114,15 +114,6 @@ public function prepend(ContainerBuilder $container)
 
         $container->prependExtensionConfig('doctrine', $doctrineGedmoEntityConfig);
 
-        $frameworkExtensionConfig = [
-            'assets' => [
-                'packages' => [
-                    'media' => null,
-                ],
-            ],
-        ];
-        $container->prependExtensionConfig('framework', $frameworkExtensionConfig);
-
         $configs = $container->getExtensionConfig($this->getAlias());
         $this->processConfiguration(new Configuration(), $configs);
     }
diff --git a/src/Kunstmaan/MediaBundle/composer.json b/src/Kunstmaan/MediaBundle/composer.json
index b533401e31..c8311d76b0 100644
--- a/src/Kunstmaan/MediaBundle/composer.json
+++ b/src/Kunstmaan/MediaBundle/composer.json
@@ -20,6 +20,7 @@
         "symfony/mime": "^4.4",
         "imagine/imagine": "^1.1",
         "knplabs/knp-gaufrette-bundle": "~0.1",
+        "kunstmaan/admin-bundle": "^5.9|^6.0",
         "kunstmaan/adminlist-bundle": "^5.9|^6.0",
         "pagerfanta/twig": "^2.4"
     },