Merge branch '2.4-develop' into issue-27954/forgot-password

Author: engcom-Charlie

.github/stale.yml

@@ -1,7 +1,7 @@
 # Configuration for probot-stale - https://github.com/probot/stale
 
 # Number of days of inactivity before an Issue or Pull Request becomes stale
- daysUntilStale: 76
+daysUntilStale: 76
 
 # Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
 # Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
@@ -18,7 +18,7 @@ exemptLabels:
   - "Progress: dev in progress"
   - "Progress: PR in progress"
   - "Progress: done"
-  - "B2B: GraphQL"   
+  - "B2B: GraphQL"
   - "Progress: PR Created"
   - "PAP"
   - "Project: Login as Customer"

app/code/Magento/AdminNotification/Block/ToolbarEntry.php

@@ -10,7 +10,6 @@
  * Toolbar entry that shows latest notifications
  *
  * @api
- * @author      Magento Core Team <[email protected]>
  * @since 100.0.2
  */
 class ToolbarEntry extends \Magento\Backend\Block\Template

app/code/Magento/AdminNotification/Model/Feed.php

@@ -12,7 +12,6 @@
 /**
  * AdminNotification Feed model
  *
- * @author      Magento Core Team <[email protected]>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  * @since 100.0.2

app/code/Magento/AdminNotification/Model/InboxInterface.php

@@ -8,7 +8,6 @@
 /**
  * AdminNotification Inbox interface
  *
- * @author Magento Core Team <[email protected]>
  * @api
  * @since 100.0.2
  */

app/code/Magento/AdminNotification/Model/NotificationService.php

@@ -8,7 +8,6 @@
 /**
  * Notification service model
  *
- * @author      Magento Core Team <[email protected]>
  * @api
  * @since 100.0.2
  */

app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php

@@ -6,8 +6,6 @@
 
 /**
  * AdminNotification Inbox model
- *
- * @author      Magento Core Team <[email protected]>
  */
 namespace Magento\AdminNotification\Model\ResourceModel\Grid;
 

app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php

@@ -9,8 +9,6 @@
  * AdminNotification Inbox model
  *
  * @api
- * @author      Magento Core Team <[email protected]>
- * @api
  * @since 100.0.2
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection

app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Unread.php

@@ -6,8 +6,6 @@
 
 /**
  * Collection of unread notifications
- *
- * @author      Magento Core Team <[email protected]>
  */
 namespace Magento\AdminNotification\Model\ResourceModel\Inbox\Collection;
 

app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php

@@ -9,8 +9,7 @@
 
 /**
  * AdminNotification observer
- *
- * @author      Magento Core Team <[email protected]>
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class PredispatchAdminActionControllerObserver implements ObserverInterface
 {

app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Edit.php

@@ -9,7 +9,6 @@
  * Search queries relations grid container
  *
  * @api
- * @author     Magento Core Team <[email protected]>
  * @since 100.0.2
  */
 class Edit extends \Magento\Backend\Block\Widget\Grid\Container

app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Grid.php

@@ -9,7 +9,6 @@
  * Search query relations edit grid
  *
  * @api
- * @author     Magento Core Team <[email protected]>
  * @since 100.0.2
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid

app/code/Magento/AdvancedSearch/Model/ResourceModel/Recommendations.php

@@ -8,7 +8,6 @@
 /**
  * Catalog search recommendations resource model
  *
- * @author      Magento Core Team <[email protected]>
  * @api
  * @since 100.0.2
  */

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

@@ -7,10 +7,16 @@
 
 namespace Magento\Catalog\Model;
 
+use Magento\Catalog\Model\CategoryRepository\PopulateWithValues;
+use Magento\Catalog\Model\ResourceModel\Category as CategoryResource;
+use Magento\Framework\Api\ExtensibleDataObjectConverter;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
 use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Repository for categories.
@@ -25,27 +31,27 @@ class CategoryRepository implements \Magento\Catalog\Api\CategoryRepositoryInter
     protected $instances = [];
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $storeManager;
 
     /**
-     * @var \Magento\Catalog\Model\CategoryFactory
+     * @var CategoryFactory
      */
     protected $categoryFactory;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Category
