Merge remote-tracking branch 'Den4ik/php8-fix-category-use-config-on-save' into platform-health

Author: xmav

app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php

@@ -168,7 +168,7 @@ public function execute()
             if (isset($categoryPostData['use_config']) && !empty($categoryPostData['use_config'])) {
                 foreach ($categoryPostData['use_config'] as $attributeCode => $attributeValue) {
                     if ($attributeValue) {
-                        $useConfig[] = $attributeValue;
+                        $useConfig[] = $attributeCode;
                         $category->setData($attributeCode, null);
                     }
                 }

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/NewCategoryDataProvider.php

@@ -3,8 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Ui\DataProvider\Product\Form;
 
+use Magento\Framework\Phrase;
 use Magento\Ui\DataProvider\AbstractDataProvider;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\Framework\UrlInterface;
@@ -47,7 +50,9 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * Get data
+     *
+     * @return array
      * @since 101.0.0
      */
     public function getData()
@@ -60,7 +65,10 @@ public function getData()
                         'is_active' => 1,
                         'include_in_menu' => 1,
                         'return_session_messages_only' => 1,
-                        'use_config' => ['available_sort_by', 'default_sort_by']
+                        'use_config' => [
+                            'available_sort_by' => true,
+                            'default_sort_by' => true
+                        ]
                     ]
                 ]
             ]
@@ -70,7 +78,9 @@ public function getData()
     }
 
     /**
-     * {@inheritdoc}
+     * Get meta
+     *
+     * @return array
      * @since 101.0.0
      */
     public function getMeta()
@@ -91,7 +101,7 @@ public function getMeta()
     /**
      * Get notice message
      *
-     * @return \Magento\Framework\Phrase
+     * @return Phrase
      * @since 101.0.0
      */
     protected function getNotice()