Merge remote-tracking branch 'origin/MAGETWO-70971' into MAGETWO-70971

svitja · svitja · commit 951bcb3fb201 · 2018-03-12T18:54:32.000+02:00
diff --git a/app/code/Magento/Bundle/etc/db_schema.xml b/app/code/Magento/Bundle/etc/db_schema.xml
@@ -45,10 +45,6 @@
         <constraint xsi:type="foreign" name="CAT_PRD_BNDL_OPT_VAL_OPT_ID_CAT_PRD_BNDL_OPT_OPT_ID"
                     table="catalog_product_bundle_option_value" column="option_id"
                     referenceTable="catalog_product_bundle_option" referenceColumn="option_id" onDelete="CASCADE"/>
-        <constraint xsi:type="unique" name="CATALOG_PRODUCT_BUNDLE_OPTION_VALUE_OPTION_ID_STORE_ID">
-            <column name="option_id"/>
-            <column name="store_id"/>
-        </constraint>
         <constraint xsi:type="unique" name="CAT_PRD_BNDL_OPT_VAL_OPT_ID_PARENT_PRD_ID_STORE_ID">
             <column name="option_id"/>
             <column name="parent_product_id"/>
diff --git a/app/code/Magento/Config/App/Config/Type/System.php b/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
      *
diff --git a/app/code/Magento/Config/App/Config/Type/System/Reader.php b/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()
             )
         );
     }
diff --git a/app/code/Magento/Config/Test/Unit/App/Config/Type/System/ReaderTest.php b/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());
     }
 }
diff --git a/app/code/Magento/Config/Test/Unit/App/Config/Type/SystemTest.php b/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));
     }
 }
diff --git a/app/code/Magento/Store/Model/Config/Placeholder.php b/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)) {
diff --git a/app/code/Magento/Store/Test/Unit/Model/Config/PlaceholderTest.php b/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(
diff --git a/lib/internal/Magento/Framework/Module/Dir/Reader.php b/lib/internal/Magento/Framework/Module/Dir/Reader.php
@@ -105,11 +105,11 @@ public function getComposerJsonFiles()
      */
     private function getFilesIterator($filename, $subDir = '')
     {
-        #if (!isset($this->fileIterators[$subDir][$filename])) {
+        if (!isset($this->fileIterators[$subDir][$filename])) {
             $this->fileIterators[$subDir][$filename] = $this->fileIteratorFactory->create(
                 $this->getFiles($filename, $subDir)
             );
-        #}
+        }
         return $this->fileIterators[$subDir][$filename];
     }
 
diff --git a/lib/internal/Magento/Framework/Setup/Patch/PatchApplier.php b/lib/internal/Magento/Framework/Setup/Patch/PatchApplier.php
@@ -10,8 +10,8 @@
 use Magento\Framework\Module\ModuleResource;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Phrase;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\Exception;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
 
 /**
  * Apply patches per specific module
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlScanner.php
@@ -30,13 +30,21 @@ public function __construct(\Magento\Setup\Module\Di\Compiler\Log\Log $log)
      */
     public function collectEntities(array $files)
     {
+        $virtualTypes = [];
         $output = [];
+        $factoriesOutput = [];
         foreach ($files as $file) {
             $dom = new \DOMDocument();
             $dom->load($file);
             $xpath = new \DOMXPath($dom);
             $xpath->registerNamespace("php", "http://php.net/xpath");
             $xpath->registerPhpFunctions('preg_match');
+            $virtualTypeQuery = "//virtualType/@name";
+
+            foreach ($xpath->query($virtualTypeQuery) as $virtualNode) {
+                $virtualTypes[] = $virtualNode->nodeValue;
+            }
+
             $regex = '/^(.*)\\\(.*)Proxy$/';
             $query = "/config/preference[ php:functionString('preg_match', '{$regex}', @type) > 0]/@type | " .
                 "//argument[@xsi:type='object' and php:functionString('preg_match', '{$regex}', text()) > 0] |" .
@@ -46,9 +54,33 @@ public function collectEntities(array $files)
             foreach ($xpath->query($query) as $node) {
                 $output[] = $node->nodeValue;
             }
+
+            $factoriesOutput = array_merge($factoriesOutput, $this->scanFactories($xpath));
         }
+
         $output = array_unique($output);
-        return $this->_filterEntities($output);
+        $factoriesOutput = array_unique($factoriesOutput);
+        $factoriesOutput = array_diff($factoriesOutput, $virtualTypes);
+        return array_merge($this->_filterEntities($output), $factoriesOutput);
+    }
+
+    /**
+     * Scan factories from all di.xml and retrieve non virtual one
+     *
+     * @param \DOMXPath $domXpath
+     * @return array
+     */
+    private function scanFactories(\DOMXPath $domXpath)
+    {
+        $output = [];
+        $regex = '/^(.*)Factory$/';
+        $query = "//argument[@xsi:type='object' and php:functionString('preg_match', '{$regex}', text()) > 0] |" .
+            "//item[@xsi:type='object' and php:functionString('preg_match', '{$regex}', text()) > 0]";
+        foreach ($domXpath->query($query) as $node) {
+            $output[] = $node->nodeValue;
+        }
+
+        return $output;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -84,10 +84,6 @@ public function testGetCachedWithLoadDefaultScopeData()`
`84`	`84`	`->method('process')`
`85`	`85`	`->with($data)`
`86`	`86`	`->willReturn($data);`
`87`		`- $this->postProcessor->expects($this->once())`
`88`		`- ->method('process')`
`89`		`- ->with($data)`
`90`		`- ->willReturn($data);`
`91`	`87`	`$this->assertEquals($data, $this->model->read());`
`92`	`88`	`}`
`93`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,12 @@ public function testGetNotCached()`
`170`	`170`	`$this->reader->expects($this->once())`
`171`	`171`	`->method('read')`
`172`	`172`	`->willReturn($data);`
	`173`	`+ $this->postProcessor->expects($this->once())`
	`174`	`+ ->method('process')`
	`175`	`+ ->with($data)`
	`176`	`+ ->willReturn($data);`
`173`	`177`
`174`	`178`	`$this->assertEquals($url, $this->configType->get($path));`
	`179`	`+ $this->assertEquals($url, $this->configType->get($path));`
`175`	`180`	`}`
`176`	`181`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ protected function setUp()`
`23`	`23`	`{`
`24`	`24`	`$this->_requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);`
`25`	`25`	`$this->_requestMock->expects(`
`26`		`- $this->any()`
	`26`	`+ $this->once()`
`27`	`27`	`)->method(`
`28`	`28`	`'getDistroBaseUrl'`
`29`	`29`	`)->will(`
Original file line number	Diff line number	Diff line change
`@@ -105,11 +105,11 @@ public function getComposerJsonFiles()`
`105`	`105`	`*/`
`106`	`106`	`private function getFilesIterator($filename, $subDir = '')`
`107`	`107`	`{`
`108`		`- #if (!isset($this->fileIterators[$subDir][$filename])) {`
	`108`	`+ if (!isset($this->fileIterators[$subDir][$filename])) {`
`109`	`109`	`$this->fileIterators[$subDir][$filename] = $this->fileIteratorFactory->create(`
`110`	`110`	`$this->getFiles($filename, $subDir)`
`111`	`111`	`);`
`112`		`- #}`
	`112`	`+ }`
`113`	`113`	`return $this->fileIterators[$subDir][$filename];`
`114`	`114`	`}`
`115`	`115`