diff options
author | Nicolas LÅ“uillet <nicolas.loeuillet@smile.fr> | 2015-10-26 15:49:44 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-01-02 23:27:41 +0100 |
commit | 303768dfe9b85f87d043eb225c5c8c3a88d8c051 (patch) | |
tree | 8e29ed85236f012ac4a18b01e271a97800d98fa7 /src/Wallabag/ImportBundle/DependencyInjection | |
parent | dda57bb9443817e3a080d5d25343f5a7e15dd14f (diff) | |
download | wallabag-303768dfe9b85f87d043eb225c5c8c3a88d8c051.tar.gz wallabag-303768dfe9b85f87d043eb225c5c8c3a88d8c051.tar.zst wallabag-303768dfe9b85f87d043eb225c5c8c3a88d8c051.zip |
- remove importers configuration
- add check on userId for findOneByURL for entries
Diffstat (limited to 'src/Wallabag/ImportBundle/DependencyInjection')
-rw-r--r-- | src/Wallabag/ImportBundle/DependencyInjection/Configuration.php | 17 | ||||
-rw-r--r-- | src/Wallabag/ImportBundle/DependencyInjection/WallabagImportExtension.php | 1 |
2 files changed, 0 insertions, 18 deletions
diff --git a/src/Wallabag/ImportBundle/DependencyInjection/Configuration.php b/src/Wallabag/ImportBundle/DependencyInjection/Configuration.php index 3c14104e..bacaff31 100644 --- a/src/Wallabag/ImportBundle/DependencyInjection/Configuration.php +++ b/src/Wallabag/ImportBundle/DependencyInjection/Configuration.php | |||
@@ -2,7 +2,6 @@ | |||
2 | 2 | ||
3 | namespace Wallabag\ImportBundle\DependencyInjection; | 3 | namespace Wallabag\ImportBundle\DependencyInjection; |
4 | 4 | ||
5 | use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; | ||
6 | use Symfony\Component\Config\Definition\Builder\TreeBuilder; | 5 | use Symfony\Component\Config\Definition\Builder\TreeBuilder; |
7 | use Symfony\Component\Config\Definition\ConfigurationInterface; | 6 | use Symfony\Component\Config\Definition\ConfigurationInterface; |
8 | 7 | ||
@@ -13,22 +12,6 @@ class Configuration implements ConfigurationInterface | |||
13 | $treeBuilder = new TreeBuilder(); | 12 | $treeBuilder = new TreeBuilder(); |
14 | $rootNode = $treeBuilder->root('wallabag_import'); | 13 | $rootNode = $treeBuilder->root('wallabag_import'); |
15 | 14 | ||
16 | $rootNode | ||
17 | ->children() | ||
18 | ->arrayNode('importers') | ||
19 | ->append($this->getURLs()) | ||
20 | ->end() | ||
21 | ->end() | ||
22 | ; | ||
23 | |||
24 | return $treeBuilder; | 15 | return $treeBuilder; |
25 | } | 16 | } |
26 | |||
27 | private function getURLs() | ||
28 | { | ||
29 | $node = new ArrayNodeDefinition('pocket_urls'); | ||
30 | $node->prototype('scalar')->end(); | ||
31 | |||
32 | return $node; | ||
33 | } | ||
34 | } | 17 | } |
diff --git a/src/Wallabag/ImportBundle/DependencyInjection/WallabagImportExtension.php b/src/Wallabag/ImportBundle/DependencyInjection/WallabagImportExtension.php index 07dc378d..4efcaace 100644 --- a/src/Wallabag/ImportBundle/DependencyInjection/WallabagImportExtension.php +++ b/src/Wallabag/ImportBundle/DependencyInjection/WallabagImportExtension.php | |||
@@ -13,7 +13,6 @@ class WallabagImportExtension extends Extension | |||
13 | { | 13 | { |
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.pocket', $config['importers']['pocket_urls']); | ||
17 | 16 | ||
18 | $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); | 17 | $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); |
19 | $loader->load('services.yml'); | 18 | $loader->load('services.yml'); |