diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/DependencyInjection')
-rw-r--r-- | src/Wallabag/CoreBundle/DependencyInjection/Configuration.php | 13 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php | 1 |
2 files changed, 0 insertions, 14 deletions
diff --git a/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php b/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php index fb1941b8..32acd1f1 100644 --- a/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php +++ b/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php | |||
@@ -4,7 +4,6 @@ namespace Wallabag\CoreBundle\DependencyInjection; | |||
4 | 4 | ||
5 | use Symfony\Component\Config\Definition\Builder\TreeBuilder; | 5 | use Symfony\Component\Config\Definition\Builder\TreeBuilder; |
6 | use Symfony\Component\Config\Definition\ConfigurationInterface; | 6 | use Symfony\Component\Config\Definition\ConfigurationInterface; |
7 | use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; | ||
8 | 7 | ||
9 | class Configuration implements ConfigurationInterface | 8 | class Configuration implements ConfigurationInterface |
10 | { | 9 | { |
@@ -18,21 +17,9 @@ class Configuration implements ConfigurationInterface | |||
18 | ->arrayNode('languages') | 17 | ->arrayNode('languages') |
19 | ->prototype('scalar')->end() | 18 | ->prototype('scalar')->end() |
20 | ->end() | 19 | ->end() |
21 | ->arrayNode('import') | ||
22 | ->append($this->getAllowMimetypes()) | ||
23 | ->end() | ||
24 | ->end() | 20 | ->end() |
25 | ; | 21 | ; |
26 | 22 | ||
27 | return $treeBuilder; | 23 | return $treeBuilder; |
28 | } | 24 | } |
29 | |||
30 | private function getAllowMimetypes() | ||
31 | { | ||
32 | $node = new ArrayNodeDefinition('allow_mimetypes'); | ||
33 | |||
34 | $node->prototype('scalar')->end(); | ||
35 | |||
36 | return $node; | ||
37 | } | ||
38 | } | 25 | } |
diff --git a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php index e2a3ad55..330cc957 100644 --- a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php +++ b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php | |||
@@ -14,7 +14,6 @@ class WallabagCoreExtension extends Extension | |||
14 | $configuration = new Configuration(); | 14 | $configuration = new Configuration(); |
15 | $config = $this->processConfiguration($configuration, $configs); | 15 | $config = $this->processConfiguration($configuration, $configs); |
16 | $container->setParameter('wallabag_core.languages', $config['languages']); | 16 | $container->setParameter('wallabag_core.languages', $config['languages']); |
17 | $container->setParameter('wallabag_core.import', $config['import']); | ||
18 | 17 | ||
19 | $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); | 18 | $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); |
20 | $loader->load('services.yml'); | 19 | $loader->load('services.yml'); |