Merge branch 'master' into develop

OxCom · OxCom · commit fcc4982a0388 · 2018-01-31T22:26:40.000+01:00
diff --git a/Tests/Fixtures/app/AppKernel.php b/Tests/Fixtures/app/AppKernel.php
@@ -32,7 +32,8 @@ public function getRootDir()
      */
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml');
+        $path = $this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml';
+        $loader->load($path);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,8 @@ public function getRootDir()`
`32`	`32`	`*/`
`33`	`33`	`public function registerContainerConfiguration(LoaderInterface $loader)`
`34`	`34`	`{`
`35`		`- $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml');`
	`35`	`+ $path = $this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml';`
	`36`	`+ $loader->load($path);`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`/**`