Merge branch 'develop' into MAGETWO-58237

Author: Olexandr Lysenko

app/code/Magento/Backend/etc/adminhtml/system.xml

@@ -198,7 +198,7 @@
             <resource>Magento_Config::config_general</resource>
             <group id="country" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Country Options</label>
-                <field id="allow" translate="label" type="multiselect" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="allow" translate="label" type="multiselect" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Allow Countries</label>
                     <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
                     <can_be_empty>1</can_be_empty>

app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CategoriesTest.php

@@ -8,6 +8,7 @@
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Categories;
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
 use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
+use Magento\Framework\App\CacheInterface;
 use Magento\Framework\DB\Helper as DbHelper;
 use Magento\Framework\UrlInterface;
 use Magento\Store\Model\Store;
@@ -112,4 +113,38 @@ public function testModifyMeta()
 
         $this->assertArrayHasKey($groupCode, $this->getModel()->modifyMeta($meta));
     }
+
+    public function testModifyMetaWithCaching()
+    {
+        $this->arrayManagerMock->expects($this->exactly(2))
+            ->method('findPath')
+            ->willReturn(true);
+        $cacheManager = $this->getMockBuilder(CacheInterface::class)
+            ->getMockForAbstractClass();
+        $cacheManager->expects($this->once())
+            ->method('load')
+            ->with(Categories::CATEGORY_TREE_ID . '_');
+        $cacheManager->expects($this->once())
+            ->method('save');
+        
+        $modifier = $this->createModel();
+        $cacheContextProperty = new \ReflectionProperty(
+            Categories::class,
+            'cacheManager'
+        );
+        $cacheContextProperty->setAccessible(true);
+        $cacheContextProperty->setValue($modifier, $cacheManager);
+
+        $groupCode = 'test_group_code';
+        $meta = [
+            $groupCode => [
+                'children' => [
+                    'category_ids' => [
+                        'sortOrder' => 10,
+                    ],
+                ],
+            ],
+        ];
+        $modifier->modifyMeta($meta);
+    }
 }

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php

@@ -7,16 +7,25 @@
 
 use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\CacheInterface;
 use Magento\Framework\DB\Helper as DbHelper;
 use Magento\Catalog\Model\Category as CategoryModel;
 use Magento\Framework\UrlInterface;
 use Magento\Framework\Stdlib\ArrayManager;
 
 /**
  * Data provider for categories field of product page
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Categories extends AbstractModifier
 {
+    /**#@+
+     * Category tree cache id
+     */
+    const CATEGORY_TREE_ID = 'CATALOG_PRODUCT_CATEGORY_TREE';
+    /**#@-*/
+
     /**
      * @var CategoryCollectionFactory
      */
@@ -29,6 +38,7 @@ class Categories extends AbstractModifier
 
     /**
      * @var array
+     * @deprecated
      */
     protected $categoriesTrees = [];
 
@@ -47,6 +57,11 @@ class Categories extends AbstractModifier
      */
     protected $arrayManager;
 
+    /**
+     * @var CacheInterface
+     */
+    private $cacheManager;
+
     /**
      * @param LocatorInterface $locator
      * @param CategoryCollectionFactory $categoryCollectionFactory
@@ -68,6 +83,21 @@ public function __construct(
         $this->arrayManager = $arrayManager;
     }
 
+    /**
+     * Retrieve cache interface
+     *
+     * @return CacheInterface
+     * @deprecated
+     */
+    private function getCacheManager()
+    {
+        if (!$this->cacheManager) {
+            $this->cacheManager = ObjectManager::getInstance()
+                ->get(CacheInterface::class);
+        }
+        return $this->cacheManager;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -254,8 +284,9 @@ protected function customizeCategoriesField(array $meta)
      */
     protected function getCategoriesTree($filter = null)
     {
-        if (isset($this->categoriesTrees[$filter])) {
-            return $this->categoriesTrees[$filter];
+        $categoryTree = $this->getCacheManager()->load(self::CATEGORY_TREE_ID . '_' . $filter);
+        if ($categoryTree) {
+            return unserialize($categoryTree);
         }
 
         $storeId = $this->locator->getStore()->getId();
@@ -307,9 +338,16 @@ protected function getCategoriesTree($filter = null)
             $categoryById[$category->getId()]['label'] = $category->getName();
             $categoryById[$category->getParentId()]['optgroup'][] = &$categoryById[$category->getId()];
         }
+        
+        $this->getCacheManager()->save(
+            serialize($categoryById[CategoryModel::TREE_ROOT_ID]['optgroup']),
+            self::CATEGORY_TREE_ID . '_' . $filter,
+            [
+                \Magento\Catalog\Model\Category::CACHE_TAG,
+                \Magento\Framework\App\Cache\Type\Block::CACHE_TAG
+            ]
+        );
 
-        $this->categoriesTrees[$filter] = $categoryById[CategoryModel::TREE_ROOT_ID]['optgroup'];
-
-        return $this->categoriesTrees[$filter];
+        return $categoryById[CategoryModel::TREE_ROOT_ID]['optgroup'];
     }
 }

app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_inline.phtml

