Allow configure Magento with env

kandy · kandy · commit 09a6147e27ae · 2021-10-25T19:12:33.000-05:00
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig.php b/lib/internal/Magento/Framework/App/DeploymentConfig.php
@@ -152,10 +152,7 @@ public function isDbAvailable()
     private function getEnvOverride() : array
     {
         $env = getenv(self::MAGENTO_ENV_PREFIX . '_OVERRIDE');
-        if (!empty($env)) {
-            return json_decode($env, true) ?? [];
-        }
-        return [];
+        return !empty($env) ? (json_decode($env, true) ?? []) : [];
     }
 
     /**
@@ -214,7 +211,7 @@ private function flattenParams(array $params, $path = null, array &$flattenResul
                 // allow reading values from env variables
                 // value need to be specified in %env(NAME, "default value")% format
                 // like %env(DB_PASSWORD)%, %env(DB_NAME, "test")%
-                if (preg_match(self::ENV_NAME_PATTERN, $param,$matches)) {
+                if (preg_match(self::ENV_NAME_PATTERN, $param, $matches)) {
                     $param = getenv($matches['name']) ?: ($matches['default'] ?? null);
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -152,10 +152,7 @@ public function isDbAvailable()`
`152`	`152`	`private function getEnvOverride() : array`
`153`	`153`	`{`
`154`	`154`	`$env = getenv(self::MAGENTO_ENV_PREFIX . '_OVERRIDE');`
`155`		`- if (!empty($env)) {`
`156`		`- return json_decode($env, true) ?? [];`
`157`		`- }`
`158`		`- return [];`
	`155`	`+ return !empty($env) ? (json_decode($env, true) ?? []) : [];`
`159`	`156`	`}`
`160`	`157`
`161`	`158`	`/**`
`@@ -214,7 +211,7 @@ private function flattenParams(array $params, $path = null, array &$flattenResul`
`214`	`211`	`// allow reading values from env variables`
`215`	`212`	`// value need to be specified in %env(NAME, "default value")% format`
`216`	`213`	`// like %env(DB_PASSWORD)%, %env(DB_NAME, "test")%`
`217`		`- if (preg_match(self::ENV_NAME_PATTERN, $param,$matches)) {`
	`214`	`+ if (preg_match(self::ENV_NAME_PATTERN, $param, $matches)) {`
`218`	`215`	`$param = getenv($matches['name']) ?: ($matches['default'] ?? null);`
`219`	`216`	`}`
`220`	`217`