Remove strict typing for Mage_Catalog_Model_Product->setStockItem method and fix incorrect class instantiated in addStockStatusToProducts. Refs OpenMage#2066

Author: colinmollenhour

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;

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);
         }