Replaced Mysql4 class names

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php

@@ -166,7 +166,7 @@ public function getGroupTreeJson()
         $items = [];
         $setId = $this->_getSetId();
 
-        /** @var Mage_Eav_Model_Mysql4_Entity_Attribute_Group_Collection $groups */
+        /** @var Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection $groups */
         $groups = Mage::getModel('eav/entity_attribute_group')
             ->getResourceCollection()
             ->setAttributeSetFilter($setId)

app/code/core/Mage/Adminhtml/Block/Cms/Block/Widget/Chooser.php

@@ -98,8 +98,8 @@ function (grid, event) {
      */
     protected function _prepareCollection()
     {
+        /** @var Mage_Cms_Model_Resource_Block_Collection $collection */
         $collection = Mage::getModel('cms/block')->getCollection();
-        /** @var Mage_Cms_Model_Mysql4_Block_Collection $collection */
         $this->setCollection($collection);
         return parent::_prepareCollection();
     }

app/code/core/Mage/Adminhtml/Block/Cms/Page/Widget/Chooser.php

@@ -97,8 +97,8 @@ function (grid, event) {
      */
     protected function _prepareCollection()
     {
+        /** @var Mage_Cms_Model_Resource_Page_Collection $collection */
         $collection = Mage::getModel('cms/page')->getCollection();
-        /** @var Mage_Cms_Model_Mysql4_Page_Collection $collection */
         $collection->setFirstStoreFlag(true);
         $this->setCollection($collection);
 

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php

@@ -190,7 +190,7 @@ public function getGridUrl()
      */
     protected function _addColumnFilterToCollection($column)
     {
-        /** @var Mage_Wishlist_Model_Mysql4_Item_Collection $collection */
+        /** @var Mage_Wishlist_Model_Resource_Item_Collection $collection */
         $collection = $this->getCollection();
         $value = $column->getFilter()->getValue();
         if ($collection && $value) {

app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php

@@ -47,10 +47,10 @@ public function __construct()
      */
     protected function _prepareCollection()
     {
+        /** @var Mage_Log_Model_Resource_Visitor_Online_Collection $collection */
         $collection = Mage::getModel('log/visitor_online')
             ->prepare()
             ->getCollection();
-        /** @var Mage_Log_Model_Mysql4_Visitor_Online_Collection $collection */
         $collection->addCustomerData();
 
         $this->setCollection($collection);

app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Most.php

@@ -38,7 +38,7 @@ public function __construct()
     protected function _prepareCollection()
     {
         $collection = Mage::getResourceModel('reports/order_collection');
-        /** @var Mage_Reports_Model_Mysql4_Order_Collection $collection */
+        /** @var Mage_Reports_Model_Resource_Order_Collection $collection */
         $collection
             ->groupByCustomer()
             ->addOrdersCount()

app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php

@@ -41,7 +41,7 @@ protected function _prepareLayout()
         $isFilter = $this->getRequest()->getParam('store') || $this->getRequest()->getParam('website') || $this->getRequest()->getParam('group');
         $period = $this->getRequest()->getParam('period', '24h');
 
-        /** @var Mage_Reports_Model_Mysql4_Order_Collection $collection */
+        /** @var Mage_Reports_Model_Resource_Order_Collection $collection */
         $collection = Mage::getResourceModel('reports/order_collection')
             ->addCreateAtPeriodFilter($period)
             ->calculateTotals($isFilter);

app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php

@@ -31,7 +31,7 @@ class Mage_Adminhtml_Block_Newsletter_Subscriber extends Mage_Adminhtml_Block_Te
     /**
      * Queue collection
      *
-     * @var Mage_Newsletter_Model_Mysql4_Queue_Collection
+     * @var Mage_Newsletter_Model_Resource_Queue_Collection
      */
     protected $_queueCollection = null;
 
@@ -59,7 +59,7 @@ protected function _beforeToHtml()
     /**
      * Return queue collection with loaded neversent queues
      *
-     * @return Mage_Newsletter_Model_Mysql4_Queue_Collection
+     * @return Mage_Newsletter_Model_Resource_Queue_Collection
      */
     public function getQueueCollection()
     {

app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php

@@ -48,7 +48,7 @@ public function __construct()
      */
     protected function _prepareCollection()
     {
-        /** @var Mage_CatalogRule_Model_Mysql4_Rule_Collection $collection */
+        /** @var Mage_CatalogRule_Model_Resource_Rule_Collection $collection */
         $collection = Mage::getModel('catalogrule/rule')
             ->getResourceCollection();
         $collection->addWebsitesToResult();

app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php

@@ -48,7 +48,7 @@ public function __construct()
      */
     protected function _prepareCollection()
     {
-        /** @var Mage_SalesRule_Model_Mysql4_Rule_Collection $collection  */
+        /** @var Mage_SalesRule_Model_Resource_Rule_Collection $collection  */
         $collection = Mage::getModel('salesrule/rule')
             ->getResourceCollection();
         $collection->addWebsitesToResult();

app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php

@@ -106,7 +106,7 @@ public function getConditionName()
      */
     protected function _prepareCollection()
     {
-        /** @var Mage_Shipping_Model_Mysql4_Carrier_Tablerate_Collection $collection */
+        /** @var Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection $collection */
         $collection = Mage::getResourceModel('shipping/carrier_tablerate_collection');
         $collection->setConditionFilter($this->getConditionName())
             ->setWebsiteFilter($this->getWebsiteId());

app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php

@@ -37,8 +37,8 @@ public function __construct()
 
     protected function _prepareCollection()
     {
+        /** @var Mage_Sitemap_Model_Resource_Sitemap_Collection $collection */
         $collection = Mage::getModel('sitemap/sitemap')->getCollection();
-        /** @var Mage_Sitemap_Model_Mysql4_Sitemap_Collection $collection */
         $this->setCollection($collection);
         return parent::_prepareCollection();
     }

app/code/core/Mage/Adminhtml/Block/System/Variable/Grid.php

@@ -47,7 +47,7 @@ protected function _construct()
      */
     protected function _prepareCollection()
     {
-        /** @var Mage_Core_Model_Mysql4_Variable_Collection $collection */
+        /** @var Mage_Core_Model_Resource_Variable_Collection $collection */
         $collection = Mage::getModel('core/variable')->getCollection();
         $this->setCollection($collection);
         return parent::_prepareCollection();

app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php

@@ -37,7 +37,7 @@ class Mage_Adminhtml_Helper_Catalog_Product_Edit_Action_Attribute extends Mage_C
     /**
      * Array of same attributes for selected products
      *
-     * @var Mage_Eav_Model_Mysql4_Entity_Attribute_Collection
+     * @var Mage_Eav_Model_Resource_Entity_Attribute_Collection
      */
     protected $_attributes;
 
@@ -111,7 +111,7 @@ public function getProductsSetIds()
     /**
      * Return collection of same attributes for selected products without unique
      *
-     * @return Mage_Eav_Model_Mysql4_Entity_Attribute_Collection
+     * @return Mage_Eav_Model_Resource_Entity_Attribute_Collection
      */
     public function getAttributes()
     {

app/code/core/Mage/Adminhtml/Helper/Sales.php

@@ -81,8 +81,8 @@ public function displayPrices($dataObject, $basePrice, $price, $strong = false,
     /**
      * Filter collection by removing not available product types
      *
-     * @param Mage_Core_Model_Mysql4_Collection_Abstract $collection
-     * @return Mage_Core_Model_Mysql4_Collection_Abstract
+     * @param Mage_Core_Model_Resource_Db_Collection_Abstract $collection
+     * @return Mage_Core_Model_Resource_Db_Collection_Abstract
      */
     public function applySalableProductTypesFilter($collection)
     {

app/code/core/Mage/Backup/Model/Db.php

@@ -47,7 +47,7 @@ class Mage_Backup_Model_Db
     /**
      * Retrieve resource model
      *
-     * @return Mage_Backup_Model_Mysql4_Db
+     * @return Mage_Backup_Model_Resource_Db
      */
     public function getResource()
     {

app/code/core/Mage/Bundle/Model/Observer.php

@@ -94,7 +94,7 @@ public function appendUpsellProducts($observer)
             }
         }
 
-        /** @var Mage_Bundle_Model_Mysql4_Selection $resource */
+        /** @var Mage_Bundle_Model_Resource_Selection $resource */
         $resource   = Mage::getResourceSingleton('bundle/selection');
 
         $productIds = array_keys($collection->getItems());
@@ -294,7 +294,7 @@ public function catalogProductLoadAfter(Varien_Event_Observer $observer)
      * CatalogIndex Indexer after plain reindex process
      *
      * @deprecated since 1.4.0.0
-     * @see Mage_Bundle_Model_Mysql4_Indexer_Price
+     * @see Mage_Bundle_Model_Resource_Indexer_Price
      *
      * @param Varien_Event_Observer $observer
      * @return $this

app/code/core/Mage/Bundle/Model/Product/Price.php

@@ -464,7 +464,7 @@ public function getMaximalPrice($product)
      * Get Options with attached Selections collection
      *
      * @param Mage_Catalog_Model_Product $product
-     * @return Mage_Bundle_Model_Mysql4_Option_Collection
+     * @return Mage_Bundle_Model_Resource_Option_Collection
      */
     public function getOptions($product)
     {

app/code/core/Mage/Bundle/Model/Product/Type.php

@@ -269,7 +269,7 @@ public function save($product = null)
     {
         parent::save($product);
         $product = $this->getProduct($product);
-        /** @var Mage_Bundle_Model_Mysql4_Bundle $resource */
+        /** @var Mage_Bundle_Model_Resource_Bundle $resource */
         $resource = Mage::getResourceModel('bundle/bundle');
 
         $options = $product->getBundleOptionsData();
@@ -708,7 +708,7 @@ public function getSpecifyOptionMessage()
      *
      * @param array $selectionIds
      * @param Mage_Catalog_Model_Product $product
-     * @return Mage_Bundle_Model_Mysql4_Selection_Collection
+     * @return Mage_Bundle_Model_Resource_Selection_Collection
      */
     public function getSelectionsByIds($selectionIds, $product = null)
     {
@@ -744,7 +744,7 @@ public function getSelectionsByIds($selectionIds, $product = null)
      *
      * @param array $optionIds
      * @param Mage_Catalog_Model_Product $product
-     * @return Mage_Bundle_Model_Mysql4_Option_Collection
+     * @return Mage_Bundle_Model_Resource_Option_Collection
      */
     public function getOptionsByIds($optionIds, $product = null)
     {

app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php

@@ -72,7 +72,7 @@ public function setCollection($collection)
     }
 
     /**
-     * @return Mage_Core_Model_Mysql4_Collection_Abstract
+     * @return Mage_Core_Model_Resource_Db_Collection_Abstract
      */
     public function getCollection()
     {

app/code/core/Mage/CatalogRule/Model/Observer.php

@@ -312,7 +312,7 @@ public function prepareCatalogProductPriceIndexTable(Varien_Event_Observer $obse
      */
     protected function _checkCatalogRulesAvailability($attributeCode)
     {
-        /** @var Mage_CatalogRule_Model_Mysql4_Rule_Collection $collection */
+        /** @var Mage_CatalogRule_Model_Resource_Rule_Collection $collection */
         $collection = Mage::getResourceModel('catalogrule/rule_collection')
             ->addAttributeInConditionFilter($attributeCode);
 

app/code/core/Mage/Checkout/controllers/CartController.php

@@ -288,7 +288,7 @@ public function addgroupAction()
             ->addFilterByCustomerId($customerId)
             ->addIdFilter($orderItemIds)
             ->load();
-        /** @var Mage_Sales_Model_Mysql4_Order_Item_Collection $itemsCollection */
+        /** @var Mage_Sales_Model_Resource_Order_Item_Collection $itemsCollection */
         $cart = $this->_getCart();
         foreach ($itemsCollection as $item) {
             try {

app/code/core/Mage/Checkout/sql/checkout_setup/install-1.6.0.0.php

@@ -18,7 +18,7 @@
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-/** @var Mage_Checkout_Model_Mysql4_Setup $installer */
+/** @var Mage_Checkout_Model_Resource_Setup $installer */
 $installer = $this;
 $installer->startSetup();
 /**

app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.3-0.9.4.php

@@ -18,7 +18,7 @@
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-/** @var Mage_Checkout_Model_Mysql4_Setup $installer */
+/** @var Mage_Checkout_Model_Resource_Setup $installer */
 $installer = $this;
 
 $installer->startSetup();

app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.4-0.9.5.php

@@ -18,7 +18,7 @@
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-/** @var Mage_Checkout_Model_Mysql4_Setup $installer */
+/** @var Mage_Checkout_Model_Resource_Setup $installer */
 $installer = $this;
 
 $installer->startSetup();

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

@@ -61,7 +61,7 @@ abstract class Mage_Core_Model_Abstract extends Varien_Object
     /**
      * Resource model instance
      *
-     * @var Mage_Core_Model_Mysql4_Abstract
+     * @var Mage_Core_Model_Resource_Db_Abstract
      */
     protected $_resource;
 

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

@@ -1434,11 +1434,12 @@ public function getModelClassName($modelClass)
      * Example:
      * $config->getModelInstance('catalog/product')
      *
-     * Will instantiate Mage_Catalog_Model_Mysql4_Product
+     * Will instantiate Mage_Catalog_Model_Resource_Product
      *
      * @param string $modelClass
      * @param array|object $constructArguments
      * @return Mage_Core_Model_Abstract|false
+     * @see Mage_Catalog_Model_Resource_Product
      */
     public function getModelInstance($modelClass = '', $constructArguments = [])
     {

app/code/core/Mage/Core/Model/Translate/Inline.php

@@ -166,7 +166,7 @@ public function processAjaxPost($translate)
             return $this;
         }
 
-        /** @var Mage_Core_Model_Mysql4_Translate_String $resource */
+        /** @var Mage_Core_Model_Resource_Translate_String $resource */
         $resource = Mage::getResourceModel('core/translate_string');
         foreach ($translate as $t) {
             if (Mage::getDesign()->getArea() == 'adminhtml') {

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

@@ -132,7 +132,7 @@ public function validate()
      */
     public function getVariablesOptionArray($withGroup = false)
     {
-        /** @var Mage_Core_Model_Mysql4_Variable_Collection $collection */
+        /** @var Mage_Core_Model_Resource_Variable_Collection $collection */
         $collection = $this->getCollection();
         $variables = [];
         foreach ($collection->toOptionArray() as $variable) {

app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php

@@ -193,10 +193,6 @@ public function getResource()
     {
         if (!$this->_resource) {
             $this->_resource = Mage::getResourceSingleton('catalog_entity/convert');
-                #->loadStores()
-                #->loadProducts()
-                #->loadAttributeSets()
-                #->loadAttributeOptions();
         }
         return $this->_resource;
     }

app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php

@@ -85,7 +85,7 @@ public function getAddNewButtonHtml()
     /**
      * Retrieve stores collection with default store
      *
-     * @return Mage_Core_Model_Mysql4_Store_Collection
+     * @return Mage_Core_Model_Resource_Store_Collection
      */
     public function getStores()
     {

app/code/core/Mage/Eav/Model/Entity/Type.php

@@ -59,7 +59,7 @@ class Mage_Eav_Model_Entity_Type extends Mage_Core_Model_Abstract
     /**
      * Collection of attributes
      *
-     * @var Mage_Eav_Model_Mysql4_Entity_Attribute_Collection
+     * @var Mage_Eav_Model_Resource_Entity_Attribute_Collection
      */
     protected $_attributes;
 
@@ -73,7 +73,7 @@ class Mage_Eav_Model_Entity_Type extends Mage_Core_Model_Abstract
     /**
      * Collection of sets
      *
-     * @var Mage_Eav_Model_Mysql4_Entity_Attribute_Set_Collection
+     * @var Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection
      */
     protected $_sets;
 
@@ -102,7 +102,7 @@ public function loadByCode($code)
      * Retrieve entity type attributes collection
      *
      * @param   int $setId
-     * @return  Mage_Eav_Model_Mysql4_Entity_Attribute_Collection
+     * @return  Mage_Eav_Model_Resource_Entity_Attribute_Collection
      */
     public function getAttributeCollection($setId = null)
     {
@@ -127,7 +127,7 @@ public function getAttributeCollection($setId = null)
     /**
      * Init and retrieve attribute collection
      *
-     * @return Mage_Core_Model_Mysql4_Collection_Abstract|object
+     * @return Mage_Core_Model_Resource_Db_Collection_Abstract|object
      */
     protected function _getAttributeCollection()
     {
@@ -143,7 +143,7 @@ protected function _getAttributeCollection()
     /**
      * Retrieve entity tpe sets collection
      *
-     * @return Mage_Eav_Model_Mysql4_Entity_Attribute_Set_Collection
+     * @return Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection
      */
     public function getAttributeSetCollection()
     {

app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.0-0.7.1.php

@@ -19,5 +19,5 @@
  */
 
 $installer = $this;
-/** @var Mage_GiftMessage_Model_Mysql4_Setup $installer */
+/** @var Mage_GiftMessage_Model_Resource_Setup $installer */
 $installer->updateAttribute('catalog_product', 'gift_message_available', 'is_configurable', 0);

app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.1-0.7.2.php

@@ -18,7 +18,7 @@
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-/** @var Mage_GiftMessage_Model_Mysql4_Setup $this */
+/** @var Mage_GiftMessage_Model_Resource_Setup $this */
 $installer = $this;
 
 $installer->addAttribute('quote', 'gift_message_id', ['type' => 'int', 'visible' => false, 'required' => false]);