mirror of
https://github.com/wallabag/wallabag.git
synced 2025-09-15 18:57:05 +00:00
Jump to Symfony 3.4
Thanks to the BC compatibility, almost nothing have to be changed. All changes are related to new bundle version of: - SensioFrameworkExtraBundle - DoctrineFixturesBundle
This commit is contained in:
parent
2b6380f5ac
commit
115de64e5b
34 changed files with 132 additions and 62 deletions
|
@ -32,6 +32,7 @@ class AppKernel extends Kernel
|
|||
new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
|
||||
new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
|
||||
new BD\GuzzleSiteAuthenticatorBundle\BDGuzzleSiteAuthenticatorBundle(),
|
||||
new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),
|
||||
|
||||
// wallabag bundles
|
||||
new Wallabag\CoreBundle\WallabagCoreBundle(),
|
||||
|
@ -39,7 +40,6 @@ class AppKernel extends Kernel
|
|||
new Wallabag\UserBundle\WallabagUserBundle(),
|
||||
new Wallabag\ImportBundle\WallabagImportBundle(),
|
||||
new Wallabag\AnnotationBundle\WallabagAnnotationBundle(),
|
||||
new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),
|
||||
];
|
||||
|
||||
if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
|
||||
|
|
|
@ -357,3 +357,8 @@ jms_serializer:
|
|||
# see: https://github.com/schmittjoh/JMSSerializerBundle/pull/494
|
||||
datetime:
|
||||
default_format: "Y-m-d\\TH:i:sO" # ATOM
|
||||
|
||||
# see https://github.com/symfony/symfony-standard/pull/1133
|
||||
sensio_framework_extra:
|
||||
router:
|
||||
annotations: false
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
imports:
|
||||
- { resource: config_dev.yml }
|
||||
- { resource: parameters_test.yml }
|
||||
- { resource: services_test.yml }
|
||||
|
||||
framework:
|
||||
test: ~
|
||||
|
|
|
@ -31,12 +31,15 @@ security:
|
|||
fos_oauth: true
|
||||
stateless: true
|
||||
anonymous: true
|
||||
provider: fos_userbundle
|
||||
|
||||
login_firewall:
|
||||
logout_on_user_change: true
|
||||
pattern: ^/login$
|
||||
anonymous: ~
|
||||
|
||||
secured_area:
|
||||
logout_on_user_change: true
|
||||
pattern: ^/
|
||||
form_login:
|
||||
provider: fos_userbundle
|
||||
|
|
|
@ -2,12 +2,6 @@ parameters:
|
|||
lexik_form_filter.get_filter.doctrine_orm.class: Wallabag\CoreBundle\Event\Subscriber\CustomDoctrineORMSubscriber
|
||||
|
||||
services:
|
||||
# used for tests
|
||||
filesystem_cache:
|
||||
class: Doctrine\Common\Cache\FilesystemCache
|
||||
arguments:
|
||||
- "%kernel.cache_dir%/doctrine/metadata"
|
||||
|
||||
twig.extension.text:
|
||||
class: Twig_Extensions_Extension_Text
|
||||
tags:
|
||||
|
|
38
app/config/services_test.yml
Normal file
38
app/config/services_test.yml
Normal file
|
@ -0,0 +1,38 @@
|
|||
services:
|
||||
# see https://github.com/symfony/symfony/issues/24543
|
||||
fos_user.user_manager.test:
|
||||
alias: fos_user.user_manager
|
||||
public: true
|
||||
|
||||
fos_user.security.login_manager.test:
|
||||
alias: fos_user.security.login_manager
|
||||
public: true
|
||||
|
||||
wallabag_core.entry_repository.test:
|
||||
alias: wallabag_core.entry_repository
|
||||
public: true
|
||||
|
||||
wallabag_user.user_repository.test:
|
||||
alias: wallabag_user.user_repository
|
||||
public: true
|
||||
|
||||
filesystem_cache:
|
||||
class: Doctrine\Common\Cache\FilesystemCache
|
||||
arguments:
|
||||
- "%kernel.cache_dir%/doctrine/metadata"
|
||||
|
||||
# fixtures
|
||||
Wallabag\AnnotationBundle\DataFixtures\ORM\:
|
||||
resource: '../../src/Wallabag/AnnotationBundle/DataFixtures/ORM/*'
|
||||
tags: ['doctrine.fixture.orm']
|
||||
autowire: true
|
||||
|
||||
Wallabag\CoreBundle\DataFixtures\ORM\:
|
||||
resource: '../../src/Wallabag/CoreBundle/DataFixtures/ORM/*'
|
||||
tags: ['doctrine.fixture.orm']
|
||||
autowire: true
|
||||
|
||||
Wallabag\UserBundle\DataFixtures\ORM\:
|
||||
resource: '../../src/Wallabag/UserBundle/DataFixtures/ORM/*'
|
||||
tags: ['doctrine.fixture.orm']
|
||||
autowire: true
|
Loading…
Add table
Add a link
Reference in a new issue