MAGETWO-93628: Shopping cart is emptied after reset password procedure

Author: dhorytskyi

app/code/Magento/Customer/Model/AccountManagement.php

@@ -1066,10 +1066,7 @@ public function validate(CustomerInterface $customer)
         $result = $this->getEavValidator()->isValid($customerModel);
         if ($result === false && is_array($this->getEavValidator()->getMessages())) {
             return $validationResults->setIsValid(false)->setMessages(
-                call_user_func_array(
-                    'array_merge',
-                    $this->getEavValidator()->getMessages()
-                )
+                array_merge(...$this->getEavValidator()->getMessages())
             );
         }
         return $validationResults->setIsValid(true)->setMessages([]);

app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php

@@ -1238,8 +1238,7 @@ public function testInitiatePasswordResetEmailReminder()
 
         $storeId = 1;
 
-        mt_srand(mt_rand() + (100000000 * (float)microtime()) % PHP_INT_MAX);
-        $hash = md5(uniqid(microtime() . mt_rand(0, mt_getrandmax()), true));
+        $hash = hash('sha256', microtime() . random_int(PHP_INT_MIN, PHP_INT_MAX));
 
         $this->emailNotificationMock->expects($this->once())
             ->method('passwordReminder')
@@ -1263,8 +1262,7 @@ public function testInitiatePasswordResetEmailReset()
         $templateIdentifier = 'Template Identifier';
         $sender = 'Sender';
 
-        mt_srand(mt_rand() + (100000000 * (float)microtime()) % PHP_INT_MAX);
-        $hash = md5(uniqid(microtime() . mt_rand(0, mt_getrandmax()), true));
+        $hash = hash('sha256', microtime() . random_int(PHP_INT_MIN, PHP_INT_MAX));
 
         $this->emailNotificationMock->expects($this->once())
             ->method('passwordResetConfirmation')
@@ -1288,8 +1286,7 @@ public function testInitiatePasswordResetNoTemplate()
         $templateIdentifier = 'Template Identifier';
         $sender = 'Sender';
 
-        mt_srand(mt_rand() + (100000000 * (float)microtime()) % PHP_INT_MAX);
-        $hash = md5(uniqid(microtime() . mt_rand(0, mt_getrandmax()), true));
+        $hash = hash('sha256', microtime() . random_int(PHP_INT_MIN, PHP_INT_MAX));
 
         $this->prepareInitiatePasswordReset($email, $templateIdentifier, $sender, $storeId, $customerId, $hash);