From f6bf2a2582f3b345d7de1ac9d1dd3f28b8564b4d Mon Sep 17 00:00:00 2001
From: Oleh Posyniak <oposyniak@magento.com>
Date: Thu, 22 Dec 2016 15:06:31 +0200
Subject: [PATCH] MAGETWO-62491: [PR] Delivery of stories (sprint 3)
---
.../Config/Processor/EnvironmentPlaceholder.php | 8 +++++++-
.../Reader/Source/Deployed/SettingChecker.php | 13 ++-----------
.../Framework/App/DeploymentConfig/Writer.php | 2 --
3 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/app/code/Magento/Config/Model/Config/Processor/EnvironmentPlaceholder.php b/app/code/Magento/Config/Model/Config/Processor/EnvironmentPlaceholder.php
index 624896257b8..efbe888f2eb 100644
--- a/app/code/Magento/Config/Model/Config/Processor/EnvironmentPlaceholder.php
+++ b/app/code/Magento/Config/Model/Config/Processor/EnvironmentPlaceholder.php
@@ -10,6 +10,9 @@ use Magento\Config\Model\Placeholder\PlaceholderInterface;
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 @@ class EnvironmentPlaceholder implements PreProcessorInterface
}
/**
- * @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)
{
diff --git a/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/SettingChecker.php b/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/SettingChecker.php
index e8858c780cf..7e673401c73 100644
--- a/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/SettingChecker.php
+++ b/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 @@ class SettingChecker
*/
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;
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig/Writer.php b/lib/internal/Magento/Framework/App/DeploymentConfig/Writer.php
index d66a3957bde..2d8e7a14aaf 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig/Writer.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig/Writer.php
@@ -15,8 +15,6 @@ use Magento\Framework\Phrase;
/**
* Deployment configuration writer to files: env.php, config.php (config.local.php, config.dist.php)
- *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Writer
{
--
GitLab