partkeepr

commit 524791126807109a0bc20625d31706d0df1716bd
parent 10ae6373d732e694d72dea7ba525101912f93de1
Author: Felicitus <felicitus@felicitus.org>
Date:   Wed,  4 Nov 2015 15:05:41 +0100

Load the custom configuration in non-test environments only

Diffstat:
M
app/AppKernel.php
 | 
14
+++++++++-----

1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -67,17 +67,21 @@ class AppKernel extends Kernel
         return $bundles;
     }
 
+    /**
+     * Loads the configuration for an environment. Also loads a custom configuration for non-text environments from
+     * app/config_config_custom.yml if it exists.
+     */
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
         $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
 
-        $customConfig = __DIR__.'/config/config_custom.yml';
+        if ($this->getEnvironment() !== "test") {
+            $customConfig = __DIR__.'/config/config_custom.yml';
 
-        if (file_exists($customConfig)) {
-            $loader->load($customConfig);
+            if (file_exists($customConfig)) {
+                $loader->load($customConfig);
+            }
         }
-
-
     }
 
     /**