From 4f39676e97f15e6bbd62b31b3837f2fa4b992d5f Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 19 Aug 2021 14:24:40 +0200 Subject: [PATCH] Remove obsolete OpenStack and Configuration stuff. --- .../src/DependencyInjection/Configuration.php | 32 -------- .../src/Resources/config/services.php | 1 - .../src/Service/OpenStack/Client.php | 21 ----- .../OpenStack/OpenStackClientInterface.php | 80 ------------------- 4 files changed, 134 deletions(-) delete mode 100644 src/Bundle/ChillWopiBundle/src/Service/OpenStack/Client.php delete mode 100644 src/Bundle/ChillWopiBundle/src/Service/OpenStack/OpenStackClientInterface.php diff --git a/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php b/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php index 8a35e8871..a30a203e4 100644 --- a/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php +++ b/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php @@ -19,38 +19,6 @@ final class Configuration implements ConfigurationInterface $treeBuilder = new TreeBuilder('chill_wopi'); $rootNode = $treeBuilder->getRootNode(); - $rootNode - ->children() - ->arrayNode('openstack') - ->info("parameters to connect to the openstack swift repository") - ->children() - ->scalarNode('username') - ->defaultValue('%env(resolve:OS_USERNAME)%') - ->isRequired() - ->cannotBeEmpty() - ->end() - ->scalarNode('password') - ->defaultValue('%env(resolve:OS_PASSWORD)%') - ->isRequired() - ->cannotBeEmpty() - ->end() - ->scalarNode('tenantId') - ->defaultValue('%env(resolve:OS_TENANT_ID)%') - ->isRequired() - ->cannotBeEmpty() - ->end() - ->scalarNode('region') - ->defaultValue('%env(resolve:OS_REGION_NAME)%') - ->isRequired() - ->cannotBeEmpty() - ->end() - ->scalarNode('authUrl') - ->defaultValue('%env(resolve:OS_AUTH_URL)%') - ->isRequired() - ->cannotBeEmpty() - ->end() - ->end(); - return $treeBuilder; } } diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php index 1f3490ce2..a40796607 100644 --- a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php +++ b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php @@ -10,7 +10,6 @@ declare(strict_types=1); namespace Symfony\Component\DependencyInjection\Loader\Configurator; use ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlGeneratorInterface; -use ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlOpenstackGenerator; use ChampsLibres\WopiLib\WopiInterface; use Chill\WopiBundle\Service\Wopi\ChillWopi; diff --git a/src/Bundle/ChillWopiBundle/src/Service/OpenStack/Client.php b/src/Bundle/ChillWopiBundle/src/Service/OpenStack/Client.php deleted file mode 100644 index faf612bfb..000000000 --- a/src/Bundle/ChillWopiBundle/src/Service/OpenStack/Client.php +++ /dev/null @@ -1,21 +0,0 @@ -get('chill_wopi'); - - parent::__construct($configuration['openstack']); - } -} diff --git a/src/Bundle/ChillWopiBundle/src/Service/OpenStack/OpenStackClientInterface.php b/src/Bundle/ChillWopiBundle/src/Service/OpenStack/OpenStackClientInterface.php deleted file mode 100644 index 3662b76eb..000000000 --- a/src/Bundle/ChillWopiBundle/src/Service/OpenStack/OpenStackClientInterface.php +++ /dev/null @@ -1,80 +0,0 @@ -