@@ -6,6 +6,6 @@
 
 // @codingStandardsIgnoreFile
 ?>
-<div class="widget block block-product-link-inline">
+<span class="widget block block-product-link-inline">
     <a <?php /* @escapeNotVerified */ echo $block->getLinkAttributes() ?>><span><?php echo $block->escapeHtml($block->getLabel()) ?></span></a>
-</div>
+</span>

app/code/Magento/Cms/view/frontend/templates/widget/link/link_inline.phtml

@@ -4,8 +4,8 @@
  * See COPYING.txt for license details.
  */
 ?>
-<div class="widget block block-cms-link-inline">
+<span class="widget block block-cms-link-inline">
     <a <?php /* @escapeNotVerified */ echo $block->getLinkAttributes() ?>>
         <span><?php echo $block->escapeHtml($block->getLabel()) ?></span>
     </a>
-</div>
+</span>

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

@@ -148,10 +148,14 @@ protected function fillSimpleProductData(
         \Magento\Catalog\Model\Product $parentProduct,
         $postData
     ) {
+        $typeId = isset($postData['weight']) && !empty($postData['weight'])
+            ? ProductType::TYPE_SIMPLE
+            : ProductType::TYPE_VIRTUAL;
+
         $product->setStoreId(
             \Magento\Store\Model\Store::DEFAULT_STORE_ID
         )->setTypeId(
-            $postData['weight'] ? ProductType::TYPE_SIMPLE : ProductType::TYPE_VIRTUAL
+            $typeId
         )->setAttributeSetId(
             $parentProduct->getNewVariationsAttributeSetId()
         );

app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/VariationHandlerTest.php

@@ -8,6 +8,7 @@
 
 namespace Magento\ConfigurableProduct\Test\Unit\Model\Product;
 
+use Magento\Catalog\Model\Product\Type;
 use Magento\ConfigurableProduct\Model\Product\VariationHandler;
 
 /**
@@ -162,23 +163,30 @@ public function testPrepareAttributeSet()
 
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @dataProvider dataProviderTestGenerateSimpleProducts
+     * @param int|string|null $weight
+     * @param string $typeId
      */
-    public function testGenerateSimpleProducts()
+    public function testGenerateSimpleProducts($weight, $typeId)
     {
         $productsData = [
-            6 =>
-                [
-                    'image' => 'image.jpg',
-                    'name' => 'config-red',
-                    'configurable_attribute' => '{"new_attr":"6"}',
-                    'sku' => 'config-red',
-                    'quantity_and_stock_status' =>
-                        [
-                            'qty' => '',
-                        ],
-                    'weight' => '333',
-                ]
+            [
+                'image' => 'image.jpg',
+                'name' => 'config-red',
+                'configurable_attribute' => '{"new_attr":"6"}',
+                'sku' => 'config-red',
+                'quantity_and_stock_status' =>
+                    [
+                        'qty' => '',
+                    ],
+            ]
         ];
+
+        // Do not add 'weight' attribute if it's value is null!
+        if ($weight !== null) {
+            $productsData[0]['weight'] = $weight;
+        }
+
         $stockData = [
             'manage_stock' => '0',
             'use_config_enable_qty_increments' => '1',
@@ -218,7 +226,7 @@ public function testGenerateSimpleProducts()
             )
             ->disableOriginalConstructor()
             ->getMock();
-        $productTypeMock = $this->getMockBuilder(\Magento\Catalog\Model\Product\Type::class)
+        $productTypeMock = $this->getMockBuilder(Type::class)
             ->setMethods(['getSetAttributes'])
             ->disableOriginalConstructor()
             ->getMock();
@@ -236,7 +244,7 @@ public function testGenerateSimpleProducts()
             ->willReturn('new_attr_set_id');
         $this->productFactoryMock->expects($this->once())->method('create')->willReturn($newSimpleProductMock);
         $newSimpleProductMock->expects($this->once())->method('setStoreId')->with(0)->willReturnSelf();
-        $newSimpleProductMock->expects($this->once())->method('setTypeId')->with('simple')->willReturnSelf();
+        $newSimpleProductMock->expects($this->once())->method('setTypeId')->with($typeId)->willReturnSelf();
         $newSimpleProductMock->expects($this->once())
             ->method('setAttributeSetId')
             ->with('new_attr_set_id')
@@ -265,6 +273,27 @@ public function testGenerateSimpleProducts()
         $this->assertEquals(['product_id'], $this->model->generateSimpleProducts($parentProductMock, $productsData));
     }
 
+    /**
+     * @return array
+     */
+    public function dataProviderTestGenerateSimpleProducts()
+    {
+        return [
+            [
+                'weight' => 333,
+                'type_id' => Type::TYPE_SIMPLE,
+            ],
+            [
+                'weight' => '',
+                'type_id' => Type::TYPE_VIRTUAL,
+            ],
+            [
+                'weight' => null,
+                'type_id' => Type::TYPE_VIRTUAL,
+            ],
+        ];
+    }
+
     public function testProcessMediaGalleryWithImagesAndGallery()
     {
         $this->product->expects($this->atLeastOnce())->method('getMediaGallery')->with('images')->willReturn([]);