Merge branch '2.3-develop' of https://github.com/magento/magento2ce into MAGETWO-88054

Author: Sergii Kovalenko

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(

app/code/Magento/Translation/Model/Js/DataProvider.php

@@ -113,7 +113,7 @@ public function getData($themePath)
                     }
                 } catch (\Exception $e) {
                     throw new LocalizedException(
-                        sprintf(__('Error while translating phrase "%s" in file %s.'), $phrase, $filePath[0])
+                        __('Error while translating phrase "%s" in file %s.', $phrase, $filePath[0])
                     );
                 }
             }
@@ -145,7 +145,7 @@ protected function getPhrases($content)
             }
             if (false === $result) {
                 throw new LocalizedException(
-                    sprintf(__('Error while generating js translation dictionary: "%s"'), error_get_last())
+                    __('Error while generating js translation dictionary: "%s"', error_get_last())
                 );
             }
         }

app/code/Magento/Translation/Test/Unit/Model/Js/DataProviderTest.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Translation\Test\Unit\Model\Js;
 
 use Magento\Framework\App\State;
@@ -148,4 +149,39 @@ public function testGetData()
 
         $this->assertEquals($expectedResult, $this->model->getData($themePath));
     }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testGetDataThrowingException()
+    {
+        $themePath = 'blank';
+        $areaCode = 'adminhtml';
+
+        $patterns = ['~\$\.mage\.__\(([\'"])(.+?)\1\)~'];
+
+        $this->fileReadMock->expects($this->once())
+            ->method('readAll')
+            ->willReturn('content1$.mage.__("hello1")content1');
+
+        $this->appStateMock->expects($this->once())
+            ->method('getAreaCode')
+            ->willReturn($areaCode);
+        $this->filesUtilityMock->expects($this->any())
+            ->method('getJsFiles')
+            ->willReturn(['test']);
+        $this->filesUtilityMock->expects($this->any())
+            ->method('getStaticHtmlFiles')
+            ->willReturn(['test']);
+
+        $this->configMock->expects($this->any())
+            ->method('getPatterns')
+            ->willReturn($patterns);
+
+        $this->translateMock->expects($this->once())
+            ->method('render')
+            ->willThrowException(new \Exception('Test exception'));
+
+        $this->model->getData($themePath);
+    }
 }