Skip to content

Commit 1a06923

Browse files
ENGCOM-9100: #32596: Category Update API resets available_sort_by to use config value. #33001
2 parents 300b5d1 + 6cea93c commit 1a06923

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,7 @@ public function getAvailableSortBy()
10371037
{
10381038
$available = $this->getData(self::KEY_AVAILABLE_SORT_BY);
10391039
if (empty($available)) {
1040-
return [];
1040+
return null;
10411041
}
10421042
if ($available && !is_array($available)) {
10431043
$available = explode(',', $available);

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoryTreeTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public function testCategoriesTree()
105105
$baseCategory['children'][0]['children'][1]['description']
106106
);
107107
$this->assertEquals('default-category', $baseCategory['url_key']);
108-
$this->assertEquals([], $baseCategory['children'][0]['available_sort_by']);
108+
$this->assertEquals(null, $baseCategory['children'][0]['available_sort_by']);
109109
$this->assertEquals('name', $baseCategory['children'][0]['default_sort_by']);
110110
$this->assertCount(7, $baseCategory['children']);
111111
$this->assertCount(2, $baseCategory['children'][0]['children']);
@@ -164,7 +164,7 @@ public function testRootCategoryTree()
164164
$baseCategory['children'][0]['children'][1]['description']
165165
);
166166
$this->assertEquals('default-category', $baseCategory['url_key']);
167-
$this->assertEquals([], $baseCategory['children'][0]['available_sort_by']);
167+
$this->assertEquals(null, $baseCategory['children'][0]['available_sort_by']);
168168
$this->assertEquals('name', $baseCategory['children'][0]['default_sort_by']);
169169
$this->assertCount(7, $baseCategory['children']);
170170
$this->assertCount(2, $baseCategory['children'][0]['children']);

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public function testCategoriesTree()
111111
$responseDataObject->getData('category/url_key')
112112
);
113113
self::assertEquals(
114-
[],
114+
null,
115115
$responseDataObject->getData('category/children/0/available_sort_by')
116116
);
117117
self::assertEquals(
@@ -185,7 +185,7 @@ public function testRootCategoryTree()
185185
$responseDataObject->getData('category/url_key')
186186
);
187187
self::assertEquals(
188-
[],
188+
null,
189189
$responseDataObject->getData('category/children/0/available_sort_by')
190190
);
191191
self::assertEquals(

dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ public function testGetProductCount(): void
273273

274274
public function testGetAvailableSortBy(): void
275275
{
276-
$this->assertEquals([], $this->_model->getAvailableSortBy());
276+
$this->assertEquals(null, $this->_model->getAvailableSortBy());
277277
$this->_model->setData('available_sort_by', 'test,and,test');
278278
$this->assertEquals(['test', 'and', 'test'], $this->_model->getAvailableSortBy());
279279
}

0 commit comments

Comments
 (0)