aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/AppKernel.php
diff options
context:
space:
mode:
authorJérémy Benoist <j0k3r@users.noreply.github.com>2017-10-15 09:24:32 +0200
committerGitHub <noreply@github.com>2017-10-15 09:24:32 +0200
commit393020100350140e421d991a3fc7d12eaf69a8b7 (patch)
tree39c058cfca7543ac4a3e60e8a5ffc97db7629474 /app/AppKernel.php
parent64f4112caea165d79d10c624bcc69e6a3597714f (diff)
parent9ca069a6fea67ddf2ef44601901ea3c02e3cffbe (diff)
downloadwallabag-393020100350140e421d991a3fc7d12eaf69a8b7.tar.gz
wallabag-393020100350140e421d991a3fc7d12eaf69a8b7.tar.zst
wallabag-393020100350140e421d991a3fc7d12eaf69a8b7.zip
Merge pull request #3382 from nclsHart/replace-kernel-rootdir
Replace kernel.root_dir by kernel.project_dir
Diffstat (limited to 'app/AppKernel.php')
-rw-r--r--app/AppKernel.php7
1 files changed, 1 insertions, 6 deletions
diff --git a/app/AppKernel.php b/app/AppKernel.php
index 45f6b795..90e9f1d8 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -58,11 +58,6 @@ class AppKernel extends Kernel
58 return $bundles; 58 return $bundles;
59 } 59 }
60 60
61 public function getRootDir()
62 {
63 return __DIR__;
64 }
65
66 public function getCacheDir() 61 public function getCacheDir()
67 { 62 {
68 return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment(); 63 return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment();
@@ -75,7 +70,7 @@ class AppKernel extends Kernel
75 70
76 public function registerContainerConfiguration(LoaderInterface $loader) 71 public function registerContainerConfiguration(LoaderInterface $loader)
77 { 72 {
78 $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml'); 73 $loader->load($this->getProjectDir() . '/app/config/config_' . $this->getEnvironment() . '.yml');
79 $loader->load(function ($container) { 74 $loader->load(function ($container) {
80 if ($container->getParameter('use_webpack_dev_server')) { 75 if ($container->getParameter('use_webpack_dev_server')) {
81 $container->loadFromExtension('framework', [ 76 $container->loadFromExtension('framework', [