Merge remote-tracking branch 'remotes/github/MAGETWO-92712' into EPAM-PR-64

Author: VeronikaYarats

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

@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Catalog\Model;
 
 use Magento\Catalog\Api\CategoryListInterface;
@@ -50,7 +53,7 @@ class CategoryList implements CategoryListInterface
      * @param JoinProcessorInterface $extensionAttributesJoinProcessor
      * @param CategorySearchResultsInterfaceFactory $categorySearchResultsFactory
      * @param CategoryRepositoryInterface $categoryRepository
-     * @param CollectionProcessorInterface $collectionProcessor
+     * @param CollectionProcessorInterface|null $collectionProcessor
      */
     public function __construct(
         CollectionFactory $categoryCollectionFactory,
@@ -74,12 +77,13 @@ public function getList(SearchCriteriaInterface $searchCriteria)
         /** @var Collection $collection */
         $collection = $this->categoryCollectionFactory->create();
         $this->extensionAttributesJoinProcessor->process($collection);
-
         $this->collectionProcessor->process($searchCriteria, $collection);
 
         $items = [];
-        foreach ($collection->getAllIds() as $id) {
-            $items[] = $this->categoryRepository->get($id);
+        foreach ($collection->getData() as $categoryData) {
+            $items[] = $this->categoryRepository->get(
+                $categoryData[$collection->getEntity()->getIdFieldName()]
+            );
         }
 
         /** @var CategorySearchResultsInterface $searchResult */

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

@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Catalog\Test\Unit\Model;
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
@@ -52,6 +55,9 @@ class CategoryListTest extends \PHPUnit\Framework\TestCase
      */
     private $collectionProcessorMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->categoryCollectionFactory = $this->getMockBuilder(CollectionFactory::class)
@@ -93,7 +99,12 @@ public function testGetList()
 
         $collection = $this->getMockBuilder(Collection::class)->disableOriginalConstructor()->getMock();
         $collection->expects($this->once())->method('getSize')->willReturn($totalCount);
-        $collection->expects($this->once())->method('getAllIds')->willReturn([$categoryIdFirst, $categoryIdSecond]);
+        $collection->expects($this->once())->method('getData')->willReturn(
+            [['entity_id' => $categoryIdFirst], ['entity_id' => $categoryIdSecond]]
+        );
+        $collection->expects($this->any())->method('getEntity')->willReturn(
+            new \Magento\Framework\DataObject(['id_field_name' => 'entity_id'])
+        );
 
         $this->collectionProcessorMock->expects($this->once())
             ->method('process')
@@ -106,10 +117,7 @@ public function testGetList()
 
         $this->categoryRepository->expects($this->exactly(2))
             ->method('get')
-            ->willReturnMap([
-                [$categoryIdFirst, $categoryFirst],
-                [$categoryIdSecond, $categorySecond],
-            ])
+            ->willReturnMap([[$categoryIdFirst, $categoryFirst], [$categoryIdSecond, $categorySecond]])
             ->willReturn($categoryFirst);
 
         $this->categorySearchResultsFactory->expects($this->once())->method('create')->willReturn($searchResult);

dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryListTest.php

@@ -3,11 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Catalog\Api;
 
 use Magento\Framework\Webapi\Rest\Request;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 
+/**
+ * Checks the categories/list api
+ */
 class CategoryListTest extends WebapiAbstract
 {
     const RESOURCE_PATH = '/V1/categories/list';
@@ -35,14 +41,11 @@ public function testGetList()
                             ],
                         ],
                     ],
+                ],
+                'sort_orders' => [
                     [
-                        'filters' => [
-                            [
-                                'field' => 'level',
-                                'value' => 2,
-                                'condition_type' => 'eq',
-                            ],
-                        ],
+                        'field' => 'name',
+                        'direction' => 'DESC',
                     ],
                 ],
                 'current_page' => 1,
@@ -69,9 +72,10 @@ public function testGetList()
 
         $this->assertEquals($searchCriteria['searchCriteria'], $response['search_criteria']);
         $this->assertTrue($response['total_count'] > 0);
-        $this->assertTrue(count($response['items']) > 0);
+        $this->assertTrue(count($response['items']) === 2);
 
         $this->assertNotNull($response['items'][0]['name']);
-        $this->assertEquals('Category 1', $response['items'][0]['name']);
+        $this->assertEquals('Category 1.1', $response['items'][0]['name']);
+        $this->assertEquals('Category 1', $response['items'][1]['name']);
     }
 }