MAGETWO-62491: [PR] Delivery of stories (sprint 3)

Author: shiftedreality

app/code/Magento/Config/Model/Config/Processor/EnvironmentPlaceholder.php

@@ -10,6 +10,9 @@
 use Magento\Framework\App\Config\Spi\PreProcessorInterface;
 use Magento\Framework\Stdlib\ArrayManager;
 
+/**
+ * Allows to extract configurations from environment variables.
+ */
 class EnvironmentPlaceholder implements PreProcessorInterface
 {
     /**
@@ -41,7 +44,10 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * Method extracts environment variables.
+     * If environment variable is matching the desired rule - it's being used as value.
+     *
+     * {@inheritdoc}
      */
     public function process(array $config)
     {

app/code/Magento/Config/Model/Config/Reader/Source/Deployed/SettingChecker.php

@@ -27,11 +27,6 @@ class SettingChecker
      */
     private $placeholder;
 
-    /**
-     * @var array|null
-     */
-    private $environmentVariables;
-
     /**
      * @var ScopeCodeResolver
      */
@@ -97,12 +92,8 @@ public function getPlaceholderValue($path, $scope, $scopeCode = null)
      */
     public function getEnvValue($placeholder)
     {
-        if (null === $this->environmentVariables) {
-            $this->environmentVariables = $_ENV;
-        }
-
-        if ($this->placeholder->isApplicable($placeholder) && isset($this->environmentVariables[$placeholder])) {
-            return $this->environmentVariables[$placeholder];
+        if ($this->placeholder->isApplicable($placeholder) && isset($_ENV[$placeholder])) {
+            return $_ENV[$placeholder];
         }
 
         return null;

lib/internal/Magento/Framework/App/DeploymentConfig/Writer.php

@@ -15,8 +15,6 @@
 
 /**
  * Deployment configuration writer to files: env.php, config.php (config.local.php, config.dist.php)
- *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Writer
 {