bug #29205 [Dotenv] skip loading "local" env twice (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 8b36baf41ebb · 2018-11-14T11:17:49.000+01:00
This PR was merged into the 4.2-dev branch. Discussion ---------- [Dotenv] skip loading "local" env twice | Q | A | ------------- | --- | Branch? | 4.2 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - e.g. on homestead, APP_ENV defaults to "local" :) Commits ------- 978fcfb [Dotenv] skip loading "local" env twice
diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php
@@ -82,6 +82,10 @@ public function loadEnv(string $path, string $varName = 'APP_ENV', string $defau
             $env = $_SERVER[$varName] ?? $_ENV[$varName] ?? $env;
         }
 
+        if ('local' === $env) {
+            return;
+        }
+
         if (file_exists($p = "$path.$env")) {
             $this->load($p);
         }

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,10 @@ public function loadEnv(string $path, string $varName = 'APP_ENV', string $defau`
`82`	`82`	`$env = $_SERVER[$varName] ?? $_ENV[$varName] ?? $env;`
`83`	`83`	`}`
`84`	`84`
	`85`	`+ if ('local' === $env) {`
	`86`	`+ return;`
	`87`	`+ }`
	`88`	`+`
`85`	`89`	`if (file_exists($p = "$path.$env")) {`
`86`	`90`	`$this->load($p);`
`87`	`91`	`}`