Skip to content

Commit 0b3406d

Browse files
committed
ACP2E-2857: fix webapi, integration, static tests' errors
1 parent 3061b40 commit 0b3406d

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

app/code/Magento/Catalog/Setup/Patch/Data/UpdateDefaultSortyByBackendType.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
use Magento\Catalog\Setup\CategorySetupFactory;
2121
use Magento\Framework\Setup\ModuleDataSetupInterface;
2222
use Magento\Framework\Setup\Patch\DataPatchInterface;
23+
use Magento\Framework\Setup\Patch\PatchInterface;
2324

2425
class UpdateDefaultSortyByBackendType implements DataPatchInterface
2526
{
@@ -49,7 +50,7 @@ public function __construct(
4950
/**
5051
* @inheritdoc
5152
*/
52-
public function apply()
53+
public function apply(): UpdateDefaultSortyByBackendType
5354
{
5455
$mediaBackendModel = \Magento\Catalog\Model\Category\Attribute\Backend\DefaultSortby::class;
5556
/** @var CategorySetup $categorySetup */
@@ -60,6 +61,8 @@ public function apply()
6061
'backend_model',
6162
$mediaBackendModel
6263
);
64+
65+
return $this;
6366
}
6467

6568
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public function testComplexAttributeTypeResolver()
156156
'catalog_product'
157157
];
158158
$attributeTypes = [
159-
'String[]',
159+
'String',
160160
'String[]',
161161
'Int',
162162
'CatalogInventoryDataStockItemInterface[]',

dev/tests/integration/framework/Magento/TestFramework/ApplicationStateComparator/_files/state-skip-list.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@
314314
Magento\Catalog\Model\Category\Attribute\Backend\Image\Interceptor::class => null,
315315
Magento\Catalog\Model\Attribute\Backend\Startdate\Interceptor::class => null,
316316
Magento\Eav\Model\Entity\Attribute\Backend\Datetime\Interceptor::class => null,
317+
Magento\Catalog\Model\Category\Attribute\Backend\DefaultSortby\Interceptor::class => null,
317318
Magento\Catalog\Model\Category\Attribute\Backend\Sortby\Interceptor::class => null,
318319
Magento\Catalog\Model\Category\Attribute\Backend\LayoutUpdate\Interceptor::class => null,
319320
Magento\Catalog\Model\Attribute\Backend\Customlayoutupdate\Interceptor::class => null,

dev/tests/integration/testsuite/Magento/Eav/Model/TypeLocatorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public function getExpectedAttributeTypesProvider(): array
193193
'custom_design_to' => 'string',
194194
'available_sort_by' => 'string[]',
195195
'page_layout' => 'string',
196-
'default_sort_by' => 'string[]',
196+
'default_sort_by' => 'string',
197197
'filter_price_range' => 'double',
198198
'custom_layout_update' => 'string',
199199
]

0 commit comments

Comments
 (0)