Skip to content

Commit 4b672b5

Browse files
committed
Revert "Revert "Put registering resources to from load to prepend method in BitBagSyliusWishlistExtension""
This reverts commit c9fb291.
1 parent c9fb291 commit 4b672b5

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

src/DependencyInjection/BitBagSyliusWishlistExtension.php

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function load(array $config, ContainerBuilder $container): void
2626
{
2727
$config = $this->processConfiguration($this->getConfiguration([], $container), $config);
2828
$loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
29-
$this->registerResources('bitbag_sylius_wishlist_plugin', 'doctrine/orm', $config['resources'], $container);
29+
3030
$loader->load('services.xml');
3131
$container->setParameter('bitbag_sylius_wishlist_plugin.parameters.wishlist_cookie_token', $config['wishlist_cookie_token']);
3232
$container->setParameter('bitbag_sylius_wishlist_plugin.parameters.allowed_mime_types', $config['allowed_mime_types']);
@@ -36,6 +36,9 @@ public function prepend(ContainerBuilder $container): void
3636
{
3737
trigger_deprecation('bitbag/wishlist-plugin', '2.0', 'Doctrine migrations existing in a bundle will be removed, move migrations to the project directory.');
3838
$this->prependDoctrineMigrations($container);
39+
40+
$config = $this->getCurrentConfiguration($container);
41+
$this->registerResources('bitbag_sylius_wishlist_plugin', 'doctrine/orm', $config['resources'], $container);
3942
}
4043

4144
protected function getMigrationsNamespace(): string
@@ -52,4 +55,13 @@ protected function getNamespacesOfMigrationsExecutedBefore(): array
5255
{
5356
return ['Sylius\Bundle\CoreBundle\Migrations'];
5457
}
58+
59+
private function getCurrentConfiguration(ContainerBuilder $container): array
60+
{
61+
/** @var ConfigurationInterface $configuration */
62+
$configuration = $this->getConfiguration([], $container);
63+
$configs = $container->getExtensionConfig($this->getAlias());
64+
65+
return $this->processConfiguration($configuration, $configs);
66+
}
5567
}

0 commit comments

Comments
 (0)