From 9b539e3078601e14320f7d86dbaf2fc6353ad6b0 Mon Sep 17 00:00:00 2001 From: Colin Mollenhour Date: Thu, 9 Jun 2022 15:11:49 -0700 Subject: [PATCH] Remove strict typing for Mage_Catalog_Model_Product->setStockItem method and fix incorrect class instantiated in addStockStatusToProducts. Refs #2066 (#2208) --- app/code/core/Mage/Catalog/Model/Product.php | 4 ++-- app/code/core/Mage/CatalogInventory/Model/Stock/Status.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/code/core/Mage/Catalog/Model/Product.php b/app/code/core/Mage/Catalog/Model/Product.php index 176f82028e9..03b59086312 100644 --- a/app/code/core/Mage/Catalog/Model/Product.php +++ b/app/code/core/Mage/Catalog/Model/Product.php @@ -713,10 +713,10 @@ public function hasStockItem() } /** - * @param Mage_CatalogInventory_Model_Stock_Item $stockItem + * @param Varien_Object|Mage_CatalogInventory_Model_Stock_Item $stockItem * @return $this */ - public function setStockItem(Mage_CatalogInventory_Model_Stock_Item $stockItem) + public function setStockItem($stockItem) { $this->_stockItem = $stockItem; return $this; diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php index 453fc68ebc1..5328c9c283a 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php +++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php @@ -493,7 +493,7 @@ public function addStockStatusToProducts($productCollection, $websiteId = null, /* back compatible stock item */ foreach ($productCollection as $product) { - $object = new Varien_Object(array('is_in_stock' => $product->getData('is_salable'))); + $object = Mage::getModel('cataloginventory/stock_item', ['is_in_stock' => $product->getData('is_salable')]); $product->setStockItem($object); }