aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/AppKernel.php11
-rw-r--r--app/config/services.yml2
2 files changed, 8 insertions, 5 deletions
diff --git a/app/AppKernel.php b/app/AppKernel.php
index 30ac7463..04f86eb7 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -22,19 +22,22 @@ class AppKernel extends Kernel
22 new Nelmio\ApiDocBundle\NelmioApiDocBundle(), 22 new Nelmio\ApiDocBundle\NelmioApiDocBundle(),
23 new Nelmio\CorsBundle\NelmioCorsBundle(), 23 new Nelmio\CorsBundle\NelmioCorsBundle(),
24 new Liip\ThemeBundle\LiipThemeBundle(), 24 new Liip\ThemeBundle\LiipThemeBundle(),
25 new Wallabag\CoreBundle\WallabagCoreBundle(),
26 new Wallabag\ApiBundle\WallabagApiBundle(),
27 new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle(), 25 new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle(),
28 new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(), 26 new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(),
29 new FOS\OAuthServerBundle\FOSOAuthServerBundle(), 27 new FOS\OAuthServerBundle\FOSOAuthServerBundle(),
30 new Wallabag\UserBundle\WallabagUserBundle(),
31 new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(), 28 new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
32 new Scheb\TwoFactorBundle\SchebTwoFactorBundle(), 29 new Scheb\TwoFactorBundle\SchebTwoFactorBundle(),
33 new KPhoen\RulerZBundle\KPhoenRulerZBundle(), 30 new KPhoen\RulerZBundle\KPhoenRulerZBundle(),
34 new Wallabag\ImportBundle\WallabagImportBundle(),
35 new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(), 31 new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
36 new Craue\ConfigBundle\CraueConfigBundle(), 32 new Craue\ConfigBundle\CraueConfigBundle(),
37 new Lexik\Bundle\MaintenanceBundle\LexikMaintenanceBundle(), 33 new Lexik\Bundle\MaintenanceBundle\LexikMaintenanceBundle(),
34 new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
35
36 // wallabag bundles
37 new Wallabag\CoreBundle\WallabagCoreBundle(),
38 new Wallabag\ApiBundle\WallabagApiBundle(),
39 new Wallabag\UserBundle\WallabagUserBundle(),
40 new Wallabag\ImportBundle\WallabagImportBundle(),
38 new Wallabag\AnnotationBundle\WallabagAnnotationBundle(), 41 new Wallabag\AnnotationBundle\WallabagAnnotationBundle(),
39 ]; 42 ];
40 43
diff --git a/app/config/services.yml b/app/config/services.yml
index e0683ffc..480408d9 100644
--- a/app/config/services.yml
+++ b/app/config/services.yml
@@ -6,7 +6,7 @@ services:
6 filesystem_cache: 6 filesystem_cache:
7 class: Doctrine\Common\Cache\FilesystemCache 7 class: Doctrine\Common\Cache\FilesystemCache
8 arguments: 8 arguments:
9 - %kernel.cache_dir%/doctrine/metadata 9 - "%kernel.cache_dir%/doctrine/metadata"
10 10
11 twig.extension.text: 11 twig.extension.text:
12 class: Twig_Extensions_Extension_Text 12 class: Twig_Extensions_Extension_Text