diff options
Diffstat (limited to 'app/AppKernel.php')
-rw-r--r-- | app/AppKernel.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/AppKernel.php b/app/AppKernel.php index f1140943..90e9f1d8 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php | |||
@@ -48,6 +48,7 @@ class AppKernel extends Kernel | |||
48 | $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); | 48 | $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); |
49 | $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle(); | 49 | $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle(); |
50 | $bundles[] = new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(); | 50 | $bundles[] = new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(); |
51 | $bundles[] = new Symfony\Bundle\WebServerBundle\WebServerBundle(); | ||
51 | 52 | ||
52 | if ('test' === $this->getEnvironment()) { | 53 | if ('test' === $this->getEnvironment()) { |
53 | $bundles[] = new DAMA\DoctrineTestBundle\DAMADoctrineTestBundle(); | 54 | $bundles[] = new DAMA\DoctrineTestBundle\DAMADoctrineTestBundle(); |
@@ -57,11 +58,6 @@ class AppKernel extends Kernel | |||
57 | return $bundles; | 58 | return $bundles; |
58 | } | 59 | } |
59 | 60 | ||
60 | public function getRootDir() | ||
61 | { | ||
62 | return __DIR__; | ||
63 | } | ||
64 | |||
65 | public function getCacheDir() | 61 | public function getCacheDir() |
66 | { | 62 | { |
67 | return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment(); | 63 | return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment(); |
@@ -74,7 +70,7 @@ class AppKernel extends Kernel | |||
74 | 70 | ||
75 | public function registerContainerConfiguration(LoaderInterface $loader) | 71 | public function registerContainerConfiguration(LoaderInterface $loader) |
76 | { | 72 | { |
77 | $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml'); | 73 | $loader->load($this->getProjectDir() . '/app/config/config_' . $this->getEnvironment() . '.yml'); |
78 | $loader->load(function ($container) { | 74 | $loader->load(function ($container) { |
79 | if ($container->getParameter('use_webpack_dev_server')) { | 75 | if ($container->getParameter('use_webpack_dev_server')) { |
80 | $container->loadFromExtension('framework', [ | 76 | $container->loadFromExtension('framework', [ |