From 055f3e56ca5ba9ce09fa3b4a2ae1d10cf55435b4 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 10 Aug 2021 15:49:07 +0200 Subject: [PATCH] Update. --- .../src/DependencyInjection/ChillWopiExtension.php | 8 ++++++++ .../ChillWopiBundle/src/Resources/config/services.php | 7 ++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php b/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php index 3bc31f507..4a8863322 100644 --- a/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php +++ b/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php @@ -18,12 +18,20 @@ final class ChillWopiExtension extends Extension { public function load(array $configs, ContainerBuilder $container) { + $config = $this->processConfiguration(new Configuration(), $configs); + $container ->setParameter( 'chill_wopi', $this->processConfiguration(new Configuration(), $configs) ); + $container + ->setParameter( + 'chill_wopi.openstack_client', + $config['openstack'] + ); + $loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config')); $loader->load('services.php'); } diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php index a238adfef..58286d66c 100644 --- a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php +++ b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php @@ -21,13 +21,14 @@ return static function (ContainerConfigurator $container) { ->autoconfigure(); $services - ->load('Chill\\WopiBundle\\Service\\', __DIR__ . '/../../Service'); + ->load('ChampsLibres\\WopiTestBundle\\Service\\', __DIR__ . '/../../Service'); $services ->load('Chill\\WopiBundle\\Controller\\', __DIR__ . '/../../Controller') ->tag('controller.service_arguments'); $services - ->set(OpenStack::class) - ->arg('$options', '%chill_wopi.openstack%'); + ->set('chill_wopi.openstack_client') + ->class(OpenStack::class) + ->arg('$options', '%chill_wopi.openstack_client%'); };