Hotfix: core_store.store_id can be null (#4330)

* fix - store entity id null

* variable name [skip ci]

* added test

* test [skip ci]

* change

* test [skip ci]

Author: sreichel

.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
@@ -2460,11 +2455,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Catalog/Model/Resource/Product.php
 
-		-
-			message: "#^Parameter \\#1 \\$expression of class Zend_Db_Expr constructor expects string, int given\\.$#"
-			count: 2
-			path: app/code/core/Mage/Catalog/Model/Resource/Product.php
-
 		-
 			message: "#^Method Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media\\:\\:insertGallery\\(\\) should return int but returns string\\.$#"
 			count: 1
@@ -3115,11 +3105,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
@@ -3960,11 +3945,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Customer/Model/Session.php
 
-		-
-			message: "#^Parameter \\#3 \\$storeId of method Mage_Customer_Model_Customer\\:\\:sendNewAccountEmail\\(\\) expects string, int given\\.$#"
-			count: 3
-			path: app/code/core/Mage/Customer/controllers/AccountController.php
-
 		-
 			message: "#^Method Mage_Dataflow_Model_Batch\\:\\:setParams\\(\\) should return Mage_Dataflow_Model_Batch_Abstract but returns \\$this\\(Mage_Dataflow_Model_Batch\\)\\.$#"
 			count: 1
@@ -5140,11 +5120,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

app/code/core/Mage/Catalog/Model/Resource/Product.php

@@ -397,7 +397,7 @@ public function refreshEnabledIndex($store = null, $product = null)
 
             $selectFields = [
                 't_v_default.entity_id',
-                new Zend_Db_Expr($storeId),
+                new Zend_Db_Expr((string)$storeId),
                 $adapter->getCheckSql('t_v.value_id > 0', 't_v.value', 't_v_default.value'),
             ];
 
@@ -426,7 +426,7 @@ public function refreshEnabledIndex($store = null, $product = null)
 
             $selectFields = [
                 new Zend_Db_Expr($productId),
-                new Zend_Db_Expr($storeId),
+                new Zend_Db_Expr((string)$storeId),
                 $adapter->getCheckSql('t_v.value_id > 0', 't_v.value', 't_v_default.value')
             ];
 

app/code/core/Mage/Core/Model/Store.php

@@ -699,11 +699,12 @@ public function getStoreInUrl()
     /**
      * Get store identifier
      *
-     * @return int
+     * @return int|null
      */
     public function getId()
     {
-        return (int)$this->_getData('store_id');
+        $storeId = $this->_getData('store_id');
+        return is_null($storeId) ? null : (int)$storeId;
     }
 
     /**

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

tests/unit/Mage/Core/Model/StoreTest.php

@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Core\Model;
+
+use Generator;
+use Mage;
+use Mage_Core_Model_Store;
+use PHPUnit\Framework\TestCase;
+
+class StoreTest extends TestCase
+{
+    public Mage_Core_Model_Store $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        $this->subject = Mage::getModel('core/store');
+    }
+
+    /**
+     * @covers Mage_Core_Model_Store::getId()
+     * @dataProvider provideGetId
+     * @group Mage_Core
+     * @group Mage_Core_Model
+     */
+    public function testGetId(?int $expectedResult, ?string $withStore): void
+    {
+        if ($withStore) {
+            $this->subject->setData('store_id', $withStore);
+        }
+        $this->assertSame($expectedResult, $this->subject->getId());
+    }
+
+    public function provideGetId(): Generator
+    {
+        yield 'store id' => [
+            1,
+            '1',
+        ];
+        yield 'no store id' => [
+            null,
+            null,
+        ];
+    }
+}