Merge branch 'MC-30260' of https://github.com/magento-tango/magento2ce into Tango-PR-01-24-2020-24

Author: Roman Lytvynenko

app/code/Magento/CatalogWidget/Block/Product/ProductsList.php

@@ -373,9 +373,9 @@ private function updateAnchorCategoryConditions(array $condition): array
                 return $condition;
             }
 
-            if ($category->getIsAnchor() && $category->getChildren()) {
-                $children = explode(',', $category->getChildren());
-
+            $children = $category->getIsAnchor() ? $category->getChildren(true) : [];
+            if ($children) {
+                $children = explode(',', $children);
                 $condition['operator'] = "()";
                 $condition['value'] = array_merge([$categoryId], $children);
             }

dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_nested_anchor_categories.php

@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$categories = [
+    [
+        'id' => 444,
+        'parentId' => 2,
+        'level' => 2,
+        'path' => '1/2/3'
+    ],
+    [
+        'id' => 445,
+        'parentId' => 444,
+        'level' => 3,
+        'path' => '1/2/3/4'
+    ],
+    [
+        'id' => 446,
+        'parentId' => 445,
+        'level' => 4,
+        'path' => '1/2/3/4/5'
+    ],
+];
+
+$products = [
+    [
+        'id' => 444,
+        'categoryIDs' => [446]
+    ],
+    [
+        'id' => 445,
+        'categoryIDs' => [446]
+    ]
+];
+
+foreach ($categories as $category) {
+    $categoryModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+        ->create(\Magento\Catalog\Model\Category::class);
+    $categoryModel->isObjectNew(true);
+    $categoryModel->setId($category['id'])
+        ->setName('Category ' . $category['id'])
+        ->setParentId($category['parentId'])
+        ->setPath($category['path'])
+        ->setLevel($category['level'])
+        ->setAvailableSortBy('name')
+        ->setDefaultSortBy('name')
+        ->setIsActive(true)
+        ->setPosition(1)
+        ->setAvailableSortBy(['position'])
+        ->save();
+}
+
+foreach ($products as $product) {
+    /** @var $product \Magento\Catalog\Model\Product */
+    $productModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+        ->create(\Magento\Catalog\Model\Product::class);
+    $productModel->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+        ->setId($product['id'])
+        ->setAttributeSetId(4)
+        ->setStoreId(1)
+        ->setWebsiteIds([1])
+        ->setName('Simple Product ' . $product['id'])
+        ->setSku('simple' . $product['id'])
+        ->setPrice(10)
+        ->setWeight(18)
+        ->setStockData(['use_config_manage_stock' => 0])
+        ->setCategoryIds($product['categoryIDs'])
+        ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+        ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+        ->save();
+}

dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_nested_anchor_categories_rollback.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$categoryIDs = [444, 445, 446];
+$productIDs = [444, 445];
+
+foreach ($productIDs as $productID) {
+    /** @var $product \Magento\Catalog\Model\Product */
+    $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+        ->create(\Magento\Catalog\Model\Product::class);
+    $product->load($productID);
+    if ($product->getId()) {
+        $product->delete();
+    }
+}
+
+foreach ($categoryIDs as $categoryID) {
+    /** @var $category \Magento\Catalog\Model\Category */
+    $category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+        ->create(\Magento\Catalog\Model\Category::class);
+    $category->load($categoryID);
+    if ($category->getId()) {
+        $category->delete();
+    }
+}

dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php

@@ -222,7 +222,7 @@ public function testProductListWithDateAttribute()
      * 4. Load collection for product list widget and make sure that number of loaded products is correct
      *
      * @magentoDbIsolation disabled
-     * @magentoDataFixture Magento/Catalog/_files/product_in_multiple_categories.php
+     * @magentoDataFixture Magento/Catalog/_files/product_in_nested_anchor_categories.php
      */
     public function testCreateAnchorCollection()
     {