Merge branch '2.4-develop-mainline' into optimize-authentication-popup

# Conflicts:
#	app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection/StorefrontCustomerSignInFormSection.xml

Author: engcom-Foxtrot

.github/PULL_REQUEST_TEMPLATE.md

@@ -43,4 +43,5 @@
  - [ ] Pull request has a meaningful description of its purpose
  - [ ] All commits are accompanied by meaningful commit messages
  - [ ] All new or changed code is covered with unit/integration tests (if applicable)
+ - [ ] README.md files for modified modules are updated and included in the pull request if any [README.md predefined sections](https://github.com/magento/devdocs/wiki/Magento-module-README.md) require an update
  - [ ] All automated tests passed successfully (all builds are green)

app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php

@@ -101,6 +101,8 @@ protected function _getConfigUrl()
      */
     public function getIdentity()
     {
+        // md5() here is not for cryptographic use.
+        // phpcs:ignore Magento2.Security.InsecureFunction
         return md5('BASE_URL' . $this->_getConfigUrl());
     }
 

app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php

@@ -62,6 +62,8 @@ protected function _getCacheTypesForRefresh()
      */
     public function getIdentity()
     {
+        // md5() here is not for cryptographic use.
+        // phpcs:ignore Magento2.Security.InsecureFunction
         return md5('cache' . implode(':', $this->_getCacheTypesForRefresh()));
     }
 

app/code/Magento/AsynchronousOperations/Model/ResourceModel/System/Message/Collection/Synchronized/Plugin.php

@@ -108,6 +108,8 @@ public function afterToArray(
                     'data' => [
                         'text' => __('Task "%1": ', $bulk->getDescription()) . $text,
                         'severity' => \Magento\Framework\Notification\MessageInterface::SEVERITY_MAJOR,
+                        // md5() here is not for cryptographic use.
+                        // phpcs:ignore Magento2.Security.InsecureFunction
                         'identity' => md5('bulk' . $bulkUuid),
                         'uuid' => $bulkUuid,
                         'status' => $bulkStatus,

app/code/Magento/Authorization/Model/Role.php

@@ -5,28 +5,32 @@
  */
 namespace Magento\Authorization\Model;
 
+use Magento\Authorization\Model\ResourceModel\Role\Collection;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Model\AbstractModel;
+
 /**
  * Admin Role Model
  *
  * @api
  * @method int getParentId()
- * @method \Magento\Authorization\Model\Role setParentId(int $value)
+ * @method Role setParentId(int $value)
  * @method int getTreeLevel()
- * @method \Magento\Authorization\Model\Role setTreeLevel(int $value)
+ * @method Role setTreeLevel(int $value)
  * @method int getSortOrder()
- * @method \Magento\Authorization\Model\Role setSortOrder(int $value)
+ * @method Role setSortOrder(int $value)
  * @method string getRoleType()
- * @method \Magento\Authorization\Model\Role setRoleType(string $value)
+ * @method Role setRoleType(string $value)
  * @method int getUserId()
- * @method \Magento\Authorization\Model\Role setUserId(int $value)
+ * @method Role setUserId(int $value)
  * @method string getUserType()
- * @method \Magento\Authorization\Model\Role setUserType(string $value)
+ * @method Role setUserType(string $value)
  * @method string getRoleName()
- * @method \Magento\Authorization\Model\Role setRoleName(string $value)
+ * @method Role setRoleName(string $value)
  * @api
  * @since 100.0.2
  */
-class Role extends \Magento\Framework\Model\AbstractModel
+class Role extends AbstractModel
 {
     /**
      * @var string
@@ -38,23 +42,6 @@ class Role extends \Magento\Framework\Model\AbstractModel
      */
     protected $_cacheTag = 'user_assigned_role';
 
-    /**
-     * @param \Magento\Framework\Model\Context $context
-     * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Authorization\Model\ResourceModel\Role $resource
-     * @param \Magento\Authorization\Model\ResourceModel\Role\Collection $resourceCollection
-     * @param array $data
-     */
-    public function __construct( //phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod
-        \Magento\Framework\Model\Context $context,
-        \Magento\Framework\Registry $registry,
-        \Magento\Authorization\Model\ResourceModel\Role $resource,
-        \Magento\Authorization\Model\ResourceModel\Role\Collection $resourceCollection,
-        array $data = []
-    ) {
-        parent::__construct($context, $registry, $resource, $resourceCollection, $data);
-    }
-
     /**
      * @inheritDoc
      */
@@ -70,31 +57,30 @@ public function __sleep()
     public function __wakeup()
     {
         parent::__wakeup();
-        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-        $this->_resource = $objectManager->get(\Magento\Authorization\Model\ResourceModel\Role::class);
-        $this->_resourceCollection = $objectManager->get(
-            \Magento\Authorization\Model\ResourceModel\Role\Collection::class
-        );
+        $objectManager = ObjectManager::getInstance();
+        $this->_resource = $objectManager->get(ResourceModel\Role::class);
+        $this->_resourceCollection = $objectManager->get(Collection::class);
     }
 
     /**
-     * Class constructor
-     *
-     * @return void
+     * @inheritdoc
      */
     protected function _construct()
     {
-        $this->_init(\Magento\Authorization\Model\ResourceModel\Role::class);
+        $this->_init(ResourceModel\Role::class);
     }
 
     /**
-     * Update object into database
+     * Obsolete method of update
      *
      * @return $this
+     * @deprecated Method was never implemented and used.
      */
     public function update()
     {
-        $this->getResource()->update($this);
+        // phpcs:disable Magento2.Functions.DiscouragedFunction
+        trigger_error('Method was never implemented and used.', E_USER_DEPRECATED);
+
         return $this;
     }