change

sreichel · Nov 3, 2024 · c30f9bf · c30f9bf
1 parent c90f5f3
commit c30f9bf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 19 deletions.
diff --git a/.phpstan.dist.baseline.neon b/.phpstan.dist.baseline.neon
@@ -690,11 +690,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php
 
-		-
-			message: "#^Parameter \\#3 \\$storeId of method Mage_Customer_Model_Customer\\:\\:sendNewAccountEmail\\(\\) expects string, int given\\.$#"
-			count: 1
-			path: app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php
-
 		-
 			message: "#^Variable \\$billingAddress might not be defined\\.$#"
 			count: 2
@@ -3115,11 +3110,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Checkout/Model/Type/Onepage.php
 
-		-
-			message: "#^Parameter \\#3 \\$storeId of method Mage_Customer_Model_Customer\\:\\:sendNewAccountEmail\\(\\) expects string, int given\\.$#"
-			count: 2
-			path: app/code/core/Mage/Checkout/Model/Type/Onepage.php
-
 		-
 			message: "#^Property Mage_Checkout_Model_Type_Onepage\\:\\:\\$_quote \\(Mage_Sales_Model_Quote\\) on left side of \\?\\? is not nullable\\.$#"
 			count: 1
@@ -5135,11 +5125,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Paypal/Model/Express/Checkout.php
 
-		-
-			message: "#^Parameter \\#3 \\$storeId of method Mage_Customer_Model_Customer\\:\\:sendNewAccountEmail\\(\\) expects string, int given\\.$#"
-			count: 2
-			path: app/code/core/Mage/Paypal/Model/Express/Checkout.php
-
 		-
 			message: "#^Variable \\$shippingAddress might not be defined\\.$#"
 			count: 1

diff --git a/app/code/core/Mage/Customer/Model/Customer.php b/app/code/core/Mage/Customer/Model/Customer.php
@@ -717,7 +717,7 @@ public function isAddressPrimary(Mage_Customer_Model_Address $address)
      *
      * @param string $type
      * @param string $backUrl
-     * @param string $storeId
+     * @param string|int $storeId
      * @param string $password
      * @throws Mage_Core_Exception
      * @return $this

diff --git a/app/code/core/Mage/Customer/controllers/AccountController.php b/app/code/core/Mage/Customer/controllers/AccountController.php
@@ -334,7 +334,7 @@ protected function _successProcessRegistration(Mage_Customer_Model_Customer $cus
             $customer->sendNewAccountEmail(
                 'confirmation',
                 $session->getBeforeAuthUrl(),
-                (string)$store->getId(),
+                $store->getId(),
                 $this->getRequest()->getPost('password')
             );
             /** @var Helper $customerHelper */
@@ -576,7 +576,7 @@ protected function _welcomeCustomer(Mage_Customer_Model_Customer $customer, $isJ
         $customer->sendNewAccountEmail(
             $isJustConfirmed ? 'confirmed' : 'registered',
             '',
-            (string)Mage::app()->getStore()->getId(),
+            Mage::app()->getStore()->getId(),
             $this->getRequest()->getPost('password')
         );
 
@@ -666,7 +666,7 @@ public function confirmationAction()
                     throw new Exception('');
                 }
                 if ($customer->getConfirmation()) {
-                    $customer->sendNewAccountEmail('confirmation', '', (string)Mage::app()->getStore()->getId());
+                    $customer->sendNewAccountEmail('confirmation', '', Mage::app()->getStore()->getId());
                     $this->_getSession()->addSuccess($this->__('Please, check your email for confirmation key.'));
                 } else {
                     $this->_getSession()->addSuccess($this->__('This email does not require confirmation.'));