Merge pull request #2178 from magento-thunder/MAGETWO-72760

Fixed issues:
 - MAGETWO-72760: 2.2.0-RC21: Omitting --base_url breaks site (not getting host:port from "Host" header correctly)

Author: Yevhen Miroshnychenko

app/code/Magento/Config/App/Config/Type/System.php

@@ -141,7 +141,7 @@ public function get($path = '')
         $pathParts = explode('/', $path);
         if (count($pathParts) === 1 && $pathParts[0] !== 'default') {
             if (!isset($this->data[$pathParts[0]])) {
-                $data = $this->reader->read();
+                $data = $this->readData();
                 $this->data = array_replace_recursive($data, $this->data);
             }
             return $this->data[$pathParts[0]];
@@ -171,7 +171,7 @@ private function loadAllData()
     {
         $cachedData = $this->cache->load($this->configType);
         if ($cachedData === false) {
-            $data = $this->reader->read();
+            $data = $this->readData();
         } else {
             $data = $this->serializer->unserialize($cachedData);
         }
@@ -188,7 +188,7 @@ private function loadDefaultScopeData($scopeType)
     {
         $cachedData = $this->cache->load($this->configType . '_' . $scopeType);
         if ($cachedData === false) {
-            $data = $this->reader->read();
+            $data = $this->readData();
             $this->cacheData($data);
         } else {
             $data = [$scopeType => $this->serializer->unserialize($cachedData)];
@@ -216,7 +216,7 @@ private function loadScopeData($scopeType, $scopeId)
             if (is_array($this->availableDataScopes) && !isset($this->availableDataScopes[$scopeType][$scopeId])) {
                 return [$scopeType => [$scopeId => []]];
             }
-            $data = $this->reader->read();
+            $data = $this->readData();
             $this->cacheData($data);
         } else {
             $data = [$scopeType => [$scopeId => $this->serializer->unserialize($cachedData)]];
@@ -282,6 +282,21 @@ private function getDataByPathParts($data, $pathParts)
         return $data;
     }
 
+    /**
+     * The freshly read data.
+     *
+     * @return array
+     */
+    private function readData(): array
+    {
+        $this->data = $this->reader->read();
+        $this->data = $this->postProcessor->process(
+            $this->data
+        );
+
+        return $this->data;
+    }
+
     /**
      * Clean cache and global variables cache
      *

app/code/Magento/Config/App/Config/Type/System/Reader.php

@@ -27,17 +27,13 @@ class Reader
      */
     private $preProcessor;
 
-    /**
-     * @var \Magento\Framework\App\Config\Spi\PostProcessorInterface
-     */
-    private $postProcessor;
-
     /**
      * Reader constructor.
      * @param \Magento\Framework\App\Config\ConfigSourceInterface $source
      * @param \Magento\Store\Model\Config\Processor\Fallback $fallback
      * @param \Magento\Framework\App\Config\Spi\PreProcessorInterface $preProcessor
      * @param \Magento\Framework\App\Config\Spi\PostProcessorInterface $postProcessor
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         \Magento\Framework\App\Config\ConfigSourceInterface $source,
@@ -48,7 +44,6 @@ public function __construct(
         $this->source = $source;
         $this->fallback = $fallback;
         $this->preProcessor = $preProcessor;
-        $this->postProcessor = $postProcessor;
     }
 
     /**
@@ -60,11 +55,9 @@ public function __construct(
      */
     public function read()
     {
-        return $this->postProcessor->process(
-            $this->fallback->process(
-                $this->preProcessor->process(
-                    $this->source->get()
-                )
+        return $this->fallback->process(
+            $this->preProcessor->process(
+                $this->source->get()
             )
         );
     }

app/code/Magento/Config/Test/Unit/App/Config/Type/System/ReaderTest.php

@@ -84,10 +84,6 @@ public function testGetCachedWithLoadDefaultScopeData()
             ->method('process')
             ->with($data)
             ->willReturn($data);
-        $this->postProcessor->expects($this->once())
-            ->method('process')
-            ->with($data)
-            ->willReturn($data);
         $this->assertEquals($data, $this->model->read());
     }
 }

app/code/Magento/Config/Test/Unit/App/Config/Type/SystemTest.php

@@ -170,7 +170,12 @@ public function testGetNotCached()
         $this->reader->expects($this->once())
             ->method('read')
             ->willReturn($data);
+        $this->postProcessor->expects($this->once())
+            ->method('process')
+            ->with($data)
+            ->willReturn($data);
 
         $this->assertEquals($url, $this->configType->get($path));
+        $this->assertEquals($url, $this->configType->get($path));
     }
 }

app/code/Magento/Store/Model/Config/Placeholder.php

@@ -91,8 +91,9 @@ protected function _processPlaceholders($value, $data)
             if ($url) {
                 $value = str_replace('{{' . $placeholder . '}}', $url, $value);
             } elseif (strpos($value, $this->urlPlaceholder) !== false) {
-                // localhost is replaced for cli requests, for http requests method getDistroBaseUrl is used
-                $value = str_replace($this->urlPlaceholder, 'http://localhost/', $value);
+                $distroBaseUrl = $this->request->getDistroBaseUrl();
+
+                $value = str_replace($this->urlPlaceholder, $distroBaseUrl, $value);
             }
 
             if (null !== $this->_getPlaceholder($value)) {

app/code/Magento/Store/Test/Unit/Model/Config/PlaceholderTest.php

@@ -23,7 +23,7 @@ protected function setUp()
     {
         $this->_requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
         $this->_requestMock->expects(
-            $this->any()
+            $this->once()
         )->method(
             'getDistroBaseUrl'
         )->will(