Skip to content

Commit

Permalink
Register dependant bundle fix (#327)
Browse files Browse the repository at this point in the history
  • Loading branch information
lukmzig committed Apr 26, 2023
1 parent f39188e commit 5d1f0e6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
10 changes: 1 addition & 9 deletions src/DependencyInjection/PimcoreDataImporterExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,9 @@

namespace Pimcore\Bundle\DataImporterBundle\DependencyInjection;

use Pimcore\Bundle\AdminBundle\PimcoreAdminBundle;
use Pimcore\Bundle\DataImporterBundle\EventListener\DataImporterListener;
use Pimcore\Bundle\DataImporterBundle\Maintenance\RestartQueueWorkersTask;
use Pimcore\Bundle\DataImporterBundle\Messenger\DataImporterHandler;
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\PrependExtensionInterface;
Expand All @@ -33,7 +30,7 @@
*
* @link http://symfony.com/doc/current/cookbook/bundles/extension.html
*/
class PimcoreDataImporterExtension extends Extension implements PrependExtensionInterface, DependentBundleInterface
class PimcoreDataImporterExtension extends Extension implements PrependExtensionInterface
{
/**
* {@inheritdoc}
Expand All @@ -58,11 +55,6 @@ public function load(array $configs, ContainerBuilder $container)
$definition->setArgument('$messengerQueueActivated', $config['messenger_queue_processing']['activated']);
}

public static function registerDependentBundles(BundleCollection $collection): void
{
$collection->addBundle(new PimcoreAdminBundle(), 60);
}

public function prepend(ContainerBuilder $container)
{
if ($container->hasExtension('doctrine_migrations')) {
Expand Down
2 changes: 2 additions & 0 deletions src/PimcoreDataImporterBundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
namespace Pimcore\Bundle\DataImporterBundle;

use League\FlysystemBundle\FlysystemBundle;
use Pimcore\Bundle\AdminBundle\PimcoreAdminBundle;
use Pimcore\Bundle\DataHubBundle\PimcoreDataHubBundle;
use Pimcore\Bundle\DataImporterBundle\DependencyInjection\CompilerPass\CleanupStrategyConfigurationFactoryPass;
use Pimcore\Bundle\DataImporterBundle\DependencyInjection\CompilerPass\InterpreterConfigurationFactoryPass;
Expand Down Expand Up @@ -147,6 +148,7 @@ public static function registerDependentBundles(BundleCollection $collection): v
{
$collection->addBundle(PimcoreDataHubBundle::class, 20);
$collection->addBundle(new FlysystemBundle());
$collection->addBundle(new PimcoreAdminBundle(), 60);

if (\Pimcore\Version::getMajorVersion() >= 11) {
$collection->addBundle(\Pimcore\Bundle\ApplicationLoggerBundle\PimcoreApplicationLoggerBundle::class);
Expand Down

0 comments on commit 5d1f0e6

Please sign in to comment.