From 7f73fa548d7bb79b9055d1c95b64a37f816ff127 Mon Sep 17 00:00:00 2001 From: kyrena <78410399+kyrena@users.noreply.github.com> Date: Sat, 15 Jul 2023 16:43:32 +0200 Subject: [PATCH 01/10] Fixed implicit conversion from float to int in Mage_SalesRule_Model_Validator (#3345) Co-authored-by: Ng Kiat Siong Co-authored-by: Fabrizio Balliano --- app/code/core/Mage/SalesRule/Model/Validator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/core/Mage/SalesRule/Model/Validator.php b/app/code/core/Mage/SalesRule/Model/Validator.php index 8300c9e7cf0..dfec594d192 100644 --- a/app/code/core/Mage/SalesRule/Model/Validator.php +++ b/app/code/core/Mage/SalesRule/Model/Validator.php @@ -465,10 +465,10 @@ public function process(Mage_Sales_Model_Quote_Item_Abstract $item) $discountAmount = $result->getDiscountAmount(); $baseDiscountAmount = $result->getBaseDiscountAmount(); - $percentKey = $item->getDiscountPercent(); /** * Process "delta" rounding */ + $percentKey = (string) $item->getDiscountPercent(); if ($percentKey) { $delta = $this->_roundingDeltas[$percentKey] ?? 0; $baseDelta = $this->_baseRoundingDeltas[$percentKey] ?? 0; From 19048e0b3da1967c5d39be8eb05e8f83eb1d53ae Mon Sep 17 00:00:00 2001 From: luigifab <31816829+luigifab@users.noreply.github.com> Date: Sat, 15 Jul 2023 23:49:39 +0200 Subject: [PATCH 02/10] Remove onmouseover/onmouseout from adminhtml menu (#2737) Co-authored-by: Fabrizio Balliano --- .../core/Mage/Adminhtml/Block/Page/Menu.php | 3 +- skin/adminhtml/default/default/menu.css | 21 +++++----- skin/adminhtml/default/openmage/menu.css | 39 ++++++++++--------- skin/adminhtml/default/openmage/menu.css.map | 8 +--- .../adminhtml/default/openmage/scss/menu.scss | 17 ++++---- 5 files changed, 44 insertions(+), 44 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Menu.php b/app/code/core/Mage/Adminhtml/Block/Page/Menu.php index da6e1768d1b..c946328b46a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Menu.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Menu.php @@ -269,8 +269,7 @@ public function getMenuLevel($menu, $level = 0) if ((empty($item['url']) || ($item['url'] == '#')) && empty($item['children'])) { continue; // for example hide System/Tools when empty } - $html .= '
  • a { +#nav li.level0:hover > a { background: #293470; color: #fff; } @@ -158,7 +158,7 @@ width: 189px; top: 38px; left: -10000px; - box-shadow: rgba(0, 0, 0, 0.18039) 1px 3px 4px; + box-shadow: rgba(0, 0, 0, 0.180392) 1px 3px 4px; } #nav ul li { padding: 0; @@ -173,6 +173,9 @@ color: #202856; font-size: 12px; } +#nav ul li a.active { + text-decoration: underline; +} #nav ul li a:hover { background: #202856; color: #fff; @@ -191,10 +194,10 @@ #nav ul li.parent li a { background-image: none; } -#nav ul li.over a { +#nav ul li:hover a { font-weight: normal; } -#nav ul li.over a:hover { +#nav ul li:hover a:hover { font-weight: normal; } #nav ul a { @@ -238,7 +241,7 @@ top: 40px; right: -10000px; display: none; - box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.20784), 0 0 5px rgba(0, 0, 0, 0.20784); + box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.207843), 0 0 5px rgba(0, 0, 0, 0.207843); background: #fff; } #usermenu ul li a:hover { @@ -252,19 +255,19 @@ display: block; } #usermenu li ul span { - border-bottom: 1px dotted #a6c4d9; + border-bottom: 1px dotted hsl(205, 40%, 75%); display: block; line-height: 31px; padding: 0 10px; } -#usermenu li.over ul { +#usermenu li:hover ul { right: 27px; display: block; } -#usermenu li.over ul a { +#usermenu li:hover ul a { color: #000537; text-decoration: none; - background: #ecf3f9; + background: hsl(205, 52%, 95%); display: block; } #usermenu > li > a { diff --git a/skin/adminhtml/default/openmage/menu.css.map b/skin/adminhtml/default/openmage/menu.css.map index 93e3112ef89..7de39bad9ba 100644 --- a/skin/adminhtml/default/openmage/menu.css.map +++ b/skin/adminhtml/default/openmage/menu.css.map @@ -1,7 +1 @@ -{ -"version": 3, -"mappings": "AAAA;;;GAGG;AC4FH;;;;;;;;EAQE;ACgEF,6BAAW;EACT,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,UAAU,EAAE,IAAI;EAChB,MAAM,EAAE,CAAC;;;AAwIX,uBAAW;EACT,KAAK,ED5PW,OAAO;EC6PvB,eAAe,EAAE,IAAI;EACrB,UAAU,EAAE,oBAAoB;EAChC,OAAO,EAAE,KAAK;;;AFhThB,QAAS;EACP,UAAU,ECPS,OAAO;EDQ1B,OAAO,EAAE,cAAc;;AAEvB,cAAQ;EACN,OAAO,EAAE,GAAG;EACZ,OAAO,EAAE,KAAK;EACd,KAAK,EAAE,IAAI;EACX,SAAS,EAAE,CAAC;EACZ,WAAW,EAAE,CAAC;EACd,MAAM,EAAE,CAAC;EACT,QAAQ,EAAE,MAAM;;;AAIpB,IAAK;EACH,YAAY,EAAC,CAAC;;AACd,OAAG;EACD,QAAQ,EAAE,QAAQ;EAClB,UAAU,EAAE,IAAI;EAChB,KAAK,EAAE,IAAI;;AAEX,YAAO;EACL,OAAO,EAAE,GAAG;;AAEZ,cAAE;EACA,KAAK,ECGS,OAAO;;ADAvB,eAAG;EACD,IAAI,EAAE,CAAC;;AAEP,kBAAG;EACD,IAAI,EAAE,QAAQ;;AAGhB,iBAAE;EACA,KAAK,ECTO,OAA8B;EDU1C,SAAS,EAAE,IAAI;;AAGjB,0BAAW;EACT,IAAI,EAAE,KAAK;;AAEX,6BAAG;EACD,IAAI,EAAE,QAAQ;;AAGhB,qCAAW;EACT,IAAI,EAAE,KAAK;;AAMnB,cAAS;EACP,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,IAAI;EACjB,KAAK,ECeH,IAAI;EDdN,WAAW,EAAE,IAAI;;AAEjB,iBAAG;EACD,OAAO,EAAE,KAAK;EACd,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,CAAC;EACN,KAAK,EAAE,IAAI;EACX,KAAK,EAAE,GAAG;EACV,MAAM,EAAE,IAAI;;AAGd,iBAAG;EACD,WAAW,EAAE,MAAM;;AAKrB,kBAAI;EACF,cAAc,EAAE,IAAI;EACpB,WAAW,EAAE,GAAG;EAChB,KAAK,ECNL,IAAI;EDOJ,MAAM,EAAE,IAAI;EACZ,WAAW,EAAE,IAAI;;AAEjB,wBAAQ;EACN,UAAU,EAAE,OAA8B;EAC1C,KAAK,ECZP,IAAI;;ADgBN,kCAAoB;EAClB,OAAO,EAAE,EAAE;EACX,QAAQ,EAAE,QAAQ;EAClB,KAAK,ECvCI,IAAI;EDwCb,MAAM,ECzCG,GAAG;ED0CZ,KAAK,EAAE,CAAC;EACR,MAAM,EAAE,CAAC;EACT,YAAY,EAAE,KAAK;EACnB,YAAY,EAAE,aAAa;EAC3B,YAAY,EAAE,2CAAwD;;AAGxE,uBAAW;EACT,UAAU,EAAE,OAA8B;EAC1C,KAAK,EC9BL,IAAI;;ADmCN,gBAAE;EACA,MAAM,EAAE,OAAO;;AAKb,0BAAE;EACA,MAAM,EAAE,OAAO;;AAKb,oCAAE;EACA,MAAM,EAAE,OAAO;;AAGjB,uCAAK;EACH,MAAM,EAAE,OAAO;;AAInB,6BAAE;EACA,MAAM,EAAE,OAAO;;AAKrB,mBAAE;EACA,MAAM,EAAE,OAAO;;AAMnB,+BAAE;EACA,mBAAmB,EAAE,UAAU;EAC/B,WAAW,EAAE,IAAI;EACjB,MAAM,EAAE,IAAI;;AAGd,kCAAO;EACL,mBAAmB,EAAE,YAAY;;AAKvC,MAAE;EACA,OAAO,EAAE,KAAK;EACd,eAAe,EAAE,IAAI;EACrB,KAAK,EAAE,IAAI;EACX,OAAO,EAAE,MAAM;EACf,KAAK,ECtFD,IAAI;EDuFR,MAAM,EAAE,OAAO;;AAEf,YAAQ;EACN,OAAO,EAAE,KAAK;EACd,eAAe,EAAE,IAAI;;AAIzB,OAAG;EACD,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,KAAK;EACZ,GAAG,EAAE,IAAI;EACT,IAAI,EAAE,QAAQ;EAEd,UAAU,EAAE,kCAA0B;;AAEtC,UAAG;EAED,OAAO,EAAE,CAAC;;AAKR,mBAAE;EACA,KAAK,EC5JO,OAA8B;ED6J1C,SAAS,EAAE,IAAI;;AAInB,YAAE;EACA,UAAU,ECrHV,IAAI;EDsHJ,OAAO,EAAE,QAA+B;EACxC,KAAK,ECpKS,OAA8B;EDqK5C,SAAS,EAAE,IAAI;;AAEf,kBAAQ;EACN,UAAU,ECxKE,OAA8B;EDyK1C,KAAK,EC5HP,IAAI;;ADiIJ,mBAAE;EACA,mBAAmB,EAAE,SAAS;EAC9B,iBAAiB,EAAE,SAAS;;AAK1B,6BAAE;EACA,mBAAmB,EAAE,SAAS;EAC9B,iBAAiB,EAAE,SAAS;;AAG9B,gCAAK;EACH,gBAAgB,EAAE,IAAI;;AAI1B,sBAAE;EACA,gBAAgB,EAAE,IAAI;;AAK5B,iBAAS;EACP,WAAW,EAAE,MAAM;;AAEnB,uBAAQ;EACN,WAAW,EAAE,MAAM;;AAKzB,SAAE;EACA,KAAK,EAAE,IAAI;EACX,WAAW,EAAE,KAAK;EAClB,WAAW,EAAE,MAAM;;AAEnB,eAAQ;EACN,KAAK,EAAE,IAAI;EACX,WAAW,EAAE,KAAK;;AAItB,UAAG;EACD,UAAU,EAAE,CAAC;EACb,WAAW,EAAE,GAAG;EAChB,IAAI,EAAE,KAAK;EACX,GAAG,EAAE,IAAI;;AAET,aAAG;EACD,IAAI,EAAE,QAAQ;;AAMlB,sBAAU;EACR,OAAO,EAAE,EAAE;EACX,OAAO,EAAE,KAAK;EACd,UAAU,EAAE,IAAI;EAChB,MAAM,EAAE,GAAG;EACX,SAAS,EAAE,CAAC;;AAGd,uBAAa;EACX,WAAW,EAAE,GAAG;EAChB,UAAU,EAAE,OAA8B;;;AAKhD,SAAU;EACR,OAAO,EAAE,MAAM;EACf,KAAK,EAAE,KAAK;EACZ,UAAU,EAAE,IAAI;;AAChB,YAAG;EACD,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,KAAK;EACZ,GAAG,EAAE,IAAI;EACT,KAAK,EAAE,QAAQ;EACf,OAAO,EAAE,IAAI;EAEb,UAAU,EAAE,gEAAgD;EAC5D,UAAU,ECpNN,IAAI;;ADsNN,uBAAQ;EAEN,UAAU,ECrQI,OAA8B;;ADuQ9C,yBAAY;EACV,aAAa,EAAE,IAAI;;AAMrB,kBAAG;EACD,KAAK,EAAE,GAAG;EACV,OAAO,EAAE,KAAK;;AAEhB,oBAAK;EACH,aAAa,EAAE,kBAAwB;EACvC,OAAO,EAAE,KAAK;EACd,WAAW,EAAE,IAAI;EACjB,OAAO,EAAE,MAAM;;AAGnB,oBAAU;EACR,KAAK,EAAE,IAAI;EACX,OAAO,EAAE,KAAK;;AACd,sBAAE;EACA,KAAK,EClTO,OAAO;EDmTnB,eAAe,EAAE,IAAI;EACrB,UAAU,ECzNF,OAAuB;ED0N/B,OAAO,EAAE,KAAK;;AAIpB,kBAAS;EACP,OAAO,EAAE,aAAa;EACtB,OAAO,EAAE,KAAK;;AACd,sBAAI;EACF,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI", -"sources": ["scss/menu.scss","scss/_variables.scss","scss/_base.scss"], -"names": [], -"file": "menu.css" -} +{"version":3,"sourceRoot":"","sources":["scss/menu.scss","scss/_variables.scss","scss/_base.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;AC+FA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACwEA;EACE;EACA;EACA;EACA;;;AAwIF;EACE,OD5PgB;EC6PhB;EACA;EACA;;;AFhTF;EACE,YCPmB;EDQnB;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAIJ;EACE;;AACA;EACE;EACA;EACA;;AAEA;EACE;;AAEA;EACE,OCGc;;ADAhB;EACE;;AAEA;EACE;;AAGF;EACE,OCTY;EDUZ;;AAGF;EACE;;AAEA;EACE;;AAGF;EACE;;AAMR;EACE;EACA;EACA,OCeE;EDdF;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;;AAKF;EACE;EACA;EACA,OCNA;EDOA;EACA;;AAEA;EACE;EACA,OCZF;;ADgBF;EACE;EACA;EACA,OCvCS;EDwCT,QCzCS;ED0CT;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA,OC9BA;;ADmCF;EACE;;AAKE;EACE;;AAKE;EACE;;AAGF;EACE;;AAIJ;EACE;;AAKN;EACE;;AAMJ;EACE;EACA;EACA;;AAGF;EACE;;AAKN;EACE;EACA;EACA;EACA;EACA,OCtFI;EDuFJ;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;EACA;EACA;EAEA;;AAEA;EAEE;;AAKE;EACE,OC5JY;ED6JZ;;AAIJ;EACE,YCrHA;EDsHA;EACA,OCpKc;EDqKd;;AAEA;EACE;;AAEF;EACE,YC3KY;ED4KZ,OC/HF;;ADoIA;EACE;EACA;;AAKE;EACE;EACA;;AAGF;EACE;;AAIJ;EACE;;AAKN;EACE;;AAEA;EACE;;AAKN;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;EACA;EACA;;AAEA;EACE;;AAMJ;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;;AAKN;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EAEA;EACA,YCvNI;;ADyNF;EAEE,YCxQc;;AD0QhB;EACE;;AAMF;EACE;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAGJ;EACE;EACA;;AACA;EACE,OCrTY;EDsTZ;EACA,YC5NQ;ED6NR;;AAIN;EACE;EACA;;AACA;EACE;EACA","file":"menu.css"} \ No newline at end of file diff --git a/skin/adminhtml/default/openmage/scss/menu.scss b/skin/adminhtml/default/openmage/scss/menu.scss index a27736d6898..8a95bc13740 100644 --- a/skin/adminhtml/default/openmage/scss/menu.scss +++ b/skin/adminhtml/default/openmage/scss/menu.scss @@ -27,7 +27,7 @@ text-align: left; float: left; - &.over { + &:hover { z-index: 999; a { @@ -46,14 +46,14 @@ font-size: 12px; } - li.over ul { + li:hover ul { left: 100px; ul { left: -10000px; } - li.over ul { + li:hover ul { left: 100px; } } @@ -106,7 +106,7 @@ border-color: transparent transparent transparent $color_silver_approx; } - &.over > a { + &:hover > a { background: darken($openmage_base_blue,12); color: $white; } @@ -200,6 +200,9 @@ color: $color_dorado_approx; font-size: 12px; + &.active { + text-decoration: underline; + } &:hover { background: $color_dorado_approx; color: $white; @@ -230,7 +233,7 @@ } } - &.over a { + &:hover a { font-weight: normal; &:hover { @@ -314,7 +317,7 @@ padding: 0 10px; } } - &.over ul { + &:hover ul { right: 27px; display: block; a { @@ -333,4 +336,4 @@ width: auto; } } -} \ No newline at end of file +} From eb5d1557fe5042333416b13966609bb0ef4fa0bb Mon Sep 17 00:00:00 2001 From: luigifab <31816829+luigifab@users.noreply.github.com> Date: Sun, 16 Jul 2023 19:59:15 +0200 Subject: [PATCH 03/10] Rewrote afterSave of product and category image attributes (#3301) * Stop trying to upload image when there are no images Allow to override extensions and models * added return type for method * added return type for method --------- Co-authored-by: Fabrizio Balliano --- .../Category/Attribute/Backend/Image.php | 54 +++++++++++-------- .../Product/Attribute/Backend/Image.php | 50 ++++++++++------- 2 files changed, 63 insertions(+), 41 deletions(-) diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php index 577c0598f46..43ae254bb1d 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php @@ -22,41 +22,51 @@ class Mage_Catalog_Model_Category_Attribute_Backend_Image extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { /** - * Save uploaded file and set its name to category + * @return array + */ + public function getAllowedExtensions(): array + { + return ['jpg', 'jpeg', 'gif', 'png']; + } + + /** + * Save uploaded file and set its name to category attribute * @param Varien_Object $object * @return $this */ public function afterSave($object) { - $value = $object->getData($this->getAttribute()->getName()); - if (empty($value) && empty($_FILES)) { - return $this; - } + $name = $this->getAttribute()->getName(); + $value = $object->getData($name); if (is_array($value) && !empty($value['delete'])) { - $object->setData($this->getAttribute()->getName(), ''); - $this->getAttribute()->getEntity() - ->saveAttribute($object, $this->getAttribute()->getName()); + $object->setData($name, ''); + $this->getAttribute()->getEntity()->saveAttribute($object, $name); return $this; } - $path = Mage::getBaseDir('media') . DS . 'catalog' . DS . 'category' . DS; + if (!empty($_FILES[$name])) { + try { + $validator = Mage::getModel('core/file_validator_image'); + $uploader = Mage::getModel('core/file_uploader', $name); + $uploader->setAllowedExtensions($this->getAllowedExtensions()); + $uploader->setAllowRenameFiles(true); + $uploader->setFilesDispersion(false); + $uploader->addValidateCallback(Mage_Core_Model_File_Validator_Image::NAME, $validator, 'validate'); + $uploader->save(Mage::getBaseDir('media') . DS . 'catalog' . DS . 'category'); - try { - $validator = Mage::getModel('core/file_validator_image'); - $uploader = new Mage_Core_Model_File_Uploader($this->getAttribute()->getName()); - $uploader->setAllowedExtensions(['jpg','jpeg','gif','png']); - $uploader->setAllowRenameFiles(true); - $uploader->addValidateCallback(Mage_Core_Model_File_Validator_Image::NAME, $validator, 'validate'); - $result = $uploader->save($path); - - $object->setData($this->getAttribute()->getName(), $result['file']); - $this->getAttribute()->getEntity()->saveAttribute($object, $this->getAttribute()->getName()); - } catch (Exception $e) { - if ($e->getCode() != UPLOAD_ERR_NO_FILE) { - Mage::logException($e); + $fileName = $uploader->getUploadedFileName(); + if ($fileName) { + $object->setData($name, $fileName); + $this->getAttribute()->getEntity()->saveAttribute($object, $name); + } + } catch (Exception $e) { + if ($e->getCode() != UPLOAD_ERR_NO_FILE) { + Mage::logException($e); + } } } + return $this; } } diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php index 3a3005e4fc3..e8a1f1efc45 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php @@ -22,37 +22,49 @@ class Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { /** + * @return array + */ + public function getAllowedExtensions(): array + { + return ['jpg', 'jpeg', 'gif', 'png']; + } + + /** + * Save uploaded file and set its name to product attribute * @param Varien_Object $object * @return $this */ public function afterSave($object) { - $value = $object->getData($this->getAttribute()->getName()); + $name = $this->getAttribute()->getName(); + $value = $object->getData($name); if (is_array($value) && !empty($value['delete'])) { - $object->setData($this->getAttribute()->getName(), ''); - $this->getAttribute()->getEntity() - ->saveAttribute($object, $this->getAttribute()->getName()); + $object->setData($name, ''); + $this->getAttribute()->getEntity()->saveAttribute($object, $name); return $this; } - try { - $validator = Mage::getModel('core/file_validator_image'); - $uploader = new Mage_Core_Model_File_Uploader($this->getAttribute()->getName()); - $uploader->setAllowedExtensions(['jpg', 'jpeg', 'gif', 'png']); - $uploader->setAllowRenameFiles(true); - $uploader->setFilesDispersion(true); - $uploader->addValidateCallback(Mage_Core_Model_File_Validator_Image::NAME, $validator, 'validate'); - $uploader->save(Mage::getBaseDir('media') . '/catalog/product'); + if (!empty($_FILES[$name])) { + try { + $validator = Mage::getModel('core/file_validator_image'); + $uploader = Mage::getModel('core/file_uploader', $name); + $uploader->setAllowedExtensions($this->getAllowedExtensions()); + $uploader->setAllowRenameFiles(true); + $uploader->setFilesDispersion(true); + $uploader->addValidateCallback(Mage_Core_Model_File_Validator_Image::NAME, $validator, 'validate'); + $uploader->save(Mage::getBaseDir('media') . DS . 'catalog' . DS . 'product'); - $fileName = $uploader->getUploadedFileName(); - if ($fileName) { - $object->setData($this->getAttribute()->getName(), $fileName); - $this->getAttribute()->getEntity() - ->saveAttribute($object, $this->getAttribute()->getName()); + $fileName = $uploader->getUploadedFileName(); + if ($fileName) { + $object->setData($name, $fileName); + $this->getAttribute()->getEntity()->saveAttribute($object, $name); + } + } catch (Exception $e) { + if ($e->getCode() != UPLOAD_ERR_NO_FILE) { + Mage::logException($e); + } } - } catch (Exception $e) { - return $this; } return $this; From 8f5d8203a902563a21c30512b920736454dc515d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 08:37:14 +0100 Subject: [PATCH 04/10] Bump friendsofphp/php-cs-fixer from 3.21.0 to 3.22.0 (#3385) --- composer.lock | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index dcb211ad557..3ca1522c504 100644 --- a/composer.lock +++ b/composer.lock @@ -2664,16 +2664,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.21.0", + "version": "v3.22.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "f29a0598c022baf99d2136da533820fec63167ed" + "reference": "92b019f6c8d79aa26349d0db7671d37440dc0ff3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/f29a0598c022baf99d2136da533820fec63167ed", - "reference": "f29a0598c022baf99d2136da533820fec63167ed", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/92b019f6c8d79aa26349d0db7671d37440dc0ff3", + "reference": "92b019f6c8d79aa26349d0db7671d37440dc0ff3", "shasum": "" }, "require": { @@ -2697,6 +2697,7 @@ "symfony/stopwatch": "^5.4 || ^6.0" }, "require-dev": { + "facile-it/paraunit": "^1.3 || ^2.0", "justinrainbow/json-schema": "^5.2", "keradus/cli-executor": "^2.0", "mikey179/vfsstream": "^1.6.11", @@ -2748,7 +2749,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.21.0" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.22.0" }, "funding": [ { @@ -2756,7 +2757,7 @@ "type": "github" } ], - "time": "2023-07-05T21:28:10+00:00" + "time": "2023-07-16T23:08:06+00:00" }, { "name": "macopedia/phpstan-magento1", From 4ece53176637e8cc66ed3832fafe2c4e9e7e08c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 08:37:37 +0100 Subject: [PATCH 05/10] Bump phpunit/phpunit from 9.6.9 to 9.6.10 (#3386) --- composer.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.lock b/composer.lock index 3ca1522c504..35bc7054d85 100644 --- a/composer.lock +++ b/composer.lock @@ -2896,16 +2896,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.15.5", + "version": "v4.16.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e" + "reference": "19526a33fb561ef417e822e85f08a00db4059c17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/11e2663a5bc9db5d714eedb4277ee300403b4a9e", - "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17", + "reference": "19526a33fb561ef417e822e85f08a00db4059c17", "shasum": "" }, "require": { @@ -2946,9 +2946,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.5" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.16.0" }, - "time": "2023-05-19T20:20:00+00:00" + "time": "2023-06-25T14:52:30+00:00" }, { "name": "openmage/dev-copyright", @@ -3753,16 +3753,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.9", + "version": "9.6.10", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a9aceaf20a682aeacf28d582654a1670d8826778" + "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a9aceaf20a682aeacf28d582654a1670d8826778", - "reference": "a9aceaf20a682aeacf28d582654a1670d8826778", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a6d351645c3fe5a30f5e86be6577d946af65a328", + "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328", "shasum": "" }, "require": { @@ -3836,7 +3836,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.9" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.10" }, "funding": [ { @@ -3852,7 +3852,7 @@ "type": "tidelift" } ], - "time": "2023-06-11T06:13:56+00:00" + "time": "2023-07-10T04:04:23+00:00" }, { "name": "psr/cache", From ca00bda366083615cb95cac6896b14540501a1bd Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Mon, 17 Jul 2023 10:49:05 +0100 Subject: [PATCH 06/10] Fixed passing null for number_format is deprecated for downloadable products (#3382) Co-authored-by: Ng Kiat Siong Co-authored-by: kyrena <78410399+kyrena@users.noreply.github.com> --- .../Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php index 31de8eb27c8..cfa8ea78124 100644 --- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php +++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php @@ -227,7 +227,7 @@ public function getLinkData() */ public function getPriceValue($value) { - return number_format($value, 2, null, ''); + return number_format($value ?? 0, 2, null, ''); } /** From 5f3e3b08a6a737f48f3c6245d2a6517a4a9cf9d4 Mon Sep 17 00:00:00 2001 From: luigifab <31816829+luigifab@users.noreply.github.com> Date: Mon, 17 Jul 2023 12:48:52 +0200 Subject: [PATCH 07/10] Removed all deprecated _Mysql4_ classes (#2730) * Remove Mysql4 class * Remove deprecatedNode * Rename class with Mysql4 * Remove deprecatedNode compatibility * PHPStan update * Add migration script --------- Co-authored-by: Fabrizio Balliano --- app/code/core/Mage/Admin/Model/Mysql4/Acl.php | 25 - .../core/Mage/Admin/Model/Mysql4/Acl/Role.php | 25 - .../Model/Mysql4/Acl/Role/Collection.php | 25 - .../Model/Mysql4/Permissions/Collection.php | 25 - .../core/Mage/Admin/Model/Mysql4/Role.php | 25 - .../Admin/Model/Mysql4/Role/Collection.php | 25 - .../core/Mage/Admin/Model/Mysql4/Roles.php | 25 - .../Admin/Model/Mysql4/Roles/Collection.php | 25 - .../Model/Mysql4/Roles/User/Collection.php | 25 - .../core/Mage/Admin/Model/Mysql4/Rules.php | 25 - .../Admin/Model/Mysql4/Rules/Collection.php | 25 - .../core/Mage/Admin/Model/Mysql4/User.php | 25 - .../Admin/Model/Mysql4/User/Collection.php | 25 - app/code/core/Mage/Admin/etc/config.xml | 1 - .../AdminNotification/Model/Mysql4/Inbox.php | 25 - .../Model/Mysql4/Inbox/Collection.php | 25 - .../Mage/AdminNotification/etc/config.xml | 1 - .../Adminhtml/Block/Catalog/Category/Tree.php | 2 +- .../Block/Catalog/Category/Widget/Chooser.php | 2 +- .../Block/Urlrewrite/Category/Tree.php | 2 +- .../Model/System/Config/Clone/Media/Image.php | 2 +- app/code/core/Mage/Adminhtml/etc/config.xml | 1 - app/code/core/Mage/Api/Model/Mysql4/Acl.php | 25 - .../core/Mage/Api/Model/Mysql4/Acl/Role.php | 25 - .../Api/Model/Mysql4/Acl/Role/Collection.php | 25 - .../Model/Mysql4/Permissions/Collection.php | 23 - app/code/core/Mage/Api/Model/Mysql4/Role.php | 23 - .../Mage/Api/Model/Mysql4/Role/Collection.php | 23 - app/code/core/Mage/Api/Model/Mysql4/Roles.php | 23 - .../Api/Model/Mysql4/Roles/Collection.php | 23 - .../Model/Mysql4/Roles/User/Collection.php | 23 - app/code/core/Mage/Api/Model/Mysql4/Rules.php | 23 - .../Api/Model/Mysql4/Rules/Collection.php | 23 - app/code/core/Mage/Api/Model/Mysql4/User.php | 25 - .../Mage/Api/Model/Mysql4/User/Collection.php | 23 - app/code/core/Mage/Api/etc/config.xml | 1 - .../core/Mage/Bundle/Model/Mysql4/Bundle.php | 25 - .../Bundle/Model/Mysql4/Indexer/Price.php | 25 - .../Bundle/Model/Mysql4/Indexer/Stock.php | 25 - .../core/Mage/Bundle/Model/Mysql4/Option.php | 25 - .../Bundle/Model/Mysql4/Option/Collection.php | 25 - .../Mage/Bundle/Model/Mysql4/Price/Index.php | 25 - .../Mage/Bundle/Model/Mysql4/Selection.php | 25 - .../Model/Mysql4/Selection/Collection.php | 25 - app/code/core/Mage/Bundle/Model/Observer.php | 2 +- app/code/core/Mage/Bundle/etc/config.xml | 1 - .../Catalog/Block/Product/Compare/Sidebar.php | 6 +- .../Catalog/Block/Product/List/Crosssell.php | 4 +- .../core/Mage/Catalog/Block/Widget/Link.php | 2 +- .../Mage/Catalog/Helper/Product/Compare.php | 4 +- .../core/Mage/Catalog/Model/Category/Api.php | 2 +- .../Mage/Catalog/Model/Product/Option.php | 2 +- .../Model/Resource/Eav/Mysql4/Abstract.php | 24 - .../Model/Resource/Eav/Mysql4/Attribute.php | 25 - .../Model/Resource/Eav/Mysql4/Category.php | 25 - .../Mysql4/Category/Attribute/Collection.php | 25 - .../Category/Attribute/Frontend/Image.php | 25 - .../Category/Attribute/Source/Layout.php | 25 - .../Mysql4/Category/Attribute/Source/Mode.php | 25 - .../Mysql4/Category/Attribute/Source/Page.php | 25 - .../Eav/Mysql4/Category/Collection.php | 25 - .../Resource/Eav/Mysql4/Category/Flat.php | 25 - .../Eav/Mysql4/Category/Flat/Collection.php | 25 - .../Eav/Mysql4/Category/Indexer/Product.php | 23 - .../Resource/Eav/Mysql4/Category/Tree.php | 25 - .../Eav/Mysql4/Collection/Abstract.php | 26 - .../Model/Resource/Eav/Mysql4/Config.php | 25 - .../Eav/Mysql4/Layer/Filter/Attribute.php | 25 - .../Eav/Mysql4/Layer/Filter/Decimal.php | 25 - .../Eav/Mysql4/Layer/Filter/Price.php | 25 - .../Model/Resource/Eav/Mysql4/Product.php | 25 - .../Resource/Eav/Mysql4/Product/Action.php | 25 - .../Product/Attribute/Backend/Image.php | 25 - .../Product/Attribute/Backend/Media.php | 25 - .../Product/Attribute/Backend/Tierprice.php | 25 - .../Product/Attribute/Backend/Urlkey.php | 25 - .../Mysql4/Product/Attribute/Collection.php | 25 - .../Product/Attribute/Frontend/Image.php | 25 - .../Product/Attribute/Frontend/Tierprice.php | 25 - .../Eav/Mysql4/Product/Collection.php | 25 - .../Eav/Mysql4/Product/Compare/Item.php | 25 - .../Product/Compare/Item/Collection.php | 25 - .../Resource/Eav/Mysql4/Product/Flat.php | 25 - .../Eav/Mysql4/Product/Flat/Indexer.php | 25 - .../Eav/Mysql4/Product/Indexer/Abstract.php | 24 - .../Eav/Mysql4/Product/Indexer/Eav.php | 25 - .../Mysql4/Product/Indexer/Eav/Abstract.php | 24 - .../Mysql4/Product/Indexer/Eav/Decimal.php | 25 - .../Eav/Mysql4/Product/Indexer/Eav/Source.php | 25 - .../Eav/Mysql4/Product/Indexer/Price.php | 25 - .../Product/Indexer/Price/Configurable.php | 25 - .../Mysql4/Product/Indexer/Price/Default.php | 26 - .../Mysql4/Product/Indexer/Price/Grouped.php | 25 - .../Product/Indexer/Price/Interface.php | 24 - .../Resource/Eav/Mysql4/Product/Link.php | 25 - .../Eav/Mysql4/Product/Link/Collection.php | 25 - .../Product/Link/Product/Collection.php | 25 - .../Resource/Eav/Mysql4/Product/Option.php | 25 - .../Eav/Mysql4/Product/Option/Collection.php | 25 - .../Eav/Mysql4/Product/Option/Value.php | 25 - .../Product/Option/Value/Collection.php | 25 - .../Resource/Eav/Mysql4/Product/Relation.php | 25 - .../Resource/Eav/Mysql4/Product/Status.php | 25 - .../Eav/Mysql4/Product/Type/Configurable.php | 25 - .../Product/Type/Configurable/Attribute.php | 25 - .../Configurable/Attribute/Collection.php | 25 - .../Type/Configurable/Product/Collection.php | 25 - .../Resource/Eav/Mysql4/Product/Website.php | 25 - .../Model/Resource/Eav/Mysql4/Sendfriend.php | 25 - .../Eav/Mysql4/Sendfriend/Collection.php | 25 - .../Model/Resource/Eav/Mysql4/Setup.php | 25 - .../Catalog/Model/Resource/Eav/Mysql4/Url.php | 25 - app/code/core/Mage/Catalog/etc/config.xml | 1 - .../CatalogIndex/Model/Mysql4/Abstract.php | 25 - .../CatalogIndex/Model/Mysql4/Aggregation.php | 23 - .../CatalogIndex/Model/Mysql4/Attribute.php | 25 - .../Model/Mysql4/Data/Abstract.php | 23 - .../Model/Mysql4/Data/Configurable.php | 23 - .../Model/Mysql4/Data/Grouped.php | 25 - .../CatalogIndex/Model/Mysql4/Indexer.php | 25 - .../Model/Mysql4/Indexer/Abstract.php | 25 - .../CatalogIndex/Model/Mysql4/Indexer/Eav.php | 25 - .../Model/Mysql4/Indexer/Minimalprice.php | 25 - .../Model/Mysql4/Indexer/Price.php | 25 - .../Mage/CatalogIndex/Model/Mysql4/Price.php | 25 - .../CatalogIndex/Model/Mysql4/Retreiver.php | 25 - .../Mage/CatalogIndex/Model/Mysql4/Setup.php | 23 - .../core/Mage/CatalogIndex/etc/config.xml | 1 - .../Model/Mysql4/Indexer/Stock.php | 25 - .../Mysql4/Indexer/Stock/Configurable.php | 25 - .../Model/Mysql4/Indexer/Stock/Default.php | 25 - .../Model/Mysql4/Indexer/Stock/Grouped.php | 25 - .../Model/Mysql4/Indexer/Stock/Interface.php | 24 - .../CatalogInventory/Model/Mysql4/Stock.php | 25 - .../Model/Mysql4/Stock/Item.php | 25 - .../Model/Mysql4/Stock/Item/Collection.php | 25 - .../Model/Mysql4/Stock/Status.php | 25 - .../core/Mage/CatalogInventory/etc/config.xml | 1 - .../Mage/CatalogRule/Model/Mysql4/Rule.php | 25 - .../Model/Mysql4/Rule/Collection.php | 23 - .../Model/Mysql4/Rule/Product/Price.php | 25 - .../Mysql4/Rule/Product/Price/Collection.php | 23 - app/code/core/Mage/CatalogRule/etc/config.xml | 1 - .../CatalogSearch/Model/Mysql4/Advanced.php | 25 - .../Model/Mysql4/Advanced/Collection.php | 23 - .../CatalogSearch/Model/Mysql4/Fulltext.php | 25 - .../Model/Mysql4/Fulltext/Collection.php | 23 - .../Model/Mysql4/Fulltext/Engine.php | 25 - .../Model/Mysql4/Indexer/Fulltext.php | 25 - .../Mage/CatalogSearch/Model/Mysql4/Query.php | 25 - .../Model/Mysql4/Query/Collection.php | 25 - .../Model/Mysql4/Search/Collection.php | 23 - .../core/Mage/CatalogSearch/etc/config.xml | 1 - .../Mage/Checkout/Model/Mysql4/Agreement.php | 23 - .../Model/Mysql4/Agreement/Collection.php | 23 - .../core/Mage/Checkout/Model/Mysql4/Cart.php | 23 - .../core/Mage/Checkout/Model/Mysql4/Setup.php | 25 - app/code/core/Mage/Checkout/etc/config.xml | 1 - app/code/core/Mage/Cms/Model/Mysql4/Block.php | 25 - .../Cms/Model/Mysql4/Block/Collection.php | 25 - app/code/core/Mage/Cms/Model/Mysql4/Page.php | 25 - .../Mage/Cms/Model/Mysql4/Page/Collection.php | 25 - .../Mage/Cms/Model/Mysql4/Page/Service.php | 25 - app/code/core/Mage/Cms/etc/config.xml | 1 - app/code/core/Mage/Core/Model/Config.php | 13 - .../core/Mage/Core/Model/Mysql4/Abstract.php | 24 - .../core/Mage/Core/Model/Mysql4/Cache.php | 23 - .../Core/Model/Mysql4/Collection/Abstract.php | 24 - .../core/Mage/Core/Model/Mysql4/Config.php | 23 - .../Mage/Core/Model/Mysql4/Config/Data.php | 23 - .../Model/Mysql4/Config/Data/Collection.php | 25 - .../core/Mage/Core/Model/Mysql4/Design.php | 23 - .../Core/Model/Mysql4/Design/Collection.php | 23 - .../Mysql4/Design/Package/Collection.php | 25 - .../Model/Mysql4/Design/Theme/Collection.php | 53 -- .../Mage/Core/Model/Mysql4/Email/Template.php | 25 - .../Mysql4/Email/Template/Collection.php | 25 - .../Model/Mysql4/File/Storage/Abstract.php | 24 - .../Model/Mysql4/File/Storage/Database.php | 25 - .../File/Storage/Directory/Database.php | 25 - .../Core/Model/Mysql4/File/Storage/File.php | 25 - app/code/core/Mage/Core/Model/Mysql4/Flag.php | 23 - .../core/Mage/Core/Model/Mysql4/Language.php | 23 - .../Core/Model/Mysql4/Language/Collection.php | 23 - .../core/Mage/Core/Model/Mysql4/Layout.php | 23 - .../core/Mage/Core/Model/Mysql4/Resource.php | 25 - .../core/Mage/Core/Model/Mysql4/Session.php | 25 - .../core/Mage/Core/Model/Mysql4/Store.php | 23 - .../Core/Model/Mysql4/Store/Collection.php | 25 - .../Mage/Core/Model/Mysql4/Store/Group.php | 25 - .../Model/Mysql4/Store/Group/Collection.php | 25 - .../core/Mage/Core/Model/Mysql4/Translate.php | 25 - .../Core/Model/Mysql4/Translate/String.php | 25 - .../Mage/Core/Model/Mysql4/Url/Rewrite.php | 25 - .../Model/Mysql4/Url/Rewrite/Collection.php | 25 - .../core/Mage/Core/Model/Mysql4/Variable.php | 25 - .../Core/Model/Mysql4/Variable/Collection.php | 25 - .../core/Mage/Core/Model/Mysql4/Website.php | 23 - .../Core/Model/Mysql4/Website/Collection.php | 25 - app/code/core/Mage/Core/Model/Resource.php | 17 +- .../core/Mage/Cron/Model/Mysql4/Schedule.php | 25 - .../Cron/Model/Mysql4/Schedule/Collection.php | 25 - app/code/core/Mage/Cron/etc/config.xml | 1 - app/code/core/Mage/Customer/etc/config.xml | 1 - .../core/Mage/Dataflow/Model/Mysql4/Batch.php | 25 - .../Dataflow/Model/Mysql4/Batch/Abstract.php | 24 - .../Model/Mysql4/Batch/Collection.php | 25 - .../Dataflow/Model/Mysql4/Batch/Export.php | 25 - .../Dataflow/Model/Mysql4/Batch/Import.php | 25 - .../Mage/Dataflow/Model/Mysql4/Import.php | 25 - .../Model/Mysql4/Import/Collection.php | 25 - .../Mage/Dataflow/Model/Mysql4/Profile.php | 25 - .../Model/Mysql4/Profile/Collection.php | 25 - .../Dataflow/Model/Mysql4/Profile/History.php | 25 - .../Mysql4/Profile/History/Collection.php | 25 - .../Mage/Dataflow/Model/Mysql4/Session.php | 25 - app/code/core/Mage/Dataflow/etc/config.xml | 1 - .../Mage/Directory/Model/Mysql4/Country.php | 23 - .../Model/Mysql4/Country/Collection.php | 25 - .../Directory/Model/Mysql4/Country/Format.php | 25 - .../Mysql4/Country/Format/Collection.php | 25 - .../Mage/Directory/Model/Mysql4/Currency.php | 25 - .../Model/Mysql4/Currency/Collection.php | 25 - .../Mage/Directory/Model/Mysql4/Region.php | 23 - .../Model/Mysql4/Region/Collection.php | 25 - app/code/core/Mage/Directory/etc/config.xml | 1 - .../Model/Mysql4/Indexer/Price.php | 25 - .../Mage/Downloadable/Model/Mysql4/Link.php | 25 - .../Model/Mysql4/Link/Collection.php | 25 - .../Model/Mysql4/Link/Purchased.php | 25 - .../Mysql4/Link/Purchased/Collection.php | 25 - .../Model/Mysql4/Link/Purchased/Item.php | 25 - .../Mysql4/Link/Purchased/Item/Collection.php | 25 - .../Mage/Downloadable/Model/Mysql4/Sample.php | 25 - .../Model/Mysql4/Sample/Collection.php | 25 - .../core/Mage/Downloadable/etc/config.xml | 3 +- .../core/Mage/Eav/Model/Mysql4/Config.php | 23 - .../Eav/Model/Mysql4/Entity/Attribute.php | 25 - .../Mysql4/Entity/Attribute/Collection.php | 25 - .../Model/Mysql4/Entity/Attribute/Group.php | 23 - .../Entity/Attribute/Group/Collection.php | 23 - .../Model/Mysql4/Entity/Attribute/Option.php | 25 - .../Entity/Attribute/Option/Collection.php | 25 - .../Eav/Model/Mysql4/Entity/Attribute/Set.php | 25 - .../Entity/Attribute/Set/Collection.php | 23 - .../Mage/Eav/Model/Mysql4/Entity/Store.php | 23 - .../Mage/Eav/Model/Mysql4/Entity/Type.php | 25 - .../Model/Mysql4/Entity/Type/Collection.php | 23 - .../Mage/Eav/Model/Mysql4/Form/Element.php | 25 - .../Model/Mysql4/Form/Element/Collection.php | 25 - .../Mage/Eav/Model/Mysql4/Form/Fieldset.php | 25 - .../Model/Mysql4/Form/Fieldset/Collection.php | 25 - .../core/Mage/Eav/Model/Mysql4/Form/Type.php | 25 - .../Eav/Model/Mysql4/Form/Type/Collection.php | 25 - app/code/core/Mage/Eav/etc/config.xml | 1 - .../Mage/GiftMessage/Model/Mysql4/Message.php | 25 - .../Model/Mysql4/Message/Collection.php | 25 - .../Mage/GiftMessage/Model/Mysql4/Setup.php | 25 - app/code/core/Mage/GiftMessage/etc/config.xml | 1 - .../ImportExport/Model/Mysql4/Import/Data.php | 25 - .../Mage/ImportExport/Model/Mysql4/Setup.php | 25 - .../core/Mage/Index/Model/Mysql4/Abstract.php | 24 - .../core/Mage/Index/Model/Mysql4/Event.php | 23 - .../Index/Model/Mysql4/Event/Collection.php | 23 - .../core/Mage/Index/Model/Mysql4/Process.php | 23 - .../Index/Model/Mysql4/Process/Collection.php | 23 - .../core/Mage/Index/Model/Mysql4/Setup.php | 23 - app/code/core/Mage/Index/etc/config.xml | 1 - app/code/core/Mage/Install/etc/config.xml | 1 - .../Mage/Log/Model/Mysql4/Aggregation.php | 23 - .../core/Mage/Log/Model/Mysql4/Customer.php | 25 - app/code/core/Mage/Log/Model/Mysql4/Log.php | 25 - .../core/Mage/Log/Model/Mysql4/Visitor.php | 25 - .../Log/Model/Mysql4/Visitor/Collection.php | 25 - .../Mage/Log/Model/Mysql4/Visitor/Online.php | 25 - .../Mysql4/Visitor/Online/Collection.php | 25 - app/code/core/Mage/Log/etc/config.xml | 1 - app/code/core/Mage/Media/etc/config.xml | 1 - .../Mage/Newsletter/Model/Mysql4/Problem.php | 25 - .../Model/Mysql4/Problem/Collection.php | 25 - .../Mage/Newsletter/Model/Mysql4/Queue.php | 25 - .../Model/Mysql4/Queue/Collection.php | 25 - .../Newsletter/Model/Mysql4/Subscriber.php | 25 - .../Model/Mysql4/Subscriber/Collection.php | 25 - .../Mage/Newsletter/Model/Mysql4/Template.php | 25 - .../Model/Mysql4/Template/Collection.php | 25 - app/code/core/Mage/Newsletter/etc/config.xml | 1 - .../Model/Mysql4/Authorizenet/Debug.php | 23 - .../Mysql4/Authorizenet/Debug/Collection.php | 23 - app/code/core/Mage/Paygate/etc/config.xml | 1 - .../core/Mage/Paypal/Model/Mysql4/Cert.php | 25 - .../Paypal/Model/Mysql4/Report/Settlement.php | 23 - .../Model/Mysql4/Report/Settlement/Row.php | 23 - .../Report/Settlement/Row/Collection.php | 25 - .../core/Mage/Paypal/Model/Mysql4/Setup.php | 25 - .../Mage/ProductAlert/Model/Mysql4/Price.php | 25 - .../Model/Mysql4/Price/Collection.php | 25 - .../Mysql4/Price/Customer/Collection.php | 25 - .../Mage/ProductAlert/Model/Mysql4/Stock.php | 25 - .../Model/Mysql4/Stock/Collection.php | 25 - .../Mysql4/Stock/Customer/Collection.php | 25 - .../core/Mage/ProductAlert/etc/config.xml | 1 - .../core/Mage/Rating/Model/Mysql4/Rating.php | 25 - .../Rating/Model/Mysql4/Rating/Collection.php | 25 - .../Rating/Model/Mysql4/Rating/Entity.php | 25 - .../Rating/Model/Mysql4/Rating/Option.php | 25 - .../Model/Mysql4/Rating/Option/Collection.php | 25 - .../Model/Mysql4/Rating/Option/Vote.php | 25 - .../Mysql4/Rating/Option/Vote/Collection.php | 25 - app/code/core/Mage/Rating/etc/config.xml | 1 - .../Model/Mysql4/Accounts/Collection.php | 25 - .../Model/Mysql4/Coupons/Collection.php | 25 - .../Model/Mysql4/Customer/Collection.php | 25 - .../Mysql4/Customer/Orders/Collection.php | 25 - .../Mysql4/Customer/Totals/Collection.php | 25 - .../Entity/Summary/Collection/Abstract.php | 25 - .../core/Mage/Reports/Model/Mysql4/Event.php | 25 - .../Reports/Model/Mysql4/Event/Collection.php | 25 - .../Mage/Reports/Model/Mysql4/Event/Type.php | 25 - .../Model/Mysql4/Event/Type/Collection.php | 25 - .../Model/Mysql4/Invoiced/Collection.php | 25 - .../Reports/Model/Mysql4/Order/Collection.php | 25 - .../Model/Mysql4/Product/Collection.php | 25 - .../Mysql4/Product/Downloads/Collection.php | 25 - .../Model/Mysql4/Product/Index/Abstract.php | 24 - .../Product/Index/Collection/Abstract.php | 24 - .../Model/Mysql4/Product/Index/Compared.php | 25 - .../Product/Index/Compared/Collection.php | 25 - .../Model/Mysql4/Product/Index/Viewed.php | 25 - .../Product/Index/Viewed/Collection.php | 25 - .../Mysql4/Product/Lowstock/Collection.php | 25 - .../Mysql4/Product/Ordered/Collection.php | 25 - .../Model/Mysql4/Product/Sold/Collection.php | 25 - .../Mysql4/Product/Viewed/Collection.php | 25 - .../Reports/Model/Mysql4/Quote/Collection.php | 25 - .../Model/Mysql4/Refunded/Collection.php | 25 - .../Reports/Model/Mysql4/Report/Abstract.php | 24 - .../Model/Mysql4/Report/Collection.php | 25 - .../Model/Mysql4/Review/Collection.php | 25 - .../Mysql4/Review/Customer/Collection.php | 25 - .../Mysql4/Review/Product/Collection.php | 25 - .../Model/Mysql4/Shipping/Collection.php | 25 - .../Mysql4/Shopcart/Product/Collection.php | 25 - .../Reports/Model/Mysql4/Tag/Collection.php | 25 - .../Model/Mysql4/Tag/Customer/Collection.php | 25 - .../Model/Mysql4/Tag/Product/Collection.php | 25 - .../Reports/Model/Mysql4/Tax/Collection.php | 25 - .../Model/Mysql4/Wishlist/Collection.php | 25 - .../Mysql4/Wishlist/Product/Collection.php | 25 - app/code/core/Mage/Reports/etc/config.xml | 1 - .../core/Mage/Review/Model/Mysql4/Review.php | 25 - .../Review/Model/Mysql4/Review/Collection.php | 25 - .../Mysql4/Review/Product/Collection.php | 25 - .../Model/Mysql4/Review/Status/Collection.php | 25 - .../Review/Model/Mysql4/Review/Summary.php | 25 - .../Mysql4/Review/Summary/Collection.php | 25 - app/code/core/Mage/Review/etc/config.xml | 1 - app/code/core/Mage/Rss/Model/Mysql4/Order.php | 25 - app/code/core/Mage/Rss/etc/config.xml | 1 - app/code/core/Mage/Rule/Model/Mysql4/Rule.php | 25 - .../Rule/Model/Mysql4/Rule/Collection.php | 25 - app/code/core/Mage/Rule/etc/config.xml | 1 - .../core/Mage/Sales/Model/Mysql4/Abstract.php | 24 - .../Sales/Model/Mysql4/Billing/Agreement.php | 25 - .../Mysql4/Billing/Agreement/Collection.php | 25 - .../Model/Mysql4/Collection/Abstract.php | 24 - .../core/Mage/Sales/Model/Mysql4/Order.php | 25 - .../Sales/Model/Mysql4/Order/Abstract.php | 24 - .../Mage/Sales/Model/Mysql4/Order/Address.php | 25 - .../Model/Mysql4/Order/Address/Collection.php | 25 - .../Order/Attribute/Backend/Billing.php | 25 - .../Mysql4/Order/Attribute/Backend/Child.php | 23 - .../Mysql4/Order/Attribute/Backend/Parent.php | 23 - .../Order/Attribute/Backend/Shipping.php | 25 - .../Sales/Model/Mysql4/Order/Collection.php | 25 - .../Mysql4/Order/Collection/Abstract.php | 24 - .../Order/Comment/Collection/Abstract.php | 24 - .../Sales/Model/Mysql4/Order/Creditmemo.php | 25 - .../Creditmemo/Attribute/Backend/Child.php | 23 - .../Creditmemo/Attribute/Backend/Parent.php | 23 - .../Mysql4/Order/Creditmemo/Collection.php | 25 - .../Model/Mysql4/Order/Creditmemo/Comment.php | 25 - .../Order/Creditmemo/Comment/Collection.php | 25 - .../Order/Creditmemo/Grid/Collection.php | 25 - .../Model/Mysql4/Order/Creditmemo/Item.php | 25 - .../Order/Creditmemo/Item/Collection.php | 25 - .../Model/Mysql4/Order/Grid/Collection.php | 25 - .../Mage/Sales/Model/Mysql4/Order/Invoice.php | 25 - .../Order/Invoice/Attribute/Backend/Child.php | 23 - .../Order/Invoice/Attribute/Backend/Item.php | 23 - .../Order/Invoice/Attribute/Backend/Order.php | 23 - .../Invoice/Attribute/Backend/Parent.php | 23 - .../Model/Mysql4/Order/Invoice/Collection.php | 25 - .../Model/Mysql4/Order/Invoice/Comment.php | 25 - .../Order/Invoice/Comment/Collection.php | 25 - .../Mysql4/Order/Invoice/Grid/Collection.php | 25 - .../Sales/Model/Mysql4/Order/Invoice/Item.php | 25 - .../Mysql4/Order/Invoice/Item/Collection.php | 25 - .../Mage/Sales/Model/Mysql4/Order/Item.php | 25 - .../Model/Mysql4/Order/Item/Collection.php | 25 - .../Mage/Sales/Model/Mysql4/Order/Payment.php | 25 - .../Model/Mysql4/Order/Payment/Collection.php | 25 - .../Mysql4/Order/Payment/Transaction.php | 25 - .../Order/Payment/Transaction/Collection.php | 25 - .../Sales/Model/Mysql4/Order/Shipment.php | 25 - .../Shipment/Attribute/Backend/Child.php | 23 - .../Shipment/Attribute/Backend/Parent.php | 23 - .../Mysql4/Order/Shipment/Collection.php | 25 - .../Model/Mysql4/Order/Shipment/Comment.php | 25 - .../Order/Shipment/Comment/Collection.php | 25 - .../Mysql4/Order/Shipment/Grid/Collection.php | 25 - .../Model/Mysql4/Order/Shipment/Item.php | 25 - .../Mysql4/Order/Shipment/Item/Collection.php | 25 - .../Model/Mysql4/Order/Shipment/Track.php | 25 - .../Order/Shipment/Track/Collection.php | 25 - .../Mage/Sales/Model/Mysql4/Order/Status.php | 25 - .../Model/Mysql4/Order/Status/Collection.php | 25 - .../Model/Mysql4/Order/Status/History.php | 25 - .../Order/Status/History/Collection.php | 25 - .../Mage/Sales/Model/Mysql4/Order/Tax.php | 23 - .../Model/Mysql4/Order/Tax/Collection.php | 25 - .../core/Mage/Sales/Model/Mysql4/Quote.php | 25 - .../Mage/Sales/Model/Mysql4/Quote/Address.php | 25 - .../Quote/Address/Attribute/Backend.php | 23 - .../Quote/Address/Attribute/Backend/Child.php | 23 - .../Address/Attribute/Backend/Parent.php | 23 - .../Address/Attribute/Backend/Region.php | 23 - .../Quote/Address/Attribute/Frontend.php | 23 - .../Attribute/Frontend/Custbalance.php | 23 - .../Address/Attribute/Frontend/Discount.php | 23 - .../Address/Attribute/Frontend/Grand.php | 23 - .../Address/Attribute/Frontend/Shipping.php | 23 - .../Address/Attribute/Frontend/Subtotal.php | 23 - .../Quote/Address/Attribute/Frontend/Tax.php | 23 - .../Model/Mysql4/Quote/Address/Collection.php | 25 - .../Sales/Model/Mysql4/Quote/Address/Item.php | 25 - .../Mysql4/Quote/Address/Item/Collection.php | 25 - .../Sales/Model/Mysql4/Quote/Address/Rate.php | 25 - .../Mysql4/Quote/Address/Rate/Collection.php | 25 - .../Sales/Model/Mysql4/Quote/Collection.php | 25 - .../Mage/Sales/Model/Mysql4/Quote/Item.php | 25 - .../Model/Mysql4/Quote/Item/Collection.php | 25 - .../Sales/Model/Mysql4/Quote/Item/Option.php | 25 - .../Mysql4/Quote/Item/Option/Collection.php | 25 - .../Mage/Sales/Model/Mysql4/Quote/Payment.php | 25 - .../Model/Mysql4/Quote/Payment/Collection.php | 25 - .../Sales/Model/Mysql4/Recurring/Profile.php | 25 - .../Mysql4/Recurring/Profile/Collection.php | 25 - .../core/Mage/Sales/Model/Mysql4/Report.php | 23 - .../Sales/Model/Mysql4/Report/Abstract.php | 24 - .../Sales/Model/Mysql4/Report/Bestsellers.php | 25 - .../Mysql4/Report/Bestsellers/Collection.php | 25 - .../Mysql4/Report/Collection/Abstract.php | 23 - .../Sales/Model/Mysql4/Report/Invoiced.php | 23 - .../Report/Invoiced/Collection/Invoiced.php | 25 - .../Report/Invoiced/Collection/Order.php | 25 - .../Mage/Sales/Model/Mysql4/Report/Order.php | 25 - .../Model/Mysql4/Report/Order/Collection.php | 25 - .../Report/Order/Updatedat/Collection.php | 25 - .../Sales/Model/Mysql4/Report/Refunded.php | 23 - .../Report/Refunded/Collection/Order.php | 25 - .../Report/Refunded/Collection/Refunded.php | 25 - .../Sales/Model/Mysql4/Report/Shipping.php | 23 - .../Report/Shipping/Collection/Order.php | 25 - .../Report/Shipping/Collection/Shipment.php | 25 - .../Sales/Model/Mysql4/Sale/Collection.php | 23 - .../core/Mage/Sales/Model/Mysql4/Setup.php | 23 - app/code/core/Mage/Sales/etc/config.xml | 1 - .../Mage/SalesRule/Model/Mysql4/Coupon.php | 25 - .../Model/Mysql4/Coupon/Collection.php | 25 - .../SalesRule/Model/Mysql4/Coupon/Usage.php | 25 - .../Model/Mysql4/Report/Collection.php | 25 - .../SalesRule/Model/Mysql4/Report/Rule.php | 25 - .../Mysql4/Report/Updatedat/Collection.php | 25 - .../core/Mage/SalesRule/Model/Mysql4/Rule.php | 25 - .../Model/Mysql4/Rule/Collection.php | 25 - .../SalesRule/Model/Mysql4/Rule/Customer.php | 25 - .../Model/Mysql4/Rule/Customer/Collection.php | 25 - .../SalesRule/Model/Mysql4/Rule/Product.php | 25 - .../Model/Mysql4/Rule/Product/Collection.php | 25 - app/code/core/Mage/SalesRule/etc/config.xml | 1 - .../Sendfriend/Model/Mysql4/Sendfriend.php | 25 - .../Model/Mysql4/Sendfriend/Collection.php | 25 - .../Mage/Sendfriend/Model/Mysql4/Setup.php | 25 - app/code/core/Mage/Sendfriend/etc/config.xml | 2 - .../Model/Mysql4/Carrier/Tablerate.php | 25 - .../Mysql4/Carrier/Tablerate/Collection.php | 25 - app/code/core/Mage/Shipping/etc/config.xml | 1 - .../Sitemap/Model/Mysql4/Catalog/Category.php | 25 - .../Sitemap/Model/Mysql4/Catalog/Product.php | 25 - .../Mage/Sitemap/Model/Mysql4/Cms/Page.php | 25 - .../Mage/Sitemap/Model/Mysql4/Sitemap.php | 25 - .../Model/Mysql4/Sitemap/Collection.php | 25 - app/code/core/Mage/Sitemap/etc/config.xml | 1 - .../Tag/Model/Mysql4/Customer/Collection.php | 25 - .../Mage/Tag/Model/Mysql4/Indexer/Summary.php | 25 - .../Tag/Model/Mysql4/Popular/Collection.php | 25 - .../Tag/Model/Mysql4/Product/Collection.php | 25 - app/code/core/Mage/Tag/Model/Mysql4/Tag.php | 25 - .../Mage/Tag/Model/Mysql4/Tag/Collection.php | 25 - .../Mage/Tag/Model/Mysql4/Tag/Relation.php | 25 - app/code/core/Mage/Tag/etc/config.xml | 2 - .../Mage/Tax/Model/Mysql4/Calculation.php | 25 - .../Model/Mysql4/Calculation/Collection.php | 25 - .../Tax/Model/Mysql4/Calculation/Rate.php | 25 - .../Mysql4/Calculation/Rate/Collection.php | 25 - .../Model/Mysql4/Calculation/Rate/Title.php | 25 - .../Calculation/Rate/Title/Collection.php | 25 - .../Tax/Model/Mysql4/Calculation/Rule.php | 25 - .../Mysql4/Calculation/Rule/Collection.php | 25 - app/code/core/Mage/Tax/Model/Mysql4/Class.php | 25 - .../Tax/Model/Mysql4/Class/Collection.php | 25 - .../Tax/Model/Mysql4/Report/Collection.php | 25 - .../core/Mage/Tax/Model/Mysql4/Report/Tax.php | 23 - .../Mysql4/Report/Updatedat/Collection.php | 25 - .../Mage/Tax/Model/Mysql4/Sales/Order/Tax.php | 23 - .../Mysql4/Sales/Order/Tax/Collection.php | 25 - app/code/core/Mage/Tax/Model/Mysql4/Setup.php | 25 - app/code/core/Mage/Tax/etc/config.xml | 1 - .../Mysql4/Attribute/Backend/Weee/Tax.php | 25 - .../core/Mage/Weee/Model/Mysql4/Setup.php | 25 - app/code/core/Mage/Weee/Model/Mysql4/Tax.php | 23 - app/code/core/Mage/Weee/etc/config.xml | 1 - .../core/Mage/Widget/Model/Mysql4/Widget.php | 25 - .../Widget/Model/Mysql4/Widget/Instance.php | 25 - .../Mysql4/Widget/Instance/Collection.php | 25 - app/code/core/Mage/Widget/etc/config.xml | 1 - .../core/Mage/Wishlist/Model/Mysql4/Item.php | 25 - .../Wishlist/Model/Mysql4/Item/Collection.php | 25 - .../Wishlist/Model/Mysql4/Item/Option.php | 25 - .../Model/Mysql4/Item/Option/Collection.php | 25 - .../Model/Mysql4/Product/Collection.php | 25 - .../Mage/Wishlist/Model/Mysql4/Wishlist.php | 25 - .../Model/Mysql4/Wishlist/Collection.php | 25 - app/code/core/Mage/Wishlist/etc/config.xml | 1 - app/etc/config.xml | 1 - phpstan.dist.baseline.neon | 20 - shell/rename-mysql4-class-to-resource.php | 583 ++++++++++++++++++ 538 files changed, 600 insertions(+), 11979 deletions(-) delete mode 100644 app/code/core/Mage/Admin/Model/Mysql4/Acl.php delete mode 100644 app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php delete mode 100644 app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php delete mode 100644 app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php delete mode 100644 app/code/core/Mage/Admin/Model/Mysql4/Role.php delete mode 100644 app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php delete mode 100644 app/code/core/Mage/Admin/Model/Mysql4/Roles.php delete mode 100644 app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php delete mode 100644 app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php delete mode 100644 app/code/core/Mage/Admin/Model/Mysql4/Rules.php delete mode 100644 app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php delete mode 100644 app/code/core/Mage/Admin/Model/Mysql4/User.php delete mode 100644 app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php delete mode 100644 app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php delete mode 100644 app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php delete mode 100644 app/code/core/Mage/Api/Model/Mysql4/Acl.php delete mode 100644 app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php delete mode 100644 app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php delete mode 100644 app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php delete mode 100644 app/code/core/Mage/Api/Model/Mysql4/Role.php delete mode 100644 app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php delete mode 100644 app/code/core/Mage/Api/Model/Mysql4/Roles.php delete mode 100644 app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php delete mode 100644 app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php delete mode 100644 app/code/core/Mage/Api/Model/Mysql4/Rules.php delete mode 100644 app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php delete mode 100644 app/code/core/Mage/Api/Model/Mysql4/User.php delete mode 100644 app/code/core/Mage/Api/Model/Mysql4/User/Collection.php delete mode 100644 app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php delete mode 100644 app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Price.php delete mode 100644 app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Stock.php delete mode 100644 app/code/core/Mage/Bundle/Model/Mysql4/Option.php delete mode 100644 app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php delete mode 100644 app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php delete mode 100644 app/code/core/Mage/Bundle/Model/Mysql4/Selection.php delete mode 100644 app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Attribute.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Collection.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat/Collection.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Indexer/Product.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Config.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Attribute.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Decimal.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Price.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Action.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Collection.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Abstract.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Abstract.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Decimal.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Source.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Configurable.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Default.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Grouped.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Interface.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value/Collection.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Relation.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php delete mode 100644 app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php delete mode 100644 app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php delete mode 100644 app/code/core/Mage/CatalogIndex/Model/Mysql4/Aggregation.php delete mode 100644 app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php delete mode 100644 app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php delete mode 100644 app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php delete mode 100644 app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php delete mode 100644 app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php delete mode 100644 app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php delete mode 100644 app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php delete mode 100644 app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php delete mode 100644 app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php delete mode 100644 app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php delete mode 100644 app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php delete mode 100644 app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php delete mode 100644 app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock.php delete mode 100644 app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Configurable.php delete mode 100644 app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Default.php delete mode 100644 app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Grouped.php delete mode 100644 app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Interface.php delete mode 100644 app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php delete mode 100644 app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php delete mode 100644 app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php delete mode 100644 app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php delete mode 100644 app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php delete mode 100644 app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php delete mode 100644 app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php delete mode 100644 app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php delete mode 100644 app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced.php delete mode 100644 app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php delete mode 100644 app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php delete mode 100644 app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Collection.php delete mode 100644 app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Engine.php delete mode 100644 app/code/core/Mage/CatalogSearch/Model/Mysql4/Indexer/Fulltext.php delete mode 100644 app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php delete mode 100644 app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php delete mode 100644 app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php delete mode 100644 app/code/core/Mage/Checkout/Model/Mysql4/Agreement.php delete mode 100644 app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php delete mode 100644 app/code/core/Mage/Checkout/Model/Mysql4/Cart.php delete mode 100644 app/code/core/Mage/Checkout/Model/Mysql4/Setup.php delete mode 100644 app/code/core/Mage/Cms/Model/Mysql4/Block.php delete mode 100644 app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php delete mode 100644 app/code/core/Mage/Cms/Model/Mysql4/Page.php delete mode 100644 app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php delete mode 100644 app/code/core/Mage/Cms/Model/Mysql4/Page/Service.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Abstract.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Cache.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Config.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Config/Data.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Design.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Email/Template.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Email/Template/Collection.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/File/Storage/Abstract.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/File/Storage/Database.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/File/Storage/Directory/Database.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/File/Storage/File.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Flag.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Language.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Layout.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Resource.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Session.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Store.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Store/Collection.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Store/Group.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Translate.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Translate/String.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Variable.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Variable/Collection.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Website.php delete mode 100644 app/code/core/Mage/Core/Model/Mysql4/Website/Collection.php delete mode 100644 app/code/core/Mage/Cron/Model/Mysql4/Schedule.php delete mode 100644 app/code/core/Mage/Cron/Model/Mysql4/Schedule/Collection.php delete mode 100644 app/code/core/Mage/Dataflow/Model/Mysql4/Batch.php delete mode 100644 app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Abstract.php delete mode 100644 app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Collection.php delete mode 100644 app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php delete mode 100644 app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php delete mode 100644 app/code/core/Mage/Dataflow/Model/Mysql4/Import.php delete mode 100644 app/code/core/Mage/Dataflow/Model/Mysql4/Import/Collection.php delete mode 100644 app/code/core/Mage/Dataflow/Model/Mysql4/Profile.php delete mode 100644 app/code/core/Mage/Dataflow/Model/Mysql4/Profile/Collection.php delete mode 100644 app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php delete mode 100644 app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History/Collection.php delete mode 100644 app/code/core/Mage/Dataflow/Model/Mysql4/Session.php delete mode 100644 app/code/core/Mage/Directory/Model/Mysql4/Country.php delete mode 100644 app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php delete mode 100644 app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php delete mode 100644 app/code/core/Mage/Directory/Model/Mysql4/Country/Format/Collection.php delete mode 100644 app/code/core/Mage/Directory/Model/Mysql4/Currency.php delete mode 100644 app/code/core/Mage/Directory/Model/Mysql4/Currency/Collection.php delete mode 100644 app/code/core/Mage/Directory/Model/Mysql4/Region.php delete mode 100644 app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php delete mode 100644 app/code/core/Mage/Downloadable/Model/Mysql4/Indexer/Price.php delete mode 100644 app/code/core/Mage/Downloadable/Model/Mysql4/Link.php delete mode 100644 app/code/core/Mage/Downloadable/Model/Mysql4/Link/Collection.php delete mode 100644 app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased.php delete mode 100644 app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Collection.php delete mode 100644 app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item.php delete mode 100644 app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item/Collection.php delete mode 100644 app/code/core/Mage/Downloadable/Model/Mysql4/Sample.php delete mode 100644 app/code/core/Mage/Downloadable/Model/Mysql4/Sample/Collection.php delete mode 100644 app/code/core/Mage/Eav/Model/Mysql4/Config.php delete mode 100644 app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php delete mode 100644 app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php delete mode 100644 app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php delete mode 100644 app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php delete mode 100644 app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php delete mode 100644 app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php delete mode 100644 app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php delete mode 100644 app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php delete mode 100644 app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php delete mode 100644 app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php delete mode 100644 app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php delete mode 100644 app/code/core/Mage/Eav/Model/Mysql4/Form/Element.php delete mode 100644 app/code/core/Mage/Eav/Model/Mysql4/Form/Element/Collection.php delete mode 100644 app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset.php delete mode 100644 app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset/Collection.php delete mode 100644 app/code/core/Mage/Eav/Model/Mysql4/Form/Type.php delete mode 100644 app/code/core/Mage/Eav/Model/Mysql4/Form/Type/Collection.php delete mode 100644 app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php delete mode 100644 app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php delete mode 100644 app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php delete mode 100644 app/code/core/Mage/ImportExport/Model/Mysql4/Import/Data.php delete mode 100644 app/code/core/Mage/ImportExport/Model/Mysql4/Setup.php delete mode 100644 app/code/core/Mage/Index/Model/Mysql4/Abstract.php delete mode 100644 app/code/core/Mage/Index/Model/Mysql4/Event.php delete mode 100644 app/code/core/Mage/Index/Model/Mysql4/Event/Collection.php delete mode 100644 app/code/core/Mage/Index/Model/Mysql4/Process.php delete mode 100644 app/code/core/Mage/Index/Model/Mysql4/Process/Collection.php delete mode 100644 app/code/core/Mage/Index/Model/Mysql4/Setup.php delete mode 100644 app/code/core/Mage/Log/Model/Mysql4/Aggregation.php delete mode 100644 app/code/core/Mage/Log/Model/Mysql4/Customer.php delete mode 100644 app/code/core/Mage/Log/Model/Mysql4/Log.php delete mode 100644 app/code/core/Mage/Log/Model/Mysql4/Visitor.php delete mode 100644 app/code/core/Mage/Log/Model/Mysql4/Visitor/Collection.php delete mode 100644 app/code/core/Mage/Log/Model/Mysql4/Visitor/Online.php delete mode 100644 app/code/core/Mage/Log/Model/Mysql4/Visitor/Online/Collection.php delete mode 100644 app/code/core/Mage/Newsletter/Model/Mysql4/Problem.php delete mode 100644 app/code/core/Mage/Newsletter/Model/Mysql4/Problem/Collection.php delete mode 100644 app/code/core/Mage/Newsletter/Model/Mysql4/Queue.php delete mode 100644 app/code/core/Mage/Newsletter/Model/Mysql4/Queue/Collection.php delete mode 100644 app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php delete mode 100644 app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber/Collection.php delete mode 100644 app/code/core/Mage/Newsletter/Model/Mysql4/Template.php delete mode 100644 app/code/core/Mage/Newsletter/Model/Mysql4/Template/Collection.php delete mode 100644 app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug.php delete mode 100644 app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug/Collection.php delete mode 100644 app/code/core/Mage/Paypal/Model/Mysql4/Cert.php delete mode 100644 app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement.php delete mode 100644 app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row.php delete mode 100644 app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row/Collection.php delete mode 100644 app/code/core/Mage/Paypal/Model/Mysql4/Setup.php delete mode 100644 app/code/core/Mage/ProductAlert/Model/Mysql4/Price.php delete mode 100644 app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Collection.php delete mode 100644 app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Customer/Collection.php delete mode 100644 app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.php delete mode 100644 app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Collection.php delete mode 100644 app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Customer/Collection.php delete mode 100644 app/code/core/Mage/Rating/Model/Mysql4/Rating.php delete mode 100644 app/code/core/Mage/Rating/Model/Mysql4/Rating/Collection.php delete mode 100644 app/code/core/Mage/Rating/Model/Mysql4/Rating/Entity.php delete mode 100644 app/code/core/Mage/Rating/Model/Mysql4/Rating/Option.php delete mode 100644 app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Collection.php delete mode 100644 app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote.php delete mode 100644 app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Accounts/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Coupons/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Customer/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Customer/Orders/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Customer/Totals/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Entity/Summary/Collection/Abstract.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Event.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Event/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Event/Type.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Event/Type/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Invoiced/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Order/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Product/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Product/Downloads/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Abstract.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Collection/Abstract.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Product/Lowstock/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Product/Ordered/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Product/Sold/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Product/Viewed/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Quote/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Refunded/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Report/Abstract.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Report/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Review/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Review/Customer/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Review/Product/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Shipping/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Shopcart/Product/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Tag/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Tag/Customer/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Tag/Product/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Tax/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Collection.php delete mode 100644 app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Product/Collection.php delete mode 100644 app/code/core/Mage/Review/Model/Mysql4/Review.php delete mode 100644 app/code/core/Mage/Review/Model/Mysql4/Review/Collection.php delete mode 100644 app/code/core/Mage/Review/Model/Mysql4/Review/Product/Collection.php delete mode 100644 app/code/core/Mage/Review/Model/Mysql4/Review/Status/Collection.php delete mode 100644 app/code/core/Mage/Review/Model/Mysql4/Review/Summary.php delete mode 100644 app/code/core/Mage/Review/Model/Mysql4/Review/Summary/Collection.php delete mode 100644 app/code/core/Mage/Rss/Model/Mysql4/Order.php delete mode 100644 app/code/core/Mage/Rule/Model/Mysql4/Rule.php delete mode 100644 app/code/core/Mage/Rule/Model/Mysql4/Rule/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Abstract.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Collection/Abstract.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Abstract.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Address.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Address/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Billing.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Child.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Parent.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Shipping.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Collection/Abstract.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Comment/Collection/Abstract.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Child.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Parent.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Grid/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Grid/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Child.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Item.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Order.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Parent.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Grid/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Item.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Item/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Payment.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Child.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Parent.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Grid/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Status.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Status/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Tax.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Order/Tax/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Quote.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Quote/Address.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Child.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Parent.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Region.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Custbalance.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Discount.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Grand.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Shipping.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Subtotal.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Tax.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Quote/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Quote/Item.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Report.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Report/Abstract.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Report/Collection/Abstract.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Invoiced.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Order.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Report/Order.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Updatedat/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Order.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Refunded.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Order.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Shipment.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Sale/Collection.php delete mode 100644 app/code/core/Mage/Sales/Model/Mysql4/Setup.php delete mode 100644 app/code/core/Mage/SalesRule/Model/Mysql4/Coupon.php delete mode 100644 app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Collection.php delete mode 100644 app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Usage.php delete mode 100644 app/code/core/Mage/SalesRule/Model/Mysql4/Report/Collection.php delete mode 100644 app/code/core/Mage/SalesRule/Model/Mysql4/Report/Rule.php delete mode 100644 app/code/core/Mage/SalesRule/Model/Mysql4/Report/Updatedat/Collection.php delete mode 100644 app/code/core/Mage/SalesRule/Model/Mysql4/Rule.php delete mode 100644 app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Collection.php delete mode 100644 app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer.php delete mode 100644 app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer/Collection.php delete mode 100644 app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product.php delete mode 100644 app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product/Collection.php delete mode 100644 app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend.php delete mode 100644 app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend/Collection.php delete mode 100644 app/code/core/Mage/Sendfriend/Model/Mysql4/Setup.php delete mode 100644 app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate.php delete mode 100644 app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate/Collection.php delete mode 100644 app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Category.php delete mode 100644 app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Product.php delete mode 100644 app/code/core/Mage/Sitemap/Model/Mysql4/Cms/Page.php delete mode 100644 app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap.php delete mode 100644 app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap/Collection.php delete mode 100644 app/code/core/Mage/Tag/Model/Mysql4/Customer/Collection.php delete mode 100644 app/code/core/Mage/Tag/Model/Mysql4/Indexer/Summary.php delete mode 100644 app/code/core/Mage/Tag/Model/Mysql4/Popular/Collection.php delete mode 100644 app/code/core/Mage/Tag/Model/Mysql4/Product/Collection.php delete mode 100644 app/code/core/Mage/Tag/Model/Mysql4/Tag.php delete mode 100644 app/code/core/Mage/Tag/Model/Mysql4/Tag/Collection.php delete mode 100644 app/code/core/Mage/Tag/Model/Mysql4/Tag/Relation.php delete mode 100644 app/code/core/Mage/Tax/Model/Mysql4/Calculation.php delete mode 100644 app/code/core/Mage/Tax/Model/Mysql4/Calculation/Collection.php delete mode 100644 app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate.php delete mode 100644 app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Collection.php delete mode 100644 app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title.php delete mode 100644 app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title/Collection.php delete mode 100644 app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule.php delete mode 100644 app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule/Collection.php delete mode 100644 app/code/core/Mage/Tax/Model/Mysql4/Class.php delete mode 100644 app/code/core/Mage/Tax/Model/Mysql4/Class/Collection.php delete mode 100644 app/code/core/Mage/Tax/Model/Mysql4/Report/Collection.php delete mode 100644 app/code/core/Mage/Tax/Model/Mysql4/Report/Tax.php delete mode 100644 app/code/core/Mage/Tax/Model/Mysql4/Report/Updatedat/Collection.php delete mode 100644 app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax.php delete mode 100644 app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax/Collection.php delete mode 100644 app/code/core/Mage/Tax/Model/Mysql4/Setup.php delete mode 100644 app/code/core/Mage/Weee/Model/Mysql4/Attribute/Backend/Weee/Tax.php delete mode 100644 app/code/core/Mage/Weee/Model/Mysql4/Setup.php delete mode 100644 app/code/core/Mage/Weee/Model/Mysql4/Tax.php delete mode 100644 app/code/core/Mage/Widget/Model/Mysql4/Widget.php delete mode 100644 app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance.php delete mode 100644 app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance/Collection.php delete mode 100644 app/code/core/Mage/Wishlist/Model/Mysql4/Item.php delete mode 100644 app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php delete mode 100644 app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option.php delete mode 100644 app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option/Collection.php delete mode 100644 app/code/core/Mage/Wishlist/Model/Mysql4/Product/Collection.php delete mode 100644 app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php delete mode 100644 app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist/Collection.php create mode 100644 shell/rename-mysql4-class-to-resource.php 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 040407ec9ac..00000000000 --- a/app/code/core/Mage/Admin/Model/Mysql4/Acl.php +++ /dev/null @@ -1,25 +0,0 @@ - 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 58ba2007d09..00000000000 --- a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php +++ /dev/null @@ -1,25 +0,0 @@ - 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 163c4c63a50..765d1b2957b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php @@ -85,7 +85,7 @@ public function getCategoryCollection() if (is_null($collection)) { $collection = Mage::getModel('catalog/category')->getCollection(); - /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection $collection */ + /** @var Mage_Catalog_Model_Resource_Category_Collection $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 d966181f46b..35ff0705413 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 @@ -167,7 +167,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/Urlrewrite/Category/Tree.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php index 4fa6ccbbe66..ba4ea1ca2ab 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php @@ -79,7 +79,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/Model/System/Config/Clone/Media/Image.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php index 5afd51fb5a6..a367fcd67b1 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 @@ -30,7 +30,7 @@ public function getPrefixes() // use cached eav config $entityTypeId = Mage::getSingleton('eav/config')->getEntityType(Mage_Catalog_Model_Product::ENTITY)->getId(); - /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection $collection */ + /** @var Mage_Catalog_Model_Resource_Product_Attribute_Collection $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 ecc908bb664..046e822bade 100644 --- a/app/code/core/Mage/Adminhtml/etc/config.xml +++ b/app/code/core/Mage/Adminhtml/etc/config.xml @@ -28,7 +28,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 2d85d3f94b1..00000000000 --- a/app/code/core/Mage/Api/Model/Mysql4/Acl.php +++ /dev/null @@ -1,25 +0,0 @@ - Mage_Api_Model_Resource - api_mysql4 api_assert
    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 130fb28785f..00000000000 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php +++ /dev/null @@ -1,25 +0,0 @@ -getEvent()->getCollection(); $limit = $observer->getEvent()->getLimit(); if (is_array($limit)) { diff --git a/app/code/core/Mage/Bundle/etc/config.xml b/app/code/core/Mage/Bundle/etc/config.xml index 9bd44d8c713..ff6c690f282 100644 --- a/app/code/core/Mage/Bundle/etc/config.xml +++ b/app/code/core/Mage/Bundle/etc/config.xml @@ -28,7 +28,6 @@ Mage_Bundle_Model_Resource - bundle_mysql4