Merge pull request #485

symfony-flex-server[bot] · web-flow · commit 5f5c10c2da66 · 2018-11-12T06:03:51.000Z
diff --git a/symfony/framework-bundle/4.2/src/Kernel.php b/symfony/framework-bundle/4.2/src/Kernel.php
@@ -31,7 +31,7 @@ public function registerBundles()
     {
         $contents = require $this->getProjectDir().'/config/bundles.php';
         foreach ($contents as $class => $envs) {
-            if (isset($envs['all']) || isset($envs[$this->environment])) {
+            if (($envs['all'] ?? false) && ($envs[$this->environment] ?? true) || ($envs[$this->environment] ?? false)) {
                 yield new $class();
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function registerBundles()`
`31`	`31`	`{`
`32`	`32`	`$contents = require $this->getProjectDir().'/config/bundles.php';`
`33`	`33`	`foreach ($contents as $class => $envs) {`
`34`		`- if (isset($envs['all']) \|\| isset($envs[$this->environment])) {`
	`34`	`+ if (($envs['all'] ?? false) && ($envs[$this->environment] ?? true) \|\| ($envs[$this->environment] ?? false)) {`
`35`	`35`	`yield new $class();`
`36`	`36`	`}`
`37`	`37`	`}`