Merge remote-tracking branch '38433/38384-productrepository-getbyid-cachekey' into community_prs_april

Author: Indraniks

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -307,7 +307,7 @@ public function get($sku, $editMode = false, $storeId = null, $forceReload = fal
      */
     public function getById($productId, $editMode = false, $storeId = null, $forceReload = false)
     {
-        $cacheKey = $this->getCacheKey([$editMode, $storeId]);
+        $cacheKey = $this->getCacheKey([$editMode, $storeId === null ? $storeId : (int) $storeId]);
         if (!isset($this->instancesById[$productId][$cacheKey]) || $forceReload) {
             $product = $this->productFactory->create();
             if ($editMode) {

app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php

@@ -969,24 +969,13 @@ public function cacheKeyDataProvider(): array
             [
                 'identifier' => 25,
                 'editMode' => true,
-                'storeId' => $anyObject
+                'storeId' => '1'
             ],
             [
                 'identifier' => 'test-sku',
                 'editMode' => true,
-                'storeId' => $anyObject
+                'storeId' => 1
             ],
-            [
-                'identifier' => 25,
-                'editMode' => false,
-                'storeId' => $anyObject
-            ],
-            [
-
-                'identifier' => 'test-sku',
-                'editMode' => false,
-                'storeId' => $anyObject
-            ]
         ];
     }