From 7a798f5643fef36fe53e3808a78a86990bf1c3a5 Mon Sep 17 00:00:00 2001
From: engcom-Dash <grp-engcom-vendorworker-Dash@adobe.com>
Date: Wed, 23 Oct 2024 18:36:59 +0530
Subject: [PATCH 1/3] 32311: Revert the change

---
 app/code/Magento/User/Controller/Adminhtml/User/Save.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Save.php b/app/code/Magento/User/Controller/Adminhtml/User/Save.php
index 72024a85bef13..a23a8a689ee70 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Save.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Save.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\User\Controller\Adminhtml\User;
@@ -34,9 +34,9 @@ private function getSecurityCookie()
     {
         if (!($this->securityCookie instanceof SecurityCookie)) {
             return \Magento\Framework\App\ObjectManager::getInstance()->get(SecurityCookie::class);
-        } else {
-            return $this->securityCookie;
         }
+
+        return $this->securityCookie;
     }
 
     /**

From b82edbfc802233749a470dd6ace0447e86379b1b Mon Sep 17 00:00:00 2001
From: engcom-Dash <grp-engcom-vendorworker-Dash@adobe.com>
Date: Thu, 24 Oct 2024 11:06:06 +0530
Subject: [PATCH 2/3] 32311: Fix PHPCS warning related to see tag

---
 app/code/Magento/User/Controller/Adminhtml/User/Save.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Save.php b/app/code/Magento/User/Controller/Adminhtml/User/Save.php
index a23a8a689ee70..0bc7ab462cace 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Save.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Save.php
@@ -29,6 +29,7 @@ class Save extends \Magento\User\Controller\Adminhtml\User implements HttpPostAc
      *
      * @return SecurityCookie
      * @deprecated 100.1.0
+     * @see Nothing
      */
     private function getSecurityCookie()
     {

From 2d803df4420ab471791e56fef6c2090715d1533e Mon Sep 17 00:00:00 2001
From: engcom-Charlie <engcom-vendorworker-charlie@adobe.com>
Date: Thu, 9 Jan 2025 15:07:47 +0530
Subject: [PATCH 3/3] Fixed static test fialure

---
 app/code/Magento/User/Controller/Adminhtml/User/Save.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Save.php b/app/code/Magento/User/Controller/Adminhtml/User/Save.php
index 0bc7ab462cace..d6b2562bb64b2 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Save.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Save.php
@@ -87,6 +87,7 @@ public function execute()
         $currentUserPasswordField = \Magento\User\Block\User\Edit\Tab\Main::CURRENT_USER_PASSWORD_FIELD;
         $isCurrentUserPasswordValid = isset($data[$currentUserPasswordField])
             && !empty($data[$currentUserPasswordField]) && is_string($data[$currentUserPasswordField]);
+        // @phpstan-ignore-next-line to avoid return statement is missing error in execute
         try {
             if (!($isCurrentUserPasswordValid)) {
                 throw new AuthenticationException(