From: Jérémy Benoist <j0k3r@users.noreply.github.com>
Date: Sun, 15 Oct 2017 07:24:32 +0000 (+0200)
Subject: Merge pull request #3382 from nclsHart/replace-kernel-rootdir
X-Git-Tag: 2.3.0~31^2~5
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=393020100350140e421d991a3fc7d12eaf69a8b7;hp=-c;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #3382 from nclsHart/replace-kernel-rootdir

 Replace kernel.root_dir by kernel.project_dir
---

393020100350140e421d991a3fc7d12eaf69a8b7
diff --combined app/AppKernel.php
index 45f6b795,d582c93e..90e9f1d8
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@@ -48,7 -48,6 +48,7 @@@ class AppKernel extends Kerne
              $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
              $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
              $bundles[] = new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle();
 +            $bundles[] = new Symfony\Bundle\WebServerBundle\WebServerBundle();
  
              if ('test' === $this->getEnvironment()) {
                  $bundles[] = new DAMA\DoctrineTestBundle\DAMADoctrineTestBundle();
@@@ -58,11 -57,6 +58,6 @@@
          return $bundles;
      }
  
-     public function getRootDir()
-     {
-         return __DIR__;
-     }
- 
      public function getCacheDir()
      {
          return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment();
@@@ -75,7 -69,7 +70,7 @@@
  
      public function registerContainerConfiguration(LoaderInterface $loader)
      {
-         $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml');
+         $loader->load($this->getProjectDir() . '/app/config/config_' . $this->getEnvironment() . '.yml');
          $loader->load(function ($container) {
              if ($container->getParameter('use_webpack_dev_server')) {
                  $container->loadFromExtension('framework', [