pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

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

Browse Source 
Replace kernel.root_dir by kernel.project_dir
This commit is contained in:
Jérémy Benoist
2017-10-15 09:24:32 +02:00
committed by GitHub
parent 64f4112cae 9ca069a6fe
commit 3930201003
11 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/AppKernel.php
View File

@ -58,11 +58,6 @@ class AppKernel extends Kernel
return $bundles;
}
public function getRootDir()
{
return __DIR__;
}
public function getCacheDir()
{
return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment();
@ -75,7 +70,7 @@ class AppKernel extends Kernel
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', [