+     * @var CategoryResource
      */
     protected $categoryResource;
 
     /**
-     * @var \Magento\Framework\EntityManager\MetadataPool
+     * @var MetadataPool
      */
     protected $metadataPool;
 
     /**
-     * @var \Magento\Framework\Api\ExtensibleDataObjectConverter
+     * @var ExtensibleDataObjectConverter
      */
     private $extensibleDataObjectConverter;
 
@@ -57,28 +63,37 @@ class CategoryRepository implements \Magento\Catalog\Api\CategoryRepositoryInter
     protected $useConfigFields = ['available_sort_by', 'default_sort_by', 'filter_price_range'];
 
     /**
-     * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
-     * @param \Magento\Catalog\Model\ResourceModel\Category $categoryResource
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @var PopulateWithValues
+     */
+    private $populateWithValues;
+
+    /**
+     * @param CategoryFactory $categoryFactory
+     * @param CategoryResource $categoryResource
+     * @param StoreManagerInterface $storeManager
+     * @param PopulateWithValues|null $populateWithValues
      */
     public function __construct(
-        \Magento\Catalog\Model\CategoryFactory $categoryFactory,
-        \Magento\Catalog\Model\ResourceModel\Category $categoryResource,
-        \Magento\Store\Model\StoreManagerInterface $storeManager
+        CategoryFactory $categoryFactory,
+        CategoryResource $categoryResource,
+        StoreManagerInterface $storeManager,
+        ?PopulateWithValues $populateWithValues
     ) {
         $this->categoryFactory = $categoryFactory;
         $this->categoryResource = $categoryResource;
         $this->storeManager = $storeManager;
+        $objectManager = ObjectManager::getInstance();
+        $this->populateWithValues = $populateWithValues ?? $objectManager->get(PopulateWithValues::class);
     }
 
     /**
      * @inheritdoc
      */
-    public function save(\Magento\Catalog\Api\Data\CategoryInterface $category)
+    public function save(CategoryInterface $category)
     {
         $storeId = (int)$this->storeManager->getStore()->getId();
         $existingData = $this->getExtensibleDataObjectConverter()
-            ->toNestedArray($category, [], \Magento\Catalog\Api\Data\CategoryInterface::class);
+            ->toNestedArray($category, [], CategoryInterface::class);
         $existingData = array_diff_key($existingData, array_flip(['path', 'level', 'parent_id']));
         $existingData['store_id'] = $storeId;
 
@@ -110,7 +125,7 @@ public function save(\Magento\Catalog\Api\Data\CategoryInterface $category)
             $existingData['parent_id'] = $parentId;
             $existingData['level'] = null;
         }
-        $category->addData($existingData);
+        $this->populateWithValues->execute($category, $existingData);
         try {
             $this->validateCategory($category);
             $this->categoryResource->save($category);
@@ -151,7 +166,7 @@ public function get($categoryId, $storeId = null)
     /**
      * @inheritdoc
      */
-    public function delete(\Magento\Catalog\Api\Data\CategoryInterface $category)
+    public function delete(CategoryInterface $category)
     {
         try {
             $categoryId = $category->getId();
@@ -213,29 +228,29 @@ protected function validateCategory(Category $category)
     /**
      * Lazy loader for the converter.
      *
-     * @return \Magento\Framework\Api\ExtensibleDataObjectConverter
+     * @return ExtensibleDataObjectConverter
      *
      * @deprecated 101.0.0
      */
     private function getExtensibleDataObjectConverter()
     {
         if ($this->extensibleDataObjectConverter === null) {
-            $this->extensibleDataObjectConverter = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Framework\Api\ExtensibleDataObjectConverter::class);
+            $this->extensibleDataObjectConverter = ObjectManager::getInstance()
+                ->get(ExtensibleDataObjectConverter::class);
         }
         return $this->extensibleDataObjectConverter;
     }
 
     /**
      * Lazy loader for the metadata pool.
      *
-     * @return \Magento\Framework\EntityManager\MetadataPool
+     * @return MetadataPool
      */
     private function getMetadataPool()
     {
         if (null === $this->metadataPool) {
-            $this->metadataPool = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Framework\EntityManager\MetadataPool::class);
+            $this->metadataPool = ObjectManager::getInstance()
+                ->get(MetadataPool::class);
         }
         return $this->metadataPool;
     }