Move asset configuration

Kunstmaan · Oct 12, 2021 · 565c0b4 · 565c0b4
1 parent 5e627b7
commit 565c0b4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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"
     },