pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Move Import configuration to Core

Browse Source
This commit is contained in:
Yassine Guedidi
2024-01-01 17:04:08 +01:00
parent 8b13631e3d
commit 6552c84eec
5 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Wallabag/CoreBundle/DependencyInjection/Configuration.php
View File

@ -75,6 +75,11 @@ class Configuration implements ConfigurationInterface
->arrayNode('fonts')
->prototype('scalar')->end()
->end()
->arrayNode('allow_mimetypes')
->prototype('scalar')->end()
->end()
->scalarNode('resource_dir')
->end()
->end()
;

2
src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
View File

@ -30,6 +30,8 @@ class WallabagCoreExtension extends Extension
$container->setParameter('wallabag_core.site_credentials.encryption_key_path', $config['encryption_key_path']);
$container->setParameter('wallabag_core.default_ignore_origin_instance_rules', $config['default_ignore_origin_instance_rules']);
$container->setParameter('wallabag_core.fonts', $config['fonts']);
$container->setParameter('wallabag_import.allow_mimetypes', $config['allow_mimetypes']);
$container->setParameter('wallabag_import.resource_dir', $config['resource_dir']);
}
public function getAlias()

11
src/Wallabag/ImportBundle/DependencyInjection/Configuration.php
View File

@ -10,17 +10,6 @@ class Configuration implements ConfigurationInterface
public function getConfigTreeBuilder()
{
$treeBuilder = new TreeBuilder('wallabag_import');
$rootNode = $treeBuilder->getRootNode();
$rootNode
->children()
->arrayNode('allow_mimetypes')
->prototype('scalar')->end()
->end()
->scalarNode('resource_dir')
->end()
->end()
;
return $treeBuilder;
}

4
src/Wallabag/ImportBundle/DependencyInjection/WallabagImportExtension.php
View File

@ -9,10 +9,6 @@ class WallabagImportExtension extends Extension
{
public function load(array $configs, ContainerBuilder $container)
{
$configuration = new Configuration();
$config = $this->processConfiguration($configuration, $configs);
$container->setParameter('wallabag_import.allow_mimetypes', $config['allow_mimetypes']);
$container->setParameter('wallabag_import.resource_dir', $config['resource_dir']);
}
public function getAlias()