X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=app%2FAppKernel.php;h=d97842f9034d45505008e975ab42dc3e915ff3ee;hb=5c895a7fd15822856fb407910264c5d95e1e223c;hp=85edc14affea612128abe6a8ea1214393c4eff84;hpb=3c65dfb735c7ccdee3d8ea420fe295439d53bb13;p=github%2Fwallabag%2Fwallabag.git

diff --git a/app/AppKernel.php b/app/AppKernel.php
index 85edc14a..d97842f9 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -31,9 +31,11 @@ class AppKernel extends Kernel
             new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
             new Scheb\TwoFactorBundle\SchebTwoFactorBundle(),
             new KPhoen\RulerZBundle\KPhoenRulerZBundle(),
+            new Wallabag\ImportBundle\WallabagImportBundle(),
+            new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
         );
 
-        if (in_array($this->getEnvironment(), array('dev', 'test'))) {
+        if (in_array($this->getEnvironment(), array('dev', 'test'), true)) {
             $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
             $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
             $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
@@ -46,6 +48,6 @@ class AppKernel extends Kernel
 
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
+        $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');
     }
 }