aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2015-02-09 22:54:29 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2015-02-09 22:54:29 +0100
commit7ffb1e80bff2c54fe3fe4343484d377eda660c3f (patch)
tree87e62dd7ef22a419235a2980e5a64f1c862d66e8
parent5078e8360a69faef6a8a5fa1646cb3a15f0e78b0 (diff)
downloadwallabag-7ffb1e80bff2c54fe3fe4343484d377eda660c3f.tar.gz
wallabag-7ffb1e80bff2c54fe3fe4343484d377eda660c3f.tar.zst
wallabag-7ffb1e80bff2c54fe3fe4343484d377eda660c3f.zip
replace services.xml into services.yml
-rw-r--r--src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php6
-rw-r--r--src/Wallabag/CoreBundle/Resources/config/services.xml29
-rw-r--r--src/Wallabag/CoreBundle/Resources/config/services.yml15
3 files changed, 18 insertions, 32 deletions
diff --git a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
index 7cc4165e..c6ecc99e 100644
--- a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
+++ b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
@@ -3,7 +3,7 @@
3namespace Wallabag\CoreBundle\DependencyInjection; 3namespace Wallabag\CoreBundle\DependencyInjection;
4 4
5use Symfony\Component\DependencyInjection\ContainerBuilder; 5use Symfony\Component\DependencyInjection\ContainerBuilder;
6use Symfony\Component\DependencyInjection\Loader\XmlFileLoader; 6use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
7use Symfony\Component\HttpKernel\DependencyInjection\Extension; 7use Symfony\Component\HttpKernel\DependencyInjection\Extension;
8use Symfony\Component\Config\FileLocator; 8use Symfony\Component\Config\FileLocator;
9 9
@@ -11,8 +11,8 @@ class WallabagCoreExtension extends Extension
11{ 11{
12 public function load(array $configs, ContainerBuilder $container) 12 public function load(array $configs, ContainerBuilder $container)
13 { 13 {
14 $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); 14 $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
15 $loader->load('services.xml'); 15 $loader->load('services.yml');
16 } 16 }
17 17
18 public function getAlias() 18 public function getAlias()
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.xml b/src/Wallabag/CoreBundle/Resources/config/services.xml
deleted file mode 100644
index ca2ba383..00000000
--- a/src/Wallabag/CoreBundle/Resources/config/services.xml
+++ /dev/null
@@ -1,29 +0,0 @@
1<?xml version="1.0" ?>
2
3<container xmlns="http://symfony.com/schema/dic/services"
4 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5 xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
6
7 <services>
8 <!-- Twig -->
9 <service id="wallabag_core.twig.wallabag" class="Wallabag\CoreBundle\Twig\Extension\WallabagExtension">
10 <tag name="twig.extension" />
11 </service>
12
13 <!-- Security -->
14 <service id="wsse.security.authentication.provider"
15 class="Wallabag\CoreBundle\Security\Authentication\Provider\WsseProvider" public="false">
16 <argument /> <!-- User Provider -->
17 <argument>%kernel.cache_dir%/security/nonces</argument>
18 </service>
19
20 <service id="wsse.security.authentication.listener"
21 class="Wallabag\CoreBundle\Security\Firewall\WsseListener" public="false">
22 <argument type="service" id="security.context"/>
23 <argument type="service" id="security.authentication.manager" />
24 <argument type="service" id="logger" />
25 <tag name="monolog.logger" channel="wsse" />
26 </service>
27 </services>
28
29</container>
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
new file mode 100644
index 00000000..b066c1a3
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -0,0 +1,15 @@
1services:
2 wallabag_core.twig.wallabag:
3 class: Wallabag\CoreBundle\Twig\Extension\WallabagExtension
4 tags:
5 - { name: twig.extension }
6 wsse.security.authentication.provider:
7 class: Wallabag\CoreBundle\Security\Authentication\Provider\WsseProvider
8 public: false
9 arguments: ['', '%kernel.cache_dir%/security/nonces']
10 wsse.security.authentication.listener:
11 class: Wallabag\CoreBundle\Security\Firewall\WsseListener
12 public: false
13 tags:
14 - { name: monolog.logger, channel: wsse }
15 arguments: ['@security.context', '@security.authentication.manager', '@logger']