Merge branch 'develop' of github.com:magento-pangolin/magento2ce into develop

Author: okolesnyk

app/code/Magento/Catalog/Model/Category.php

@@ -1094,7 +1094,11 @@ public function reindex()
         if ($this->flatState->isFlatEnabled()) {
             $flatIndexer = $this->indexerRegistry->get(Indexer\Category\Flat\State::INDEXER_ID);
             if (!$flatIndexer->isScheduled()) {
-                $flatIndexer->reindexRow($this->getId());
+                $idsList = [$this->getId()];
+                if ($this->dataHasChangedFor('url_key')) {
+                    $idsList = array_merge($idsList, explode(',', $this->getAllChildren()));
+                }
+                $flatIndexer->reindexList($idsList);
             }
         }
         $productIndexer = $this->indexerRegistry->get(Indexer\Category\Product::INDEXER_ID);

app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php

@@ -318,7 +318,7 @@ public function testReindexFlatEnabled($flatScheduled, $productScheduled, $expec
             ->will($this->returnValue(true));
 
         $this->flatIndexer->expects($this->exactly(1))->method('isScheduled')->will($this->returnValue($flatScheduled));
-        $this->flatIndexer->expects($this->exactly($expectedFlatReindexCalls))->method('reindexRow')->with('123');
+        $this->flatIndexer->expects($this->exactly($expectedFlatReindexCalls))->method('reindexList')->with(['123']);
 
         $this->productIndexer->expects($this->exactly(1))->method('isScheduled')->will($this->returnValue($productScheduled));
         $this->productIndexer->expects($this->exactly($expectedProductReindexCall))->method('reindexList')->with($pathIds);

app/code/Magento/ConfigurableProduct/Model/Product/SaveHandler.php

@@ -66,8 +66,11 @@ public function execute($entity, $arguments = [])
             $this->saveConfigurableProductAttributes($entity, $configurableOptions);
         }
 
-        $configurableLinks = (array) $extensionAttributes->getConfigurableProductLinks();
-        $this->resourceModel->saveProducts($entity, $configurableLinks);
+        $configurableLinks = $extensionAttributes->getConfigurableProductLinks();
+        if ($configurableLinks !== null) {
+            $configurableLinks = (array)$configurableLinks;
+            $this->resourceModel->saveProducts($entity, $configurableLinks);
+        }
 
         return $entity;
     }

app/code/Magento/Swagger/Block/Index.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Swagger\Block;
+
+use Magento\Framework\View\Element\Template;
+
+/**
+ * Block for swagger index page
+ *
+ * @api
+ */
+class Index extends Template
+{
+    /**
+     * @return mixed|string
+     */
+    private function getParamStore()
+    {
+        return ($this->getRequest()->getParam('store')) ? $this->getRequest()->getParam('store') : 'all';
+    }
+
+    /**
+     * @return string
+     */
+    public function getSchemaUrl()
+    {
+        return rtrim($this->getBaseUrl(), '/') . '/rest/' . $this->getParamStore() . '/schema?services=all';
+    }
+}

app/code/Magento/Swagger/view/frontend/layout/swagger_index_index.xml

@@ -41,7 +41,7 @@
         <referenceContainer name="page.wrapper" remove="true"/>
         <referenceBlock name="requirejs-config" remove="true"/>
         <referenceContainer name="root">
-            <block name="swaggerUiContent" class="Magento\Framework\View\Element\Template" template="Magento_Swagger::swagger-ui/index.phtml"/>
+            <block name="swaggerUiContent" class="Magento\Swagger\Block\Index" template="Magento_Swagger::swagger-ui/index.phtml"/>
         </referenceContainer>
     </body>
 </page>

app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml

@@ -14,7 +14,7 @@
 
 /** @var \Magento\Framework\View\Element\Template $block */
 
-$schemaUrl = rtrim($block->getBaseUrl(), '/') . '/rest/all/schema?services=all';
+$schemaUrl = $block->getSchemaUrl();
 ?>
 
 <div id='header'>

app/code/Magento/Theme/Model/Design/Config/Validator.php

@@ -64,17 +64,8 @@ public function validate(DesignConfigInterface $designConfig)
         }
 
         foreach ($elements as $name => $data) {
-            // Load template object by configured template id
-            $template = $this->templateFactory->create();
-            $template->emulateDesign($designConfig->getScopeId());
             $templateId = $data['value'];
-            if (is_numeric($templateId)) {
-                $template->load($templateId);
-            } else {
-                $template->loadDefault($templateId);
-            }
-            $text = $template->getTemplateText();
-            $template->revertDesign();
+            $text = $this->getTemplateText($templateId, $designConfig);
             // Check if template body has a reference to the same config path
             if (preg_match_all(Template::CONSTRUCTION_TEMPLATE_PATTERN, $text, $constructions, PREG_SET_ORDER)) {
                 foreach ($constructions as $construction) {
@@ -94,6 +85,41 @@ public function validate(DesignConfigInterface $designConfig)
         }
     }
 
+    /**
+     * Returns store identifier if is store scope
+     *
+     * @param DesignConfigInterface $designConfig
+     * @return string|bool
+     */
+    private function getScopeId(DesignConfigInterface $designConfig)
+    {
+        if ($designConfig->getScope() == 'stores') {
+            return $designConfig->getScopeId();
+        }
+        return false;
+    }
+    /**
+     * Load template text in configured scope
+     *
+     * @param integer|string $templateId
+     * @param DesignConfigInterface $designConfig
+     * @return string
+     */
+    private function getTemplateText($templateId, DesignConfigInterface $designConfig)
+    {
+        // Load template object by configured template id
+        $template = $this->templateFactory->create();
+        $template->emulateDesign($this->getScopeId($designConfig));
+        if (is_numeric($templateId)) {
+            $template->load($templateId);
+        } else {
+            $template->loadDefault($templateId);
+        }
+        $text = $template->getTemplateText();
+        $template->revertDesign();
+        return $text;
+    }
+
     /**
      * Return associative array of parameters.
      *