aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
authorJérémy Benoist <j0k3r@users.noreply.github.com>2018-10-08 08:00:07 +0000
committerGitHub <noreply@github.com>2018-10-08 08:00:07 +0000
commit102f57941ebfd03899760f8add0701952b4d982f (patch)
tree004a45801b8e811e97661a156d862da572f14034 /app
parent2b6380f5acaecaa7aa04c12d7bf4fd7c84b60b08 (diff)
parent115de64e5bb9d7f9151ecf15e15a0d988563528e (diff)
downloadwallabag-102f57941ebfd03899760f8add0701952b4d982f.tar.gz
wallabag-102f57941ebfd03899760f8add0701952b4d982f.tar.zst
wallabag-102f57941ebfd03899760f8add0701952b4d982f.zip
Merge pull request #3731 from wallabag/symfony3.4
Jump to Symfony 3.4
Diffstat (limited to 'app')
-rw-r--r--app/AppKernel.php2
-rw-r--r--app/config/config.yml5
-rw-r--r--app/config/config_test.yml1
-rw-r--r--app/config/security.yml3
-rw-r--r--app/config/services.yml6
-rw-r--r--app/config/services_test.yml38
6 files changed, 48 insertions, 7 deletions
diff --git a/app/AppKernel.php b/app/AppKernel.php
index 40726f05..546794de 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -32,6 +32,7 @@ class AppKernel extends Kernel
32 new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(), 32 new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
33 new FOS\JsRoutingBundle\FOSJsRoutingBundle(), 33 new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
34 new BD\GuzzleSiteAuthenticatorBundle\BDGuzzleSiteAuthenticatorBundle(), 34 new BD\GuzzleSiteAuthenticatorBundle\BDGuzzleSiteAuthenticatorBundle(),
35 new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),
35 36
36 // wallabag bundles 37 // wallabag bundles
37 new Wallabag\CoreBundle\WallabagCoreBundle(), 38 new Wallabag\CoreBundle\WallabagCoreBundle(),
@@ -39,7 +40,6 @@ class AppKernel extends Kernel
39 new Wallabag\UserBundle\WallabagUserBundle(), 40 new Wallabag\UserBundle\WallabagUserBundle(),
40 new Wallabag\ImportBundle\WallabagImportBundle(), 41 new Wallabag\ImportBundle\WallabagImportBundle(),
41 new Wallabag\AnnotationBundle\WallabagAnnotationBundle(), 42 new Wallabag\AnnotationBundle\WallabagAnnotationBundle(),
42 new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),
43 ]; 43 ];
44 44
45 if (in_array($this->getEnvironment(), ['dev', 'test'], true)) { 45 if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
diff --git a/app/config/config.yml b/app/config/config.yml
index 0c2b6a1d..951cdf71 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -357,3 +357,8 @@ jms_serializer:
357 # see: https://github.com/schmittjoh/JMSSerializerBundle/pull/494 357 # see: https://github.com/schmittjoh/JMSSerializerBundle/pull/494
358 datetime: 358 datetime:
359 default_format: "Y-m-d\\TH:i:sO" # ATOM 359 default_format: "Y-m-d\\TH:i:sO" # ATOM
360
361# see https://github.com/symfony/symfony-standard/pull/1133
362sensio_framework_extra:
363 router:
364 annotations: false
diff --git a/app/config/config_test.yml b/app/config/config_test.yml
index fc067ff4..11e0feb7 100644
--- a/app/config/config_test.yml
+++ b/app/config/config_test.yml
@@ -1,6 +1,7 @@
1imports: 1imports:
2 - { resource: config_dev.yml } 2 - { resource: config_dev.yml }
3 - { resource: parameters_test.yml } 3 - { resource: parameters_test.yml }
4 - { resource: services_test.yml }
4 5
5framework: 6framework:
6 test: ~ 7 test: ~
diff --git a/app/config/security.yml b/app/config/security.yml
index 02afc9ea..98f43011 100644
--- a/app/config/security.yml
+++ b/app/config/security.yml
@@ -31,12 +31,15 @@ security:
31 fos_oauth: true 31 fos_oauth: true
32 stateless: true 32 stateless: true
33 anonymous: true 33 anonymous: true
34 provider: fos_userbundle
34 35
35 login_firewall: 36 login_firewall:
37 logout_on_user_change: true
36 pattern: ^/login$ 38 pattern: ^/login$
37 anonymous: ~ 39 anonymous: ~
38 40
39 secured_area: 41 secured_area:
42 logout_on_user_change: true
40 pattern: ^/ 43 pattern: ^/
41 form_login: 44 form_login:
42 provider: fos_userbundle 45 provider: fos_userbundle
diff --git a/app/config/services.yml b/app/config/services.yml
index 7b85d846..25bbe5dc 100644
--- a/app/config/services.yml
+++ b/app/config/services.yml
@@ -2,12 +2,6 @@ parameters:
2 lexik_form_filter.get_filter.doctrine_orm.class: Wallabag\CoreBundle\Event\Subscriber\CustomDoctrineORMSubscriber 2 lexik_form_filter.get_filter.doctrine_orm.class: Wallabag\CoreBundle\Event\Subscriber\CustomDoctrineORMSubscriber
3 3
4services: 4services:
5 # used for tests
6 filesystem_cache:
7 class: Doctrine\Common\Cache\FilesystemCache
8 arguments:
9 - "%kernel.cache_dir%/doctrine/metadata"
10
11 twig.extension.text: 5 twig.extension.text:
12 class: Twig_Extensions_Extension_Text 6 class: Twig_Extensions_Extension_Text
13 tags: 7 tags:
diff --git a/app/config/services_test.yml b/app/config/services_test.yml
new file mode 100644
index 00000000..a300f75d
--- /dev/null
+++ b/app/config/services_test.yml
@@ -0,0 +1,38 @@
1services:
2 # see https://github.com/symfony/symfony/issues/24543
3 fos_user.user_manager.test:
4 alias: fos_user.user_manager
5 public: true
6
7 fos_user.security.login_manager.test:
8 alias: fos_user.security.login_manager
9 public: true
10
11 wallabag_core.entry_repository.test:
12 alias: wallabag_core.entry_repository
13 public: true
14
15 wallabag_user.user_repository.test:
16 alias: wallabag_user.user_repository
17 public: true
18
19 filesystem_cache:
20 class: Doctrine\Common\Cache\FilesystemCache
21 arguments:
22 - "%kernel.cache_dir%/doctrine/metadata"
23
24 # fixtures
25 Wallabag\AnnotationBundle\DataFixtures\ORM\:
26 resource: '../../src/Wallabag/AnnotationBundle/DataFixtures/ORM/*'
27 tags: ['doctrine.fixture.orm']
28 autowire: true
29
30 Wallabag\CoreBundle\DataFixtures\ORM\:
31 resource: '../../src/Wallabag/CoreBundle/DataFixtures/ORM/*'
32 tags: ['doctrine.fixture.orm']
33 autowire: true
34
35 Wallabag\UserBundle\DataFixtures\ORM\:
36 resource: '../../src/Wallabag/UserBundle/DataFixtures/ORM/*'
37 tags: ['doctrine.fixture.orm']
38 autowire: true