Update fixes

Author: mrtuvn

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

@@ -17,6 +17,7 @@
 use Magento\Framework\Reflection\DataObjectProcessor;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Customer\Model\Data\CustomerSecure;
 
 /**
  * Customer email notification
@@ -126,7 +127,7 @@ public function __construct(
         $this->customerViewHelper = $customerViewHelper;
         $this->dataProcessor = $dataProcessor;
         $this->scopeConfig = $scopeConfig;
-        $this->senderResolver = $senderResolver ?: ObjectManager::getInstance()->get(SenderResolverInterface::class);
+        $this->senderResolver = $senderResolver ?? ObjectManager::getInstance()->get(SenderResolverInterface::class);
     }
 
     /**
@@ -141,7 +142,7 @@ public function credentialsChanged(
         CustomerInterface $savedCustomer,
         $origCustomerEmail,
         $isPasswordChanged = false
-    ) {
+    ): void {
         if ($origCustomerEmail != $savedCustomer->getEmail()) {
             if ($isPasswordChanged) {
                 $this->emailAndPasswordChanged($savedCustomer, $origCustomerEmail);
@@ -166,7 +167,7 @@ public function credentialsChanged(
      * @param string $email
      * @return void
      */
-    private function emailAndPasswordChanged(CustomerInterface $customer, $email)
+    private function emailAndPasswordChanged(CustomerInterface $customer, $email): void
     {
         $storeId = $customer->getStoreId();
         if (!$storeId) {
@@ -192,7 +193,7 @@ private function emailAndPasswordChanged(CustomerInterface $customer, $email)
      * @param string $email
      * @return void
      */
-    private function emailChanged(CustomerInterface $customer, $email)
+    private function emailChanged(CustomerInterface $customer, $email): void
     {
         $storeId = $customer->getStoreId();
         if (!$storeId) {
@@ -217,7 +218,7 @@ private function emailChanged(CustomerInterface $customer, $email)
      * @param CustomerInterface $customer
      * @return void
      */
-    private function passwordReset(CustomerInterface $customer)
+    private function passwordReset(CustomerInterface $customer): void
     {
         $storeId = $customer->getStoreId();
         if (!$storeId) {
@@ -254,7 +255,7 @@ private function sendEmailTemplate(
         $templateParams = [],
         $storeId = null,
         $email = null
-    ) {
+    ): void {
         $templateId = $this->scopeConfig->getValue($template, ScopeInterface::SCOPE_STORE, $storeId);
         if ($email === null) {
             $email = $customer->getEmail();
@@ -280,15 +281,15 @@ private function sendEmailTemplate(
      * Create an object with data merged from Customer and CustomerSecure
      *
      * @param CustomerInterface $customer
-     * @return \Magento\Customer\Model\Data\CustomerSecure
+     * @return CustomerSecure
      */
-    private function getFullCustomerObject($customer)
+    private function getFullCustomerObject($customer): CustomerSecure
     {
         // No need to flatten the custom attributes or nested objects since the only usage is for email templates and
         // object passed for events
         $mergedCustomerData = $this->customerRegistry->retrieveSecureData($customer->getId());
         $customerData = $this->dataProcessor
-            ->buildOutputDataArray($customer, \Magento\Customer\Api\Data\CustomerInterface::class);
+            ->buildOutputDataArray($customer, CustomerInterface::class);
         $mergedCustomerData->addData($customerData);
         $mergedCustomerData->setData('name', $this->customerViewHelper->getCustomerName($customer));
         return $mergedCustomerData;
@@ -301,7 +302,7 @@ private function getFullCustomerObject($customer)
      * @param int|string|null $defaultStoreId
      * @return int
      */
-    private function getWebsiteStoreId($customer, $defaultStoreId = null)
+    private function getWebsiteStoreId($customer, $defaultStoreId = null): int
     {
         if ($customer->getWebsiteId() != 0 && empty($defaultStoreId)) {
             $storeIds = $this->storeManager->getWebsite($customer->getWebsiteId())->getStoreIds();
@@ -316,7 +317,7 @@ private function getWebsiteStoreId($customer, $defaultStoreId = null)
      * @param CustomerInterface $customer
      * @return void
      */
-    public function passwordReminder(CustomerInterface $customer)
+    public function passwordReminder(CustomerInterface $customer): void
     {
         $storeId = $customer->getStoreId();
         if (!$storeId) {
@@ -340,7 +341,7 @@ public function passwordReminder(CustomerInterface $customer)
      * @param CustomerInterface $customer
      * @return void
      */
-    public function passwordResetConfirmation(CustomerInterface $customer)
+    public function passwordResetConfirmation(CustomerInterface $customer): void
     {
         $storeId = $customer->getStoreId();
         if (!$storeId) {
@@ -375,7 +376,7 @@ public function newAccount(
         $backUrl = '',
         $storeId = 0,
         $sendemailStoreId = null
-    ) {
+    ): void {
         $types = self::TEMPLATE_TYPES;
 
         if (!isset($types[$type])) {

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

@@ -37,7 +37,7 @@ class EmailNotificationTest extends TestCase
 
     private const STUB_EMAIL_IDENTIFIER = 'Template Identifier';
 
-    private const STUB_Sender = 'Sender';
+    private const STUB_SENDER = 'Sender';
 
     /**
      * @var \Magento\Customer\Model\CustomerRegistry|MockObject