Merge remote-tracking branch 'remotes/github/MAGETWO-96428' into EPAM-PR-28

Mac · Mac · commit 599ce2b67569 · 2019-01-15T00:41:03.000+03:00
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig.php b/lib/internal/Magento/Framework/App/DeploymentConfig.php
@@ -70,6 +70,11 @@ public function get($key = null, $defaultValue = null)
         if ($key === null) {
             return $this->flatData;
         }
+
+        if (array_key_exists($key, $this->flatData) && $this->flatData[$key] === null) {
+            return '';
+        }
+
         return $this->flatData[$key] ?? $defaultValue;
     }
 
@@ -146,6 +151,8 @@ private function load()
     }
 
     /**
+     * Array keys conversion
+     *
      * Convert associative array of arbitrary depth to a flat associative array with concatenated key path as keys
      * each level of array is accessible by path key
      *

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,11 @@ public function get($key = null, $defaultValue = null)`
`70`	`70`	`if ($key === null) {`
`71`	`71`	`return $this->flatData;`
`72`	`72`	`}`
	`73`	`+`
	`74`	`+ if (array_key_exists($key, $this->flatData) && $this->flatData[$key] === null) {`
	`75`	`+ return '';`
	`76`	`+ }`
	`77`	`+`
`73`	`78`	`return $this->flatData[$key] ?? $defaultValue;`
`74`	`79`	`}`
`75`	`80`
`@@ -146,6 +151,8 @@ private function load()`
`146`	`151`	`}`
`147`	`152`
`148`	`153`	`/**`
	`154`	`+ * Array keys conversion`
	`155`	`+ *`
`149`	`156`	`* Convert associative array of arbitrary depth to a flat associative array with concatenated key path as keys`
`150`	`157`	`* each level of array is accessible by path key`
`151`	`158`	`*`