Adapted more changes

pimcore · Apr 26, 2023 · e338f7d · e338f7d
1 parent 16e59d4
commit e338f7d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/DependencyInjection/PimcoreDataHubExtension.php b/src/DependencyInjection/PimcoreDataHubExtension.php
@@ -15,17 +15,14 @@
 
 namespace Pimcore\Bundle\DataHubBundle\DependencyInjection;
 
-use Pimcore\Bundle\AdminBundle\PimcoreAdminBundle;
 use Pimcore\Bundle\CoreBundle\DependencyInjection\ConfigurationHelper;
-use Pimcore\HttpKernel\Bundle\DependentBundleInterface;
-use Pimcore\HttpKernel\BundleCollection\BundleCollection;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 
-class PimcoreDataHubExtension extends Extension implements PrependExtensionInterface, DependentBundleInterface
+class PimcoreDataHubExtension extends Extension implements PrependExtensionInterface
 {
     /**
      * {@inheritdoc}
@@ -44,11 +41,6 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('config.yml');
     }
 
-    public static function registerDependentBundles(BundleCollection $collection): void
-    {
-        $collection->addBundle(new PimcoreAdminBundle(), 60);
-    }
-
     public function prepend(ContainerBuilder $container)
     {
         if ($container->hasExtension('doctrine_migrations')) {

diff --git a/src/PimcoreDataHubBundle.php b/src/PimcoreDataHubBundle.php
@@ -15,6 +15,7 @@
 
 namespace Pimcore\Bundle\DataHubBundle;
 
+use Pimcore\Bundle\AdminBundle\PimcoreAdminBundle;
 use Pimcore\Bundle\DataHubBundle\DependencyInjection\Compiler\CustomDocumentTypePass;
 use Pimcore\Bundle\DataHubBundle\DependencyInjection\Compiler\ImportExportLocatorsPass;
 use Pimcore\Extension\Bundle\AbstractPimcoreBundle;
@@ -23,8 +24,10 @@
 use Pimcore\Extension\Bundle\Traits\BundleAdminClassicTrait;
 use Pimcore\Extension\Bundle\Traits\PackageVersionTrait;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Pimcore\HttpKernel\Bundle\DependentBundleInterface;
+use Pimcore\HttpKernel\BundleCollection\BundleCollection;
 
-class PimcoreDataHubBundle extends AbstractPimcoreBundle implements PimcoreBundleAdminClassicInterface
+class PimcoreDataHubBundle extends AbstractPimcoreBundle implements PimcoreBundleAdminClassicInterface, DependentBundleInterface
 {
     use BundleAdminClassicTrait;
     use PackageVersionTrait;
@@ -47,6 +50,11 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new CustomDocumentTypePass());
     }
 
+    public static function registerDependentBundles(BundleCollection $collection): void
+    {
+        $collection->addBundle(new PimcoreAdminBundle(), 60);
+    }
+
     /**
      * {@inheritdoc}
      */