diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php
index 7cb8dee1e93..6bb130057ac 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php
+++ b/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)
diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Widget/Chooser.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Widget/Chooser.php
index 473063915bb..5dc4041fec7 100644
--- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Widget/Chooser.php
+++ b/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();
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Widget/Chooser.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Widget/Chooser.php
index c6b37024139..a0390fe3cb8 100644
--- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Widget/Chooser.php
+++ b/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);
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php
index 9998d3fbf46..106670340c6 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php
+++ b/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) {
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php
index b93ee7601a8..7b7ad0e021a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php
+++ b/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);
diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Most.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Most.php
index 0fded8d6f15..64b8fb1be89 100644
--- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Most.php
+++ b/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()
diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php
index 13941d94df6..f547464e889 100644
--- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php
+++ b/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);
diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php
index c65e7a5e1c0..f61b909541b 100644
--- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php
+++ b/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()
{
diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php
index 4b13915c748..95d2290a0f0 100644
--- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php
+++ b/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();
diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php
index 0975ef6b6eb..93018959805 100644
--- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php
+++ b/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();
diff --git a/app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php b/app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php
index 24bf6591c83..cb111e84a36 100644
--- a/app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php
+++ b/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());
diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php
index e4b990bbccb..e03109527cb 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php
+++ b/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();
}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Variable/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Variable/Grid.php
index 7b0133ef3fa..776cbcef68a 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Variable/Grid.php
+++ b/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();
diff --git a/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php b/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php
index 823a1fbf652..79f1883fa47 100644
--- a/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php
+++ b/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()
{
diff --git a/app/code/core/Mage/Adminhtml/Helper/Sales.php b/app/code/core/Mage/Adminhtml/Helper/Sales.php
index 2ab70be32fe..01a39922b7d 100644
--- a/app/code/core/Mage/Adminhtml/Helper/Sales.php
+++ b/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)
{
diff --git a/app/code/core/Mage/Backup/Model/Db.php b/app/code/core/Mage/Backup/Model/Db.php
index ca6024bfefe..54400d7b14a 100644
--- a/app/code/core/Mage/Backup/Model/Db.php
+++ b/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()
{
diff --git a/app/code/core/Mage/Bundle/Model/Observer.php b/app/code/core/Mage/Bundle/Model/Observer.php
index add35a54044..c4dbb00a767 100644
--- a/app/code/core/Mage/Bundle/Model/Observer.php
+++ b/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
diff --git a/app/code/core/Mage/Bundle/Model/Product/Price.php b/app/code/core/Mage/Bundle/Model/Product/Price.php
index d153fb0dc37..c16e3dd83d5 100644
--- a/app/code/core/Mage/Bundle/Model/Product/Price.php
+++ b/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)
{
diff --git a/app/code/core/Mage/Bundle/Model/Product/Type.php b/app/code/core/Mage/Bundle/Model/Product/Type.php
index bdeef498d91..08eac48abac 100644
--- a/app/code/core/Mage/Bundle/Model/Product/Type.php
+++ b/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)
{
diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php
index 0fb99468a79..c707064a69f 100644
--- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php
+++ b/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()
{
diff --git a/app/code/core/Mage/CatalogRule/Model/Observer.php b/app/code/core/Mage/CatalogRule/Model/Observer.php
index 92d6438b345..a64de1eddf6 100644
--- a/app/code/core/Mage/CatalogRule/Model/Observer.php
+++ b/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);
diff --git a/app/code/core/Mage/Checkout/controllers/CartController.php b/app/code/core/Mage/Checkout/controllers/CartController.php
index ff7af98d311..7dbf3c09e3a 100644
--- a/app/code/core/Mage/Checkout/controllers/CartController.php
+++ b/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 {
diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/install-1.6.0.0.php b/app/code/core/Mage/Checkout/sql/checkout_setup/install-1.6.0.0.php
index c8e8870cdad..685e90e9a98 100644
--- a/app/code/core/Mage/Checkout/sql/checkout_setup/install-1.6.0.0.php
+++ b/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();
/**
diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.3-0.9.4.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.3-0.9.4.php
index 977030b7bab..efd46acce22 100644
--- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.3-0.9.4.php
+++ b/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();
diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.4-0.9.5.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.4-0.9.5.php
index 93ee8029e84..be7d591c5c7 100644
--- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.4-0.9.5.php
+++ b/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();
diff --git a/app/code/core/Mage/Core/Model/Abstract.php b/app/code/core/Mage/Core/Model/Abstract.php
index 3f955224706..29e08393adf 100644
--- a/app/code/core/Mage/Core/Model/Abstract.php
+++ b/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;
diff --git a/app/code/core/Mage/Core/Model/Config.php b/app/code/core/Mage/Core/Model/Config.php
index 3f5f4f172f7..22f78f8cb47 100644
--- a/app/code/core/Mage/Core/Model/Config.php
+++ b/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 = [])
{
diff --git a/app/code/core/Mage/Core/Model/Translate/Inline.php b/app/code/core/Mage/Core/Model/Translate/Inline.php
index d331321bf0c..8a6d01d40ad 100644
--- a/app/code/core/Mage/Core/Model/Translate/Inline.php
+++ b/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') {
diff --git a/app/code/core/Mage/Core/Model/Variable.php b/app/code/core/Mage/Core/Model/Variable.php
index b0b2dbd5835..484fc0fd999 100644
--- a/app/code/core/Mage/Core/Model/Variable.php
+++ b/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) {
diff --git a/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php b/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php
index acc4da70165..4e7259ca7b9 100644
--- a/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php
+++ b/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;
}
diff --git a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php
index d9dd2ac8cb4..53cad8913b4 100644
--- a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php
+++ b/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()
{
diff --git a/app/code/core/Mage/Eav/Model/Entity/Type.php b/app/code/core/Mage/Eav/Model/Entity/Type.php
index 8ee053b6b07..c2780f0595d 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Type.php
+++ b/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()
{
diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.0-0.7.1.php
index 3aeb1accd8c..48e4e7af3c7 100644
--- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/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);
diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.1-0.7.2.php
index bc95faf25a7..bb324748044 100644
--- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/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]);
diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.2-0.7.3.php
index d13c78a92e4..062ed0ae5c0 100644
--- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.2-0.7.3.php
+++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.2-0.7.3.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;
$pathesForReplace = [
diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.3-0.7.4.php
index dddb1dc07c4..d3437ac15b8 100644
--- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.3-0.7.4.php
+++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.3-0.7.4.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->updateAttribute(
diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.4-0.7.5.php
index f66ce3b4ac7..60390687730 100644
--- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.4-0.7.5.php
+++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.4-0.7.5.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->updateAttribute('catalog_product', 'gift_message_available', 'apply_to', '');
diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.5-0.7.6.php
index b6af0080516..f26d706d694 100644
--- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.5-0.7.6.php
+++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.5-0.7.6.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->updateAttribute(
diff --git a/app/code/core/Mage/ImportExport/sql/importexport_setup/mysql4-install-0.1.0.php b/app/code/core/Mage/ImportExport/sql/importexport_setup/mysql4-install-0.1.0.php
index 8ffa8be7db9..f825163e2f3 100644
--- a/app/code/core/Mage/ImportExport/sql/importexport_setup/mysql4-install-0.1.0.php
+++ b/app/code/core/Mage/ImportExport/sql/importexport_setup/mysql4-install-0.1.0.php
@@ -18,7 +18,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/** @var Mage_ImportExport_Model_Mysql4_Setup $installer */
+/** @var Mage_ImportExport_Model_Resource_Setup $installer */
$installer = $this;
$installer->startSetup();
diff --git a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.0-0.8.1.php b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.0-0.8.1.php
index 44a882d25fb..8e27db9ab35 100644
--- a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.0-0.8.1.php
+++ b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.0-0.8.1.php
@@ -27,7 +27,7 @@
*/
$installer = $this;
-/** @var Mage_Tax_Model_Mysql4_Setup $installer */
+/** @var Mage_Tax_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Page/Block/Html/Pager.php b/app/code/core/Mage/Page/Block/Html/Pager.php
index cf95b1c13d4..3c6cfb14725 100644
--- a/app/code/core/Mage/Page/Block/Html/Pager.php
+++ b/app/code/core/Mage/Page/Block/Html/Pager.php
@@ -143,7 +143,7 @@ public function setCollection($collection)
}
/**
- * @return Mage_Core_Model_Mysql4_Collection_Abstract
+ * @return Mage_Core_Model_Resource_Db_Collection_Abstract
*/
public function getCollection()
{
diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-0.7.0.php
index a943487aab1..3fa20b5ac07 100644
--- a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-0.7.0.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Paypal_Model_Mysql4_Setup $installer */
+/** @var Mage_Paypal_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-1.4.0.0.php b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-1.4.0.0.php
index a285f8bf152..b1435f3311b 100644
--- a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-1.4.0.0.php
+++ b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-1.4.0.0.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Paypal_Model_Mysql4_Setup $installer */
+/** @var Mage_Paypal_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.1-0.7.2.php
index c1aa0f0b8f9..e8223aac6fa 100644
--- a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/Paypal/sql/paypal_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)
*/
$installer = $this;
-/** @var Mage_Paypal_Model_Mysql4_Setup $installer */
+/** @var Mage_Paypal_Model_Resource_Setup $installer */
$installer->startSetup();
$installer->addAttribute('order', 'paypal_ipn_customer_notified', ['type'=>'int', 'visible' => false, 'default' => 0]);
$installer->endSetup();
diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.2-0.7.3.php
index a6cbc3ad929..5ec80520909 100644
--- a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.2-0.7.3.php
+++ b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.2-0.7.3.php
@@ -18,7 +18,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
$installer = $this;
-/** @var Mage_Paypal_Model_Mysql4_Setup $installer */
+/** @var Mage_Paypal_Model_Resource_Setup $installer */
$installer->startSetup();
$installer->addAttribute('order_payment', 'cc_secure_verify', []);
diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php
index 941875cbb93..0f9afd777f6 100644
--- a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php
+++ b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Paypal_Model_Mysql4_Setup $installer */
+/** @var Mage_Paypal_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php
index 4af5daff87d..602a284cbd5 100644
--- a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php
+++ b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php
@@ -18,7 +18,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/** @var Mage_Paypal_Model_Mysql4_Setup $installer */
+/** @var Mage_Paypal_Model_Resource_Setup $installer */
$installer = $this;
$installer->run("
diff --git a/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/mysql4-install-0.7.0.php
index 1cea49e9fe3..3a3bd29b257 100644
--- a/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/mysql4-install-0.7.0.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Paypal_Model_Mysql4_Setup $installer */
+/** @var Mage_Paypal_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php b/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php
index 4e9173a7acc..47715f3d2b6 100644
--- a/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php
+++ b/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php
@@ -139,7 +139,7 @@ protected function _prepareItem(Mage_Core_Block_Abstract $renderer)
/**
* Retrieve order shipments collection
*
- * @return array|Mage_Sales_Model_Mysql4_Order_Shipment_Collection
+ * @return array|Mage_Sales_Model_Resource_Order_Shipment_Collection
*/
public function getShipmentsCollection()
{
diff --git a/app/code/core/Mage/Sales/Model/Observer.php b/app/code/core/Mage/Sales/Model/Observer.php
index 6c9b246b5d1..6e2d6eda5da 100644
--- a/app/code/core/Mage/Sales/Model/Observer.php
+++ b/app/code/core/Mage/Sales/Model/Observer.php
@@ -49,7 +49,7 @@ public function cleanExpiredQuotes($schedule)
foreach ($lifetimes as $storeId => $lifetime) {
$lifetime *= 86400;
- /** @var Mage_Sales_Model_Mysql4_Quote_Collection $quotes */
+ /** @var Mage_Sales_Model_Resource_Quote_Collection $quotes */
$quotes = Mage::getModel('sales/quote')->getCollection();
$quotes->addFieldToFilter('store_id', $storeId);
diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Api.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Api.php
index b974122143c..08a97d8c637 100644
--- a/app/code/core/Mage/Sales/Model/Order/Invoice/Api.php
+++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Api.php
@@ -47,7 +47,7 @@ public function __construct()
public function items($filters = null)
{
$invoices = [];
- /** @var Mage_Sales_Model_Mysql4_Order_Invoice_Collection $invoiceCollection */
+ /** @var Mage_Sales_Model_Resource_Order_Invoice_Collection $invoiceCollection */
$invoiceCollection = Mage::getResourceModel('sales/order_invoice_collection');
$invoiceCollection->addAttributeToSelect('entity_id')
->addAttributeToSelect('order_id')
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.1-0.9.2.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.1-0.9.2.php
index 9eda400f30b..a19b10e3bc9 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.1-0.9.2.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.1-0.9.2.php
@@ -19,6 +19,6 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->addAttribute('quote_address', 'applied_taxes', ['type'=>'text']);
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.10-0.9.11.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.10-0.9.11.php
index 197abd8e026..44732211df8 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.10-0.9.11.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.10-0.9.11.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->run("
ALTER TABLE `{$installer->getTable('sales_order_tax')}` ADD `base_real_amount` DECIMAL( 12, 4 ) NOT NULL;
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.11-0.9.12.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.11-0.9.12.php
index e167e136424..4c7bb664525 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.11-0.9.12.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.11-0.9.12.php
@@ -19,6 +19,6 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->addAttribute('quote_item', 'original_custom_price', ['type'=>'decimal']);
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.12-0.9.13.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.12-0.9.13.php
index b7ec82f147f..1fb32acdfd5 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.12-0.9.13.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.12-0.9.13.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->addAttribute('quote', 'subtotal', ['type'=>'decimal']);
$installer->addAttribute('quote', 'base_subtotal', ['type'=>'decimal']);
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.13-0.9.14.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.13-0.9.14.php
index 43a979b70fa..f7a1f82c1be 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.13-0.9.14.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.13-0.9.14.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.14-0.9.15.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.14-0.9.15.php
index 701c1f144cf..556b0490a9a 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.14-0.9.15.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.14-0.9.15.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.15-0.9.16.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.15-0.9.16.php
index b0d71214097..eeff55253a5 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.15-0.9.16.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.15-0.9.16.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.16-0.9.17.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.16-0.9.17.php
index 5fd2417de0e..fc175f28662 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.16-0.9.17.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.16-0.9.17.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.17-0.9.18.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.17-0.9.18.php
index a87d2423a40..6f669447a31 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.17-0.9.18.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.17-0.9.18.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.18-0.9.19.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.18-0.9.19.php
index a909ba07d56..b2311897d24 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.18-0.9.19.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.18-0.9.19.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->run("
ALTER TABLE `{$this->getTable('sales_order')}` ADD INDEX `IDX_INCREMENT_ID` (`increment_id`);
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.19-0.9.20.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.19-0.9.20.php
index 890e55e47d7..fd0c37f2a9c 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.19-0.9.20.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.19-0.9.20.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.2-0.9.3.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.2-0.9.3.php
index 4a509c33ca1..ca9dc94e03c 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.2-0.9.3.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.2-0.9.3.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->run("
ALTER TABLE `{$installer->getTable('sales_flat_quote_address')}` CHANGE `applied_taxes` `applied_taxes` TEXT;
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.20-0.9.21.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.20-0.9.21.php
index 44dde352a1a..c8c594725e4 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.20-0.9.21.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.20-0.9.21.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.21-0.9.22.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.21-0.9.22.php
index 337cc3379b4..9797c982981 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.21-0.9.22.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.21-0.9.22.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.24-0.9.25.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.24-0.9.25.php
index a3e21f0b0fd..9c10cdfd929 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.24-0.9.25.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.24-0.9.25.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->getConnection()->addColumn($this->getTable('sales_order'), 'shipping_tax_refunded', 'decimal(12,4) NULL');
$installer->getConnection()->addColumn($this->getTable('sales_order'), 'base_shipping_tax_refunded', 'decimal(12,4) NULL');
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.25-0.9.26.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.25-0.9.26.php
index 23170716a78..079a72983db 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.25-0.9.26.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.25-0.9.26.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->run("
DELETE FROM `{$this->getTable('sales_order_tax')}`
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.26-0.9.27.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.26-0.9.27.php
index 8aa3e0597fb..2339779c7c3 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.26-0.9.27.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.26-0.9.27.php
@@ -22,7 +22,7 @@
set_time_limit(0);
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->getConnection()->addColumn(
$this->getTable('sales/quote'),
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.27-0.9.28.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.27-0.9.28.php
index 3c34d02a452..c9acce50996 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.27-0.9.28.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.27-0.9.28.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.28-0.9.29.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.28-0.9.29.php
index 0042d462da5..58d61b17434 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.28-0.9.29.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.28-0.9.29.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->getConnection()->addColumn($this->getTable('sales_order'), 'discount_refunded', 'decimal(12,4) default NULL AFTER `subtotal_canceled`');
$installer->getConnection()->addColumn($this->getTable('sales_order'), 'discount_canceled', 'decimal(12,4) default NULL AFTER `discount_refunded`');
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.29-0.9.30.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.29-0.9.30.php
index 280374dedae..341ec8e14f9 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.29-0.9.30.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.29-0.9.30.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$tableOrder = $this->getTable('sales_order');
$tableOrderEntity = $this->getTable('sales_order_entity');
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.3-0.9.4.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.3-0.9.4.php
index 81f4f8c97b4..0bc82cd7723 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.3-0.9.4.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.3-0.9.4.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->run("
CREATE TABLE `{$installer->getTable('sales_flat_order_item')}` (
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.30-0.9.31.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.30-0.9.31.php
index 4788f17bce1..4f4a5f08ba3 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.30-0.9.31.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.30-0.9.31.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->getConnection()->modifyColumn($installer->getTable('sales/quote_item'), 'base_tax_before_discount', 'decimal(12,4)');
$installer->getConnection()->modifyColumn($installer->getTable('sales/quote_item'), 'tax_before_discount', 'decimal(12,4)');
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.31-0.9.32.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.31-0.9.32.php
index 858535a7e10..cdd23573d26 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.31-0.9.32.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.31-0.9.32.php
@@ -19,6 +19,6 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->getConnection()->modifyColumn($installer->getTable('sales/quote'), 'global_currency_code', 'varchar(255)');
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.32-0.9.33.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.32-0.9.33.php
index fe37acd1c60..48f1052784d 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.32-0.9.33.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.32-0.9.33.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.33-0.9.34.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.33-0.9.34.php
index aff055abb47..62f3bacf10b 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.33-0.9.34.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.33-0.9.34.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.34-0.9.35.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.34-0.9.35.php
index 386eeebd01f..2b32bbd8f02 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.34-0.9.35.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.34-0.9.35.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->startSetup();
$installer->removeAttribute('order', 'ext_order_item_id');
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.35-0.9.36.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.35-0.9.36.php
index 59f0f287373..f538d4347cc 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.35-0.9.36.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.35-0.9.36.php
@@ -18,5 +18,5 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer = $this;
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.36-0.9.37.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.36-0.9.37.php
index f325fc9f38b..17a387f95fd 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.36-0.9.37.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.36-0.9.37.php
@@ -18,7 +18,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer = $this;
$installer->startSetup();
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.37-0.9.38.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.37-0.9.38.php
index 5a57f9ca6a4..be8fee6c5fe 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.37-0.9.38.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.37-0.9.38.php
@@ -18,7 +18,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer = $this;
$installer->startSetup();
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.38-0.9.39.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.38-0.9.39.php
index 106e601a336..af25c361956 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.38-0.9.39.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.38-0.9.39.php
@@ -18,7 +18,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer = $this;
$installer->startSetup();
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.4-0.9.5.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.4-0.9.5.php
index a31fb144cbd..e92e8ff672a 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.4-0.9.5.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.4-0.9.5.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->startSetup();
$installer->getConnection()->dropColumn($installer->getTable('sales_flat_quote_item'), 'super_product_id');
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.40-0.9.41.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.40-0.9.41.php
index f4a7dc9337c..8b110631ff6 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.40-0.9.41.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.40-0.9.41.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.43-0.9.44.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.43-0.9.44.php
index 5b3e16d1710..fb3c7e8ff40 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.43-0.9.44.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.43-0.9.44.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->getConnection()->addColumn($installer->getTable('sales_order'), 'protect_code', 'VARCHAR( 6 ) NULL DEFAULT NULL');
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.44-0.9.45.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.44-0.9.45.php
index 18f18ffe80f..c21a99a3494 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.44-0.9.45.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.44-0.9.45.php
@@ -18,7 +18,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer = $this;
$orderEntityType = $installer->getEntityType('order');
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.45-0.9.46.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.45-0.9.46.php
index ceae6f683d1..a521e6af4e3 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.45-0.9.46.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.45-0.9.46.php
@@ -18,7 +18,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer = $this;
$this->startSetup();
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.46-0.9.47.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.46-0.9.47.php
index bc57860cc35..b4607296bb1 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.46-0.9.47.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.46-0.9.47.php
@@ -18,7 +18,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer = $this;
$this->startSetup();
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.47-0.9.48.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.47-0.9.48.php
index 1516b2545cc..cde59c5047c 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.47-0.9.48.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.47-0.9.48.php
@@ -18,7 +18,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer = $this;
$this->startSetup();
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.48-0.9.49.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.48-0.9.49.php
index 529060de753..0a89e8ab98a 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.48-0.9.49.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.48-0.9.49.php
@@ -18,7 +18,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer = $this;
$this->startSetup();
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.49-0.9.50.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.49-0.9.50.php
index 84598ca9503..cdd2f281153 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.49-0.9.50.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.49-0.9.50.php
@@ -18,7 +18,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer = $this;
$tablePaymentTransaction = $this->getTable('sales/payment_transaction');
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.5-0.9.6.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.5-0.9.6.php
index 81bfa0ca0aa..14a12fb400a 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.5-0.9.6.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.5-0.9.6.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->run("
ALTER TABLE `{$installer->getTable('sales_flat_quote_address_item')}`
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.50-0.9.51.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.50-0.9.51.php
index eb6bf4115c8..1c096391ea2 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.50-0.9.51.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.50-0.9.51.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->startSetup();
$installer->addAttribute('order_payment', 'additional_information', ['type' => 'text']);
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.51-0.9.52.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.51-0.9.52.php
index 0df143d9aa9..37674811c0f 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.51-0.9.52.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.51-0.9.52.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$tableOrder = $this->getTable('sales_order');
$tableOrderItem = $this->getTable('sales_flat_order_item');
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.52-0.9.53.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.52-0.9.53.php
index a2550f40f63..80e9f5583b8 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.52-0.9.53.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.52-0.9.53.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->addAttribute('quote', 'customer_gender', ['type' => 'int', 'visible' => false]);
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.53-0.9.54.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.53-0.9.54.php
index be1b614562f..b0f139314d7 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.53-0.9.54.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.53-0.9.54.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$this->startSetup();
$installer->getConnection()->addColumn(
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.54-0.9.55.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.54-0.9.55.php
index 9dfb9404860..f411b2fb5fe 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.54-0.9.55.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.54-0.9.55.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->addAttribute('order_payment', 'base_amount_paid_online', ['type' => 'decimal']);
$installer->addAttribute('order_payment', 'base_amount_refunded_online', ['type' => 'decimal']);
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.55-0.9.56.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.55-0.9.56.php
index 1c639aa063a..94b8c40d370 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.55-0.9.56.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.55-0.9.56.php
@@ -20,7 +20,7 @@
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->startSetup();
$installer->updateAttribute('order', 'customer_dob', 'backend_model', '');
$installer->endSetup();
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.6-0.9.7.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.6-0.9.7.php
index 30a72794cef..9128169703e 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.6-0.9.7.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.6-0.9.7.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->addAttribute('quote_item', 'base_tax_before_discount', ['type'=>'decimal']);
$installer->addAttribute('quote_item', 'tax_before_discount', ['type'=>'decimal']);
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.7-0.9.8.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.7-0.9.8.php
index a40510c2e64..0c3eaa9c49e 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.7-0.9.8.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.7-0.9.8.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->run("
ALTER TABLE `{$installer->getTable('sales_order_tax')}` ADD `base_amount` DECIMAL( 12, 4 ) NOT NULL, ADD `process` SMALLINT NOT NULL;
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.8-0.9.9.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.8-0.9.9.php
index a366297779d..6aa3b078f45 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.8-0.9.9.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.8-0.9.9.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->addAttribute('invoice', 'store_id', ['type'=>'static']);
$installer->addAttribute('creditmemo', 'store_id', ['type'=>'static']);
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.9-0.9.10.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.9-0.9.10.php
index ed3700e116e..53aecb46588 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.9-0.9.10.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.9-0.9.10.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
// add FK constraint on products to flat quote items
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.20-1.4.0.21.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.20-1.4.0.21.php
index 028480fb31c..e259ee5a42f 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.20-1.4.0.21.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.20-1.4.0.21.php
@@ -23,9 +23,9 @@
// Setup data to configure
$frequencies = [
- Mage_Sales_Model_Mysql4_Report_Bestsellers::AGGREGATION_DAILY,
- Mage_Sales_Model_Mysql4_Report_Bestsellers::AGGREGATION_MONTHLY,
- Mage_Sales_Model_Mysql4_Report_Bestsellers::AGGREGATION_YEARLY
+ Mage_Sales_Model_Resource_Report_Bestsellers::AGGREGATION_DAILY,
+ Mage_Sales_Model_Resource_Report_Bestsellers::AGGREGATION_MONTHLY,
+ Mage_Sales_Model_Resource_Report_Bestsellers::AGGREGATION_YEARLY
];
$foreignKeys = [
diff --git a/app/code/core/Mage/SalesRule/Model/Observer.php b/app/code/core/Mage/SalesRule/Model/Observer.php
index 08a9416de62..e4eaf4cf17d 100644
--- a/app/code/core/Mage/SalesRule/Model/Observer.php
+++ b/app/code/core/Mage/SalesRule/Model/Observer.php
@@ -195,7 +195,7 @@ public function aggregateSalesReportCouponsData($schedule)
*/
protected function _checkSalesRulesAvailability($attributeCode)
{
- /** @var Mage_SalesRule_Model_Mysql4_Rule_Collection $collection */
+ /** @var Mage_SalesRule_Model_Resource_Rule_Collection $collection */
$collection = Mage::getResourceModel('salesrule/rule_collection')
->addAttributeInConditionFilter($attributeCode);
diff --git a/app/code/core/Mage/SalesRule/Model/Validator.php b/app/code/core/Mage/SalesRule/Model/Validator.php
index b299a2d919c..eeb853ea4ff 100644
--- a/app/code/core/Mage/SalesRule/Model/Validator.php
+++ b/app/code/core/Mage/SalesRule/Model/Validator.php
@@ -39,7 +39,7 @@ class Mage_SalesRule_Model_Validator extends Mage_Core_Model_Abstract
/**
* Rule source collection
*
- * @var Mage_SalesRule_Model_Mysql4_Rule_Collection
+ * @var Mage_SalesRule_Model_Resource_Rule_Collection
*/
protected $_rules;
@@ -129,7 +129,7 @@ public function init($websiteId, $customerGroupId, $couponCode)
/**
* Get rules collection for current object state
*
- * @return Mage_SalesRule_Model_Mysql4_Rule_Collection
+ * @return Mage_SalesRule_Model_Resource_Rule_Collection
*/
protected function _getRules()
{
diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-install-1.4.0.0.0.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-install-1.4.0.0.0.php
index 7bbd0786808..6cd1079b144 100644
--- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-install-1.4.0.0.0.php
+++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-install-1.4.0.0.0.php
@@ -18,7 +18,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer = $this;
$installer->startSetup();
diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.10-0.7.11.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.10-0.7.11.php
index 4fbbcbf8053..376c56bd863 100644
--- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.10-0.7.11.php
+++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.10-0.7.11.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->startSetup();
/*
diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.11-0.7.12.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.11-0.7.12.php
index df6f354248f..a7d2cdfc305 100644
--- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.11-0.7.12.php
+++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.11-0.7.12.php
@@ -23,7 +23,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->startSetup();
// $installer->getConnection()->changeColumn($this->getTable('sales_order'), 'coupon_code', 'coupon_code', 'varchar(255) DEFAULT NULL');
diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.7-0.7.8.php
index 18579e25b9c..5367867f8f7 100644
--- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.7-0.7.8.php
+++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.7-0.7.8.php
@@ -18,7 +18,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer = $this;
/**
diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.8-0.7.9.php
index 711e750c4f7..c7361a13e59 100644
--- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.8-0.7.9.php
+++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.8-0.7.9.php
@@ -18,7 +18,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer = $this;
$installer->getConnection()->addColumn(
diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php
index 17fafadc520..1f12ca4861c 100644
--- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php
+++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$tableSalesrule = $installer->getTable('salesrule/rule');
$tableSalesruleCustomer = $installer->getTable('salesrule/rule_customer');
diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php
index 44a1eb5c328..1620bba152c 100644
--- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php
+++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$tableSalesrule = $installer->getTable('salesrule/rule');
$tableSalesruleCoupon = $installer->getTable('salesrule/coupon');
diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php
index 605a26cac58..1c9afc96cad 100644
--- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php
+++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php
index 4e93d372632..e2ecacbf0fe 100644
--- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php
+++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer->getConnection()->addColumn(
$installer->getTable('salesrule/coupon_aggregated'),
diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php
index 08eac26bf4f..df70c9284da 100644
--- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php
+++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php
@@ -18,7 +18,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer = $this;
$installer->run("
diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php
index 7a24a5d48a7..b661d68be3d 100644
--- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php
+++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php
@@ -18,7 +18,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/** @var Mage_Sales_Model_Mysql4_Setup $installer */
+/** @var Mage_Sales_Model_Resource_Setup $installer */
$installer = $this;
$installer->startSetup();
diff --git a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-install-0.7.0.php
index 857c1d0440d..9fb9b8f8b9b 100644
--- a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-install-0.7.0.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sendfriend_Model_Mysql4_Setup $installer */
+/** @var Mage_Sendfriend_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.1-0.7.2.php
index bcda7f4bbd9..4301408344b 100644
--- a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Sendfriend_Model_Mysql4_Setup $installer */
+/** @var Mage_Sendfriend_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.2-0.7.3.php
index 43152805279..a5561ae9836 100644
--- a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.2-0.7.3.php
+++ b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.2-0.7.3.php
@@ -18,7 +18,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/** @var Mage_Sendfriend_Model_Mysql4_Setup $installer */
+/** @var Mage_Sendfriend_Model_Resource_Setup $installer */
$installer = $this;
$installer->startSetup();
diff --git a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.3-0.7.4.php
index 99020cbf18f..1358d08c07c 100644
--- a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.3-0.7.4.php
+++ b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.3-0.7.4.php
@@ -18,7 +18,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/** @var Mage_Sendfriend_Model_Mysql4_Setup $installer */
+/** @var Mage_Sendfriend_Model_Resource_Setup $installer */
$installer = $this;
$installer->startSetup();
diff --git a/app/code/core/Mage/Tag/Model/Tag.php b/app/code/core/Mage/Tag/Model/Tag.php
index 172f531c904..6e0740c9073 100644
--- a/app/code/core/Mage/Tag/Model/Tag.php
+++ b/app/code/core/Mage/Tag/Model/Tag.php
@@ -129,7 +129,7 @@ public function getAddBasePopularity()
* Product event tags collection getter
*
* @param Varien_Event_Observer $observer
- * @return Mage_Tag_Model_Mysql4_Tag_Collection
+ * @return Mage_Tag_Model_Resource_Tag_Collection
*/
protected function _getProductEventTagsCollection(Varien_Event_Observer $observer)
{
diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.10-0.7.11.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.10-0.7.11.php
index adbe451443c..ff9d22bc8d7 100644
--- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.10-0.7.11.php
+++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.10-0.7.11.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Tax_Model_Mysql4_Setup $installer */
+/** @var Mage_Tax_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.6-0.7.7.php
index 2cededcfaad..ce30fc51ca5 100644
--- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.6-0.7.7.php
+++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.6-0.7.7.php
@@ -18,7 +18,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/** @var Mage_Tax_Model_Mysql4_Setup $installer */
+/** @var Mage_Tax_Model_Resource_Setup $installer */
$installer = $this;
$installer->startSetup();
diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.7-0.7.8.php
index 1f77e4278c0..99d7fe89391 100644
--- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.7-0.7.8.php
+++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.7-0.7.8.php
@@ -18,7 +18,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/** @var Mage_Tax_Model_Mysql4_Setup $installer */
+/** @var Mage_Tax_Model_Resource_Setup $installer */
$installer = $this;
$installer->startSetup();
diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.8-0.7.9.php
index ba1691cd2f5..2c3d64f4c11 100644
--- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.8-0.7.9.php
+++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.8-0.7.9.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Tax_Model_Mysql4_Setup $installer */
+/** @var Mage_Tax_Model_Resource_Setup $installer */
$installer->addAttribute('invoice', 'shipping_tax_amount', ['type'=>'decimal']);
$installer->addAttribute('invoice', 'base_shipping_tax_amount', ['type'=>'decimal']);
diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.9-0.7.10.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.9-0.7.10.php
index 7d2d0d789b0..dc974a2659b 100644
--- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.9-0.7.10.php
+++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.9-0.7.10.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Tax_Model_Mysql4_Setup $installer */
+/** @var Mage_Tax_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.2-1.6.0.3.php
index 4c4a1800a9e..e240a7992d3 100644
--- a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.2-1.6.0.3.php
+++ b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.2-1.6.0.3.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Tax_Model_Mysql4_Setup $installer */
+/** @var Mage_Tax_Model_Resource_Setup $installer */
/**
* Add new field to 'tax/sales_order_tax_item'
diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-install-0.1.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-install-0.1.php
index 80cd2bb3b3f..03076b17b00 100644
--- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-install-0.1.php
+++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-install-0.1.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Weee_Model_Mysql4_Setup $installer */
+/** @var Mage_Weee_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.1-0.2.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.1-0.2.php
index 74de8ced265..057edc96131 100644
--- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.1-0.2.php
+++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.1-0.2.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Weee_Model_Mysql4_Setup $installer */
+/** @var Mage_Weee_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.10-0.11.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.10-0.11.php
index e6010c97991..e91a4ab25fa 100644
--- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.10-0.11.php
+++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.10-0.11.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Weee_Model_Mysql4_Setup $installer */
+/** @var Mage_Weee_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.11-0.12.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.11-0.12.php
index f6d60aaf4f9..62bd95f47d7 100644
--- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.11-0.12.php
+++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.11-0.12.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Weee_Model_Mysql4_Setup $installer */
+/** @var Mage_Weee_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.12-0.13.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.12-0.13.php
index 3736de83fbf..53feebd6f48 100644
--- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.12-0.13.php
+++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.12-0.13.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Weee_Model_Mysql4_Setup $installer */
+/** @var Mage_Weee_Model_Resource_Setup $installer */
$installer->getConnection()->modifyColumn($installer->getTable('sales/quote_item'), 'weee_tax_applied_amount', 'decimal(12,4)');
$installer->getConnection()->modifyColumn($installer->getTable('sales/quote_item'), 'weee_tax_applied_row_amount', 'decimal(12,4)');
diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.2-0.3.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.2-0.3.php
index 6ba508a3f20..7c4ee2fbbe2 100644
--- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.2-0.3.php
+++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.2-0.3.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Weee_Model_Mysql4_Setup $installer */
+/** @var Mage_Weee_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.3-0.4.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.3-0.4.php
index 741c8d15c70..d3afbe005d7 100644
--- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.3-0.4.php
+++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.3-0.4.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Weee_Model_Mysql4_Setup $installer */
+/** @var Mage_Weee_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.4-0.5.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.4-0.5.php
index 761907306ce..de42dc3719c 100644
--- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.4-0.5.php
+++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.4-0.5.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Weee_Model_Mysql4_Setup $installer */
+/** @var Mage_Weee_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.5-0.6.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.5-0.6.php
index a6580efb19f..3d32d0de1e3 100644
--- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.5-0.6.php
+++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.5-0.6.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Weee_Model_Mysql4_Setup $installer */
+/** @var Mage_Weee_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.6-0.7.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.6-0.7.php
index a0c3cec11d2..2abd407ae2a 100644
--- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.6-0.7.php
+++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.6-0.7.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Weee_Model_Mysql4_Setup $installer */
+/** @var Mage_Weee_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.7-0.8.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.7-0.8.php
index d0bfd82a500..35ef9cadd9e 100644
--- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.7-0.8.php
+++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.7-0.8.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Weee_Model_Mysql4_Setup $installer */
+/** @var Mage_Weee_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.8-0.9.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.8-0.9.php
index 06534cbf7c7..3839dadc6ec 100644
--- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.8-0.9.php
+++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.8-0.9.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Weee_Model_Mysql4_Setup $installer */
+/** @var Mage_Weee_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.9-0.10.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.9-0.10.php
index ac3c1d1f325..d066d4e0516 100644
--- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.9-0.10.php
+++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.9-0.10.php
@@ -19,7 +19,7 @@
*/
$installer = $this;
-/** @var Mage_Weee_Model_Mysql4_Setup $installer */
+/** @var Mage_Weee_Model_Resource_Setup $installer */
$installer->startSetup();
diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Grid.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Grid.php
index 3c8d696d861..4d2f903a13f 100644
--- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Grid.php
+++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Grid.php
@@ -46,7 +46,7 @@ protected function _construct()
*/
protected function _prepareCollection()
{
- /** @var Mage_Widget_Model_Mysql4_Widget_Instance_Collection $collection */
+ /** @var Mage_Widget_Model_Resource_Widget_Instance_Collection $collection */
$collection = Mage::getModel('widget/widget_instance')->getCollection();
$this->setCollection($collection);
return parent::_prepareCollection();
diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php
index 88eebfb0958..12828783e2f 100644
--- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php
+++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php
@@ -35,7 +35,7 @@ class Mage_Wishlist_Block_Customer_Wishlist extends Mage_Wishlist_Block_Abstract
/**
* Add wishlist conditions to collection
*
- * @param Mage_Wishlist_Model_Mysql4_Item_Collection $collection
+ * @param Mage_Wishlist_Model_Resource_Item_Collection $collection
* @return $this
*/
protected function _prepareCollection($collection)
diff --git a/app/code/core/Mage/Wishlist/Helper/Data.php b/app/code/core/Mage/Wishlist/Helper/Data.php
index eeb69211a0f..1ea2a5a4fbb 100644
--- a/app/code/core/Mage/Wishlist/Helper/Data.php
+++ b/app/code/core/Mage/Wishlist/Helper/Data.php
@@ -54,7 +54,7 @@ class Mage_Wishlist_Helper_Data extends Mage_Core_Helper_Abstract
/**
* Wishlist Product Items Collection
*
- * @var Mage_Wishlist_Model_Mysql4_Product_Collection
+ * @var Mage_Wishlist_Model_Resource_Product_Collection
*/
protected $_productCollection = null;
@@ -183,7 +183,7 @@ public function getItemCount()
* @deprecated after 1.4.2.0
* @see Mage_Wishlist_Model_Wishlist::getItemCollection()
*
- * @return Mage_Wishlist_Model_Mysql4_Product_Collection
+ * @return Mage_Wishlist_Model_Resource_Product_Collection
*/
public function getItemCollection()
{
@@ -219,7 +219,7 @@ public function getWishlistItemCollection()
* @deprecated after 1.4.2.0
* @see Mage_Wishlist_Model_Wishlist::getItemCollection()
*
- * @return Mage_Wishlist_Model_Mysql4_Product_Collection
+ * @return Mage_Wishlist_Model_Resource_Product_Collection
*/
public function getProductCollection()
{
diff --git a/app/code/core/Mage/Wishlist/Model/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Wishlist.php
index 7da7ad27231..2825098fb43 100644
--- a/app/code/core/Mage/Wishlist/Model/Wishlist.php
+++ b/app/code/core/Mage/Wishlist/Model/Wishlist.php
@@ -276,7 +276,7 @@ public function getItem($itemId)
* @deprecated after 1.4.2.0
* @see Mage_Wishlist_Model_Wishlist::getItemCollection()
*
- * @return Mage_Wishlist_Model_Mysql4_Product_Collection
+ * @return Mage_Wishlist_Model_Resource_Product_Collection
*/
public function getProductCollection()
{