diff --git a/app/code/community/Cm/RedisSession/Model/Session.php b/app/code/community/Cm/RedisSession/Model/Session.php index dfccb18b96d..8f068996679 100644 --- a/app/code/community/Cm/RedisSession/Model/Session.php +++ b/app/code/community/Cm/RedisSession/Model/Session.php @@ -49,7 +49,7 @@ * - Detects inactive waiting processes to prevent false-positives in concurrency throttling. * */ -class Cm_RedisSession_Model_Session extends Mage_Core_Model_Mysql4_Session +class Cm_RedisSession_Model_Session extends Mage_Core_Model_Resource_Session { const SLEEP_TIME = 500000; /* Sleep 0.5 seconds between lock attempts (1,000,000 == 1 second) */ const FAIL_AFTER = 15; /* Try to break lock for at most this many seconds */ diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Acl.php b/app/code/core/Mage/Admin/Model/Mysql4/Acl.php deleted file mode 100644 index 9c3c49c4500..00000000000 --- a/app/code/core/Mage/Admin/Model/Mysql4/Acl.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Admin_Model_Mysql4_Acl extends Mage_Admin_Model_Resource_Acl -{ -} diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php b/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php deleted file mode 100644 index f91be9786bb..00000000000 --- a/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Admin_Model_Mysql4_Acl_Role extends Mage_Admin_Model_Resource_Acl_Role -{ -} diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php deleted file mode 100644 index 998b6a337b3..00000000000 --- a/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Admin_Model_Mysql4_Acl_Role_Collection extends Mage_Admin_Model_Resource_Acl_Role_Collection -{ -} diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php deleted file mode 100644 index 8cf54143761..00000000000 --- a/app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Admin_Model_Mysql4_Permissions_Collection extends Mage_Admin_Model_Resource_Permissions_Collection -{ -} diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Role.php b/app/code/core/Mage/Admin/Model/Mysql4/Role.php deleted file mode 100644 index 5083fe6a795..00000000000 --- a/app/code/core/Mage/Admin/Model/Mysql4/Role.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Admin_Model_Mysql4_Role extends Mage_Admin_Model_Resource_Role -{ -} diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php deleted file mode 100644 index 5a5107606f4..00000000000 --- a/app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Admin_Model_Mysql4_Role_Collection extends Mage_Admin_Model_Resource_Role_Collection -{ -} diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Roles.php b/app/code/core/Mage/Admin/Model/Mysql4/Roles.php deleted file mode 100644 index ce76a725965..00000000000 --- a/app/code/core/Mage/Admin/Model/Mysql4/Roles.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Admin_Model_Mysql4_Roles extends Mage_Admin_Model_Resource_Roles -{ -} diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php deleted file mode 100644 index 20838c58453..00000000000 --- a/app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Admin_Model_Mysql4_Roles_Collection extends Mage_Admin_Model_Resource_Roles_Collection -{ -} diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php deleted file mode 100644 index 5c125ec7754..00000000000 --- a/app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Admin_Model_Mysql4_Roles_User_Collection extends Mage_Admin_Model_Resource_Roles_User_Collection -{ -} diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Rules.php b/app/code/core/Mage/Admin/Model/Mysql4/Rules.php deleted file mode 100644 index 2f2d2bf5d65..00000000000 --- a/app/code/core/Mage/Admin/Model/Mysql4/Rules.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Admin_Model_Mysql4_Rules extends Mage_Admin_Model_Resource_Rules -{ -} diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php deleted file mode 100644 index 480758adf68..00000000000 --- a/app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Admin_Model_Mysql4_Rules_Collection extends Mage_Admin_Model_Resource_Rules_Collection -{ -} diff --git a/app/code/core/Mage/Admin/Model/Mysql4/User.php b/app/code/core/Mage/Admin/Model/Mysql4/User.php deleted file mode 100644 index b74db12d7e6..00000000000 --- a/app/code/core/Mage/Admin/Model/Mysql4/User.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Admin_Model_Mysql4_User extends Mage_Admin_Model_Resource_User -{ -} diff --git a/app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php deleted file mode 100644 index 35947525858..00000000000 --- a/app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Admin_Model_Mysql4_User_Collection extends Mage_Admin_Model_Resource_User_Collection -{ -} diff --git a/app/code/core/Mage/Admin/etc/config.xml b/app/code/core/Mage/Admin/etc/config.xml index 472d73c8f3b..2eb26a5f4cd 100644 --- a/app/code/core/Mage/Admin/etc/config.xml +++ b/app/code/core/Mage/Admin/etc/config.xml @@ -39,7 +39,6 @@ Mage_Admin_Model_Resource - admin_mysql4 admin_user
diff --git a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php b/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php deleted file mode 100644 index 674f80b3ab3..00000000000 --- a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_AdminNotification_Model_Mysql4_Inbox extends Mage_AdminNotification_Model_Resource_Inbox -{ -} diff --git a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php b/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php deleted file mode 100644 index e0143e0f068..00000000000 --- a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_AdminNotification_Model_Mysql4_Inbox_Collection extends Mage_AdminNotification_Model_Resource_Inbox_Collection -{ -} diff --git a/app/code/core/Mage/AdminNotification/etc/config.xml b/app/code/core/Mage/AdminNotification/etc/config.xml index a1449f6d6b5..6ba4e4c4af3 100644 --- a/app/code/core/Mage/AdminNotification/etc/config.xml +++ b/app/code/core/Mage/AdminNotification/etc/config.xml @@ -39,7 +39,6 @@ Mage_AdminNotification_Model_Resource - adminnotification_mysql4 adminnotification_inbox
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php index ea76b4cfbdc..3fe5c17d7e0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php @@ -96,7 +96,7 @@ public function getCategoryCollection() if (is_null($collection)) { $collection = Mage::getModel('catalog/category')->getCollection(); - /* @var $collection Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection */ + /* @var $collection Mage_Catalog_Model_Resource_Category_Collection */ $collection->addAttributeToSelect('name') ->addAttributeToSelect('is_active') ->setProductStoreId($storeId) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php index a11cb3156cb..b216eda69cb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php @@ -177,7 +177,7 @@ protected function _getNodeJson($node, $level = 0) /** * Adds some extra params to categories collection * - * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection + * @return Mage_Catalog_Model_Resource_Category_Collection */ public function getCategoryCollection() { 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 b620eb21361..122a384bc82 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 @@ -172,7 +172,7 @@ public function getGroupTreeJson() $items = array(); $setId = $this->_getSetId(); - /* @var $groups Mage_Eav_Model_Mysql4_Entity_Attribute_Group_Collection */ + /* @var $groups Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection */ $groups = Mage::getModel('eav/entity_attribute_group') ->getResourceCollection() ->setAttributeSetFilter($setId) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser.php index 46295c149a7..be7306ff6f4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser.php @@ -183,7 +183,7 @@ protected function _addColumnFilterToCollection($column) */ protected function _prepareCollection() { - /* @var $collection Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection */ + /* @var $collection Mage_Catalog_Model_Resource_Product_Collection */ $collection = Mage::getResourceModel('catalog/product_collection') ->setStoreId(0) ->addAttributeToSelect('name'); diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php index 05fd2da7337..72628106fac 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php @@ -45,7 +45,7 @@ public function __construct() protected function _prepareCollection() { $collection = Mage::getModel('cms/block')->getCollection(); - /* @var $collection Mage_Cms_Model_Mysql4_Block_Collection */ + /* @var $collection Mage_Cms_Model_Resource_Block_Collection */ $this->setCollection($collection); return parent::_prepareCollection(); } 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 a33adaa9d28..a75e1f1582b 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 @@ -107,7 +107,7 @@ function (grid, event) { protected function _prepareCollection() { $collection = Mage::getModel('cms/block')->getCollection(); - /* @var $collection Mage_Cms_Model_Mysql4_Block_Collection */ + /* @var $collection Mage_Cms_Model_Resource_Block_Collection */ $this->setCollection($collection); return parent::_prepareCollection(); } diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php index f9b23070279..46b2c31f996 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php @@ -45,7 +45,7 @@ public function __construct() protected function _prepareCollection() { $collection = Mage::getModel('cms/page')->getCollection(); - /* @var $collection Mage_Cms_Model_Mysql4_Page_Collection */ + /* @var $collection Mage_Cms_Model_Resource_Page_Collection */ $collection->setFirstStoreFlag(true); $this->setCollection($collection); 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 3d2a0696756..7b96512d0dc 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 @@ -106,7 +106,7 @@ function (grid, event) { protected function _prepareCollection() { $collection = Mage::getModel('cms/page')->getCollection(); - /* @var $collection Mage_Cms_Model_Mysql4_Page_Collection */ + /* @var $collection Mage_Cms_Model_Resource_Page_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 c2566fc6efd..7c1e47515cc 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 @@ -197,7 +197,7 @@ public function getGridUrl() */ protected function _addColumnFilterToCollection($column) { - /* @var $collection Mage_Wishlist_Model_Mysql4_Item_Collection */ + /* @var $collection Mage_Wishlist_Model_Resource_Item_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 09519dcb3d8..ec772a4a8ee 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php @@ -56,7 +56,7 @@ protected function _prepareCollection() $collection = Mage::getModel('log/visitor_online') ->prepare() ->getCollection(); - /* @var $collection Mage_Log_Model_Mysql4_Visitor_Online_Collection */ + /* @var $collection Mage_Log_Model_Resource_Visitor_Online_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 5ca76869a94..6157c7c36de 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 @@ -44,7 +44,7 @@ public function __construct() protected function _prepareCollection() { $collection = Mage::getResourceModel('reports/order_collection'); - /* @var $collection Mage_Reports_Model_Mysql4_Order_Collection */ + /* @var $collection Mage_Reports_Model_Resource_Order_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 55423b41563..c051c504943 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php @@ -48,7 +48,7 @@ protected function _prepareLayout() $isFilter = $this->getRequest()->getParam('store') || $this->getRequest()->getParam('website') || $this->getRequest()->getParam('group'); $period = $this->getRequest()->getParam('period', '24h'); - /* @var $collection Mage_Reports_Model_Mysql4_Order_Collection */ + /* @var $collection Mage_Reports_Model_Resource_Order_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 e70564d957e..9267c2ba840 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php @@ -37,7 +37,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; @@ -65,7 +65,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/Newsletter/Subscriber/Grid.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php index aa2faae6ea9..c840e83af2d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php @@ -54,7 +54,7 @@ public function __construct() protected function _prepareCollection() { $collection = Mage::getResourceSingleton('newsletter/subscriber_collection'); - /* @var $collection Mage_Newsletter_Model_Mysql4_Subscriber_Collection */ + /* @var $collection Mage_Newsletter_Model_Resource_Subscriber_Collection */ $collection ->showCustomerInfo(true) ->addSubscriberTypeField() 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 ea952767045..af3854197a4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php @@ -54,7 +54,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 a5520e9f7ec..188d23ae342 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php @@ -54,7 +54,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 7ed88601ea7..9a332e8575a 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 @@ -114,7 +114,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 da8e7217c0b..53eb85d08a0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php @@ -45,7 +45,7 @@ public function __construct() protected function _prepareCollection() { $collection = Mage::getModel('sitemap/sitemap')->getCollection(); - /* @var $collection Mage_Sitemap_Model_Mysql4_Sitemap_Collection */ + /* @var $collection Mage_Sitemap_Model_Resource_Sitemap_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 6cde6cbdf13..a48b3ea7a9c 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Variable/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Variable/Grid.php @@ -53,7 +53,7 @@ protected function _construct() */ protected function _prepareCollection() { - /* @var $collection Mage_Core_Model_Mysql4_Variable_Collection */ + /* @var $collection Mage_Core_Model_Resource_Variable_Collection */ $collection = Mage::getModel('core/variable')->getCollection(); $this->setCollection($collection); return parent::_prepareCollection(); diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php index f669920b57b..8a744d66cca 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php @@ -91,7 +91,7 @@ public function getTreeArray($parentId = null, $asJson = false, $recursionLevel /** * Get categories collection * - * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection + * @return Mage_Catalog_Model_Resource_Category_Collection */ public function getCategoryCollection() { 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 b198db134fb..e6e802992fb 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 @@ -44,7 +44,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; @@ -59,7 +59,7 @@ class Mage_Adminhtml_Helper_Catalog_Product_Edit_Action_Attribute extends Mage_C * Return product collection with selected product filter * Product collection didn't load * - * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection + * @return Mage_Catalog_Model_Resource_Product_Collection */ public function getProducts() { @@ -117,7 +117,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 fecab9b4f63..1d0920b6c3e 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Sales.php +++ b/app/code/core/Mage/Adminhtml/Helper/Sales.php @@ -87,8 +87,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/Adminhtml/Model/System/Config/Clone/Media/Image.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php index 7534b321fd6..827c61ee31e 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php @@ -49,7 +49,7 @@ public function getPrefixes() // use cached eav config $entityTypeId = Mage::getSingleton('eav/config')->getEntityType(Mage_Catalog_Model_Product::ENTITY)->getId(); - /* @var $collection Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection */ + /* @var $collection Mage_Catalog_Model_Resource_Product_Attribute_Collection */ $collection = Mage::getResourceModel('catalog/product_attribute_collection'); $collection->setEntityTypeFilter($entityTypeId); $collection->setFrontendInputTypeFilter('media_image'); diff --git a/app/code/core/Mage/Adminhtml/etc/config.xml b/app/code/core/Mage/Adminhtml/etc/config.xml index 4125484d17f..724af078bc6 100644 --- a/app/code/core/Mage/Adminhtml/etc/config.xml +++ b/app/code/core/Mage/Adminhtml/etc/config.xml @@ -39,7 +39,6 @@ Mage_Adminhtml_Model_Resource - adminhtml_mysql4 diff --git a/app/code/core/Mage/Api/Model/Mysql4/Acl.php b/app/code/core/Mage/Api/Model/Mysql4/Acl.php deleted file mode 100644 index a17425f4a5c..00000000000 --- a/app/code/core/Mage/Api/Model/Mysql4/Acl.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Api_Model_Mysql4_Acl extends Mage_Api_Model_Resource_Acl -{ -} diff --git a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php b/app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php deleted file mode 100644 index a58f9495628..00000000000 --- a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Api_Model_Mysql4_Acl_Role extends Mage_Api_Model_Resource_Acl_Role -{ -} diff --git a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php deleted file mode 100644 index dab2d1bdaff..00000000000 --- a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Api_Model_Mysql4_Acl_Role_Collection extends Mage_Api_Model_Resource_Acl_Role_Collection -{ -} diff --git a/app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php deleted file mode 100644 index fa82922bb74..00000000000 --- a/app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Api_Model_Mysql4_Permissions_Collection extends Mage_Api_Model_Resource_Permissions_Collection -{ -} diff --git a/app/code/core/Mage/Api/Model/Mysql4/Role.php b/app/code/core/Mage/Api/Model/Mysql4/Role.php deleted file mode 100644 index cea1bd79176..00000000000 --- a/app/code/core/Mage/Api/Model/Mysql4/Role.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Api_Model_Mysql4_Role extends Mage_Api_Model_Resource_Role -{ -} diff --git a/app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php deleted file mode 100644 index a9092347d2c..00000000000 --- a/app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Api_Model_Mysql4_Role_Collection extends Mage_Api_Model_Resource_Role_Collection -{ -} diff --git a/app/code/core/Mage/Api/Model/Mysql4/Roles.php b/app/code/core/Mage/Api/Model/Mysql4/Roles.php deleted file mode 100644 index 8a59095afce..00000000000 --- a/app/code/core/Mage/Api/Model/Mysql4/Roles.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Api_Model_Mysql4_Roles extends Mage_Api_Model_Resource_Roles -{ -} diff --git a/app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php deleted file mode 100644 index 7655e4b2947..00000000000 --- a/app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Api_Model_Mysql4_Roles_Collection extends Mage_Api_Model_Resource_Roles_Collection -{ -} diff --git a/app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php deleted file mode 100644 index 6df5bdcb31c..00000000000 --- a/app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Api_Model_Mysql4_Roles_User_Collection extends Mage_Api_Model_Resource_Roles_User_Collection -{ -} diff --git a/app/code/core/Mage/Api/Model/Mysql4/Rules.php b/app/code/core/Mage/Api/Model/Mysql4/Rules.php deleted file mode 100644 index 7a44a37f115..00000000000 --- a/app/code/core/Mage/Api/Model/Mysql4/Rules.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Api_Model_Mysql4_Rules extends Mage_Api_Model_Resource_Rules -{ -} diff --git a/app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php deleted file mode 100644 index ce154e017a6..00000000000 --- a/app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Api_Model_Mysql4_Rules_Collection extends Mage_Api_Model_Resource_Rules_Collection -{ -} diff --git a/app/code/core/Mage/Api/Model/Mysql4/User.php b/app/code/core/Mage/Api/Model/Mysql4/User.php deleted file mode 100644 index 62a489463dd..00000000000 --- a/app/code/core/Mage/Api/Model/Mysql4/User.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Api_Model_Mysql4_User extends Mage_Api_Model_Resource_User -{ -} diff --git a/app/code/core/Mage/Api/Model/Mysql4/User/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/User/Collection.php deleted file mode 100644 index 13018d460a9..00000000000 --- a/app/code/core/Mage/Api/Model/Mysql4/User/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Api_Model_Mysql4_User_Collection extends Mage_Api_Model_Resource_User_Collection -{ -} diff --git a/app/code/core/Mage/Api/etc/config.xml b/app/code/core/Mage/Api/etc/config.xml index 83e3dbb0edb..05e9b28a3f5 100644 --- a/app/code/core/Mage/Api/etc/config.xml +++ b/app/code/core/Mage/Api/etc/config.xml @@ -53,7 +53,6 @@ Mage_Api_Model_Resource - api_mysql4 api_assert
diff --git a/app/code/core/Mage/Backup/Model/Db.php b/app/code/core/Mage/Backup/Model/Db.php index cf99504840b..a05ae42b065 100644 --- a/app/code/core/Mage/Backup/Model/Db.php +++ b/app/code/core/Mage/Backup/Model/Db.php @@ -54,7 +54,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/Backup/Model/Mysql4/Db.php b/app/code/core/Mage/Backup/Model/Mysql4/Db.php deleted file mode 100644 index 48c15f475b6..00000000000 --- a/app/code/core/Mage/Backup/Model/Mysql4/Db.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Backup_Model_Mysql4_Db extends Mage_Backup_Model_Resource_Db -{ -} diff --git a/app/code/core/Mage/Backup/etc/config.xml b/app/code/core/Mage/Backup/etc/config.xml index d315ac57061..073150871e9 100644 --- a/app/code/core/Mage/Backup/etc/config.xml +++ b/app/code/core/Mage/Backup/etc/config.xml @@ -39,7 +39,6 @@ Mage_Backup_Model_Resource - backup_mysql4 diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php b/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php deleted file mode 100644 index a4bf148a220..00000000000 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Bundle_Model_Mysql4_Bundle extends Mage_Bundle_Model_Resource_Bundle -{ -} diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Price.php b/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Price.php deleted file mode 100644 index 170b22ba6ba..00000000000 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Price.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Bundle_Model_Mysql4_Indexer_Price extends Mage_Bundle_Model_Resource_Indexer_Price -{ -} diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Stock.php b/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Stock.php deleted file mode 100644 index 1243bb97e51..00000000000 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Stock.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Bundle_Model_Mysql4_Indexer_Stock extends Mage_Bundle_Model_Resource_Indexer_Stock -{ -} diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Option.php b/app/code/core/Mage/Bundle/Model/Mysql4/Option.php deleted file mode 100644 index ece1f016ba2..00000000000 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Option.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Bundle_Model_Mysql4_Option extends Mage_Bundle_Model_Resource_Option -{ -} diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php b/app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php deleted file mode 100644 index 90356825513..00000000000 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Bundle_Model_Mysql4_Option_Collection extends Mage_Bundle_Model_Resource_Option_Collection -{ -} diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php b/app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php deleted file mode 100644 index 01a004b0cfd..00000000000 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Bundle_Model_Mysql4_Price_Index extends Mage_Bundle_Model_Resource_Price_Index -{ -} diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Selection.php b/app/code/core/Mage/Bundle/Model/Mysql4/Selection.php deleted file mode 100644 index 9f43601fd96..00000000000 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Selection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Bundle_Model_Mysql4_Selection extends Mage_Bundle_Model_Resource_Selection -{ -} diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php b/app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php deleted file mode 100644 index c8e36d9adbb..00000000000 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Bundle_Model_Mysql4_Selection_Collection extends Mage_Bundle_Model_Resource_Selection_Collection -{ -} diff --git a/app/code/core/Mage/Bundle/Model/Observer.php b/app/code/core/Mage/Bundle/Model/Observer.php index 76aea5fd029..684e5fc1216 100644 --- a/app/code/core/Mage/Bundle/Model/Observer.php +++ b/app/code/core/Mage/Bundle/Model/Observer.php @@ -89,7 +89,7 @@ public function appendUpsellProducts($observer) return $this; } - /* @var Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection $collection */ + /* @var Mage_Catalog_Model_Resource_Product_Link_Product_Collection $collection */ $collection = $observer->getEvent()->getCollection(); $limit = $observer->getEvent()->getLimit(); if (is_array($limit)) { @@ -100,7 +100,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()); @@ -300,7 +300,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 851dc352682..4e9baf62a1a 100644 --- a/app/code/core/Mage/Bundle/Model/Product/Price.php +++ b/app/code/core/Mage/Bundle/Model/Product/Price.php @@ -457,7 +457,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 6fdb7837690..139677ca721 100644 --- a/app/code/core/Mage/Bundle/Model/Product/Type.php +++ b/app/code/core/Mage/Bundle/Model/Product/Type.php @@ -275,7 +275,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(); @@ -714,7 +714,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) { @@ -750,7 +750,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/Bundle/etc/config.xml b/app/code/core/Mage/Bundle/etc/config.xml index 27d6fdc8175..3033d249cfa 100644 --- a/app/code/core/Mage/Bundle/etc/config.xml +++ b/app/code/core/Mage/Bundle/etc/config.xml @@ -39,7 +39,6 @@ Mage_Bundle_Model_Resource - bundle_mysql4 diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-0.1.0.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-0.1.0.php index 9d9955607a3..92ac003894e 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-0.1.0.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-0.1.0.php @@ -25,7 +25,7 @@ */ $installer = $this; -/* @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +/* @var Mage_Catalog_Model_Resource_Setup $installer */ $installer->startSetup(); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-1.4.0.0.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-1.4.0.0.php index 0223522bbac..4692571b97b 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-1.4.0.0.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-1.4.0.0.php @@ -24,7 +24,7 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -/* @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +/* @var Mage_Catalog_Model_Resource_Setup $installer */ $installer = $this; $installer->startSetup(); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.0-0.1.1.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.0-0.1.1.php index f0ecd24d1fc..1e9f41696e7 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.0-0.1.1.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.0-0.1.1.php @@ -25,7 +25,7 @@ */ $installer = $this; -/* @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $this */ +/* @var Mage_Catalog_Model_Resource_Setup $this */ $installer->startSetup(); // make attribute 'weight' not applicable to downloadable products diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.1-0.1.2.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.1-0.1.2.php index d1acea3e822..a48fd32a227 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.1-0.1.2.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.1-0.1.2.php @@ -25,7 +25,7 @@ */ $installer = $this; -/* @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +/* @var Mage_Catalog_Model_Resource_Setup $installer */ $conn = $installer->getConnection(); /* @var Varien_Db_Adapter_Pdo_Mysql $conn */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.10-0.1.11.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.10-0.1.11.php index 763543452cb..f30d67b8d4d 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.10-0.1.11.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.10-0.1.11.php @@ -25,7 +25,7 @@ */ $installer = $this; -/* @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +/* @var Mage_Catalog_Model_Resource_Setup $installer */ $installer->startSetup(); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.11-0.1.12.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.11-0.1.12.php index 7c76a1135f3..d8fb832da01 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.11-0.1.12.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.11-0.1.12.php @@ -25,7 +25,7 @@ */ $installer = $this; -/* @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +/* @var Mage_Catalog_Model_Resource_Setup $installer */ $installer->startSetup(); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.12-0.1.13.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.12-0.1.13.php index b7862e5f094..2e2cdd01d0b 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.12-0.1.13.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.12-0.1.13.php @@ -25,7 +25,7 @@ */ $installer = $this; -/* @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +/* @var Mage_Catalog_Model_Resource_Setup $installer */ $installer->startSetup(); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.13-0.1.14.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.13-0.1.14.php index b1d64474333..7e5c265286f 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.13-0.1.14.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.13-0.1.14.php @@ -25,7 +25,7 @@ */ $installer = $this; -/* @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +/* @var Mage_Catalog_Model_Resource_Setup $installer */ $installer->startSetup(); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.14-0.1.15.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.14-0.1.15.php index 0c53ddcf0de..e24f7d786a7 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.14-0.1.15.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.14-0.1.15.php @@ -24,7 +24,7 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -/* @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +/* @var Mage_Catalog_Model_Resource_Setup $installer */ $installer = $this; $installer->startSetup(); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.15-0.1.16.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.15-0.1.16.php index 1b4334d76d2..ee34f65efd8 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.15-0.1.16.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.15-0.1.16.php @@ -25,7 +25,7 @@ */ $installer = $this; -/* @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +/* @var Mage_Catalog_Model_Resource_Setup $installer */ $installer->startSetup(); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.2-0.1.3.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.2-0.1.3.php index 810aeef3fbe..ca67638d02f 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.2-0.1.3.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.2-0.1.3.php @@ -25,7 +25,7 @@ */ $installer = $this; -/* @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +/* @var Mage_Catalog_Model_Resource_Setup $installer */ $installer->startSetup(); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.3-0.1.4.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.3-0.1.4.php index 788b88735fb..4f553c4c928 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.3-0.1.4.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.3-0.1.4.php @@ -25,7 +25,7 @@ */ $installer = $this; -/* @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +/* @var Mage_Catalog_Model_Resource_Setup $installer */ $installer->startSetup(); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.4-0.1.5.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.4-0.1.5.php index 16a74c3531e..6589d73db52 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.4-0.1.5.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.4-0.1.5.php @@ -25,7 +25,7 @@ */ $installer = $this; -/* @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +/* @var Mage_Catalog_Model_Resource_Setup $installer */ $installer->startSetup(); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.5-0.1.6.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.5-0.1.6.php index c79d261105c..db6d5a3a3ad 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.5-0.1.6.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.5-0.1.6.php @@ -25,7 +25,7 @@ */ $installer = $this; -/* @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +/* @var Mage_Catalog_Model_Resource_Setup $installer */ $installer->startSetup(); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.6-0.1.7.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.6-0.1.7.php index 5b37ee62f2a..ddc30e4d0ae 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.6-0.1.7.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.6-0.1.7.php @@ -25,7 +25,7 @@ */ $installer = $this; -/* @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +/* @var Mage_Catalog_Model_Resource_Setup $installer */ $installer->startSetup(); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.7-0.1.8.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.7-0.1.8.php index 3cd4ff91fa4..fab1e035078 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.7-0.1.8.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.7-0.1.8.php @@ -25,7 +25,7 @@ */ $installer = $this; -/* @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +/* @var Mage_Catalog_Model_Resource_Setup $installer */ $installer->startSetup(); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.8-0.1.9.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.8-0.1.9.php index a36f66f6e4a..94153a92b7f 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.8-0.1.9.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.8-0.1.9.php @@ -25,7 +25,7 @@ */ $installer = $this; -/* @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +/* @var Mage_Catalog_Model_Resource_Setup $installer */ $installer->startSetup(); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.9-0.1.10.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.9-0.1.10.php index f469ce3d452..ba37f523849 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.9-0.1.10.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.9-0.1.10.php @@ -25,7 +25,7 @@ */ $installer = $this; -/* @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +/* @var Mage_Catalog_Model_Resource_Setup $installer */ $installer->startSetup(); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.3.9-1.4.0.0.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.3.9-1.4.0.0.php index b3e5b6d7119..7835e01882a 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.3.9-1.4.0.0.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.3.9-1.4.0.0.php @@ -24,7 +24,7 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -/* @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +/* @var Mage_Catalog_Model_Resource_Setup $installer */ $installer = $this; $installer->startSetup(); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php index e86234afe32..361091f7118 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php @@ -24,7 +24,7 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -/* @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +/* @var Mage_Catalog_Model_Resource_Setup $installer */ $installer = $this; $installer->startSetup(); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php index 0b27804ba52..d4ffc55279c 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php @@ -24,6 +24,6 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -/* @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +/* @var Mage_Catalog_Model_Resource_Setup $installer */ $installer = $this; $installer->updateAttribute('catalog_product', 'links_purchased_separately', 'used_in_product_listing', 1); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.2-1.4.0.3.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.2-1.4.0.3.php index a16095c14ed..a965547e90d 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.2-1.4.0.3.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.2-1.4.0.3.php @@ -24,7 +24,7 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -/** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +/* @var Mage_Catalog_Model_Resource_Setup $installer */ $installer = $this; $adapter = $installer->getConnection(); 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 5db584d5ae5..8387a61e584 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 @@ -91,7 +91,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 aa72313f18d..c3cbebbf85a 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Type.php +++ b/app/code/core/Mage/Eav/Model/Entity/Type.php @@ -65,7 +65,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; @@ -79,7 +79,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; @@ -108,7 +108,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) { @@ -133,7 +133,7 @@ public function getAttributeCollection($setId = null) /** * Init and retreive attribute collection * - * @return Mage_Core_Model_Mysql4_Collection_Abstract|object + * @return Mage_Core_Model_Resource_Db_Collection_Abstract|object */ protected function _getAttributeCollection() { @@ -149,7 +149,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/Eav/Model/Mysql4/Config.php b/app/code/core/Mage/Eav/Model/Mysql4/Config.php deleted file mode 100644 index 91635273459..00000000000 --- a/app/code/core/Mage/Eav/Model/Mysql4/Config.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Eav_Model_Mysql4_Config extends Mage_Eav_Model_Resource_Config -{ -} diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php deleted file mode 100644 index c6d3ccf96f3..00000000000 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Eav_Model_Mysql4_Entity_Attribute extends Mage_Eav_Model_Resource_Entity_Attribute -{ -} diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php deleted file mode 100644 index eccc06e5101..00000000000 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Eav_Model_Mysql4_Entity_Attribute_Collection extends Mage_Eav_Model_Resource_Entity_Attribute_Collection -{ -} diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php deleted file mode 100644 index c52f6d41f3e..00000000000 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Eav_Model_Mysql4_Entity_Attribute_Group extends Mage_Eav_Model_Resource_Entity_Attribute_Group -{ -} diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php deleted file mode 100644 index 2cd723cd1a1..00000000000 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Eav_Model_Mysql4_Entity_Attribute_Group_Collection extends Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection -{ -} diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php deleted file mode 100644 index dafe0082bfd..00000000000 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Eav_Model_Mysql4_Entity_Attribute_Option extends Mage_Eav_Model_Resource_Entity_Attribute_Option -{ -} diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php deleted file mode 100644 index 9ccf113e666..00000000000 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Eav_Model_Mysql4_Entity_Attribute_Option_Collection extends Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection -{ -} diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php deleted file mode 100644 index 0397ac1b4c3..00000000000 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Eav_Model_Mysql4_Entity_Attribute_Set extends Mage_Eav_Model_Resource_Entity_Attribute_Set -{ -} diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php deleted file mode 100644 index 7169a5dcbf5..00000000000 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Eav_Model_Mysql4_Entity_Attribute_Set_Collection extends Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection -{ -} diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php deleted file mode 100644 index 2fcbb89777a..00000000000 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Eav_Model_Mysql4_Entity_Store extends Mage_Eav_Model_Resource_Entity_Store -{ -} diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php deleted file mode 100644 index 731218a39ac..00000000000 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Eav_Model_Mysql4_Entity_Type extends Mage_Eav_Model_Resource_Entity_Type -{ -} diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php deleted file mode 100644 index 90625986a82..00000000000 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Eav_Model_Mysql4_Entity_Type_Collection extends Mage_Eav_Model_Resource_Entity_Type_Collection -{ -} diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Form/Element.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Element.php deleted file mode 100644 index b695ff993a4..00000000000 --- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Element.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Eav_Model_Mysql4_Form_Element extends Mage_Eav_Model_Resource_Form_Element -{ -} diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Form/Element/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Element/Collection.php deleted file mode 100644 index 43d472c8153..00000000000 --- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Element/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Eav_Model_Mysql4_Form_Element_Collection extends Mage_Eav_Model_Resource_Form_Element_Collection -{ -} diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset.php deleted file mode 100644 index f18ace9e9d9..00000000000 --- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Eav_Model_Mysql4_Form_Fieldset extends Mage_Eav_Model_Resource_Form_Fieldset -{ -} diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset/Collection.php deleted file mode 100644 index 64f38852372..00000000000 --- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Eav_Model_Mysql4_Form_Fieldset_Collection extends Mage_Eav_Model_Resource_Form_Fieldset_Collection -{ -} diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Form/Type.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Type.php deleted file mode 100644 index f725e56babf..00000000000 --- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Type.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Eav_Model_Mysql4_Form_Type extends Mage_Eav_Model_Resource_Form_Type -{ -} diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Form/Type/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Type/Collection.php deleted file mode 100644 index 82cfae0e5f4..00000000000 --- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Type/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Eav_Model_Mysql4_Form_Type_Collection extends Mage_Eav_Model_Resource_Form_Type_Collection -{ -} diff --git a/app/code/core/Mage/Eav/etc/config.xml b/app/code/core/Mage/Eav/etc/config.xml index f4427ef8fbd..4ad1179f0af 100644 --- a/app/code/core/Mage/Eav/etc/config.xml +++ b/app/code/core/Mage/Eav/etc/config.xml @@ -39,7 +39,6 @@ Mage_Eav_Model_Resource - eav_mysql4 eav_entity
diff --git a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php b/app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php deleted file mode 100644 index 8f42d9e3842..00000000000 --- a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_GiftMessage_Model_Mysql4_Message extends Mage_GiftMessage_Model_Resource_Message -{ -} diff --git a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php b/app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php deleted file mode 100644 index 36aef775845..00000000000 --- a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_GiftMessage_Model_Mysql4_Message_Collection extends Mage_GiftMessage_Model_Resource_Message_Collection -{ -} diff --git a/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php b/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php deleted file mode 100644 index 164bcbad6ba..00000000000 --- a/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_GiftMessage_Model_Mysql4_Setup extends Mage_GiftMessage_Model_Resource_Setup -{ -} diff --git a/app/code/core/Mage/GiftMessage/etc/config.xml b/app/code/core/Mage/GiftMessage/etc/config.xml index edd1d926a30..de03e4ee8ad 100644 --- a/app/code/core/Mage/GiftMessage/etc/config.xml +++ b/app/code/core/Mage/GiftMessage/etc/config.xml @@ -49,7 +49,6 @@ Mage_GiftMessage_Model_Resource - giftmessage_mysql4 gift_message
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 526eeb6ba54..34b3dfc4ab2 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 @@ -25,5 +25,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 0f8dfefc384..5117e9d3d92 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 @@ -24,7 +24,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', array('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 1ea76a1b275..90ab9570fa6 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 @@ -24,7 +24,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 = array( 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 9b1fda408f6..fc6fae596c3 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 @@ -24,7 +24,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 71bc9e57e33..24e777b1238 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 @@ -24,7 +24,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 8a4e288c912..242b4611228 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 @@ -24,7 +24,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/Model/Import/Proxy/Product/Resource.php b/app/code/core/Mage/ImportExport/Model/Import/Proxy/Product/Resource.php index 73f7f7c8cc9..5eac0fcce14 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Proxy/Product/Resource.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Proxy/Product/Resource.php @@ -31,7 +31,7 @@ * @package Mage_ImportExport * @author Magento Core Team */ -class Mage_ImportExport_Model_Import_Proxy_Product_Resource extends Mage_Catalog_Model_Resource_Eav_Mysql4_Product +class Mage_ImportExport_Model_Import_Proxy_Product_Resource extends Mage_Catalog_Model_Resource_Product { /** * Product to category table. diff --git a/app/code/core/Mage/ImportExport/Model/Mysql4/Import/Data.php b/app/code/core/Mage/ImportExport/Model/Mysql4/Import/Data.php deleted file mode 100644 index 6f0edaba11c..00000000000 --- a/app/code/core/Mage/ImportExport/Model/Mysql4/Import/Data.php +++ /dev/null @@ -1,37 +0,0 @@ - - * @deprecated - */ -class Mage_ImportExport_Model_Mysql4_Import_Data extends Mage_ImportExport_Model_Resource_Import_Data -{ -} diff --git a/app/code/core/Mage/ImportExport/Model/Mysql4/Setup.php b/app/code/core/Mage/ImportExport/Model/Mysql4/Setup.php deleted file mode 100644 index 011ffe8bfb2..00000000000 --- a/app/code/core/Mage/ImportExport/Model/Mysql4/Setup.php +++ /dev/null @@ -1,37 +0,0 @@ - - * @deprecated - */ -class Mage_ImportExport_Model_Mysql4_Setup extends Mage_ImportExport_Model_Resource_Setup -{ -} 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 515f3f7f1af..401f263d0bd 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 @@ -24,7 +24,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/Index/Model/Mysql4/Abstract.php b/app/code/core/Mage/Index/Model/Mysql4/Abstract.php deleted file mode 100644 index b9c47a58704..00000000000 --- a/app/code/core/Mage/Index/Model/Mysql4/Abstract.php +++ /dev/null @@ -1,37 +0,0 @@ - - */ -abstract class Mage_Index_Model_Mysql4_Abstract extends Mage_Index_Model_Resource_Abstract -{ -} diff --git a/app/code/core/Mage/Index/Model/Mysql4/Event.php b/app/code/core/Mage/Index/Model/Mysql4/Event.php deleted file mode 100644 index 578e84549ef..00000000000 --- a/app/code/core/Mage/Index/Model/Mysql4/Event.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Index_Model_Mysql4_Event extends Mage_Index_Model_Resource_Event -{ -} diff --git a/app/code/core/Mage/Index/Model/Mysql4/Event/Collection.php b/app/code/core/Mage/Index/Model/Mysql4/Event/Collection.php deleted file mode 100644 index 85e0132c4ab..00000000000 --- a/app/code/core/Mage/Index/Model/Mysql4/Event/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Index_Model_Mysql4_Event_Collection extends Mage_Index_Model_Resource_Event_Collection -{ -} diff --git a/app/code/core/Mage/Index/Model/Mysql4/Process.php b/app/code/core/Mage/Index/Model/Mysql4/Process.php deleted file mode 100644 index bc8e10d1f85..00000000000 --- a/app/code/core/Mage/Index/Model/Mysql4/Process.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Index_Model_Mysql4_Process extends Mage_Index_Model_Resource_Process -{ -} diff --git a/app/code/core/Mage/Index/Model/Mysql4/Process/Collection.php b/app/code/core/Mage/Index/Model/Mysql4/Process/Collection.php deleted file mode 100644 index 18d187a5e30..00000000000 --- a/app/code/core/Mage/Index/Model/Mysql4/Process/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Index_Model_Mysql4_Process_Collection extends Mage_Index_Model_Resource_Process_Collection -{ -} diff --git a/app/code/core/Mage/Index/Model/Mysql4/Setup.php b/app/code/core/Mage/Index/Model/Mysql4/Setup.php deleted file mode 100644 index 9669ceff344..00000000000 --- a/app/code/core/Mage/Index/Model/Mysql4/Setup.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Index_Model_Mysql4_Setup extends Mage_Index_Model_Resource_Setup -{ -} diff --git a/app/code/core/Mage/Index/etc/config.xml b/app/code/core/Mage/Index/etc/config.xml index 5fc2a7fe0d8..d6d79528b18 100644 --- a/app/code/core/Mage/Index/etc/config.xml +++ b/app/code/core/Mage/Index/etc/config.xml @@ -44,7 +44,6 @@ Mage_Index_Model_Resource - index_mysql4 index_event
diff --git a/app/code/core/Mage/Install/etc/config.xml b/app/code/core/Mage/Install/etc/config.xml index 9aab226d5b6..f64023e0e54 100644 --- a/app/code/core/Mage/Install/etc/config.xml +++ b/app/code/core/Mage/Install/etc/config.xml @@ -39,7 +39,6 @@ Mage_Install_Model_Resource - install_mysql4 diff --git a/app/code/core/Mage/Log/Model/Mysql4/Aggregation.php b/app/code/core/Mage/Log/Model/Mysql4/Aggregation.php deleted file mode 100644 index 7631e9f17b7..00000000000 --- a/app/code/core/Mage/Log/Model/Mysql4/Aggregation.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Log_Model_Mysql4_Aggregation extends Mage_Log_Model_Resource_Aggregation -{ -} diff --git a/app/code/core/Mage/Log/Model/Mysql4/Customer.php b/app/code/core/Mage/Log/Model/Mysql4/Customer.php deleted file mode 100644 index cb6a7565397..00000000000 --- a/app/code/core/Mage/Log/Model/Mysql4/Customer.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Log_Model_Mysql4_Customer extends Mage_Log_Model_Resource_Customer -{ -} diff --git a/app/code/core/Mage/Log/Model/Mysql4/Log.php b/app/code/core/Mage/Log/Model/Mysql4/Log.php deleted file mode 100644 index 7fb52c2f6d5..00000000000 --- a/app/code/core/Mage/Log/Model/Mysql4/Log.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Log_Model_Mysql4_Log extends Mage_Log_Model_Resource_Log -{ -} diff --git a/app/code/core/Mage/Log/Model/Mysql4/Visitor.php b/app/code/core/Mage/Log/Model/Mysql4/Visitor.php deleted file mode 100644 index 79d29ed663c..00000000000 --- a/app/code/core/Mage/Log/Model/Mysql4/Visitor.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Log_Model_Mysql4_Visitor extends Mage_Log_Model_Resource_Visitor -{ -} diff --git a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Collection.php b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Collection.php deleted file mode 100644 index cdfbf90f61b..00000000000 --- a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Log_Model_Mysql4_Visitor_Collection extends Mage_Log_Model_Resource_Visitor_Collection -{ -} diff --git a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online.php b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online.php deleted file mode 100644 index 0c308f723e0..00000000000 --- a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Log_Model_Mysql4_Visitor_Online extends Mage_Log_Model_Resource_Visitor_Online -{ -} diff --git a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online/Collection.php b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online/Collection.php deleted file mode 100644 index 18af902a8de..00000000000 --- a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Log_Model_Mysql4_Visitor_Online_Collection extends Mage_Log_Model_Resource_Visitor_Online_Collection -{ -} diff --git a/app/code/core/Mage/Log/etc/config.xml b/app/code/core/Mage/Log/etc/config.xml index 3c01fc48640..44aca32dffc 100644 --- a/app/code/core/Mage/Log/etc/config.xml +++ b/app/code/core/Mage/Log/etc/config.xml @@ -56,7 +56,6 @@ Mage_Log_Model_Resource - log_mysql4 log_customer
diff --git a/app/code/core/Mage/Media/etc/config.xml b/app/code/core/Mage/Media/etc/config.xml index 6a505894968..530f0c0e8f5 100644 --- a/app/code/core/Mage/Media/etc/config.xml +++ b/app/code/core/Mage/Media/etc/config.xml @@ -39,7 +39,6 @@ Mage_Media_Model_File - media_file diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Problem.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Problem.php deleted file mode 100644 index 8c5d2c0ec22..00000000000 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Problem.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Newsletter_Model_Mysql4_Problem extends Mage_Newsletter_Model_Resource_Problem -{ -} diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Problem/Collection.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Problem/Collection.php deleted file mode 100644 index 842fc0e1b3b..00000000000 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Problem/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Newsletter_Model_Mysql4_Problem_Collection extends Mage_Newsletter_Model_Resource_Problem_Collection -{ -} diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Queue.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Queue.php deleted file mode 100644 index 52cd5c74122..00000000000 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Queue.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Newsletter_Model_Mysql4_Queue extends Mage_Newsletter_Model_Resource_Queue -{ -} diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Queue/Collection.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Queue/Collection.php deleted file mode 100644 index 3bb95f66532..00000000000 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Queue/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Newsletter_Model_Mysql4_Queue_Collection extends Mage_Newsletter_Model_Resource_Queue_Collection -{ -} diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php deleted file mode 100644 index 706c3d04a79..00000000000 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Newsletter_Model_Mysql4_Subscriber extends Mage_Newsletter_Model_Resource_Subscriber -{ -} diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber/Collection.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber/Collection.php deleted file mode 100644 index b77766b5bf3..00000000000 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Newsletter_Model_Mysql4_Subscriber_Collection extends Mage_Newsletter_Model_Resource_Subscriber_Collection -{ -} diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php deleted file mode 100644 index e706be52d0d..00000000000 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Newsletter_Model_Mysql4_Template extends Mage_Newsletter_Model_Resource_Template -{ -} diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Template/Collection.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Template/Collection.php deleted file mode 100644 index 3984bd67f33..00000000000 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Template/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Newsletter_Model_Mysql4_Template_Collection extends Mage_Newsletter_Model_Resource_Template_Collection -{ -} diff --git a/app/code/core/Mage/Newsletter/etc/config.xml b/app/code/core/Mage/Newsletter/etc/config.xml index 2ea7e524e12..e24531e7837 100644 --- a/app/code/core/Mage/Newsletter/etc/config.xml +++ b/app/code/core/Mage/Newsletter/etc/config.xml @@ -44,7 +44,6 @@ Mage_Newsletter_Model_Resource - newsletter_mysql4 newsletter_subscriber
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 c6b14647dc6..68777bb1874 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 @@ -33,7 +33,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 572c60310fc..2bf20460770 100644 --- a/app/code/core/Mage/Page/Block/Html/Pager.php +++ b/app/code/core/Mage/Page/Block/Html/Pager.php @@ -149,7 +149,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/Paygate/Model/Mysql4/Authorizenet/Debug.php b/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug.php deleted file mode 100644 index a24ddf4078a..00000000000 --- a/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Paygate_Model_Mysql4_Authorizenet_Debug extends Mage_Paygate_Model_Resource_Authorizenet_Debug -{ -} diff --git a/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug/Collection.php b/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug/Collection.php deleted file mode 100644 index 8d74df5ef25..00000000000 --- a/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection extends Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection -{ -} diff --git a/app/code/core/Mage/Paygate/etc/config.xml b/app/code/core/Mage/Paygate/etc/config.xml index e889bdf041f..929e26cc86c 100644 --- a/app/code/core/Mage/Paygate/etc/config.xml +++ b/app/code/core/Mage/Paygate/etc/config.xml @@ -39,7 +39,6 @@ Mage_Paygate_Model_Resource - paygate_mysql4 paygate_authorizenet_debug
diff --git a/app/code/core/Mage/Paypal/Model/Mysql4/Cert.php b/app/code/core/Mage/Paypal/Model/Mysql4/Cert.php deleted file mode 100644 index 52291e8e025..00000000000 --- a/app/code/core/Mage/Paypal/Model/Mysql4/Cert.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Paypal_Model_Mysql4_Cert extends Mage_Paypal_Model_Resource_Cert -{ -} diff --git a/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement.php b/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement.php deleted file mode 100644 index beb7ba50461..00000000000 --- a/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Paypal_Model_Mysql4_Report_Settlement extends Mage_Paypal_Model_Resource_Report_Settlement -{ -} diff --git a/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row.php b/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row.php deleted file mode 100644 index ac2974503bd..00000000000 --- a/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Paypal_Model_Mysql4_Report_Settlement_Row extends Mage_Paypal_Model_Resource_Report_Settlement_Row -{ -} diff --git a/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row/Collection.php b/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row/Collection.php deleted file mode 100644 index 73c7f39549e..00000000000 --- a/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Paypal_Model_Mysql4_Report_Settlement_Row_Collection extends Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection -{ -} diff --git a/app/code/core/Mage/Paypal/Model/Mysql4/Setup.php b/app/code/core/Mage/Paypal/Model/Mysql4/Setup.php deleted file mode 100644 index 21507c45827..00000000000 --- a/app/code/core/Mage/Paypal/Model/Mysql4/Setup.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Paypal_Model_Mysql4_Setup extends Mage_Paypal_Model_Resource_Setup -{ -} diff --git a/app/code/core/Mage/Paypal/etc/config.xml b/app/code/core/Mage/Paypal/etc/config.xml index 9ea9c533d3e..7a326edd74f 100644 --- a/app/code/core/Mage/Paypal/etc/config.xml +++ b/app/code/core/Mage/Paypal/etc/config.xml @@ -49,7 +49,6 @@ Mage_Paypal_Model_Resource - paypal_mysql4 paypal_api_debug
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 270023cdec7..76ab0b832a2 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 @@ -26,7 +26,7 @@ $installer = $this; -/* @var $installer Mage_Paypal_Model_Mysql4_Setup */ +/* @var $installer Mage_Paypal_Model_Resource_Setup */ $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 2c7268b26c9..abd93251d2e 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 @@ -26,7 +26,7 @@ $installer = $this; -/* @var $installer Mage_Paypal_Model_Mysql4_Setup */ +/* @var $installer Mage_Paypal_Model_Resource_Setup */ $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 6dc23db23b1..4814d32282e 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 @@ -24,7 +24,7 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; -/* @var $installer Mage_Paypal_Model_Mysql4_Setup */ +/* @var $installer Mage_Paypal_Model_Resource_Setup */ $installer->startSetup(); $installer->addAttribute('order', 'paypal_ipn_customer_notified', array('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 b0971666116..fcc6b8a2657 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 @@ -24,7 +24,7 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; -/* @var $installer Mage_Paypal_Model_Mysql4_Setup */ +/* @var $installer Mage_Paypal_Model_Resource_Setup */ $installer->startSetup(); $installer->addAttribute('order_payment', 'cc_secure_verify', array()); 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 fef26c2a8fa..f17a245a027 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 @@ -26,7 +26,7 @@ $installer = $this; -/* @var $installer Mage_Paypal_Model_Mysql4_Setup */ +/* @var $installer Mage_Paypal_Model_Resource_Setup */ $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 5a2c78c7648..4e88ff545f0 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 @@ -24,7 +24,7 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -/* @var $installer Mage_Paypal_Model_Mysql4_Setup */ +/* @var $installer Mage_Paypal_Model_Resource_Setup */ $installer = $this; $installer->run(" diff --git a/app/code/core/Mage/PaypalUk/etc/config.xml b/app/code/core/Mage/PaypalUk/etc/config.xml index c105d6f83a7..6410a38961f 100644 --- a/app/code/core/Mage/PaypalUk/etc/config.xml +++ b/app/code/core/Mage/PaypalUk/etc/config.xml @@ -39,7 +39,6 @@ Mage_PaypalUk_Model_Resource - paypaluk_mysql4 paypaluk_api_debug
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 9fc0a3c4d43..d8980250f13 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 @@ -26,7 +26,7 @@ $installer = $this; -/* @var $installer Mage_Paypal_Model_Mysql4_Setup */ +/* @var $installer Mage_Paypal_Model_Resource_Setup */ $installer->startSetup(); diff --git a/app/code/core/Mage/Poll/Model/Mysql4/Poll.php b/app/code/core/Mage/Poll/Model/Mysql4/Poll.php deleted file mode 100644 index f7bf9ab67ad..00000000000 --- a/app/code/core/Mage/Poll/Model/Mysql4/Poll.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Poll_Model_Mysql4_Poll extends Mage_Poll_Model_Resource_Poll -{ -} diff --git a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer.php b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer.php deleted file mode 100644 index be87d7dd4c3..00000000000 --- a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Poll_Model_Mysql4_Poll_Answer extends Mage_Poll_Model_Resource_Poll_Answer -{ -} diff --git a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer/Collection.php b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer/Collection.php deleted file mode 100644 index 88de05d6677..00000000000 --- a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Poll_Model_Mysql4_Poll_Answer_Collection extends Mage_Poll_Model_Resource_Poll_Answer_Collection -{ -} diff --git a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Collection.php b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Collection.php deleted file mode 100644 index 10b390d2fec..00000000000 --- a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Poll_Model_Mysql4_Poll_Collection extends Mage_Poll_Model_Resource_Poll_Collection -{ -} diff --git a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Vote.php b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Vote.php deleted file mode 100644 index 3a4b8c25f2d..00000000000 --- a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Vote.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Poll_Model_Mysql4_Poll_Vote extends Mage_Poll_Model_Resource_Poll_Vote -{ -} diff --git a/app/code/core/Mage/Poll/etc/config.xml b/app/code/core/Mage/Poll/etc/config.xml index 028ae578511..4ad5440491c 100644 --- a/app/code/core/Mage/Poll/etc/config.xml +++ b/app/code/core/Mage/Poll/etc/config.xml @@ -77,7 +77,6 @@ Mage_Poll_Model_Resource - poll_mysql4 poll
diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Price.php deleted file mode 100644 index 32f7be58a42..00000000000 --- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_ProductAlert_Model_Mysql4_Price extends Mage_ProductAlert_Model_Resource_Price -{ -} diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Collection.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Collection.php deleted file mode 100644 index a36a24768f5..00000000000 --- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_ProductAlert_Model_Mysql4_Price_Collection extends Mage_ProductAlert_Model_Resource_Price_Collection -{ -} diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Customer/Collection.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Customer/Collection.php deleted file mode 100644 index e596531c23e..00000000000 --- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Customer/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_ProductAlert_Model_Mysql4_Price_Customer_Collection extends Mage_ProductAlert_Model_Resource_Price_Customer_Collection -{ -} diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.php deleted file mode 100644 index 0d13a772204..00000000000 --- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_ProductAlert_Model_Mysql4_Stock extends Mage_ProductAlert_Model_Resource_Stock -{ -} diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Collection.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Collection.php deleted file mode 100644 index 32f407e6276..00000000000 --- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_ProductAlert_Model_Mysql4_Stock_Collection extends Mage_ProductAlert_Model_Resource_Stock_Collection -{ -} diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Customer/Collection.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Customer/Collection.php deleted file mode 100644 index 3a867dd8142..00000000000 --- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Customer/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_ProductAlert_Model_Mysql4_Stock_Customer_Collection extends Mage_ProductAlert_Model_Resource_Stock_Customer_Collection -{ -} diff --git a/app/code/core/Mage/ProductAlert/etc/config.xml b/app/code/core/Mage/ProductAlert/etc/config.xml index 6ec08ee3f47..40b99fbaa3d 100644 --- a/app/code/core/Mage/ProductAlert/etc/config.xml +++ b/app/code/core/Mage/ProductAlert/etc/config.xml @@ -39,7 +39,6 @@ Mage_ProductAlert_Model_Resource - productalert_mysql4 product_alert_price
diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating.php deleted file mode 100644 index e7104f7f952..00000000000 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Rating_Model_Mysql4_Rating extends Mage_Rating_Model_Resource_Rating -{ -} diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Collection.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Collection.php deleted file mode 100644 index fe841b16509..00000000000 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Rating_Model_Mysql4_Rating_Collection extends Mage_Rating_Model_Resource_Rating_Collection -{ -} diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Entity.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Entity.php deleted file mode 100644 index 149e182a06d..00000000000 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Entity.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Rating_Model_Mysql4_Rating_Entity extends Mage_Rating_Model_Resource_Rating_Entity -{ -} diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option.php deleted file mode 100644 index e34022810ee..00000000000 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Rating_Model_Mysql4_Rating_Option extends Mage_Rating_Model_Resource_Rating_Option -{ -} diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Collection.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Collection.php deleted file mode 100644 index 11dad6727c4..00000000000 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Rating_Model_Mysql4_Rating_Option_Collection extends Mage_Rating_Model_Resource_Rating_Option_Collection -{ -} diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote.php deleted file mode 100644 index bf6ee807284..00000000000 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Rating_Model_Mysql4_Rating_Option_Vote extends Mage_Rating_Model_Resource_Rating_Option_Vote -{ -} diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote/Collection.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote/Collection.php deleted file mode 100644 index a27b6466926..00000000000 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Rating_Model_Mysql4_Rating_Option_Vote_Collection extends Mage_Rating_Model_Resource_Rating_Option_Vote_Collection -{ -} diff --git a/app/code/core/Mage/Rating/etc/config.xml b/app/code/core/Mage/Rating/etc/config.xml index 6994646ac51..7a73d6aad77 100644 --- a/app/code/core/Mage/Rating/etc/config.xml +++ b/app/code/core/Mage/Rating/etc/config.xml @@ -39,7 +39,6 @@ Mage_Rating_Model_Resource - rating_mysql4 rating
diff --git a/app/code/core/Mage/Reports/Block/Product/Abstract.php b/app/code/core/Mage/Reports/Block/Product/Abstract.php index c91f35ece37..2c7660f31d8 100644 --- a/app/code/core/Mage/Reports/Block/Product/Abstract.php +++ b/app/code/core/Mage/Reports/Block/Product/Abstract.php @@ -53,7 +53,7 @@ abstract class Mage_Reports_Block_Product_Abstract extends Mage_Catalog_Block_Pr /** * Product Index Collection * - * @var Mage_Reports_Model_Mysql4_Product_Index_Collection_Abstract + * @var Mage_Reports_Model_Resource_Product_Index_Collection_Abstract */ protected $_collection; diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Accounts/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Accounts/Collection.php deleted file mode 100644 index 0a9375c59b4..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Accounts/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Accounts_Collection extends Mage_Reports_Model_Resource_Accounts_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Coupons/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Coupons/Collection.php deleted file mode 100644 index 13375a54932..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Coupons/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Coupons_Collection extends Mage_Reports_Model_Resource_Coupons_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Customer/Collection.php deleted file mode 100644 index 68be9036618..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Customer_Collection extends Mage_Reports_Model_Resource_Customer_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Orders/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Customer/Orders/Collection.php deleted file mode 100644 index 965ccbd88ba..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Orders/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Customer_Orders_Collection extends Mage_Reports_Model_Resource_Customer_Orders_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Totals/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Customer/Totals/Collection.php deleted file mode 100644 index fbec4aee726..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Totals/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Customer_Totals_Collection extends Mage_Reports_Model_Resource_Customer_Totals_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Entity/Summary/Collection/Abstract.php b/app/code/core/Mage/Reports/Model/Mysql4/Entity/Summary/Collection/Abstract.php deleted file mode 100644 index f774b3b860f..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Entity/Summary/Collection/Abstract.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Entity_Summary_Collection_Abstract extends Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Event.php b/app/code/core/Mage/Reports/Model/Mysql4/Event.php deleted file mode 100644 index 9d0d4975fa0..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Event.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Event extends Mage_Reports_Model_Resource_Event -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Event/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Event/Collection.php deleted file mode 100644 index cc2583aa4e5..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Event/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Event_Collection extends Mage_Reports_Model_Resource_Event_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Event/Type.php b/app/code/core/Mage/Reports/Model/Mysql4/Event/Type.php deleted file mode 100644 index d9beed094e7..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Event/Type.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Event_Type extends Mage_Reports_Model_Resource_Event_Type -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Event/Type/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Event/Type/Collection.php deleted file mode 100644 index d3f0e64cff5..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Event/Type/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Event_Type_Collection extends Mage_Reports_Model_Resource_Event_Type_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Invoiced/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Invoiced/Collection.php deleted file mode 100644 index 2c404b9419c..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Invoiced/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Invoiced_Collection extends Mage_Reports_Model_Resource_Invoiced_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Order/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Order/Collection.php deleted file mode 100644 index 93029ebffe3..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Order/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Order_Collection extends Mage_Reports_Model_Resource_Order_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Collection.php deleted file mode 100644 index ccd9cfa48bf..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Product_Collection extends Mage_Reports_Model_Resource_Product_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Downloads/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Downloads/Collection.php deleted file mode 100644 index 3c78827ee56..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Downloads/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Product_Downloads_Collection extends Mage_Reports_Model_Resource_Product_Downloads_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Abstract.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Abstract.php deleted file mode 100644 index 919f31447b2..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Abstract.php +++ /dev/null @@ -1,37 +0,0 @@ - - */ -abstract class Mage_Reports_Model_Mysql4_Product_Index_Abstract extends Mage_Reports_Model_Resource_Product_Index_Abstract -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Collection/Abstract.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Collection/Abstract.php deleted file mode 100644 index 083e48a3380..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Collection/Abstract.php +++ /dev/null @@ -1,37 +0,0 @@ - - */ -abstract class Mage_Reports_Model_Mysql4_Product_Index_Collection_Abstract extends Mage_Reports_Model_Resource_Product_Index_Collection_Abstract -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared.php deleted file mode 100644 index 94b44f83d80..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Product_Index_Compared extends Mage_Reports_Model_Resource_Product_Index_Compared -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared/Collection.php deleted file mode 100644 index d2ac5b4f6d8..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Product_Index_Compared_Collection extends Mage_Reports_Model_Resource_Product_Index_Compared_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed.php deleted file mode 100644 index 62da521f227..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Product_Index_Viewed extends Mage_Reports_Model_Resource_Product_Index_Viewed -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed/Collection.php deleted file mode 100644 index d7f89772f2d..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Product_Index_Viewed_Collection extends Mage_Reports_Model_Resource_Product_Index_Viewed_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Lowstock/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Lowstock/Collection.php deleted file mode 100644 index 1825b6ca705..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Lowstock/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Product_Lowstock_Collection extends Mage_Reports_Model_Resource_Product_Lowstock_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Ordered/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Ordered/Collection.php deleted file mode 100644 index 7007634c3af..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Ordered/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Product_Ordered_Collection extends Mage_Reports_Model_Resource_Product_Ordered_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Sold/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Sold/Collection.php deleted file mode 100644 index ba88fb5908d..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Sold/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Product_Sold_Collection extends Mage_Reports_Model_Resource_Product_Sold_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Viewed/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Viewed/Collection.php deleted file mode 100644 index 419a7540273..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Viewed/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Product_Viewed_Collection extends Mage_Reports_Model_Resource_Product_Viewed_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Quote/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Quote/Collection.php deleted file mode 100644 index 5a69baab572..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Quote/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Quote_Collection extends Mage_Reports_Model_Resource_Quote_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Refunded/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Refunded/Collection.php deleted file mode 100644 index c76b9068a88..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Refunded/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Refunded_Collection extends Mage_Reports_Model_Resource_Refunded_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Report/Abstract.php b/app/code/core/Mage/Reports/Model/Mysql4/Report/Abstract.php deleted file mode 100644 index 81404c98924..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Report/Abstract.php +++ /dev/null @@ -1,37 +0,0 @@ - - */ -abstract class Mage_Reports_Model_Mysql4_Report_Abstract extends Mage_Reports_Model_Resource_Report_Abstract -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Report/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Report/Collection.php deleted file mode 100644 index 80b720bd207..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Report/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Report_Collection extends Mage_Reports_Model_Resource_Report_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Review/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Review/Collection.php deleted file mode 100644 index e44b5dfd777..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Review/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Review_Collection extends Mage_Reports_Model_Resource_Review_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Review/Customer/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Review/Customer/Collection.php deleted file mode 100644 index c7e93c82fcc..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Review/Customer/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Review_Customer_Collection extends Mage_Reports_Model_Resource_Review_Customer_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Review/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Review/Product/Collection.php deleted file mode 100644 index d3dd9b7bcca..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Review/Product/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Review_Product_Collection extends Mage_Reports_Model_Resource_Review_Product_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Shipping/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Shipping/Collection.php deleted file mode 100644 index d9e8556a55b..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Shipping/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Shipping_Collection extends Mage_Reports_Model_Resource_Shipping_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Shopcart/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Shopcart/Product/Collection.php deleted file mode 100644 index bd19fd978f3..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Shopcart/Product/Collection.php +++ /dev/null @@ -1,39 +0,0 @@ - - * - * @deprecated after 1.5.0.1 - */ -class Mage_Reports_Model_Mysql4_Shopcart_Product_Collection extends Mage_Reports_Model_Resource_Shopcart_Product_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Tag/Collection.php deleted file mode 100644 index 97e751c27f0..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Tag_Collection extends Mage_Reports_Model_Resource_Tag_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Customer/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Tag/Customer/Collection.php deleted file mode 100644 index a76a2385f05..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Customer/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Tag_Customer_Collection extends Mage_Reports_Model_Resource_Tag_Customer_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Tag/Product/Collection.php deleted file mode 100644 index 225faf2065d..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Product/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Tag_Product_Collection extends Mage_Reports_Model_Resource_Tag_Product_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Tax/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Tax/Collection.php deleted file mode 100644 index 8f00c09411e..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Tax/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Tax_Collection extends Mage_Reports_Model_Resource_Tax_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Collection.php deleted file mode 100644 index b260968af6a..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Wishlist_Collection extends Mage_Reports_Model_Resource_Wishlist_Collection -{ -} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Product/Collection.php deleted file mode 100644 index 62ae4a4f5b6..00000000000 --- a/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Product/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Reports_Model_Mysql4_Wishlist_Product_Collection extends Mage_Reports_Model_Resource_Wishlist_Product_Collection -{ -} diff --git a/app/code/core/Mage/Reports/etc/config.xml b/app/code/core/Mage/Reports/etc/config.xml index ef02b0aad07..0257a0d94d2 100644 --- a/app/code/core/Mage/Reports/etc/config.xml +++ b/app/code/core/Mage/Reports/etc/config.xml @@ -39,7 +39,6 @@ Mage_Reports_Model_Resource - reports_mysql4 report_event
diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review.php b/app/code/core/Mage/Review/Model/Mysql4/Review.php deleted file mode 100644 index 0bf1e690efd..00000000000 --- a/app/code/core/Mage/Review/Model/Mysql4/Review.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Review_Model_Mysql4_Review extends Mage_Review_Model_Resource_Review -{ -} diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review/Collection.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Collection.php deleted file mode 100644 index 9de0fa9282e..00000000000 --- a/app/code/core/Mage/Review/Model/Mysql4/Review/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Review_Model_Mysql4_Review_Collection extends Mage_Review_Model_Resource_Review_Collection -{ -} diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review/Product/Collection.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Product/Collection.php deleted file mode 100644 index 0018629f570..00000000000 --- a/app/code/core/Mage/Review/Model/Mysql4/Review/Product/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Review_Model_Mysql4_Review_Product_Collection extends Mage_Review_Model_Resource_Review_Product_Collection -{ -} diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review/Status/Collection.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Status/Collection.php deleted file mode 100644 index 484f466fc48..00000000000 --- a/app/code/core/Mage/Review/Model/Mysql4/Review/Status/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Review_Model_Mysql4_Review_Status_Collection extends Mage_Review_Model_Resource_Review_Status_Collection -{ -} diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review/Summary.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Summary.php deleted file mode 100644 index 0b8a96026cf..00000000000 --- a/app/code/core/Mage/Review/Model/Mysql4/Review/Summary.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Review_Model_Mysql4_Review_Summary extends Mage_Review_Model_Resource_Review_Summary -{ -} diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review/Summary/Collection.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Summary/Collection.php deleted file mode 100644 index 6c0e4f03e05..00000000000 --- a/app/code/core/Mage/Review/Model/Mysql4/Review/Summary/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Review_Model_Mysql4_Review_Summary_Collection extends Mage_Review_Model_Resource_Review_Summary_Collection -{ -} diff --git a/app/code/core/Mage/Review/etc/config.xml b/app/code/core/Mage/Review/etc/config.xml index 6d939cfb107..e42e1bc4c0f 100644 --- a/app/code/core/Mage/Review/etc/config.xml +++ b/app/code/core/Mage/Review/etc/config.xml @@ -39,7 +39,6 @@ Mage_Review_Model_Resource - review_mysql4 review
diff --git a/app/code/core/Mage/Rss/Block/List.php b/app/code/core/Mage/Rss/Block/List.php index 98e9d410f33..bd0a911b160 100644 --- a/app/code/core/Mage/Rss/Block/List.php +++ b/app/code/core/Mage/Rss/Block/List.php @@ -197,7 +197,7 @@ public function CategoriesRssFeed() if((bool)Mage::getStoreConfig($path)){ $category = Mage::getModel('catalog/category'); - /* @var Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection $collection */ + /* @var Mage_Catalog_Model_Resource_Category_Collection $collection */ $treeModel = $category->getTreeModel()->loadNode(Mage::app()->getStore()->getRootCategoryId()); $nodes = $treeModel->loadChildren()->getChildren(); diff --git a/app/code/core/Mage/Rss/Model/Mysql4/Order.php b/app/code/core/Mage/Rss/Model/Mysql4/Order.php deleted file mode 100644 index e399c4d01ff..00000000000 --- a/app/code/core/Mage/Rss/Model/Mysql4/Order.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Rss_Model_Mysql4_Order extends Mage_Rss_Model_Resource_Order -{ -} diff --git a/app/code/core/Mage/Rss/etc/config.xml b/app/code/core/Mage/Rss/etc/config.xml index ae0ff5369e8..ae0d2665d08 100644 --- a/app/code/core/Mage/Rss/etc/config.xml +++ b/app/code/core/Mage/Rss/etc/config.xml @@ -39,7 +39,6 @@ Mage_Rss_Model_Resource - rss_mysql4 diff --git a/app/code/core/Mage/Rule/Model/Mysql4/Rule.php b/app/code/core/Mage/Rule/Model/Mysql4/Rule.php deleted file mode 100644 index d4bbd101b84..00000000000 --- a/app/code/core/Mage/Rule/Model/Mysql4/Rule.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Rule_Model_Mysql4_Rule extends Mage_Rule_Model_Resource_Rule -{ -} diff --git a/app/code/core/Mage/Rule/Model/Mysql4/Rule/Collection.php b/app/code/core/Mage/Rule/Model/Mysql4/Rule/Collection.php deleted file mode 100644 index 792b64b6afc..00000000000 --- a/app/code/core/Mage/Rule/Model/Mysql4/Rule/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Rule_Model_Mysql4_Rule_Collection extends Mage_Rule_Model_Resource_Rule_Collection -{ -} diff --git a/app/code/core/Mage/Rule/etc/config.xml b/app/code/core/Mage/Rule/etc/config.xml index c4b45934ab6..02cb73b134c 100644 --- a/app/code/core/Mage/Rule/etc/config.xml +++ b/app/code/core/Mage/Rule/etc/config.xml @@ -39,7 +39,6 @@ Mage_Rule_Model_Resource - rule_mysql4 diff --git a/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php b/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php index f43df060e8a..0363cd5da7d 100644 --- a/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php +++ b/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php @@ -57,14 +57,14 @@ class Mage_Sales_Block_Billing_Agreement_View extends Mage_Core_Block_Template /** * Related orders collection * - * @var Mage_Sales_Model_Mysql4_Order_Collection + * @var Mage_Sales_Model_Resource_Order_Collection */ protected $_relatedOrders = null; /** * Retrieve related orders collection * - * @return Mage_Sales_Model_Mysql4_Order_Collection + * @return Mage_Sales_Model_Resource_Order_Collection */ public function getRelatedOrders() { diff --git a/app/code/core/Mage/Sales/Block/Billing/Agreements.php b/app/code/core/Mage/Sales/Block/Billing/Agreements.php index 27b18c7e2bf..551dd6e526f 100644 --- a/app/code/core/Mage/Sales/Block/Billing/Agreements.php +++ b/app/code/core/Mage/Sales/Block/Billing/Agreements.php @@ -44,7 +44,7 @@ class Mage_Sales_Block_Billing_Agreements extends Mage_Core_Block_Template /** * Billing agreements collection * - * @var Mage_Sales_Model_Mysql4_Billing_Agreement_Collection + * @var Mage_Sales_Model_Resource_Billing_Agreement_Collection */ protected $_billingAgreements = null; @@ -67,7 +67,7 @@ protected function _prepareLayout() /** * Retrieve billing agreements collection * - * @return Mage_Sales_Model_Mysql4_Billing_Agreement_Collection + * @return Mage_Sales_Model_Resource_Billing_Agreement_Collection */ public function getBillingAgreements() { diff --git a/app/code/core/Mage/Sales/Block/Order/Comments.php b/app/code/core/Mage/Sales/Block/Order/Comments.php index 5b46ea76dc7..5afc087cb3f 100644 --- a/app/code/core/Mage/Sales/Block/Order/Comments.php +++ b/app/code/core/Mage/Sales/Block/Order/Comments.php @@ -35,7 +35,7 @@ class Mage_Sales_Block_Order_Comments extends Mage_Core_Block_Template /** * Currect comments collection * - * @var Mage_Sales_Model_Mysql4_Order_Comment_Collection_Abstract + * @var Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract */ protected $_commentCollection; @@ -65,7 +65,7 @@ public function getEntity() /** * Initialize model comments and return comment collection * - * @return Mage_Sales_Model_Mysql4_Order_Comment_Collection_Abstract + * @return Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract */ public function getComments() { 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 2b40d0866aa..055dd93c7af 100644 --- a/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php +++ b/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php @@ -44,7 +44,7 @@ class Mage_Sales_Block_Order_Print_Shipment extends Mage_Sales_Block_Items_Abstr /** * Order shipments collection * - * @var array|Mage_Sales_Model_Mysql4_Order_Shipment_Collection + * @var array|Mage_Sales_Model_Resource_Order_Shipment_Collection */ protected $_shipmentsCollection; @@ -140,7 +140,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/Block/Recurring/Profile/View.php b/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php index 98765dc3671..b7875d134ac 100644 --- a/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php +++ b/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php @@ -51,7 +51,7 @@ class Mage_Sales_Block_Recurring_Profile_View extends Mage_Core_Block_Template /** * Related orders collection * - * @var Mage_Sales_Model_Mysql4_Order_Collection + * @var Mage_Sales_Model_Resource_Order_Collection */ protected $_relatedOrders = null; diff --git a/app/code/core/Mage/Sales/Block/Recurring/Profiles.php b/app/code/core/Mage/Sales/Block/Recurring/Profiles.php index e5a29312840..912e81c0243 100644 --- a/app/code/core/Mage/Sales/Block/Recurring/Profiles.php +++ b/app/code/core/Mage/Sales/Block/Recurring/Profiles.php @@ -36,7 +36,7 @@ class Mage_Sales_Block_Recurring_Profiles extends Mage_Core_Block_Template /** * Profiles collection * - * @var Mage_Sales_Model_Mysql4_Recurring_Profile_Collection + * @var Mage_Sales_Model_Resource_Recurring_Profile_Collection */ protected $_profiles = null; diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Abstract.php deleted file mode 100644 index fe8efa2455f..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Abstract.php +++ /dev/null @@ -1,37 +0,0 @@ - - */ -abstract class Mage_Sales_Model_Mysql4_Abstract extends Mage_Sales_Model_Resource_Abstract -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement.php b/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement.php deleted file mode 100644 index f40a3007437..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Billing_Agreement extends Mage_Sales_Model_Resource_Billing_Agreement -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement/Collection.php deleted file mode 100644 index 9b0c3115d9e..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Billing_Agreement_Collection extends Mage_Sales_Model_Resource_Billing_Agreement_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Collection/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Collection/Abstract.php deleted file mode 100644 index d064090bf7c..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Collection/Abstract.php +++ /dev/null @@ -1,37 +0,0 @@ - - */ -class Mage_Sales_Model_Mysql4_Collection_Abstract extends Mage_Sales_Model_Resource_Collection_Abstract -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order.php b/app/code/core/Mage/Sales/Model/Mysql4/Order.php deleted file mode 100644 index 3403bcd86cc..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order extends Mage_Sales_Model_Resource_Order -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Abstract.php deleted file mode 100644 index 0aa0c763940..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Abstract.php +++ /dev/null @@ -1,37 +0,0 @@ - - */ -abstract class Mage_Sales_Model_Mysql4_Order_Abstract extends Mage_Sales_Model_Resource_Order_Abstract -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Address.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Address.php deleted file mode 100644 index 2f0e67c96fe..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Address.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Address extends Mage_Sales_Model_Resource_Order_Address -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Address/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Address/Collection.php deleted file mode 100644 index fe30d5e4ef0..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Address/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Address_Collection extends Mage_Sales_Model_Resource_Order_Address_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Billing.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Billing.php deleted file mode 100644 index 3c94877b8bd..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Billing.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Attribute_Backend_Billing extends Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Child.php deleted file mode 100644 index 52c78587603..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Child.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Attribute_Backend_Child extends Mage_Sales_Model_Resource_Order_Attribute_Backend_Child -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Parent.php deleted file mode 100644 index 633ba7d237a..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Parent.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Attribute_Backend_Parent extends Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Shipping.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Shipping.php deleted file mode 100644 index 5b6758edb47..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Shipping.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Attribute_Backend_Shipping extends Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php deleted file mode 100644 index 93eddd77469..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Collection extends Mage_Sales_Model_Resource_Order_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection/Abstract.php deleted file mode 100644 index 299b919747a..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection/Abstract.php +++ /dev/null @@ -1,37 +0,0 @@ - - */ -class Mage_Sales_Model_Mysql4_Order_Collection_Abstract extends Mage_Sales_Model_Resource_Order_Collection_Abstract -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Comment/Collection/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Comment/Collection/Abstract.php deleted file mode 100644 index cd9672152b7..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Comment/Collection/Abstract.php +++ /dev/null @@ -1,37 +0,0 @@ - - */ -class Mage_Sales_Model_Mysql4_Order_Comment_Collection_Abstract extends Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo.php deleted file mode 100644 index 14f4bad834c..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Creditmemo extends Mage_Sales_Model_Resource_Order_Creditmemo -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Child.php deleted file mode 100644 index 2df035e0a9f..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Child.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Creditmemo_Attribute_Backend_Child extends Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Parent.php deleted file mode 100644 index bde46a10b99..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Parent.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Creditmemo_Attribute_Backend_Parent extends Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Collection.php deleted file mode 100644 index d7407d9ce99..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Creditmemo_Collection extends Mage_Sales_Model_Resource_Order_Creditmemo_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment.php deleted file mode 100644 index 5633aa71e63..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Creditmemo_Comment extends Mage_Sales_Model_Resource_Order_Creditmemo_Comment -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment/Collection.php deleted file mode 100644 index 37ae7e3eefc..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Creditmemo_Comment_Collection extends Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Grid/Collection.php deleted file mode 100644 index 677b300646f..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Grid/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Creditmemo_Grid_Collection extends Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item.php deleted file mode 100644 index 26911ce636e..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Creditmemo_Item extends Mage_Sales_Model_Resource_Order_Creditmemo_Item -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item/Collection.php deleted file mode 100644 index 4c550503f9a..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Creditmemo_Item_Collection extends Mage_Sales_Model_Resource_Order_Creditmemo_Item_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Grid/Collection.php deleted file mode 100644 index 251ae577743..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Grid/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Grid_Collection extends Mage_Sales_Model_Resource_Order_Grid_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice.php deleted file mode 100644 index d964e7ff19f..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Invoice extends Mage_Sales_Model_Resource_Order_Invoice -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Child.php deleted file mode 100644 index 7c074864a2b..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Child.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Invoice_Attribute_Backend_Child extends Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Item.php deleted file mode 100644 index c3a5618defa..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Item.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Invoice_Attribute_Backend_Item extends Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Order.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Order.php deleted file mode 100644 index c76d9cf0262..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Order.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Invoice_Attribute_Backend_Order extends Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Parent.php deleted file mode 100644 index 565625ec9e7..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Parent.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Invoice_Attribute_Backend_Parent extends Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php deleted file mode 100644 index 36de1980981..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Invoice_Collection extends Mage_Sales_Model_Resource_Order_Invoice_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment.php deleted file mode 100644 index aa5383e22d2..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Invoice_Comment extends Mage_Sales_Model_Resource_Order_Invoice_Comment -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment/Collection.php deleted file mode 100644 index 618919683d0..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Invoice_Comment_Collection extends Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Grid/Collection.php deleted file mode 100644 index b40753c1199..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Grid/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Invoice_Grid_Collection extends Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item.php deleted file mode 100644 index 01c8668063a..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Invoice_Item extends Mage_Sales_Model_Resource_Order_Invoice_Item -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item/Collection.php deleted file mode 100644 index d6d96d441ad..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Invoice_Item_Collection extends Mage_Sales_Model_Resource_Order_Invoice_Item_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Item.php deleted file mode 100644 index 4aea70d0125..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Item.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Item extends Mage_Sales_Model_Resource_Order_Item -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Item/Collection.php deleted file mode 100644 index cd9cd626b14..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Item/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Item_Collection extends Mage_Sales_Model_Resource_Order_Item_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment.php deleted file mode 100644 index f54711ea70d..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Payment extends Mage_Sales_Model_Resource_Order_Payment -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Collection.php deleted file mode 100644 index 9932cf38adb..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Payment_Collection extends Mage_Sales_Model_Resource_Order_Payment_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction.php deleted file mode 100644 index 9653790ff03..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Payment_Transaction extends Mage_Sales_Model_Resource_Order_Payment_Transaction -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction/Collection.php deleted file mode 100644 index f64610de0ff..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Payment_Transaction_Collection extends Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment.php deleted file mode 100644 index 201817d40df..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Shipment extends Mage_Sales_Model_Resource_Order_Shipment -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Child.php deleted file mode 100644 index f5f29d3ae76..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Child.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Shipment_Attribute_Backend_Child extends Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Parent.php deleted file mode 100644 index 8baa1680f06..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Parent.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Shipment_Attribute_Backend_Parent extends Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Collection.php deleted file mode 100644 index 15863c3bf88..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Shipment_Collection extends Mage_Sales_Model_Resource_Order_Shipment_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment.php deleted file mode 100644 index 6b2ce7981dc..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Shipment_Comment extends Mage_Sales_Model_Resource_Order_Shipment_Comment -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment/Collection.php deleted file mode 100644 index 2287845eec8..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Shipment_Comment_Collection extends Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Grid/Collection.php deleted file mode 100644 index 24d60aebb8b..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Grid/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Shipment_Grid_Collection extends Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item.php deleted file mode 100644 index 1f3fcb4f6ee..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Shipment_Item extends Mage_Sales_Model_Resource_Order_Shipment_Item -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item/Collection.php deleted file mode 100644 index f6d83d1742a..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Shipment_Item_Collection extends Mage_Sales_Model_Resource_Order_Shipment_Item_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track.php deleted file mode 100644 index 6f41b3bcf8b..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Shipment_Track extends Mage_Sales_Model_Resource_Order_Shipment_Track -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track/Collection.php deleted file mode 100644 index 50aa898e520..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Shipment_Track_Collection extends Mage_Sales_Model_Resource_Order_Shipment_Track_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status.php deleted file mode 100644 index 62f4ae32287..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status.php +++ /dev/null @@ -1,33 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Status_History extends Mage_Sales_Model_Resource_Order_Status_History -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History/Collection.php deleted file mode 100644 index 41e5772ad0e..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Status_History_Collection extends Mage_Sales_Model_Resource_Order_Status_History_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax.php deleted file mode 100644 index d8bd4cee7cc..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Tax extends Mage_Sales_Model_Resource_Order_Tax -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax/Collection.php deleted file mode 100644 index ae00ef7d7c2..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Order_Tax_Collection extends Mage_Sales_Model_Resource_Order_Tax_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote.php deleted file mode 100644 index 6700f2f55bc..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Quote extends Mage_Sales_Model_Resource_Quote -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address.php deleted file mode 100644 index 2a564232af2..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Quote_Address extends Mage_Sales_Model_Resource_Quote_Address -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend.php deleted file mode 100644 index 87b95f75334..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Backend extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Child.php deleted file mode 100644 index eacd97371f8..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Child.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Backend_Child extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Parent.php deleted file mode 100644 index a233fb0cfb4..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Parent.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Backend_Parent extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Region.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Region.php deleted file mode 100644 index f49d567ce23..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Region.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Backend_Region extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend.php deleted file mode 100644 index 281be9968f2..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Custbalance.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Custbalance.php deleted file mode 100644 index 488f577da26..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Custbalance.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend_Custbalance extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Discount.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Discount.php deleted file mode 100644 index 7ff985532c5..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Discount.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend_Discount extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Grand.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Grand.php deleted file mode 100644 index a1234be815e..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Grand.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend_Grand extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Shipping.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Shipping.php deleted file mode 100644 index 64de86a0744..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Shipping.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend_Shipping extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Subtotal.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Subtotal.php deleted file mode 100644 index aab810505d6..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Subtotal.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend_Subtotal extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Tax.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Tax.php deleted file mode 100644 index e2ac089ebbb..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Tax.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend_Tax extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Collection.php deleted file mode 100644 index 6df361d4572..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Quote_Address_Collection extends Mage_Sales_Model_Resource_Quote_Address_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item.php deleted file mode 100644 index 17eae29b031..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Quote_Address_Item extends Mage_Sales_Model_Resource_Quote_Address_Item -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item/Collection.php deleted file mode 100644 index c2e84cef8f4..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Quote_Address_Item_Collection extends Mage_Sales_Model_Resource_Quote_Address_Item_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate.php deleted file mode 100644 index e4811ae8320..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Quote_Address_Rate extends Mage_Sales_Model_Resource_Quote_Address_Rate -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate/Collection.php deleted file mode 100644 index 05c87020902..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Quote_Address_Rate_Collection extends Mage_Sales_Model_Resource_Quote_Address_Rate_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Collection.php deleted file mode 100644 index 353d3bc5d22..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Quote_Collection extends Mage_Sales_Model_Resource_Quote_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item.php deleted file mode 100644 index 8e713693db3..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Quote_Item extends Mage_Sales_Model_Resource_Quote_Item -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Collection.php deleted file mode 100644 index b5aacbbeab6..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Quote_Item_Collection extends Mage_Sales_Model_Resource_Quote_Item_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option.php deleted file mode 100644 index e5f07bedefd..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Quote_Item_Option extends Mage_Sales_Model_Resource_Quote_Item_Option -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option/Collection.php deleted file mode 100644 index bfd8e1dde4d..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Quote_Item_Option_Collection extends Mage_Sales_Model_Resource_Quote_Item_Option_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment.php deleted file mode 100644 index fe09fda0be2..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Quote_Payment extends Mage_Sales_Model_Resource_Quote_Payment -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment/Collection.php deleted file mode 100644 index 7f0e2268038..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Quote_Payment_Collection extends Mage_Sales_Model_Resource_Quote_Payment_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile.php b/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile.php deleted file mode 100644 index 9485dde553e..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Recurring_Profile extends Mage_Sales_Model_Resource_Recurring_Profile -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile/Collection.php deleted file mode 100644 index abc2d8b405e..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Recurring_Profile_Collection extends Mage_Sales_Model_Resource_Recurring_Profile_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report.php b/app/code/core/Mage/Sales/Model/Mysql4/Report.php deleted file mode 100644 index 99450a3c7c0..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Report extends Mage_Sales_Model_Resource_Report -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Abstract.php deleted file mode 100644 index 3c9f14f27ca..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Abstract.php +++ /dev/null @@ -1,37 +0,0 @@ - - */ -abstract class Mage_Sales_Model_Mysql4_Report_Abstract extends Mage_Sales_Model_Resource_Report_Abstract -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers.php deleted file mode 100644 index 03d7134b636..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Report_Bestsellers extends Mage_Sales_Model_Resource_Report_Bestsellers -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers/Collection.php deleted file mode 100644 index 4482f1f60b3..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Report_Bestsellers_Collection extends Mage_Sales_Model_Resource_Report_Bestsellers_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Collection/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Collection/Abstract.php deleted file mode 100644 index 64b1dd84ce0..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Collection/Abstract.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Report_Collection_Abstract extends Mage_Sales_Model_Resource_Report_Collection_Abstract -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced.php deleted file mode 100644 index 11e2bd36d85..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Report_Invoiced extends Mage_Sales_Model_Resource_Report_Invoiced -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Invoiced.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Invoiced.php deleted file mode 100644 index 17ac93bced5..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Invoiced.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Report_Invoiced_Collection_Invoiced extends Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Order.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Order.php deleted file mode 100644 index d56485ecc8e..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Order.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Report_Invoiced_Collection_Order extends Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Order.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Order.php deleted file mode 100644 index b690cf15cbe..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Order.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Report_Order extends Mage_Sales_Model_Resource_Report_Order -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Collection.php deleted file mode 100644 index 4abe64f2f65..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Report_Order_Collection extends Mage_Sales_Model_Resource_Report_Order_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Updatedat/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Updatedat/Collection.php deleted file mode 100644 index 37c0034e70e..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Updatedat/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Report_Order_Updatedat_Collection extends Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded.php deleted file mode 100644 index 4af619758ad..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Report_Refunded extends Mage_Sales_Model_Resource_Report_Refunded -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Order.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Order.php deleted file mode 100644 index d397583ac48..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Order.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Report_Refunded_Collection_Order extends Mage_Sales_Model_Resource_Report_Refunded_Collection_Order -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Refunded.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Refunded.php deleted file mode 100644 index dd020ad6d42..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Refunded.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Report_Refunded_Collection_Refunded extends Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping.php deleted file mode 100644 index e7be5bc4320..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Report_Shipping extends Mage_Sales_Model_Resource_Report_Shipping -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Order.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Order.php deleted file mode 100644 index e9a35193d0d..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Order.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Report_Shipping_Collection_Order extends Mage_Sales_Model_Resource_Report_Shipping_Collection_Order -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Shipment.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Shipment.php deleted file mode 100644 index 12f21cce090..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Shipment.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Report_Shipping_Collection_Shipment extends Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Sale/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Sale/Collection.php deleted file mode 100644 index 67035872fb6..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Sale/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Sale_Collection extends Mage_Sales_Model_Resource_Sale_Collection -{ -} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Setup.php b/app/code/core/Mage/Sales/Model/Mysql4/Setup.php deleted file mode 100644 index 1c44a12dfc3..00000000000 --- a/app/code/core/Mage/Sales/Model/Mysql4/Setup.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sales_Model_Mysql4_Setup extends Mage_Sales_Model_Resource_Setup -{ -} diff --git a/app/code/core/Mage/Sales/Model/Observer.php b/app/code/core/Mage/Sales/Model/Observer.php index b0db13a9c55..4fa4d924019 100644 --- a/app/code/core/Mage/Sales/Model/Observer.php +++ b/app/code/core/Mage/Sales/Model/Observer.php @@ -55,7 +55,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 a2c7a3faf76..26ec6a9f3c8 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Api.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Api.php @@ -53,7 +53,7 @@ public function __construct() public function items($filters = null) { $invoices = array(); - /** @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') @@ -63,7 +63,7 @@ public function items($filters = null) ->addAttributeToSelect('grand_total') ->addAttributeToSelect('order_currency_code'); - /** @var Mage_Api_Helper_Data $apiHelper */ + /* @var Mage_Api_Helper_Data $apiHelper */ $apiHelper = Mage::helper('api'); try { $filters = $apiHelper->parseFilters($filters, $this->_attributesMap['invoice']); diff --git a/app/code/core/Mage/Sales/etc/config.xml b/app/code/core/Mage/Sales/etc/config.xml index b69d2796f53..7a14ad78cc3 100644 --- a/app/code/core/Mage/Sales/etc/config.xml +++ b/app/code/core/Mage/Sales/etc/config.xml @@ -942,7 +942,6 @@ Mage_Sales_Model_Resource - sales_mysql4 sales_flat_quote
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 65b7a57e7e6..ff7ad8dcb7a 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 @@ -25,6 +25,6 @@ */ $installer = $this; -/* @var Mage_Sales_Model_Mysql4_Setup $installer */ +/* @var Mage_Sales_Model_Resource_Setup $installer */ $installer->addAttribute('quote_address', 'applied_taxes', array('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 669187115c1..aff099d3db8 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 @@ -25,7 +25,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 aa0ae3fb5b7..351fc3ea1be 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 @@ -25,6 +25,6 @@ */ $installer = $this; -/* @var Mage_Sales_Model_Mysql4_Setup $installer */ +/* @var Mage_Sales_Model_Resource_Setup $installer */ $installer->addAttribute('quote_item', 'original_custom_price', array('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 ccc103e611e..bdd5cd55035 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 @@ -25,7 +25,7 @@ */ $installer = $this; -/* @var Mage_Sales_Model_Mysql4_Setup $installer */ +/* @var Mage_Sales_Model_Resource_Setup $installer */ $installer->addAttribute('quote', 'subtotal', array('type'=>'decimal')); $installer->addAttribute('quote', 'base_subtotal', array('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 abb3c485daf..4eb18acb608 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 @@ -25,7 +25,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 ac8d0fc031c..19c16b6512b 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 @@ -25,7 +25,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 5a1fb9ece60..c17b3a7453e 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 @@ -25,7 +25,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 b997eec9d88..27969f4b7fc 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 @@ -25,7 +25,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 63982856585..ba7c55588be 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 @@ -25,7 +25,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 5a9cd665ccc..d51d55f2fa0 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 @@ -25,7 +25,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 2ffb6137873..c6b51bbb743 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 @@ -25,7 +25,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 f2f8a70c5e8..16829bfa031 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 @@ -25,7 +25,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 d3580d49fa1..95f2f0cc3fb 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 @@ -25,7 +25,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 acd03a3e1c6..cc84f3e7b5f 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 @@ -25,7 +25,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 c5b275f4e13..9d580e011cf 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 @@ -25,7 +25,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 daffeec3fc6..b197bf8ac1d 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 @@ -25,7 +25,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 4aba8274199..700c825498d 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 @@ -28,7 +28,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 70b47b719e1..551901996aa 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 @@ -25,7 +25,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 0a26c6e5648..b393dc1ea95 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 @@ -25,7 +25,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 087de556738..7c3c05d7a98 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 @@ -25,7 +25,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 cf63c214e5a..b1711bea2b8 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 @@ -25,7 +25,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 824bd41de97..a03b40348b4 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 @@ -25,7 +25,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 44a7f23edc3..91e480e063f 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 @@ -25,6 +25,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 f38ce6bfdfe..5910a3ee60b 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 @@ -25,7 +25,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 5579794d9b0..29c6e704f5a 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 @@ -25,7 +25,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 9ed981a3eee..f5d057b4cdc 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 @@ -25,7 +25,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 d18b17e4bf5..6acbfd739a4 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 @@ -24,5 +24,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 5238ef751d5..d852083ae72 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 @@ -24,7 +24,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 a35ecddd34f..7a0daeac158 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 @@ -25,7 +25,7 @@ */ -/* @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 aff30aa4f23..876e41873ca 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 @@ -25,7 +25,7 @@ */ -/* @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 07bd8dd0de6..f99df6981b9 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 @@ -25,7 +25,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 7becf47a399..03a764319c1 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 @@ -25,7 +25,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 1294ab20ca6..1b8957c7095 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 @@ -25,7 +25,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 1a240c61072..2d5bbd0df63 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 @@ -25,7 +25,7 @@ */ -/* @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 26dafede07a..c62548528c4 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 @@ -25,7 +25,7 @@ */ -/* @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 948d0444674..466a7da6c3f 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 @@ -25,7 +25,7 @@ */ -/* @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 fd0f4fd3b2d..0ab65ebc141 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 @@ -25,7 +25,7 @@ */ -/* @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 83bb336eb2c..24d88b6be06 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 @@ -25,7 +25,7 @@ */ -/* @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 1d7df7b5b29..6ca496a255c 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 @@ -25,7 +25,7 @@ */ -/* @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 9b86d804f63..3ff34485aae 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 @@ -25,7 +25,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 f8e8b1b3913..fffc45540f5 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 @@ -25,7 +25,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', array('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 05c0b79e226..97070d39631 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 @@ -25,7 +25,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 c8ace5210ba..1ee420a56be 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 @@ -25,7 +25,7 @@ */ $installer = $this; -/* @var Mage_Sales_Model_Mysql4_Setup $installer */ +/* @var Mage_Sales_Model_Resource_Setup $installer */ $installer->addAttribute('quote', 'customer_gender', array('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 168eeec64fa..cb4d6a606e7 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 @@ -25,7 +25,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 c54b4fcbb03..bb03884f3bc 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 @@ -25,7 +25,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', array('type' => 'decimal')); $installer->addAttribute('order_payment', 'base_amount_refunded_online', array('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 3bdb174128a..cabc625688c 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 @@ -26,7 +26,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 95c2c1baf2c..cabfead45a2 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 @@ -25,7 +25,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', array('type'=>'decimal')); $installer->addAttribute('quote_item', 'tax_before_discount', array('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 5f6ba85e8ce..087e379148f 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 @@ -25,7 +25,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 65276cbfa84..b9ac4d4af9c 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 @@ -25,7 +25,7 @@ */ $installer = $this; -/* @var Mage_Sales_Model_Mysql4_Setup $installer */ +/* @var Mage_Sales_Model_Resource_Setup $installer */ $installer->addAttribute('invoice', 'store_id', array('type'=>'static')); $installer->addAttribute('creditmemo', 'store_id', array('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 77acf4e6589..011257ed161 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 @@ -25,7 +25,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 dff2d6ca491..5b9415d10fd 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 @@ -29,9 +29,9 @@ // Setup data to configure $frequencies = array( - 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 = array( diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon.php deleted file mode 100644 index ff463725493..00000000000 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_SalesRule_Model_Mysql4_Coupon extends Mage_SalesRule_Model_Resource_Coupon -{ -} diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Collection.php deleted file mode 100644 index 76b14e63790..00000000000 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_SalesRule_Model_Mysql4_Coupon_Collection extends Mage_SalesRule_Model_Resource_Coupon_Collection -{ -} diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Usage.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Usage.php deleted file mode 100644 index e7f318db65d..00000000000 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Usage.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_SalesRule_Model_Mysql4_Coupon_Usage extends Mage_SalesRule_Model_Resource_Coupon_Usage -{ -} diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Collection.php deleted file mode 100644 index c06b89ee281..00000000000 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_SalesRule_Model_Mysql4_Report_Collection extends Mage_SalesRule_Model_Resource_Report_Collection -{ -} diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Rule.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Rule.php deleted file mode 100644 index 7e8603b42ca..00000000000 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Rule.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_SalesRule_Model_Mysql4_Report_Rule extends Mage_SalesRule_Model_Resource_Report_Rule -{ -} diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Updatedat/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Updatedat/Collection.php deleted file mode 100644 index ef043de62ec..00000000000 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Updatedat/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_SalesRule_Model_Mysql4_Report_Updatedat_Collection extends Mage_SalesRule_Model_Resource_Report_Updatedat_Collection -{ -} diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule.php deleted file mode 100644 index cecae72928e..00000000000 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule.php +++ /dev/null @@ -1,39 +0,0 @@ - - * @deprecated - */ -class Mage_SalesRule_Model_Mysql4_Rule extends Mage_SalesRule_Model_Resource_Rule -{ - -} diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Collection.php deleted file mode 100644 index 11b3beb2659..00000000000 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_SalesRule_Model_Mysql4_Rule_Collection extends Mage_SalesRule_Model_Resource_Rule_Collection -{ -} diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer.php deleted file mode 100644 index a8454b625de..00000000000 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_SalesRule_Model_Mysql4_Rule_Customer extends Mage_SalesRule_Model_Resource_Rule_Customer -{ -} diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer/Collection.php deleted file mode 100644 index 3282020bb6b..00000000000 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_SalesRule_Model_Mysql4_Rule_Customer_Collection extends Mage_SalesRule_Model_Resource_Rule_Customer_Collection -{ -} diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product.php deleted file mode 100644 index 515ed213161..00000000000 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_SalesRule_Model_Mysql4_Rule_Product extends Mage_SalesRule_Model_Resource_Rule_Product -{ -} diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product/Collection.php deleted file mode 100644 index 92b2b3dcc88..00000000000 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_SalesRule_Model_Mysql4_Rule_Product_Collection extends Mage_SalesRule_Model_Resource_Rule_Product_Collection -{ -} diff --git a/app/code/core/Mage/SalesRule/Model/Observer.php b/app/code/core/Mage/SalesRule/Model/Observer.php index 6a71926190e..d7dedd71bbb 100644 --- a/app/code/core/Mage/SalesRule/Model/Observer.php +++ b/app/code/core/Mage/SalesRule/Model/Observer.php @@ -202,7 +202,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 a75a6ed3956..3995aa388f3 100644 --- a/app/code/core/Mage/SalesRule/Model/Validator.php +++ b/app/code/core/Mage/SalesRule/Model/Validator.php @@ -45,7 +45,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; @@ -135,7 +135,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/etc/config.xml b/app/code/core/Mage/SalesRule/etc/config.xml index 4c9ff12f79a..46bf5898cf6 100644 --- a/app/code/core/Mage/SalesRule/etc/config.xml +++ b/app/code/core/Mage/SalesRule/etc/config.xml @@ -44,7 +44,6 @@ Mage_SalesRule_Model_Resource - salesrule_mysql4 salesrule
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 a47c0c32613..2bbf805e574 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 @@ -24,7 +24,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 9b73d05b23a..57f417bf4ed 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 @@ -25,7 +25,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 c79932697a6..3afcb5607fd 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 @@ -29,7 +29,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 c7bb25f5e87..5d1e457e137 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 @@ -24,7 +24,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 1dd09755e36..5d6cfa18dc8 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 @@ -24,7 +24,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 f1a2a25f5e1..b12f588ab43 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 @@ -25,7 +25,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 c41df1f2825..90628e78bc5 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 @@ -25,7 +25,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 35e0c46081f..b448e47afae 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 @@ -25,7 +25,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 30f224086fd..d94c7530219 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 @@ -25,7 +25,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 361611f28b7..d23813def2e 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 @@ -24,7 +24,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 2d7a677c8f2..3333a6e68d2 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 @@ -24,7 +24,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/Model/Mysql4/Sendfriend.php b/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend.php deleted file mode 100644 index ecb7d87b2cd..00000000000 --- a/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sendfriend_Model_Mysql4_Sendfriend extends Mage_Sendfriend_Model_Resource_Sendfriend -{ -} diff --git a/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend/Collection.php b/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend/Collection.php deleted file mode 100644 index e565ca0d5ce..00000000000 --- a/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sendfriend_Model_Mysql4_Sendfriend_Collection extends Mage_Sendfriend_Model_Resource_Sendfriend_Collection -{ -} diff --git a/app/code/core/Mage/Sendfriend/Model/Mysql4/Setup.php b/app/code/core/Mage/Sendfriend/Model/Mysql4/Setup.php deleted file mode 100644 index 525e63690ed..00000000000 --- a/app/code/core/Mage/Sendfriend/Model/Mysql4/Setup.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sendfriend_Model_Mysql4_Setup extends Mage_Sendfriend_Model_Resource_Setup -{ -} diff --git a/app/code/core/Mage/Sendfriend/etc/config.xml b/app/code/core/Mage/Sendfriend/etc/config.xml index 4c1ac33d470..e46f38414e9 100644 --- a/app/code/core/Mage/Sendfriend/etc/config.xml +++ b/app/code/core/Mage/Sendfriend/etc/config.xml @@ -39,8 +39,6 @@ Mage_Sendfriend_Model_Resource - sendfriend_mysql4 - sendfriend_mysql4 sendfriend_log
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 1861f5b9d10..dd4aafd2de0 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 @@ -25,7 +25,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 0f7ab0e7f6c..c8670633d15 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 @@ -25,7 +25,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 7c0d9a1c4f9..5a49d1ab86d 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 @@ -25,7 +25,7 @@ */ -/* @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 c2623f8562d..19910ca564e 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 @@ -25,7 +25,7 @@ */ -/* @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/Shipping/Model/Mysql4/Carrier/Tablerate.php b/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate.php deleted file mode 100644 index acb9d348772..00000000000 --- a/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Shipping_Model_Mysql4_Carrier_Tablerate extends Mage_Shipping_Model_Resource_Carrier_Tablerate -{ -} diff --git a/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate/Collection.php b/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate/Collection.php deleted file mode 100644 index 6172e94c06b..00000000000 --- a/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Shipping_Model_Mysql4_Carrier_Tablerate_Collection extends Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection -{ -} diff --git a/app/code/core/Mage/Shipping/etc/config.xml b/app/code/core/Mage/Shipping/etc/config.xml index 8e7ce46bb05..30a31ac110e 100644 --- a/app/code/core/Mage/Shipping/etc/config.xml +++ b/app/code/core/Mage/Shipping/etc/config.xml @@ -39,7 +39,6 @@ Mage_Shipping_Model_Resource - shipping_mysql4 shipping_tablerate
diff --git a/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Category.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Category.php deleted file mode 100644 index d6a634f1bf5..00000000000 --- a/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Category.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sitemap_Model_Mysql4_Catalog_Category extends Mage_Sitemap_Model_Resource_Catalog_Category -{ -} diff --git a/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Product.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Product.php deleted file mode 100644 index 8a207dd259c..00000000000 --- a/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Product.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sitemap_Model_Mysql4_Catalog_Product extends Mage_Sitemap_Model_Resource_Catalog_Product -{ -} diff --git a/app/code/core/Mage/Sitemap/Model/Mysql4/Cms/Page.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Cms/Page.php deleted file mode 100644 index 839e74541b1..00000000000 --- a/app/code/core/Mage/Sitemap/Model/Mysql4/Cms/Page.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sitemap_Model_Mysql4_Cms_Page extends Mage_Sitemap_Model_Resource_Cms_Page -{ -} diff --git a/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap.php deleted file mode 100644 index 3df4a8d084b..00000000000 --- a/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Sitemap_Model_Mysql4_Sitemap extends Mage_Sitemap_Model_Resource_Sitemap -{ -} diff --git a/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap/Collection.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap/Collection.php deleted file mode 100644 index 7455bd530c5..00000000000 --- a/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap/Collection.php +++ /dev/null @@ -1,37 +0,0 @@ - - * @deprecated - */ -class Mage_Sitemap_Model_Mysql4_Sitemap_Collection extends Mage_Sitemap_Model_Resource_Sitemap_Collection -{ -} diff --git a/app/code/core/Mage/Sitemap/etc/config.xml b/app/code/core/Mage/Sitemap/etc/config.xml index b7b981438cc..6f8bbb659bc 100644 --- a/app/code/core/Mage/Sitemap/etc/config.xml +++ b/app/code/core/Mage/Sitemap/etc/config.xml @@ -39,7 +39,6 @@ Mage_Sitemap_Model_Resource - sitemap_mysql4 sitemap
diff --git a/app/code/core/Mage/Tag/Block/Customer/View.php b/app/code/core/Mage/Tag/Block/Customer/View.php index a7ef49305d1..dcebfc5f5d2 100644 --- a/app/code/core/Mage/Tag/Block/Customer/View.php +++ b/app/code/core/Mage/Tag/Block/Customer/View.php @@ -40,7 +40,7 @@ class Mage_Tag_Block_Customer_View extends Mage_Catalog_Block_Product_Abstract /** * Tagged Product Collection * - * @var Mage_Tag_Model_Mysql4_Product_Collection + * @var Mage_Tag_Model_Resource_Product_Collection */ protected $_collection; @@ -144,7 +144,7 @@ public function getMode() /** * Retrieve Tagged product(s) collection * - * @return Mage_Tag_Model_Mysql4_Product_Collection + * @return Mage_Tag_Model_Resource_Product_Collection */ protected function _getCollection() { diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Customer/Collection.php b/app/code/core/Mage/Tag/Model/Mysql4/Customer/Collection.php deleted file mode 100644 index fb7e2113425..00000000000 --- a/app/code/core/Mage/Tag/Model/Mysql4/Customer/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Tag_Model_Mysql4_Customer_Collection extends Mage_Tag_Model_Resource_Customer_Collection -{ -} diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Indexer/Summary.php b/app/code/core/Mage/Tag/Model/Mysql4/Indexer/Summary.php deleted file mode 100644 index efc32890428..00000000000 --- a/app/code/core/Mage/Tag/Model/Mysql4/Indexer/Summary.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Tag_Model_Mysql4_Indexer_Summary extends Mage_Tag_Model_Resource_Indexer_Summary -{ -} diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Popular/Collection.php b/app/code/core/Mage/Tag/Model/Mysql4/Popular/Collection.php deleted file mode 100644 index 5b5e92fb83e..00000000000 --- a/app/code/core/Mage/Tag/Model/Mysql4/Popular/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * - */ -class Mage_Tag_Model_Mysql4_Popular_Collection extends Mage_Tag_Model_Resource_Popular_Collection -{ -} diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Product/Collection.php b/app/code/core/Mage/Tag/Model/Mysql4/Product/Collection.php deleted file mode 100644 index 15487740eff..00000000000 --- a/app/code/core/Mage/Tag/Model/Mysql4/Product/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Tag_Model_Mysql4_Product_Collection extends Mage_Tag_Model_Resource_Product_Collection -{ -} diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Tag.php b/app/code/core/Mage/Tag/Model/Mysql4/Tag.php deleted file mode 100644 index 04524345bfc..00000000000 --- a/app/code/core/Mage/Tag/Model/Mysql4/Tag.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Tag_Model_Mysql4_Tag extends Mage_Tag_Model_Resource_Tag -{ -} diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Tag/Collection.php b/app/code/core/Mage/Tag/Model/Mysql4/Tag/Collection.php deleted file mode 100644 index a714274415e..00000000000 --- a/app/code/core/Mage/Tag/Model/Mysql4/Tag/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Tag_Model_Mysql4_Tag_Collection extends Mage_Tag_Model_Resource_Tag_Collection -{ -} diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Tag/Relation.php b/app/code/core/Mage/Tag/Model/Mysql4/Tag/Relation.php deleted file mode 100644 index 499fe534916..00000000000 --- a/app/code/core/Mage/Tag/Model/Mysql4/Tag/Relation.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Tag_Model_Mysql4_Tag_Relation extends Mage_Tag_Model_Resource_Tag_Relation -{ -} diff --git a/app/code/core/Mage/Tag/Model/Tag.php b/app/code/core/Mage/Tag/Model/Tag.php index 3324fbb7c28..34852209a43 100644 --- a/app/code/core/Mage/Tag/Model/Tag.php +++ b/app/code/core/Mage/Tag/Model/Tag.php @@ -134,7 +134,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/Tag/etc/config.xml b/app/code/core/Mage/Tag/etc/config.xml index c8f9e36eb22..865d0855bc7 100644 --- a/app/code/core/Mage/Tag/etc/config.xml +++ b/app/code/core/Mage/Tag/etc/config.xml @@ -39,12 +39,10 @@ Mage_Tag_Model_Customer - tag_customer_resource Mage_Tag_Model_Resource - tag_mysql4 tag
diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation.php deleted file mode 100644 index f5d982e8148..00000000000 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Tax_Model_Mysql4_Calculation extends Mage_Tax_Model_Resource_Calculation -{ -} diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Collection.php deleted file mode 100644 index 2a6d3d637d5..00000000000 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Tax_Model_Mysql4_Calculation_Collection extends Mage_Tax_Model_Resource_Calculation_Collection -{ -} diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate.php deleted file mode 100644 index ffe7570a27f..00000000000 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Tax_Model_Mysql4_Calculation_Rate extends Mage_Tax_Model_Resource_Calculation_Rate -{ -} diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Collection.php deleted file mode 100644 index d07eefa3401..00000000000 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Tax_Model_Mysql4_Calculation_Rate_Collection extends Mage_Tax_Model_Resource_Calculation_Rate_Collection -{ -} diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title.php deleted file mode 100644 index adf044df8ca..00000000000 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Tax_Model_Mysql4_Calculation_Rate_Title extends Mage_Tax_Model_Resource_Calculation_Rate_Title -{ -} diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title/Collection.php deleted file mode 100644 index 039d8914240..00000000000 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Tax_Model_Mysql4_Calculation_Rate_Title_Collection extends Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection -{ -} diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule.php deleted file mode 100644 index 0455390423e..00000000000 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Tax_Model_Mysql4_Calculation_Rule extends Mage_Tax_Model_Resource_Calculation_Rule -{ -} diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule/Collection.php deleted file mode 100644 index bd5dded2b42..00000000000 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Tax_Model_Mysql4_Calculation_Rule_Collection extends Mage_Tax_Model_Resource_Calculation_Rule_Collection -{ -} diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Class.php b/app/code/core/Mage/Tax/Model/Mysql4/Class.php deleted file mode 100644 index 32d604d1afa..00000000000 --- a/app/code/core/Mage/Tax/Model/Mysql4/Class.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Tax_Model_Mysql4_Class extends Mage_Tax_Model_Resource_Class -{ -} diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Class/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Class/Collection.php deleted file mode 100644 index 6cace31b729..00000000000 --- a/app/code/core/Mage/Tax/Model/Mysql4/Class/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Tax_Model_Mysql4_Class_Collection extends Mage_Tax_Model_Resource_Class_Collection -{ -} diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Report/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Report/Collection.php deleted file mode 100644 index d4a1a2d80a6..00000000000 --- a/app/code/core/Mage/Tax/Model/Mysql4/Report/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Tax_Model_Mysql4_Report_Collection extends Mage_Tax_Model_Resource_Report_Collection -{ -} diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Report/Tax.php b/app/code/core/Mage/Tax/Model/Mysql4/Report/Tax.php deleted file mode 100644 index 8f2ad63c63c..00000000000 --- a/app/code/core/Mage/Tax/Model/Mysql4/Report/Tax.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Tax_Model_Mysql4_Report_Tax extends Mage_Tax_Model_Resource_Report_Tax -{ -} diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Report/Updatedat/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Report/Updatedat/Collection.php deleted file mode 100644 index 1e90f7e184e..00000000000 --- a/app/code/core/Mage/Tax/Model/Mysql4/Report/Updatedat/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Tax_Model_Mysql4_Report_Updatedat_Collection extends Mage_Tax_Model_Resource_Report_Updatedat_Collection -{ -} diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax.php b/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax.php deleted file mode 100644 index db47cbf3676..00000000000 --- a/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Tax_Model_Mysql4_Sales_Order_Tax extends Mage_Tax_Model_Resource_Sales_Order_Tax -{ -} diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax/Collection.php deleted file mode 100644 index ac12e774fe9..00000000000 --- a/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Tax_Model_Mysql4_Sales_Order_Tax_Collection extends Mage_Tax_Model_Resource_Sales_Order_Tax_Collection -{ -} diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Setup.php b/app/code/core/Mage/Tax/Model/Mysql4/Setup.php deleted file mode 100644 index aaa774c02dc..00000000000 --- a/app/code/core/Mage/Tax/Model/Mysql4/Setup.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Tax_Model_Mysql4_Setup extends Mage_Tax_Model_Resource_Setup -{ -} diff --git a/app/code/core/Mage/Tax/etc/config.xml b/app/code/core/Mage/Tax/etc/config.xml index 5df1c992125..b90fdc1aece 100644 --- a/app/code/core/Mage/Tax/etc/config.xml +++ b/app/code/core/Mage/Tax/etc/config.xml @@ -39,7 +39,6 @@ Mage_Tax_Model_Resource - tax_mysql4 tax_class
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 25997b613ec..80e5c85dc46 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 @@ -25,7 +25,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 25c53336293..a20c237df4c 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 @@ -24,7 +24,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; 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 2acb53b03bf..d342b648a38 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 @@ -24,7 +24,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 09811e6e2b5..4bb18d9d1d5 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 @@ -25,7 +25,7 @@ */ $installer = $this; -/* @var Mage_Tax_Model_Mysql4_Setup $installer */ +/* @var Mage_Tax_Model_Resource_Setup $installer */ $installer->addAttribute('invoice', 'shipping_tax_amount', array('type'=>'decimal')); $installer->addAttribute('invoice', 'base_shipping_tax_amount', array('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 00fb2193074..19213134dab 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 @@ -25,7 +25,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 9fde7e3feca..909c726645e 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 @@ -25,7 +25,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/Model/Mysql4/Attribute/Backend/Weee/Tax.php b/app/code/core/Mage/Weee/Model/Mysql4/Attribute/Backend/Weee/Tax.php deleted file mode 100644 index 3405674a671..00000000000 --- a/app/code/core/Mage/Weee/Model/Mysql4/Attribute/Backend/Weee/Tax.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Weee_Model_Mysql4_Attribute_Backend_Weee_Tax extends Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax -{ -} diff --git a/app/code/core/Mage/Weee/Model/Mysql4/Setup.php b/app/code/core/Mage/Weee/Model/Mysql4/Setup.php deleted file mode 100644 index 87125afde5e..00000000000 --- a/app/code/core/Mage/Weee/Model/Mysql4/Setup.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Weee_Model_Mysql4_Setup extends Mage_Weee_Model_Resource_Setup -{ -} diff --git a/app/code/core/Mage/Weee/Model/Mysql4/Tax.php b/app/code/core/Mage/Weee/Model/Mysql4/Tax.php deleted file mode 100644 index a691c2e8678..00000000000 --- a/app/code/core/Mage/Weee/Model/Mysql4/Tax.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Weee_Model_Mysql4_Tax extends Mage_Weee_Model_Resource_Tax -{ -} diff --git a/app/code/core/Mage/Weee/etc/config.xml b/app/code/core/Mage/Weee/etc/config.xml index 7c9f74c1fdd..bc79c6605c1 100644 --- a/app/code/core/Mage/Weee/etc/config.xml +++ b/app/code/core/Mage/Weee/etc/config.xml @@ -39,7 +39,6 @@ Mage_Weee_Model_Resource - weee_mysql4 weee_tax
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 fcc9dbf003f..a50a195a16d 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 @@ -25,7 +25,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 3fc8f5e8fa9..0f88dfb5376 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 @@ -25,7 +25,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 cba518e9fe4..0dba6ff5af3 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 @@ -25,7 +25,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 4b73103fbd9..6e3671d2bfa 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 @@ -25,7 +25,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 0ab834dd1e9..9ca0a880cdf 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 @@ -25,7 +25,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 831683d23bd..59d5e7298ad 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 @@ -25,7 +25,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 66ad33c7581..046f61d58d8 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 @@ -25,7 +25,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 a1f15f4d26c..3797a044cd0 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 @@ -25,7 +25,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 d7ef0b65358..cc52162412b 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 @@ -25,7 +25,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 2efb1f17508..e2367258218 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 @@ -25,7 +25,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 652437cfaf1..095d8997578 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 @@ -25,7 +25,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 939c272bc7b..36e0a0eb711 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 @@ -25,7 +25,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 2f43dd0fc78..a0e6c0e9858 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 @@ -25,7 +25,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 c56aaf7f768..2fa8137567e 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 @@ -52,7 +52,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/Widget/Model/Mysql4/Widget.php b/app/code/core/Mage/Widget/Model/Mysql4/Widget.php deleted file mode 100644 index 449128449fc..00000000000 --- a/app/code/core/Mage/Widget/Model/Mysql4/Widget.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Widget_Model_Mysql4_Widget extends Mage_Widget_Model_Resource_Widget -{ -} diff --git a/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance.php b/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance.php deleted file mode 100644 index 205ca45ffb4..00000000000 --- a/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Widget_Model_Mysql4_Widget_Instance extends Mage_Widget_Model_Resource_Widget_Instance -{ -} diff --git a/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance/Collection.php b/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance/Collection.php deleted file mode 100644 index 363caa4fe25..00000000000 --- a/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Widget_Model_Mysql4_Widget_Instance_Collection extends Mage_Widget_Model_Resource_Widget_Instance_Collection -{ -} diff --git a/app/code/core/Mage/Widget/etc/config.xml b/app/code/core/Mage/Widget/etc/config.xml index d7ce8b95386..771eda76d5f 100644 --- a/app/code/core/Mage/Widget/etc/config.xml +++ b/app/code/core/Mage/Widget/etc/config.xml @@ -39,7 +39,6 @@ Mage_Widget_Model_Resource - widget_mysql4 widget
diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php index 14f8cf42b5a..30cb20b61a1 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php @@ -42,7 +42,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 9576fd2db1c..c6efc15c470 100644 --- a/app/code/core/Mage/Wishlist/Helper/Data.php +++ b/app/code/core/Mage/Wishlist/Helper/Data.php @@ -61,7 +61,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; @@ -190,7 +190,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() { @@ -226,7 +226,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/Mysql4/Item.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Item.php deleted file mode 100644 index 759afca388e..00000000000 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Item.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Wishlist_Model_Mysql4_Item extends Mage_Wishlist_Model_Resource_Item -{ -} diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php deleted file mode 100644 index 3018e36e610..00000000000 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Wishlist_Model_Mysql4_Item_Collection extends Mage_Wishlist_Model_Resource_Item_Collection -{ -} diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option.php deleted file mode 100644 index 4a7f5c913f9..00000000000 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option.php +++ /dev/null @@ -1,37 +0,0 @@ - - * @deprecated - */ -class Mage_Wishlist_Model_Mysql4_Item_Option extends Mage_Wishlist_Model_Resource_Item_Option -{ -} diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option/Collection.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option/Collection.php deleted file mode 100644 index 4079665fcf4..00000000000 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Wishlist_Model_Mysql4_Item_Option_Collection extends Mage_Wishlist_Model_Resource_Item_Option_Collection -{ -} diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Product/Collection.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Product/Collection.php deleted file mode 100644 index 25ab86719fa..00000000000 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Product/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Wishlist_Model_Mysql4_Product_Collection extends Mage_Wishlist_Model_Resource_Product_Collection -{ -} diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php deleted file mode 100644 index 00b848f13ed..00000000000 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Wishlist_Model_Mysql4_Wishlist extends Mage_Wishlist_Model_Resource_Wishlist -{ -} diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist/Collection.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist/Collection.php deleted file mode 100644 index 30ba1153023..00000000000 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist/Collection.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Wishlist_Model_Mysql4_Wishlist_Collection extends Mage_Wishlist_Model_Resource_Wishlist_Collection -{ -} diff --git a/app/code/core/Mage/Wishlist/Model/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Wishlist.php index 34949c23d9e..58b5baf446b 100644 --- a/app/code/core/Mage/Wishlist/Model/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Model/Wishlist.php @@ -55,7 +55,7 @@ class Mage_Wishlist_Model_Wishlist extends Mage_Core_Model_Abstract /** * Wishlist item collection * - * @var Mage_Wishlist_Model_Mysql4_Item_Collection + * @var Mage_Wishlist_Model_Resource_Item_Collection */ protected $_itemCollection = null; @@ -283,7 +283,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() { diff --git a/app/code/core/Mage/Wishlist/etc/config.xml b/app/code/core/Mage/Wishlist/etc/config.xml index 2987ae1cb92..9028ea8ddb7 100644 --- a/app/code/core/Mage/Wishlist/etc/config.xml +++ b/app/code/core/Mage/Wishlist/etc/config.xml @@ -44,7 +44,6 @@ Mage_Wishlist_Model_Resource - wishlist_mysql4 wishlist
diff --git a/app/etc/config.xml b/app/etc/config.xml index e5f31e1fa5d..8ad6b37a7f4 100644 --- a/app/etc/config.xml +++ b/app/etc/config.xml @@ -94,7 +94,6 @@ Mage_Core_Model_Resource - core_mysql4 core_config_data
diff --git a/shell/rename-mysql4-class-to-resource-pr1470.php b/shell/rename-mysql4-class-to-resource-pr1470.php new file mode 100644 index 00000000000..d595b2e411a --- /dev/null +++ b/shell/rename-mysql4-class-to-resource-pr1470.php @@ -0,0 +1,572 @@ + 'Mage_Admin_Model_Resource_Acl', + 'Mage_Admin_Model_Mysql4_Acl_Role' => 'Mage_Admin_Model_Resource_Acl_Role', + 'Mage_Admin_Model_Mysql4_Acl_Role_Collection' => 'Mage_Admin_Model_Resource_Acl_Role_Collection', + 'Mage_Admin_Model_Mysql4_Permissions_Collection' => 'Mage_Admin_Model_Resource_Permissions_Collection', + 'Mage_Admin_Model_Mysql4_Role' => 'Mage_Admin_Model_Resource_Role', + 'Mage_Admin_Model_Mysql4_Role_Collection' => 'Mage_Admin_Model_Resource_Role_Collection', + 'Mage_Admin_Model_Mysql4_Roles' => 'Mage_Admin_Model_Resource_Roles', + 'Mage_Admin_Model_Mysql4_Roles_Collection' => 'Mage_Admin_Model_Resource_Roles_Collection', + 'Mage_Admin_Model_Mysql4_Roles_User_Collection' => 'Mage_Admin_Model_Resource_Roles_User_Collection', + 'Mage_Admin_Model_Mysql4_Rules' => 'Mage_Admin_Model_Resource_Rules', + 'Mage_Admin_Model_Mysql4_Rules_Collection' => 'Mage_Admin_Model_Resource_Rules_Collection', + 'Mage_Admin_Model_Mysql4_User' => 'Mage_Admin_Model_Resource_User', + 'Mage_Admin_Model_Mysql4_User_Collection' => 'Mage_Admin_Model_Resource_User_Collection', + 'Mage_AdminNotification_Model_Mysql4_Inbox' => 'Mage_AdminNotification_Model_Resource_Inbox', + 'Mage_AdminNotification_Model_Mysql4_Inbox_Collection' => 'Mage_AdminNotification_Model_Resource_Inbox_Collection', + 'Mage_Api_Model_Mysql4_Acl' => 'Mage_Api_Model_Resource_Acl', + 'Mage_Api_Model_Mysql4_Acl_Role' => 'Mage_Api_Model_Resource_Acl_Role', + 'Mage_Api_Model_Mysql4_Acl_Role_Collection' => 'Mage_Api_Model_Resource_Acl_Role_Collection', + 'Mage_Api_Model_Mysql4_Permissions_Collection' => 'Mage_Api_Model_Resource_Permissions_Collection', + 'Mage_Api_Model_Mysql4_Role' => 'Mage_Api_Model_Resource_Role', + 'Mage_Api_Model_Mysql4_Role_Collection' => 'Mage_Api_Model_Resource_Role_Collection', + 'Mage_Api_Model_Mysql4_Roles' => 'Mage_Api_Model_Resource_Roles', + 'Mage_Api_Model_Mysql4_Roles_Collection' => 'Mage_Api_Model_Resource_Roles_Collection', + 'Mage_Api_Model_Mysql4_Roles_User_Collection' => 'Mage_Api_Model_Resource_Roles_User_Collection', + 'Mage_Api_Model_Mysql4_Rules' => 'Mage_Api_Model_Resource_Rules', + 'Mage_Api_Model_Mysql4_Rules_Collection' => 'Mage_Api_Model_Resource_Rules_Collection', + 'Mage_Api_Model_Mysql4_User' => 'Mage_Api_Model_Resource_User', + 'Mage_Api_Model_Mysql4_User_Collection' => 'Mage_Api_Model_Resource_User_Collection', + 'Mage_Backup_Model_Mysql4_Db' => 'Mage_Backup_Model_Resource_Db', + 'Mage_Bundle_Model_Mysql4_Bundle' => 'Mage_Bundle_Model_Resource_Bundle', + 'Mage_Bundle_Model_Mysql4_Indexer_Price' => 'Mage_Bundle_Model_Resource_Indexer_Price', + 'Mage_Bundle_Model_Mysql4_Indexer_Stock' => 'Mage_Bundle_Model_Resource_Indexer_Stock', + 'Mage_Bundle_Model_Mysql4_Option' => 'Mage_Bundle_Model_Resource_Option', + 'Mage_Bundle_Model_Mysql4_Option_Collection' => 'Mage_Bundle_Model_Resource_Option_Collection', + 'Mage_Bundle_Model_Mysql4_Price_Index' => 'Mage_Bundle_Model_Resource_Price_Index', + 'Mage_Bundle_Model_Mysql4_Selection' => 'Mage_Bundle_Model_Resource_Selection', + 'Mage_Bundle_Model_Mysql4_Selection_Collection' => 'Mage_Bundle_Model_Resource_Selection_Collection', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract' => 'Mage_Catalog_Model_Resource_Abstract', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute' => 'Mage_Catalog_Model_Resource_Attribute', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Category' => 'Mage_Catalog_Model_Resource_Category', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection' => 'Mage_Catalog_Model_Resource_Category_Attribute_Collection', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image' => 'Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout' => 'Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode' => 'Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page' => 'Mage_Catalog_Model_Resource_Category_Attribute_Source_Page', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection' => 'Mage_Catalog_Model_Resource_Category_Collection', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat' => 'Mage_Catalog_Model_Resource_Category_Flat', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection' => 'Mage_Catalog_Model_Resource_Category_Flat_Collection', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product' => 'Mage_Catalog_Model_Resource_Category_Indexer_Product', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree' => 'Mage_Catalog_Model_Resource_Category_Tree', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract' => 'Mage_Catalog_Model_Resource_Collection_Abstract', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Config' => 'Mage_Catalog_Model_Resource_Config', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute' => 'Mage_Catalog_Model_Resource_Layer_Filter_Attribute', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal' => 'Mage_Catalog_Model_Resource_Layer_Filter_Decimal', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price' => 'Mage_Catalog_Model_Resource_Layer_Filter_Price', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product' => 'Mage_Catalog_Model_Resource_Product', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action' => 'Mage_Catalog_Model_Resource_Product_Action', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image' => 'Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media' => 'Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice' => 'Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey' => 'Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection' => 'Mage_Catalog_Model_Resource_Product_Attribute_Collection', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image' => 'Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice' => 'Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection' => 'Mage_Catalog_Model_Resource_Product_Collection', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item' => 'Mage_Catalog_Model_Resource_Product_Compare_Item', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection' => 'Mage_Catalog_Model_Resource_Product_Compare_Item_Collection', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat' => 'Mage_Catalog_Model_Resource_Product_Flat', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer' => 'Mage_Catalog_Model_Resource_Product_Flat_Indexer', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract' => 'Mage_Catalog_Model_Resource_Product_Indexer_Abstract', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav' => 'Mage_Catalog_Model_Resource_Product_Indexer_Eav', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract' => 'Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal' => 'Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source' => 'Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price' => 'Mage_Catalog_Model_Resource_Product_Indexer_Price', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable' => 'Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default' => 'Mage_Catalog_Model_Resource_Product_Indexer_Price_Default', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped' => 'Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link' => 'Mage_Catalog_Model_Resource_Product_Link', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection' => 'Mage_Catalog_Model_Resource_Product_Link_Collection', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection' => 'Mage_Catalog_Model_Resource_Product_Link_Product_Collection', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option' => 'Mage_Catalog_Model_Resource_Product_Option', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection' => 'Mage_Catalog_Model_Resource_Product_Option_Collection', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value' => 'Mage_Catalog_Model_Resource_Product_Option_Value', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection' => 'Mage_Catalog_Model_Resource_Product_Option_Value_Collection', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation' => 'Mage_Catalog_Model_Resource_Product_Relation', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status' => 'Mage_Catalog_Model_Resource_Product_Status', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable' => 'Mage_Catalog_Model_Resource_Product_Type_Configurable', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute' => 'Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection' => 'Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection' => 'Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website' => 'Mage_Catalog_Model_Resource_Product_Website', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend' => 'Mage_Sendfriend_Model_Resource_Sendfriend', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection' => 'Mage_Sendfriend_Model_Resource_Sendfriend_Collection', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Setup' => 'Mage_Catalog_Model_Resource_Setup', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Url' => 'Mage_Catalog_Model_Resource_Url', + 'Mage_CatalogIndex_Model_Mysql4_Abstract' => 'Mage_CatalogIndex_Model_Resource_Abstract', + 'Mage_CatalogIndex_Model_Mysql4_Aggregation' => 'Mage_CatalogIndex_Model_Resource_Aggregation', + 'Mage_CatalogIndex_Model_Mysql4_Attribute' => 'Mage_CatalogIndex_Model_Resource_Attribute', + 'Mage_CatalogIndex_Model_Mysql4_Data_Abstract' => 'Mage_CatalogIndex_Model_Resource_Data_Abstract', + 'Mage_CatalogIndex_Model_Mysql4_Data_Configurable' => 'Mage_CatalogIndex_Model_Resource_Data_Configurable', + 'Mage_CatalogIndex_Model_Mysql4_Data_Grouped' => 'Mage_CatalogIndex_Model_Resource_Data_Grouped', + 'Mage_CatalogIndex_Model_Mysql4_Indexer' => 'Mage_CatalogIndex_Model_Resource_Indexer', + 'Mage_CatalogIndex_Model_Mysql4_Indexer_Abstract' => 'Mage_CatalogIndex_Model_Resource_Indexer_Abstract', + 'Mage_CatalogIndex_Model_Mysql4_Indexer_Eav' => 'Mage_CatalogIndex_Model_Resource_Indexer_Eav', + 'Mage_CatalogIndex_Model_Mysql4_Indexer_Minimalprice' => 'Mage_CatalogIndex_Model_Resource_Indexer_Minimalprice', + 'Mage_CatalogIndex_Model_Mysql4_Indexer_Price' => 'Mage_CatalogIndex_Model_Resource_Indexer_Price', + 'Mage_CatalogIndex_Model_Mysql4_Price' => 'Mage_CatalogIndex_Model_Resource_Price', + 'Mage_CatalogIndex_Model_Mysql4_Retreiver' => 'Mage_CatalogIndex_Model_Resource_Retreiver', + 'Mage_CatalogIndex_Model_Mysql4_Setup' => 'Mage_CatalogIndex_Model_Resource_Setup', + 'Mage_CatalogInventory_Model_Mysql4_Indexer_Stock' => 'Mage_CatalogInventory_Model_Resource_Indexer_Stock', + 'Mage_CatalogInventory_Model_Mysql4_Indexer_Stock_Configurable' => 'Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable', + 'Mage_CatalogInventory_Model_Mysql4_Indexer_Stock_Default' => 'Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default', + 'Mage_CatalogInventory_Model_Mysql4_Indexer_Stock_Grouped' => 'Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped', + 'Mage_CatalogInventory_Model_Mysql4_Stock' => 'Mage_CatalogInventory_Model_Resource_Stock', + 'Mage_CatalogInventory_Model_Mysql4_Stock_Item' => 'Mage_CatalogInventory_Model_Resource_Stock_Item', + 'Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection' => 'Mage_CatalogInventory_Model_Resource_Stock_Item_Collection', + 'Mage_CatalogInventory_Model_Mysql4_Stock_Status' => 'Mage_CatalogInventory_Model_Resource_Stock_Status', + 'Mage_CatalogRule_Model_Mysql4_Rule' => 'Mage_CatalogRule_Model_Resource_Rule', + 'Mage_CatalogRule_Model_Mysql4_Rule_Collection' => 'Mage_CatalogRule_Model_Resource_Rule_Collection', + 'Mage_CatalogRule_Model_Mysql4_Rule_Product_Price' => 'Mage_CatalogRule_Model_Resource_Rule_Product_Price', + 'Mage_CatalogRule_Model_Mysql4_Rule_Product_Price_Collection' => 'Mage_CatalogRule_Model_Resource_Rule_Product_Price_Collection', + 'Mage_CatalogSearch_Model_Mysql4_Advanced' => 'Mage_CatalogSearch_Model_Resource_Advanced', + 'Mage_CatalogSearch_Model_Mysql4_Advanced_Collection' => 'Mage_CatalogSearch_Model_Resource_Advanced_Collection', + 'Mage_CatalogSearch_Model_Mysql4_Fulltext' => 'Mage_CatalogSearch_Model_Resource_Fulltext', + 'Mage_CatalogSearch_Model_Mysql4_Fulltext_Collection' => 'Mage_CatalogSearch_Model_Resource_Fulltext_Collection', + 'Mage_CatalogSearch_Model_Mysql4_Fulltext_Engine' => 'Mage_CatalogSearch_Model_Resource_Fulltext_Engine', + 'Mage_CatalogSearch_Model_Mysql4_Indexer_Fulltext' => 'Mage_CatalogSearch_Model_Resource_Indexer_Fulltext', + 'Mage_CatalogSearch_Model_Mysql4_Query' => 'Mage_CatalogSearch_Model_Resource_Query', + 'Mage_CatalogSearch_Model_Mysql4_Query_Collection' => 'Mage_CatalogSearch_Model_Resource_Query_Collection', + 'Mage_CatalogSearch_Model_Mysql4_Search_Collection' => 'Mage_CatalogSearch_Model_Resource_Search_Collection', + 'Mage_Checkout_Model_Mysql4_Agreement' => 'Mage_Checkout_Model_Resource_Agreement', + 'Mage_Checkout_Model_Mysql4_Agreement_Collection' => 'Mage_Checkout_Model_Resource_Agreement_Collection', + 'Mage_Checkout_Model_Mysql4_Cart' => 'Mage_Checkout_Model_Resource_Cart', + 'Mage_Checkout_Model_Mysql4_Setup' => 'Mage_Checkout_Model_Resource_Setup', + 'Mage_Cms_Model_Mysql4_Block' => 'Mage_Cms_Model_Resource_Block', + 'Mage_Cms_Model_Mysql4_Block_Collection' => 'Mage_Cms_Model_Resource_Block_Collection', + 'Mage_Cms_Model_Mysql4_Page' => 'Mage_Cms_Model_Resource_Page', + 'Mage_Cms_Model_Mysql4_Page_Collection' => 'Mage_Cms_Model_Resource_Page_Collection', + 'Mage_Cms_Model_Mysql4_Page_Service' => 'Mage_Cms_Model_Resource_Page_Service', + 'Mage_Core_Model_Mysql4_Abstract' => 'Mage_Core_Model_Resource_Db_Abstract', + 'Mage_Core_Model_Mysql4_Cache' => 'Mage_Core_Model_Resource_Cache', + 'Mage_Core_Model_Mysql4_Collection_Abstract' => 'Mage_Core_Model_Resource_Db_Collection_Abstract', + 'Mage_Core_Model_Mysql4_Config' => 'Mage_Core_Model_Resource_Config', + 'Mage_Core_Model_Mysql4_Config_Data' => 'Mage_Core_Model_Resource_Config_Data', + 'Mage_Core_Model_Mysql4_Config_Data_Collection' => 'Mage_Core_Model_Resource_Config_Data_Collection', + 'Mage_Core_Model_Mysql4_Design' => 'Mage_Core_Model_Resource_Design', + 'Mage_Core_Model_Mysql4_Design_Collection' => 'Mage_Core_Model_Resource_Design_Collection', + 'Mage_Core_Model_Mysql4_Design_Package_Collection' => 'Mage_Core_Model_Resource_Design_Package_Collection', + 'Mage_Core_Model_Mysql4_Design_Theme_Collection' => 'Varien_Directory_Collection', + 'Mage_Core_Model_Mysql4_Email_Template' => 'Mage_Core_Model_Resource_Email_Template', + 'Mage_Core_Model_Mysql4_Email_Template_Collection' => 'Mage_Core_Model_Resource_Email_Template_Collection', + 'Mage_Core_Model_Mysql4_File_Storage_Abstract' => 'Mage_Core_Model_Resource_File_Storage_Abstract', + 'Mage_Core_Model_Mysql4_File_Storage_Database' => 'Mage_Core_Model_Resource_File_Storage_Database', + 'Mage_Core_Model_Mysql4_File_Storage_Directory_Database' => 'Mage_Core_Model_Resource_File_Storage_Directory_Database', + 'Mage_Core_Model_Mysql4_File_Storage_File' => 'Mage_Core_Model_Resource_File_Storage_File', + 'Mage_Core_Model_Mysql4_Flag' => 'Mage_Core_Model_Resource_Flag', + 'Mage_Core_Model_Mysql4_Language' => 'Mage_Core_Model_Resource_Language', + 'Mage_Core_Model_Mysql4_Language_Collection' => 'Mage_Core_Model_Resource_Language_Collection', + 'Mage_Core_Model_Mysql4_Layout' => 'Mage_Core_Model_Resource_Layout', + 'Mage_Core_Model_Mysql4_Resource' => 'Mage_Core_Model_Resource_Resource', + 'Mage_Core_Model_Mysql4_Session' => 'Mage_Core_Model_Resource_Session', + 'Mage_Core_Model_Mysql4_Store' => 'Mage_Core_Model_Resource_Store', + 'Mage_Core_Model_Mysql4_Store_Collection' => 'Mage_Core_Model_Resource_Store_Collection', + 'Mage_Core_Model_Mysql4_Store_Group' => 'Mage_Core_Model_Resource_Store_Group', + 'Mage_Core_Model_Mysql4_Store_Group_Collection' => 'Mage_Core_Model_Resource_Store_Group_Collection', + 'Mage_Core_Model_Mysql4_Translate' => 'Mage_Core_Model_Resource_Translate', + 'Mage_Core_Model_Mysql4_Translate_String' => 'Mage_Core_Model_Resource_Translate_String', + 'Mage_Core_Model_Mysql4_Url_Rewrite' => 'Mage_Core_Model_Resource_Url_Rewrite', + 'Mage_Core_Model_Mysql4_Url_Rewrite_Collection' => 'Mage_Core_Model_Resource_Url_Rewrite_Collection', + 'Mage_Core_Model_Mysql4_Variable' => 'Mage_Core_Model_Resource_Variable', + 'Mage_Core_Model_Mysql4_Variable_Collection' => 'Mage_Core_Model_Resource_Variable_Collection', + 'Mage_Core_Model_Mysql4_Website' => 'Mage_Core_Model_Resource_Website', + 'Mage_Core_Model_Mysql4_Website_Collection' => 'Mage_Core_Model_Resource_Website_Collection', + 'Mage_Cron_Model_Mysql4_Schedule' => 'Mage_Cron_Model_Resource_Schedule', + 'Mage_Cron_Model_Mysql4_Schedule_Collection' => 'Mage_Cron_Model_Resource_Schedule_Collection', + 'Mage_Dataflow_Model_Mysql4_Batch' => 'Mage_Dataflow_Model_Resource_Batch', + 'Mage_Dataflow_Model_Mysql4_Batch_Abstract' => 'Mage_Dataflow_Model_Resource_Batch_Abstract', + 'Mage_Dataflow_Model_Mysql4_Batch_Collection' => 'Mage_Dataflow_Model_Resource_Batch_Collection', + 'Mage_Dataflow_Model_Mysql4_Batch_Export' => 'Mage_Dataflow_Model_Resource_Batch_Export', + 'Mage_Dataflow_Model_Mysql4_Batch_Import' => 'Mage_Dataflow_Model_Resource_Batch_Import', + 'Mage_Dataflow_Model_Mysql4_Import' => 'Mage_Dataflow_Model_Resource_Import', + 'Mage_Dataflow_Model_Mysql4_Import_Collection' => 'Mage_Dataflow_Model_Resource_Import_Collection', + 'Mage_Dataflow_Model_Mysql4_Profile' => 'Mage_Dataflow_Model_Resource_Profile', + 'Mage_Dataflow_Model_Mysql4_Profile_Collection' => 'Mage_Dataflow_Model_Resource_Profile_Collection', + 'Mage_Dataflow_Model_Mysql4_Profile_History' => 'Mage_Dataflow_Model_Resource_Profile_History', + 'Mage_Dataflow_Model_Mysql4_Profile_History_Collection' => 'Mage_Dataflow_Model_Resource_Profile_History_Collection', + 'Mage_Dataflow_Model_Mysql4_Session' => 'Mage_Dataflow_Model_Resource_Session', + 'Mage_Directory_Model_Mysql4_Country' => 'Mage_Directory_Model_Resource_Country', + 'Mage_Directory_Model_Mysql4_Country_Collection' => 'Mage_Directory_Model_Resource_Country_Collection', + 'Mage_Directory_Model_Mysql4_Country_Format' => 'Mage_Directory_Model_Resource_Country_Format', + 'Mage_Directory_Model_Mysql4_Country_Format_Collection' => 'Mage_Directory_Model_Resource_Country_Format_Collection', + 'Mage_Directory_Model_Mysql4_Currency' => 'Mage_Directory_Model_Resource_Currency', + 'Mage_Directory_Model_Mysql4_Currency_Collection' => 'Mage_Directory_Model_Resource_Currency_Collection', + 'Mage_Directory_Model_Mysql4_Region' => 'Mage_Directory_Model_Resource_Region', + 'Mage_Directory_Model_Mysql4_Region_Collection' => 'Mage_Directory_Model_Resource_Region_Collection', + 'Mage_Downloadable_Model_Mysql4_Indexer_Price' => 'Mage_Downloadable_Model_Resource_Indexer_Price', + 'Mage_Downloadable_Model_Mysql4_Link' => 'Mage_Downloadable_Model_Resource_Link', + 'Mage_Downloadable_Model_Mysql4_Link_Collection' => 'Mage_Downloadable_Model_Resource_Link_Collection', + 'Mage_Downloadable_Model_Mysql4_Link_Purchased' => 'Mage_Downloadable_Model_Resource_Link_Purchased', + 'Mage_Downloadable_Model_Mysql4_Link_Purchased_Collection' => 'Mage_Downloadable_Model_Resource_Link_Purchased_Collection', + 'Mage_Downloadable_Model_Mysql4_Link_Purchased_Item' => 'Mage_Downloadable_Model_Resource_Link_Purchased_Item', + 'Mage_Downloadable_Model_Mysql4_Link_Purchased_Item_Collection' => 'Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection', + 'Mage_Downloadable_Model_Mysql4_Sample' => 'Mage_Downloadable_Model_Resource_Sample', + 'Mage_Downloadable_Model_Mysql4_Sample_Collection' => 'Mage_Downloadable_Model_Resource_Sample_Collection', + 'Mage_Eav_Model_Mysql4_Config' => 'Mage_Eav_Model_Resource_Config', + 'Mage_Eav_Model_Mysql4_Entity_Attribute' => 'Mage_Eav_Model_Resource_Entity_Attribute', + 'Mage_Eav_Model_Mysql4_Entity_Attribute_Collection' => 'Mage_Eav_Model_Resource_Entity_Attribute_Collection', + 'Mage_Eav_Model_Mysql4_Entity_Attribute_Group' => 'Mage_Eav_Model_Resource_Entity_Attribute_Group', + 'Mage_Eav_Model_Mysql4_Entity_Attribute_Group_Collection' => 'Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection', + 'Mage_Eav_Model_Mysql4_Entity_Attribute_Option' => 'Mage_Eav_Model_Resource_Entity_Attribute_Option', + 'Mage_Eav_Model_Mysql4_Entity_Attribute_Option_Collection' => 'Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection', + 'Mage_Eav_Model_Mysql4_Entity_Attribute_Set' => 'Mage_Eav_Model_Resource_Entity_Attribute_Set', + 'Mage_Eav_Model_Mysql4_Entity_Attribute_Set_Collection' => 'Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection', + 'Mage_Eav_Model_Mysql4_Entity_Store' => 'Mage_Eav_Model_Resource_Entity_Store', + 'Mage_Eav_Model_Mysql4_Entity_Type' => 'Mage_Eav_Model_Resource_Entity_Type', + 'Mage_Eav_Model_Mysql4_Entity_Type_Collection' => 'Mage_Eav_Model_Resource_Entity_Type_Collection', + 'Mage_Eav_Model_Mysql4_Form_Element' => 'Mage_Eav_Model_Resource_Form_Element', + 'Mage_Eav_Model_Mysql4_Form_Element_Collection' => 'Mage_Eav_Model_Resource_Form_Element_Collection', + 'Mage_Eav_Model_Mysql4_Form_Fieldset' => 'Mage_Eav_Model_Resource_Form_Fieldset', + 'Mage_Eav_Model_Mysql4_Form_Fieldset_Collection' => 'Mage_Eav_Model_Resource_Form_Fieldset_Collection', + 'Mage_Eav_Model_Mysql4_Form_Type' => 'Mage_Eav_Model_Resource_Form_Type', + 'Mage_Eav_Model_Mysql4_Form_Type_Collection' => 'Mage_Eav_Model_Resource_Form_Type_Collection', + 'Mage_GiftMessage_Model_Mysql4_Message' => 'Mage_GiftMessage_Model_Resource_Message', + 'Mage_GiftMessage_Model_Mysql4_Message_Collection' => 'Mage_GiftMessage_Model_Resource_Message_Collection', + 'Mage_GiftMessage_Model_Mysql4_Setup' => 'Mage_GiftMessage_Model_Resource_Setup', + 'Mage_ImportExport_Model_Mysql4_Import_Data' => 'Mage_ImportExport_Model_Resource_Import_Data', + 'Mage_ImportExport_Model_Mysql4_Setup' => 'Mage_ImportExport_Model_Resource_Setup', + 'Mage_Index_Model_Mysql4_Abstract' => 'Mage_Index_Model_Resource_Abstract', + 'Mage_Index_Model_Mysql4_Event' => 'Mage_Index_Model_Resource_Event', + 'Mage_Index_Model_Mysql4_Event_Collection' => 'Mage_Index_Model_Resource_Event_Collection', + 'Mage_Index_Model_Mysql4_Process' => 'Mage_Index_Model_Resource_Process', + 'Mage_Index_Model_Mysql4_Process_Collection' => 'Mage_Index_Model_Resource_Process_Collection', + 'Mage_Index_Model_Mysql4_Setup' => 'Mage_Index_Model_Resource_Setup', + 'Mage_Log_Model_Mysql4_Aggregation' => 'Mage_Log_Model_Resource_Aggregation', + 'Mage_Log_Model_Mysql4_Customer' => 'Mage_Log_Model_Resource_Customer', + 'Mage_Log_Model_Mysql4_Log' => 'Mage_Log_Model_Resource_Log', + 'Mage_Log_Model_Mysql4_Visitor' => 'Mage_Log_Model_Resource_Visitor', + 'Mage_Log_Model_Mysql4_Visitor_Collection' => 'Mage_Log_Model_Resource_Visitor_Collection', + 'Mage_Log_Model_Mysql4_Visitor_Online' => 'Mage_Log_Model_Resource_Visitor_Online', + 'Mage_Log_Model_Mysql4_Visitor_Online_Collection' => 'Mage_Log_Model_Resource_Visitor_Online_Collection', + 'Mage_Newsletter_Model_Mysql4_Problem' => 'Mage_Newsletter_Model_Resource_Problem', + 'Mage_Newsletter_Model_Mysql4_Problem_Collection' => 'Mage_Newsletter_Model_Resource_Problem_Collection', + 'Mage_Newsletter_Model_Mysql4_Queue' => 'Mage_Newsletter_Model_Resource_Queue', + 'Mage_Newsletter_Model_Mysql4_Queue_Collection' => 'Mage_Newsletter_Model_Resource_Queue_Collection', + 'Mage_Newsletter_Model_Mysql4_Subscriber' => 'Mage_Newsletter_Model_Resource_Subscriber', + 'Mage_Newsletter_Model_Mysql4_Subscriber_Collection' => 'Mage_Newsletter_Model_Resource_Subscriber_Collection', + 'Mage_Newsletter_Model_Mysql4_Template' => 'Mage_Newsletter_Model_Resource_Template', + 'Mage_Newsletter_Model_Mysql4_Template_Collection' => 'Mage_Newsletter_Model_Resource_Template_Collection', + 'Mage_Paygate_Model_Mysql4_Authorizenet_Debug' => 'Mage_Paygate_Model_Resource_Authorizenet_Debug', + 'Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection' => 'Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection', + 'Mage_Paypal_Model_Mysql4_Cert' => 'Mage_Paypal_Model_Resource_Cert', + 'Mage_Paypal_Model_Mysql4_Report_Settlement' => 'Mage_Paypal_Model_Resource_Report_Settlement', + 'Mage_Paypal_Model_Mysql4_Report_Settlement_Row' => 'Mage_Paypal_Model_Resource_Report_Settlement_Row', + 'Mage_Paypal_Model_Mysql4_Report_Settlement_Row_Collection' => 'Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection', + 'Mage_Paypal_Model_Mysql4_Setup' => 'Mage_Paypal_Model_Resource_Setup', + 'Mage_Poll_Model_Mysql4_Poll' => 'Mage_Poll_Model_Resource_Poll', + 'Mage_Poll_Model_Mysql4_Poll_Answer' => 'Mage_Poll_Model_Resource_Poll_Answer', + 'Mage_Poll_Model_Mysql4_Poll_Answer_Collection' => 'Mage_Poll_Model_Resource_Poll_Answer_Collection', + 'Mage_Poll_Model_Mysql4_Poll_Collection' => 'Mage_Poll_Model_Resource_Poll_Collection', + 'Mage_Poll_Model_Mysql4_Poll_Vote' => 'Mage_Poll_Model_Resource_Poll_Vote', + 'Mage_ProductAlert_Model_Mysql4_Price' => 'Mage_ProductAlert_Model_Resource_Price', + 'Mage_ProductAlert_Model_Mysql4_Price_Collection' => 'Mage_ProductAlert_Model_Resource_Price_Collection', + 'Mage_ProductAlert_Model_Mysql4_Price_Customer_Collection' => 'Mage_ProductAlert_Model_Resource_Price_Customer_Collection', + 'Mage_ProductAlert_Model_Mysql4_Stock' => 'Mage_ProductAlert_Model_Resource_Stock', + 'Mage_ProductAlert_Model_Mysql4_Stock_Collection' => 'Mage_ProductAlert_Model_Resource_Stock_Collection', + 'Mage_ProductAlert_Model_Mysql4_Stock_Customer_Collection' => 'Mage_ProductAlert_Model_Resource_Stock_Customer_Collection', + 'Mage_Rating_Model_Mysql4_Rating' => 'Mage_Rating_Model_Resource_Rating', + 'Mage_Rating_Model_Mysql4_Rating_Collection' => 'Mage_Rating_Model_Resource_Rating_Collection', + 'Mage_Rating_Model_Mysql4_Rating_Entity' => 'Mage_Rating_Model_Resource_Rating_Entity', + 'Mage_Rating_Model_Mysql4_Rating_Option' => 'Mage_Rating_Model_Resource_Rating_Option', + 'Mage_Rating_Model_Mysql4_Rating_Option_Collection' => 'Mage_Rating_Model_Resource_Rating_Option_Collection', + 'Mage_Rating_Model_Mysql4_Rating_Option_Vote' => 'Mage_Rating_Model_Resource_Rating_Option_Vote', + 'Mage_Rating_Model_Mysql4_Rating_Option_Vote_Collection' => 'Mage_Rating_Model_Resource_Rating_Option_Vote_Collection', + 'Mage_Reports_Model_Mysql4_Accounts_Collection' => 'Mage_Reports_Model_Resource_Accounts_Collection', + 'Mage_Reports_Model_Mysql4_Coupons_Collection' => 'Mage_Reports_Model_Resource_Coupons_Collection', + 'Mage_Reports_Model_Mysql4_Customer_Collection' => 'Mage_Reports_Model_Resource_Customer_Collection', + 'Mage_Reports_Model_Mysql4_Customer_Orders_Collection' => 'Mage_Reports_Model_Resource_Customer_Orders_Collection', + 'Mage_Reports_Model_Mysql4_Customer_Totals_Collection' => 'Mage_Reports_Model_Resource_Customer_Totals_Collection', + 'Mage_Reports_Model_Mysql4_Entity_Summary_Collection_Abstract' => 'Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract', + 'Mage_Reports_Model_Mysql4_Event' => 'Mage_Reports_Model_Resource_Event', + 'Mage_Reports_Model_Mysql4_Event_Collection' => 'Mage_Reports_Model_Resource_Event_Collection', + 'Mage_Reports_Model_Mysql4_Event_Type' => 'Mage_Reports_Model_Resource_Event_Type', + 'Mage_Reports_Model_Mysql4_Event_Type_Collection' => 'Mage_Reports_Model_Resource_Event_Type_Collection', + 'Mage_Reports_Model_Mysql4_Invoiced_Collection' => 'Mage_Reports_Model_Resource_Invoiced_Collection', + 'Mage_Reports_Model_Mysql4_Order_Collection' => 'Mage_Reports_Model_Resource_Order_Collection', + 'Mage_Reports_Model_Mysql4_Product_Collection' => 'Mage_Reports_Model_Resource_Product_Collection', + 'Mage_Reports_Model_Mysql4_Product_Downloads_Collection' => 'Mage_Reports_Model_Resource_Product_Downloads_Collection', + 'Mage_Reports_Model_Mysql4_Product_Index_Abstract' => 'Mage_Reports_Model_Resource_Product_Index_Abstract', + 'Mage_Reports_Model_Mysql4_Product_Index_Collection_Abstract' => 'Mage_Reports_Model_Resource_Product_Index_Collection_Abstract', + 'Mage_Reports_Model_Mysql4_Product_Index_Compared' => 'Mage_Reports_Model_Resource_Product_Index_Compared', + 'Mage_Reports_Model_Mysql4_Product_Index_Compared_Collection' => 'Mage_Reports_Model_Resource_Product_Index_Compared_Collection', + 'Mage_Reports_Model_Mysql4_Product_Index_Viewed' => 'Mage_Reports_Model_Resource_Product_Index_Viewed', + 'Mage_Reports_Model_Mysql4_Product_Index_Viewed_Collection' => 'Mage_Reports_Model_Resource_Product_Index_Viewed_Collection', + 'Mage_Reports_Model_Mysql4_Product_Lowstock_Collection' => 'Mage_Reports_Model_Resource_Product_Lowstock_Collection', + 'Mage_Reports_Model_Mysql4_Product_Ordered_Collection' => 'Mage_Reports_Model_Resource_Product_Ordered_Collection', + 'Mage_Reports_Model_Mysql4_Product_Sold_Collection' => 'Mage_Reports_Model_Resource_Product_Sold_Collection', + 'Mage_Reports_Model_Mysql4_Product_Viewed_Collection' => 'Mage_Reports_Model_Resource_Product_Viewed_Collection', + 'Mage_Reports_Model_Mysql4_Quote_Collection' => 'Mage_Reports_Model_Resource_Quote_Collection', + 'Mage_Reports_Model_Mysql4_Refunded_Collection' => 'Mage_Reports_Model_Resource_Refunded_Collection', + 'Mage_Reports_Model_Mysql4_Report_Abstract' => 'Mage_Reports_Model_Resource_Report_Abstract', + 'Mage_Reports_Model_Mysql4_Report_Collection' => 'Mage_Reports_Model_Resource_Report_Collection', + 'Mage_Reports_Model_Mysql4_Review_Collection' => 'Mage_Reports_Model_Resource_Review_Collection', + 'Mage_Reports_Model_Mysql4_Review_Customer_Collection' => 'Mage_Reports_Model_Resource_Review_Customer_Collection', + 'Mage_Reports_Model_Mysql4_Review_Product_Collection' => 'Mage_Reports_Model_Resource_Review_Product_Collection', + 'Mage_Reports_Model_Mysql4_Shipping_Collection' => 'Mage_Reports_Model_Resource_Shipping_Collection', + 'Mage_Reports_Model_Mysql4_Shopcart_Product_Collection' => 'Mage_Reports_Model_Resource_Shopcart_Product_Collection', + 'Mage_Reports_Model_Mysql4_Tag_Collection' => 'Mage_Reports_Model_Resource_Tag_Collection', + 'Mage_Reports_Model_Mysql4_Tag_Customer_Collection' => 'Mage_Reports_Model_Resource_Tag_Customer_Collection', + 'Mage_Reports_Model_Mysql4_Tag_Product_Collection' => 'Mage_Reports_Model_Resource_Tag_Product_Collection', + 'Mage_Reports_Model_Mysql4_Tax_Collection' => 'Mage_Reports_Model_Resource_Tax_Collection', + 'Mage_Reports_Model_Mysql4_Wishlist_Collection' => 'Mage_Reports_Model_Resource_Wishlist_Collection', + 'Mage_Reports_Model_Mysql4_Wishlist_Product_Collection' => 'Mage_Reports_Model_Resource_Wishlist_Product_Collection', + 'Mage_Review_Model_Mysql4_Review' => 'Mage_Review_Model_Resource_Review', + 'Mage_Review_Model_Mysql4_Review_Collection' => 'Mage_Review_Model_Resource_Review_Collection', + 'Mage_Review_Model_Mysql4_Review_Product_Collection' => 'Mage_Review_Model_Resource_Review_Product_Collection', + 'Mage_Review_Model_Mysql4_Review_Status_Collection' => 'Mage_Review_Model_Resource_Review_Status_Collection', + 'Mage_Review_Model_Mysql4_Review_Summary' => 'Mage_Review_Model_Resource_Review_Summary', + 'Mage_Review_Model_Mysql4_Review_Summary_Collection' => 'Mage_Review_Model_Resource_Review_Summary_Collection', + 'Mage_Rss_Model_Mysql4_Order' => 'Mage_Rss_Model_Resource_Order', + 'Mage_Rule_Model_Mysql4_Rule' => 'Mage_Rule_Model_Resource_Rule', + 'Mage_Rule_Model_Mysql4_Rule_Collection' => 'Mage_Rule_Model_Resource_Rule_Collection', + 'Mage_Sales_Model_Mysql4_Abstract' => 'Mage_Sales_Model_Resource_Abstract', + 'Mage_Sales_Model_Mysql4_Billing_Agreement' => 'Mage_Sales_Model_Resource_Billing_Agreement', + 'Mage_Sales_Model_Mysql4_Billing_Agreement_Collection' => 'Mage_Sales_Model_Resource_Billing_Agreement_Collection', + 'Mage_Sales_Model_Mysql4_Collection_Abstract' => 'Mage_Sales_Model_Resource_Collection_Abstract', + 'Mage_Sales_Model_Mysql4_Order' => 'Mage_Sales_Model_Resource_Order', + 'Mage_Sales_Model_Mysql4_Order_Abstract' => 'Mage_Sales_Model_Resource_Order_Abstract', + 'Mage_Sales_Model_Mysql4_Order_Address' => 'Mage_Sales_Model_Resource_Order_Address', + 'Mage_Sales_Model_Mysql4_Order_Address_Collection' => 'Mage_Sales_Model_Resource_Order_Address_Collection', + 'Mage_Sales_Model_Mysql4_Order_Attribute_Backend_Billing' => 'Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing', + 'Mage_Sales_Model_Mysql4_Order_Attribute_Backend_Child' => 'Mage_Sales_Model_Resource_Order_Attribute_Backend_Child', + 'Mage_Sales_Model_Mysql4_Order_Attribute_Backend_Parent' => 'Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent', + 'Mage_Sales_Model_Mysql4_Order_Attribute_Backend_Shipping' => 'Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping', + 'Mage_Sales_Model_Mysql4_Order_Collection' => 'Mage_Sales_Model_Resource_Order_Collection', + 'Mage_Sales_Model_Mysql4_Order_Collection_Abstract' => 'Mage_Sales_Model_Resource_Order_Collection_Abstract', + 'Mage_Sales_Model_Mysql4_Order_Comment_Collection_Abstract' => 'Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract', + 'Mage_Sales_Model_Mysql4_Order_Creditmemo' => 'Mage_Sales_Model_Resource_Order_Creditmemo', + 'Mage_Sales_Model_Mysql4_Order_Creditmemo_Attribute_Backend_Child' => 'Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child', + 'Mage_Sales_Model_Mysql4_Order_Creditmemo_Attribute_Backend_Parent' => 'Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent', + 'Mage_Sales_Model_Mysql4_Order_Creditmemo_Collection' => 'Mage_Sales_Model_Resource_Order_Creditmemo_Collection', + 'Mage_Sales_Model_Mysql4_Order_Creditmemo_Comment' => 'Mage_Sales_Model_Resource_Order_Creditmemo_Comment', + 'Mage_Sales_Model_Mysql4_Order_Creditmemo_Comment_Collection' => 'Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection', + 'Mage_Sales_Model_Mysql4_Order_Creditmemo_Grid_Collection' => 'Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection', + 'Mage_Sales_Model_Mysql4_Order_Creditmemo_Item' => 'Mage_Sales_Model_Resource_Order_Creditmemo_Item', + 'Mage_Sales_Model_Mysql4_Order_Creditmemo_Item_Collection' => 'Mage_Sales_Model_Resource_Order_Creditmemo_Item_Collection', + 'Mage_Sales_Model_Mysql4_Order_Grid_Collection' => 'Mage_Sales_Model_Resource_Order_Grid_Collection', + 'Mage_Sales_Model_Mysql4_Order_Invoice' => 'Mage_Sales_Model_Resource_Order_Invoice', + 'Mage_Sales_Model_Mysql4_Order_Invoice_Attribute_Backend_Child' => 'Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child', + 'Mage_Sales_Model_Mysql4_Order_Invoice_Attribute_Backend_Item' => 'Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item', + 'Mage_Sales_Model_Mysql4_Order_Invoice_Attribute_Backend_Order' => 'Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order', + 'Mage_Sales_Model_Mysql4_Order_Invoice_Attribute_Backend_Parent' => 'Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent', + 'Mage_Sales_Model_Mysql4_Order_Invoice_Collection' => 'Mage_Sales_Model_Resource_Order_Invoice_Collection', + 'Mage_Sales_Model_Mysql4_Order_Invoice_Comment' => 'Mage_Sales_Model_Resource_Order_Invoice_Comment', + 'Mage_Sales_Model_Mysql4_Order_Invoice_Comment_Collection' => 'Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection', + 'Mage_Sales_Model_Mysql4_Order_Invoice_Grid_Collection' => 'Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection', + 'Mage_Sales_Model_Mysql4_Order_Invoice_Item' => 'Mage_Sales_Model_Resource_Order_Invoice_Item', + 'Mage_Sales_Model_Mysql4_Order_Invoice_Item_Collection' => 'Mage_Sales_Model_Resource_Order_Invoice_Item_Collection', + 'Mage_Sales_Model_Mysql4_Order_Item' => 'Mage_Sales_Model_Resource_Order_Item', + 'Mage_Sales_Model_Mysql4_Order_Item_Collection' => 'Mage_Sales_Model_Resource_Order_Item_Collection', + 'Mage_Sales_Model_Mysql4_Order_Payment' => 'Mage_Sales_Model_Resource_Order_Payment', + 'Mage_Sales_Model_Mysql4_Order_Payment_Collection' => 'Mage_Sales_Model_Resource_Order_Payment_Collection', + 'Mage_Sales_Model_Mysql4_Order_Payment_Transaction' => 'Mage_Sales_Model_Resource_Order_Payment_Transaction', + 'Mage_Sales_Model_Mysql4_Order_Payment_Transaction_Collection' => 'Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection', + 'Mage_Sales_Model_Mysql4_Order_Shipment' => 'Mage_Sales_Model_Resource_Order_Shipment', + 'Mage_Sales_Model_Mysql4_Order_Shipment_Attribute_Backend_Child' => 'Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child', + 'Mage_Sales_Model_Mysql4_Order_Shipment_Attribute_Backend_Parent' => 'Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent', + 'Mage_Sales_Model_Mysql4_Order_Shipment_Collection' => 'Mage_Sales_Model_Resource_Order_Shipment_Collection', + 'Mage_Sales_Model_Mysql4_Order_Shipment_Comment' => 'Mage_Sales_Model_Resource_Order_Shipment_Comment', + 'Mage_Sales_Model_Mysql4_Order_Shipment_Comment_Collection' => 'Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection', + 'Mage_Sales_Model_Mysql4_Order_Shipment_Grid_Collection' => 'Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection', + 'Mage_Sales_Model_Mysql4_Order_Shipment_Item' => 'Mage_Sales_Model_Resource_Order_Shipment_Item', + 'Mage_Sales_Model_Mysql4_Order_Shipment_Item_Collection' => 'Mage_Sales_Model_Resource_Order_Shipment_Item_Collection', + 'Mage_Sales_Model_Mysql4_Order_Shipment_Track' => 'Mage_Sales_Model_Resource_Order_Shipment_Track', + 'Mage_Sales_Model_Mysql4_Order_Shipment_Track_Collection' => 'Mage_Sales_Model_Resource_Order_Shipment_Track_Collection', + 'Mage_Sales_Model_Mysql4_Order_Status' => 'Mage_Sales_Model_Resource_Order_Status', + 'Mage_Sales_Model_Mysql4_Order_Status_Collection' => 'Mage_Sales_Model_Resource_Order_Status_Collection', + 'Mage_Sales_Model_Mysql4_Order_Status_History' => 'Mage_Sales_Model_Resource_Order_Status_History', + 'Mage_Sales_Model_Mysql4_Order_Status_History_Collection' => 'Mage_Sales_Model_Resource_Order_Status_History_Collection', + 'Mage_Sales_Model_Mysql4_Order_Tax' => 'Mage_Sales_Model_Resource_Order_Tax', + 'Mage_Sales_Model_Mysql4_Order_Tax_Collection' => 'Mage_Sales_Model_Resource_Order_Tax_Collection', + 'Mage_Sales_Model_Mysql4_Quote' => 'Mage_Sales_Model_Resource_Quote', + 'Mage_Sales_Model_Mysql4_Quote_Address' => 'Mage_Sales_Model_Resource_Quote_Address', + 'Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Backend' => 'Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend', + 'Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Backend_Child' => 'Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child', + 'Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Backend_Parent' => 'Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent', + 'Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Backend_Region' => 'Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region', + 'Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend' => 'Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend', + 'Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend_Custbalance' => 'Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance', + 'Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend_Discount' => 'Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount', + 'Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend_Grand' => 'Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand', + 'Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend_Shipping' => 'Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping', + 'Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend_Subtotal' => 'Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal', + 'Mage_Sales_Model_Mysql4_Quote_Address_Attribute_Frontend_Tax' => 'Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax', + 'Mage_Sales_Model_Mysql4_Quote_Address_Collection' => 'Mage_Sales_Model_Resource_Quote_Address_Collection', + 'Mage_Sales_Model_Mysql4_Quote_Address_Item' => 'Mage_Sales_Model_Resource_Quote_Address_Item', + 'Mage_Sales_Model_Mysql4_Quote_Address_Item_Collection' => 'Mage_Sales_Model_Resource_Quote_Address_Item_Collection', + 'Mage_Sales_Model_Mysql4_Quote_Address_Rate' => 'Mage_Sales_Model_Resource_Quote_Address_Rate', + 'Mage_Sales_Model_Mysql4_Quote_Address_Rate_Collection' => 'Mage_Sales_Model_Resource_Quote_Address_Rate_Collection', + 'Mage_Sales_Model_Mysql4_Quote_Collection' => 'Mage_Sales_Model_Resource_Quote_Collection', + 'Mage_Sales_Model_Mysql4_Quote_Item' => 'Mage_Sales_Model_Resource_Quote_Item', + 'Mage_Sales_Model_Mysql4_Quote_Item_Collection' => 'Mage_Sales_Model_Resource_Quote_Item_Collection', + 'Mage_Sales_Model_Mysql4_Quote_Item_Option' => 'Mage_Sales_Model_Resource_Quote_Item_Option', + 'Mage_Sales_Model_Mysql4_Quote_Item_Option_Collection' => 'Mage_Sales_Model_Resource_Quote_Item_Option_Collection', + 'Mage_Sales_Model_Mysql4_Quote_Payment' => 'Mage_Sales_Model_Resource_Quote_Payment', + 'Mage_Sales_Model_Mysql4_Quote_Payment_Collection' => 'Mage_Sales_Model_Resource_Quote_Payment_Collection', + 'Mage_Sales_Model_Mysql4_Recurring_Profile' => 'Mage_Sales_Model_Resource_Recurring_Profile', + 'Mage_Sales_Model_Mysql4_Recurring_Profile_Collection' => 'Mage_Sales_Model_Resource_Recurring_Profile_Collection', + 'Mage_Sales_Model_Mysql4_Report' => 'Mage_Sales_Model_Resource_Report', + 'Mage_Sales_Model_Mysql4_Report_Abstract' => 'Mage_Sales_Model_Resource_Report_Abstract', + 'Mage_Sales_Model_Mysql4_Report_Bestsellers' => 'Mage_Sales_Model_Resource_Report_Bestsellers', + 'Mage_Sales_Model_Mysql4_Report_Bestsellers_Collection' => 'Mage_Sales_Model_Resource_Report_Bestsellers_Collection', + 'Mage_Sales_Model_Mysql4_Report_Collection_Abstract' => 'Mage_Sales_Model_Resource_Report_Collection_Abstract', + 'Mage_Sales_Model_Mysql4_Report_Invoiced' => 'Mage_Sales_Model_Resource_Report_Invoiced', + 'Mage_Sales_Model_Mysql4_Report_Invoiced_Collection_Invoiced' => 'Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced', + 'Mage_Sales_Model_Mysql4_Report_Invoiced_Collection_Order' => 'Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order', + 'Mage_Sales_Model_Mysql4_Report_Order' => 'Mage_Sales_Model_Resource_Report_Order', + 'Mage_Sales_Model_Mysql4_Report_Order_Collection' => 'Mage_Sales_Model_Resource_Report_Order_Collection', + 'Mage_Sales_Model_Mysql4_Report_Order_Updatedat_Collection' => 'Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection', + 'Mage_Sales_Model_Mysql4_Report_Refunded' => 'Mage_Sales_Model_Resource_Report_Refunded', + 'Mage_Sales_Model_Mysql4_Report_Refunded_Collection_Order' => 'Mage_Sales_Model_Resource_Report_Refunded_Collection_Order', + 'Mage_Sales_Model_Mysql4_Report_Refunded_Collection_Refunded' => 'Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded', + 'Mage_Sales_Model_Mysql4_Report_Shipping' => 'Mage_Sales_Model_Resource_Report_Shipping', + 'Mage_Sales_Model_Mysql4_Report_Shipping_Collection_Order' => 'Mage_Sales_Model_Resource_Report_Shipping_Collection_Order', + 'Mage_Sales_Model_Mysql4_Report_Shipping_Collection_Shipment' => 'Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment', + 'Mage_Sales_Model_Mysql4_Sale_Collection' => 'Mage_Sales_Model_Resource_Sale_Collection', + 'Mage_Sales_Model_Mysql4_Setup' => 'Mage_Sales_Model_Resource_Setup', + 'Mage_SalesRule_Model_Mysql4_Coupon' => 'Mage_SalesRule_Model_Resource_Coupon', + 'Mage_SalesRule_Model_Mysql4_Coupon_Collection' => 'Mage_SalesRule_Model_Resource_Coupon_Collection', + 'Mage_SalesRule_Model_Mysql4_Coupon_Usage' => 'Mage_SalesRule_Model_Resource_Coupon_Usage', + 'Mage_SalesRule_Model_Mysql4_Report_Collection' => 'Mage_SalesRule_Model_Resource_Report_Collection', + 'Mage_SalesRule_Model_Mysql4_Report_Rule' => 'Mage_SalesRule_Model_Resource_Report_Rule', + 'Mage_SalesRule_Model_Mysql4_Report_Updatedat_Collection' => 'Mage_SalesRule_Model_Resource_Report_Updatedat_Collection', + 'Mage_SalesRule_Model_Mysql4_Rule' => 'Mage_SalesRule_Model_Resource_Rule', + 'Mage_SalesRule_Model_Mysql4_Rule_Collection' => 'Mage_SalesRule_Model_Resource_Rule_Collection', + 'Mage_SalesRule_Model_Mysql4_Rule_Customer' => 'Mage_SalesRule_Model_Resource_Rule_Customer', + 'Mage_SalesRule_Model_Mysql4_Rule_Customer_Collection' => 'Mage_SalesRule_Model_Resource_Rule_Customer_Collection', + 'Mage_SalesRule_Model_Mysql4_Rule_Product' => 'Mage_SalesRule_Model_Resource_Rule_Product', + 'Mage_SalesRule_Model_Mysql4_Rule_Product_Collection' => 'Mage_SalesRule_Model_Resource_Rule_Product_Collection', + 'Mage_Sendfriend_Model_Mysql4_Sendfriend' => 'Mage_Sendfriend_Model_Resource_Sendfriend', + 'Mage_Sendfriend_Model_Mysql4_Sendfriend_Collection' => 'Mage_Sendfriend_Model_Resource_Sendfriend_Collection', + 'Mage_Sendfriend_Model_Mysql4_Setup' => 'Mage_Sendfriend_Model_Resource_Setup', + 'Mage_Shipping_Model_Mysql4_Carrier_Tablerate' => 'Mage_Shipping_Model_Resource_Carrier_Tablerate', + 'Mage_Shipping_Model_Mysql4_Carrier_Tablerate_Collection' => 'Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection', + 'Mage_Sitemap_Model_Mysql4_Catalog_Category' => 'Mage_Sitemap_Model_Resource_Catalog_Category', + 'Mage_Sitemap_Model_Mysql4_Catalog_Product' => 'Mage_Sitemap_Model_Resource_Catalog_Product', + 'Mage_Sitemap_Model_Mysql4_Cms_Page' => 'Mage_Sitemap_Model_Resource_Cms_Page', + 'Mage_Sitemap_Model_Mysql4_Sitemap' => 'Mage_Sitemap_Model_Resource_Sitemap', + 'Mage_Sitemap_Model_Mysql4_Sitemap_Collection' => 'Mage_Sitemap_Model_Resource_Sitemap_Collection', + 'Mage_Tag_Model_Mysql4_Customer_Collection' => 'Mage_Tag_Model_Resource_Customer_Collection', + 'Mage_Tag_Model_Mysql4_Indexer_Summary' => 'Mage_Tag_Model_Resource_Indexer_Summary', + 'Mage_Tag_Model_Mysql4_Popular_Collection' => 'Mage_Tag_Model_Resource_Popular_Collection', + 'Mage_Tag_Model_Mysql4_Product_Collection' => 'Mage_Tag_Model_Resource_Product_Collection', + 'Mage_Tag_Model_Mysql4_Tag' => 'Mage_Tag_Model_Resource_Tag', + 'Mage_Tag_Model_Mysql4_Tag_Collection' => 'Mage_Tag_Model_Resource_Tag_Collection', + 'Mage_Tag_Model_Mysql4_Tag_Relation' => 'Mage_Tag_Model_Resource_Tag_Relation', + 'Mage_Tax_Model_Mysql4_Calculation' => 'Mage_Tax_Model_Resource_Calculation', + 'Mage_Tax_Model_Mysql4_Calculation_Collection' => 'Mage_Tax_Model_Resource_Calculation_Collection', + 'Mage_Tax_Model_Mysql4_Calculation_Rate' => 'Mage_Tax_Model_Resource_Calculation_Rate', + 'Mage_Tax_Model_Mysql4_Calculation_Rate_Collection' => 'Mage_Tax_Model_Resource_Calculation_Rate_Collection', + 'Mage_Tax_Model_Mysql4_Calculation_Rate_Title' => 'Mage_Tax_Model_Resource_Calculation_Rate_Title', + 'Mage_Tax_Model_Mysql4_Calculation_Rate_Title_Collection' => 'Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection', + 'Mage_Tax_Model_Mysql4_Calculation_Rule' => 'Mage_Tax_Model_Resource_Calculation_Rule', + 'Mage_Tax_Model_Mysql4_Calculation_Rule_Collection' => 'Mage_Tax_Model_Resource_Calculation_Rule_Collection', + 'Mage_Tax_Model_Mysql4_Class' => 'Mage_Tax_Model_Resource_Class', + 'Mage_Tax_Model_Mysql4_Class_Collection' => 'Mage_Tax_Model_Resource_Class_Collection', + 'Mage_Tax_Model_Mysql4_Report_Collection' => 'Mage_Tax_Model_Resource_Report_Collection', + 'Mage_Tax_Model_Mysql4_Report_Tax' => 'Mage_Tax_Model_Resource_Report_Tax', + 'Mage_Tax_Model_Mysql4_Report_Updatedat_Collection' => 'Mage_Tax_Model_Resource_Report_Updatedat_Collection', + 'Mage_Tax_Model_Mysql4_Sales_Order_Tax' => 'Mage_Tax_Model_Resource_Sales_Order_Tax', + 'Mage_Tax_Model_Mysql4_Sales_Order_Tax_Collection' => 'Mage_Tax_Model_Resource_Sales_Order_Tax_Collection', + 'Mage_Tax_Model_Mysql4_Setup' => 'Mage_Tax_Model_Resource_Setup', + 'Mage_Weee_Model_Mysql4_Attribute_Backend_Weee_Tax' => 'Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax', + 'Mage_Weee_Model_Mysql4_Setup' => 'Mage_Weee_Model_Resource_Setup', + 'Mage_Weee_Model_Mysql4_Tax' => 'Mage_Weee_Model_Resource_Tax', + 'Mage_Widget_Model_Mysql4_Widget' => 'Mage_Widget_Model_Resource_Widget', + 'Mage_Widget_Model_Mysql4_Widget_Instance' => 'Mage_Widget_Model_Resource_Widget_Instance', + 'Mage_Widget_Model_Mysql4_Widget_Instance_Collection' => 'Mage_Widget_Model_Resource_Widget_Instance_Collection', + 'Mage_Wishlist_Model_Mysql4_Item' => 'Mage_Wishlist_Model_Resource_Item', + 'Mage_Wishlist_Model_Mysql4_Item_Collection' => 'Mage_Wishlist_Model_Resource_Item_Collection', + 'Mage_Wishlist_Model_Mysql4_Item_Option' => 'Mage_Wishlist_Model_Resource_Item_Option', + 'Mage_Wishlist_Model_Mysql4_Item_Option_Collection' => 'Mage_Wishlist_Model_Resource_Item_Option_Collection', + 'Mage_Wishlist_Model_Mysql4_Product_Collection' => 'Mage_Wishlist_Model_Resource_Product_Collection', + 'Mage_Wishlist_Model_Mysql4_Wishlist' => 'Mage_Wishlist_Model_Resource_Wishlist', + 'Mage_Wishlist_Model_Mysql4_Wishlist_Collection' => 'Mage_Wishlist_Model_Resource_Wishlist_Collection', + 'Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Interface' => 'Mage_Catalog_Model_Resource_Product_Indexer_Price_Interface', + 'Mage_CatalogInventory_Model_Mysql4_Indexer_Stock_Interface' => 'Mage_CatalogInventory_Model_Resource_Indexer_Stock_Interface', + + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', +]; + +foreach ($todo as $search => $replace) { + + echo $search,"\n"; + + $files = []; + exec('grep -Hlrn "'.$search.'" app/', $files); + + if ($search[0] == '<') { + foreach ($files as $file) { + echo ' ',$file,"\n"; + file_put_contents($file, preg_replace('#[[:<:]]'.$search.'[[:>:]]#', $replace, file_get_contents($file))); + file_put_contents($file, preg_replace('#[[:<:]]'.str_replace('<', ':]]#', str_replace('<', ':]]#', $replace, file_get_contents($file))); + } + } +}