diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2015-12-30 13:26:30 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-01-02 23:27:41 +0100 |
commit | b1d05721cf37ab94ec1a6837fe79cf19474dd0ff (patch) | |
tree | 95cb2413a6044af6603a40339a1ceb2961206ae3 /src/Wallabag/ImportBundle/DependencyInjection | |
parent | 252ebd60719d32ec954d0519c9edf2b52b03310c (diff) | |
download | wallabag-b1d05721cf37ab94ec1a6837fe79cf19474dd0ff.tar.gz wallabag-b1d05721cf37ab94ec1a6837fe79cf19474dd0ff.tar.zst wallabag-b1d05721cf37ab94ec1a6837fe79cf19474dd0ff.zip |
Rewrote Wallabag v1 import
Diffstat (limited to 'src/Wallabag/ImportBundle/DependencyInjection')
-rw-r--r-- | src/Wallabag/ImportBundle/DependencyInjection/Configuration.php | 2 | ||||
-rw-r--r-- | src/Wallabag/ImportBundle/DependencyInjection/WallabagImportExtension.php | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/Wallabag/ImportBundle/DependencyInjection/Configuration.php b/src/Wallabag/ImportBundle/DependencyInjection/Configuration.php index 2ef35463..39df9d3f 100644 --- a/src/Wallabag/ImportBundle/DependencyInjection/Configuration.php +++ b/src/Wallabag/ImportBundle/DependencyInjection/Configuration.php | |||
@@ -17,6 +17,8 @@ class Configuration implements ConfigurationInterface | |||
17 | ->arrayNode('allow_mimetypes') | 17 | ->arrayNode('allow_mimetypes') |
18 | ->prototype('scalar')->end() | 18 | ->prototype('scalar')->end() |
19 | ->end() | 19 | ->end() |
20 | ->scalarNode('resource_dir') | ||
21 | ->end() | ||
20 | ->end() | 22 | ->end() |
21 | ; | 23 | ; |
22 | 24 | ||
diff --git a/src/Wallabag/ImportBundle/DependencyInjection/WallabagImportExtension.php b/src/Wallabag/ImportBundle/DependencyInjection/WallabagImportExtension.php index 38163886..3f23c36b 100644 --- a/src/Wallabag/ImportBundle/DependencyInjection/WallabagImportExtension.php +++ b/src/Wallabag/ImportBundle/DependencyInjection/WallabagImportExtension.php | |||
@@ -14,6 +14,7 @@ class WallabagImportExtension 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_import.allow_mimetypes', $config['allow_mimetypes']); | 16 | $container->setParameter('wallabag_import.allow_mimetypes', $config['allow_mimetypes']); |
17 | $container->setParameter('wallabag_import.resource_dir', $config['resource_dir']); | ||
17 | 18 | ||
18 | $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); | 19 | $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); |
19 | $loader->load('services.yml'); | 20 | $loader->load('services.yml'); |