From acb4505470110007da592e1252cfead442a5e72e Mon Sep 17 00:00:00 2001 From: sdecalom Date: Wed, 29 Jun 2022 20:28:24 +0200 Subject: [PATCH 01/61] Support for uploading xlsx files (#2266) --- app/code/core/Mage/Uploader/Helper/File.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/core/Mage/Uploader/Helper/File.php b/app/code/core/Mage/Uploader/Helper/File.php index 4373e1c007c..46853a782c9 100644 --- a/app/code/core/Mage/Uploader/Helper/File.php +++ b/app/code/core/Mage/Uploader/Helper/File.php @@ -616,6 +616,7 @@ class Mage_Uploader_Helper_File extends Mage_Core_Helper_Abstract 'xxlc' => 'application/vnd.ms-excel', 'xxlm' => 'application/vnd.ms-excel', 'xxls' => 'application/vnd.ms-excel', + 'xxlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'xxlt' => 'application/vnd.ms-excel', 'xxlw' => 'application/vnd.ms-excel', 'xxml' => 'application/xml', From af8d06868e59148be670832d2fe22f2c7214357f Mon Sep 17 00:00:00 2001 From: ADDISON <8360474+ADDISON74@users.noreply.github.com> Date: Thu, 30 Jun 2022 19:12:46 +0300 Subject: [PATCH 02/61] Backend grid heads - Remove colons after To, From and In words (#2267) --- .../Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php | 4 ++-- .../Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php | 4 ++-- .../Adminhtml/Block/Widget/Grid/Column/Filter/Price.php | 6 +++--- .../Adminhtml/Block/Widget/Grid/Column/Filter/Range.php | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php index ea2d6c6f7b2..a60ddd60efd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php @@ -50,7 +50,7 @@ public function getHtml() $htmlId = $this->_getHtmlId() . microtime(true); $format = $this->getLocale()->getDateStrFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT); $html = '
' - . '' . Mage::helper('adminhtml')->__('From').':' + . '' . Mage::helper('adminhtml')->__('From').'' . '' . '' . '
'; $html.= '
' - . '' . Mage::helper('adminhtml')->__('To').' :' + . '' . Mage::helper('adminhtml')->__('To').'' . '' . '' . Mage::helper('adminhtml')->__('From').':' + . '' . Mage::helper('adminhtml')->__('From').'' . '' . '' . '
'; $html.= '
' - . '' . Mage::helper('adminhtml')->__('To').' :' + . '' . Mage::helper('adminhtml')->__('To').'' . '' . '__('From').':
'; - $html .= '
' . Mage::helper('adminhtml')->__('To').':
'; + $html .= '
' . Mage::helper('adminhtml')->__('From').'
'; + $html .= '
' . Mage::helper('adminhtml')->__('To').'
'; if ($this->getDisplayCurrencySelect()) - $html .= '
' . Mage::helper('adminhtml')->__('In').': ' . $this->_getCurrencySelectHtml() . '
'; + $html .= '
' . Mage::helper('adminhtml')->__('In').'' . $this->_getCurrencySelectHtml() . '
'; $html .= '
'; return $html; diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Range.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Range.php index 64c381448d6..5856a39f19f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Range.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Range.php @@ -35,8 +35,8 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Range extends Mage_Adminhtm { public function getHtml() { - $html = '
' . Mage::helper('adminhtml')->__('From').':
'; - $html .= '
' . Mage::helper('adminhtml')->__('To').':
'; + $html = '
' . Mage::helper('adminhtml')->__('From').'
'; + $html .= '
' . Mage::helper('adminhtml')->__('To').'
'; return $html; } From e890d7c7a5023b2b82d8f9b81f0406a3546f32a6 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 5 Jul 2022 09:35:30 +0100 Subject: [PATCH 03/61] Fixed documentation link for "store scope" (#2256) --- app/code/core/Mage/Adminhtml/etc/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/core/Mage/Adminhtml/etc/config.xml b/app/code/core/Mage/Adminhtml/etc/config.xml index 9fe996a4364..2efa76e6869 100644 --- a/app/code/core/Mage/Adminhtml/etc/config.xml +++ b/app/code/core/Mage/Adminhtml/etc/config.xml @@ -226,7 +226,7 @@ - + 1 From add10659da6306e3e7ace9c7d30268d60954946a Mon Sep 17 00:00:00 2001 From: luigifab <31816829+luigifab@users.noreply.github.com> Date: Tue, 5 Jul 2022 11:31:15 +0200 Subject: [PATCH 04/61] Fix Varien_Io_File ignored errors with error control operator (#1269) --- lib/Varien/Image/Adapter/Gd2.php | 4 +- lib/Varien/Io/File.php | 70 ++++++++++++++++++++++++-------- 2 files changed, 55 insertions(+), 19 deletions(-) diff --git a/lib/Varien/Image/Adapter/Gd2.php b/lib/Varien/Image/Adapter/Gd2.php index fc8dec926d1..e8fca647f9f 100644 --- a/lib/Varien/Image/Adapter/Gd2.php +++ b/lib/Varien/Image/Adapter/Gd2.php @@ -54,7 +54,9 @@ public function __construct() */ public function destruct() { - @imagedestroy($this->_imageHandler); + if (is_resource($this->_imageHandler) || $this->_imageHandler instanceof \GdImage) { + @imagedestroy($this->_imageHandler); + } } /** diff --git a/lib/Varien/Io/File.php b/lib/Varien/Io/File.php index 1327861d9a5..946b072f9cb 100644 --- a/lib/Varien/Io/File.php +++ b/lib/Varien/Io/File.php @@ -134,9 +134,13 @@ public function streamOpen($fileName, $mode = 'w+', $chmod = 0666) ini_set('auto_detect_line_endings', 1); } - @chdir($this->_cwd); + if ($this->_cwd) { + @chdir($this->_cwd); + } $this->_streamHandler = @fopen($fileName, $mode); - @chdir($this->_iwd); + if ($this->_iwd) { + @chdir($this->_iwd); + } if ($this->_streamHandler === false) { throw new Exception('Error write to file ' . $this->getFilteredPath($fileName)); } @@ -365,7 +369,9 @@ public function rmdir($dir, $recursive = false) @chdir($this->_cwd); } $result = self::rmdirRecursive($dir, $recursive); - @chdir($this->_iwd); + if ($this->_iwd) { + @chdir($this->_iwd); + } return $result; } @@ -510,7 +516,9 @@ protected function _IsValidSource($src) protected function _isFilenameWriteable($filename) { $error = false; - @chdir($this->_cwd); + if ($this->_cwd) { + @chdir($this->_cwd); + } if (file_exists($filename)) { if (!is_writeable($filename)) { $error = "File '{$this->getFilteredPath($filename)}' isn't writeable"; @@ -521,7 +529,9 @@ protected function _isFilenameWriteable($filename) $error = "Folder '{$this->getFilteredPath($folder)}' isn't writeable"; } } - @chdir($this->_iwd); + if ($this->_iwd) { + @chdir($this->_iwd); + } if ($error) { throw new Varien_Io_Exception($error); @@ -555,29 +565,41 @@ protected function _checkSrcIsFile($src) */ public function filePutContent($filename, $src) { - @chdir($this->_cwd); + if ($this->_cwd) { + @chdir($this->_cwd); + } $result = @file_put_contents($filename, $src); - chdir($this->_iwd); + if ($this->_iwd) { + chdir($this->_iwd); + } return $result; } public function fileExists($file, $onlyFile = true) { - @chdir($this->_cwd); + if ($this->_cwd) { + @chdir($this->_cwd); + } $result = file_exists($file); if ($result && $onlyFile) { $result = is_file($file); } - @chdir($this->_iwd); + if ($this->_iwd) { + @chdir($this->_iwd); + } return $result; } public function isWriteable($path) { - @chdir($this->_cwd); + if ($this->_cwd) { + @chdir($this->_cwd); + } $result = is_writeable($path); - @chdir($this->_iwd); + if ($this->_iwd) { + @chdir($this->_iwd); + } return $result; } @@ -634,9 +656,13 @@ public function checkAndCreateFolder($folder, $mode = 0777) */ public function rm($filename) { - @chdir($this->_cwd); + if ($this->_cwd) { + @chdir($this->_cwd); + } $result = @unlink($filename); - @chdir($this->_iwd); + if ($this->_iwd) { + @chdir($this->_iwd); + } return $result; } @@ -649,9 +675,13 @@ public function rm($filename) */ public function mv($src, $dest) { - chdir($this->_cwd); + if ($this->_cwd) { + chdir($this->_cwd); + } $result = @rename($src, $dest); - chdir($this->_iwd); + if ($this->_iwd) { + chdir($this->_iwd); + } return $result; } @@ -664,9 +694,13 @@ public function mv($src, $dest) */ public function cp($src, $dest) { - @chdir($this->_cwd); + if ($this->_cwd) { + @chdir($this->_cwd); + } $result = @copy($src, $dest); - @chdir($this->_iwd); + if ($this->_iwd) { + @chdir($this->_iwd); + } return $result; } @@ -682,7 +716,7 @@ public function chmod($filename, $mode) if ($this->_cwd) { chdir($this->_cwd); } - $result = @chmod($filename, $mode); + $result = file_exists($filename) ? @chmod($filename, $mode) : false; if ($this->_iwd) { chdir($this->_iwd); } From 9343518f43be40b6a895ca1e94d80222fc26c8a9 Mon Sep 17 00:00:00 2001 From: Mohamed ELIDRISSI <67818913+elidrissidev@users.noreply.github.com> Date: Thu, 7 Jul 2022 13:43:19 +0100 Subject: [PATCH 05/61] Fix store id filter in `catalogProductList` SOAP method (#2243) --- app/code/core/Mage/Catalog/Model/Product/Api.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/core/Mage/Catalog/Model/Product/Api.php b/app/code/core/Mage/Catalog/Model/Product/Api.php index 884be49cba6..168ddde78dd 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Api.php @@ -90,7 +90,7 @@ public function __construct() public function items($filters = null, $store = null) { $collection = Mage::getModel('catalog/product')->getCollection() - ->addStoreFilter($this->_getStoreId($store)) + ->setStoreId($this->_getStoreId($store)) ->addAttributeToSelect('name'); $apiHelper = Mage::helper('api'); From 62146d8b1b478b67c18e9f9f3cdd44aab783ea6c Mon Sep 17 00:00:00 2001 From: ADDISON <8360474+ADDISON74@users.noreply.github.com> Date: Thu, 7 Jul 2022 15:44:57 +0300 Subject: [PATCH 06/61] Small changes in .htaccess file /media directory (#2280) --- media/.htaccess | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/media/.htaccess b/media/.htaccess index 770d054bd2b..7555f6acf59 100644 --- a/media/.htaccess +++ b/media/.htaccess @@ -1,6 +1,14 @@ Options All -Indexes + +############################################ +## Disable PHP7/PHP8 code execution for media directory + -php_flag engine 0 + php_flag engine 0 + + + + php_flag engine 0 AddHandler cgi-script .php .pl .py .jsp .asp .htm .shtml .sh .cgi @@ -9,17 +17,19 @@ Options -ExecCGI ############################################ -## enable rewrites +## Enable rewrites Options +FollowSymLinks RewriteEngine on ############################################ -## never rewrite for existing files +## Never rewrite for existing files + RewriteCond %{REQUEST_FILENAME} !-f ############################################ -## rewrite everything else to get.php +## Rewrite everything else to get.php + + RewriteRule (.*) ../get.php [L] - RewriteRule .* ../get.php [L] From 5bf1ab5e4c193935383fa87bf4e0c7e92c6a5175 Mon Sep 17 00:00:00 2001 From: ADDISON <8360474+ADDISON74@users.noreply.github.com> Date: Fri, 8 Jul 2022 09:59:50 +0300 Subject: [PATCH 07/61] All .gitignore files in one place (#2269) --- .gitignore | 37 +++++++++++++++++++++++++++---------- dev/.gitignore | 4 ---- dev/gitpod/.gitignore | 2 -- dev/openmage/.gitignore | 2 -- var/.gitignore | 6 ------ 5 files changed, 27 insertions(+), 24 deletions(-) delete mode 100644 dev/.gitignore delete mode 100644 dev/gitpod/.gitignore delete mode 100644 dev/openmage/.gitignore delete mode 100644 var/.gitignore diff --git a/.gitignore b/.gitignore index 45f9d4ef72a..fd407433177 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,30 @@ /app/etc/local.xml -/media/catalog -/media/captcha -/media/css -/media/css_secure -/media/email/logo -/media/favicon -/media/js -/media/sales/store/logo -/media/sales/store/logo_html -/media/wysiwyg + +# Add a base setup for running unit Tests with code coverage and send them to SonarCloud +# https://github.com/OpenMage/magento-lts/pull/1836 +/dev/testfield +/dev/tests/clover.xml +/dev/tests/crap4j.xml +/dev/tests/junit.xml + +# Add Gitpod online IDE config +# https://github.com/OpenMage/magento-lts/pull/1836 +/dev/gitpod/docker-magento +/dev/gitpod/.env + +# Add development environment setup files and README +# https://github.com/OpenMage/magento-lts/pull/1012 +/dev/openmage/docker-magento +/dev/openmage/.env /dev/tests/functional/generated /dev/tests/functional/vendor + +/media/* +!/media/.htaccess +!/media/custom_options/.htaccess +!/media/customer/.htaccess +!/media/dhl/logo.jpg +!/media/downloadable/.htaccess + +/var/* +!/var/.htaccess diff --git a/dev/.gitignore b/dev/.gitignore deleted file mode 100644 index b0aeb98d779..00000000000 --- a/dev/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/testfield -/tests/clover.xml -/tests/crap4j.xml -/tests/junit.xml diff --git a/dev/gitpod/.gitignore b/dev/gitpod/.gitignore deleted file mode 100644 index db60f9e1563..00000000000 --- a/dev/gitpod/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -docker-magento/ -.env diff --git a/dev/openmage/.gitignore b/dev/openmage/.gitignore deleted file mode 100644 index a0f74afad50..00000000000 --- a/dev/openmage/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -docker-magento/ -.env \ No newline at end of file diff --git a/var/.gitignore b/var/.gitignore deleted file mode 100644 index bdbc998087c..00000000000 --- a/var/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -* -.* -!package -!package/* -!.htaccess -!.gitignore From 0bb8d831047ae0574b2bc7bcca4444dfda539198 Mon Sep 17 00:00:00 2001 From: ADDISON <8360474+ADDISON74@users.noreply.github.com> Date: Fri, 8 Jul 2022 19:53:47 +0300 Subject: [PATCH 08/61] Create/Update .htaccess file in skin and media directories (#2289) --- media/.htaccess | 9 ++++++--- skin/.htaccess | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 skin/.htaccess diff --git a/media/.htaccess b/media/.htaccess index 7555f6acf59..c0893376aa6 100644 --- a/media/.htaccess +++ b/media/.htaccess @@ -1,7 +1,7 @@ Options All -Indexes ############################################ -## Disable PHP7/PHP8 code execution for media directory +## Disable PHP code execution php_flag engine 0 @@ -11,8 +11,11 @@ Options All -Indexes php_flag engine 0 -AddHandler cgi-script .php .pl .py .jsp .asp .htm .shtml .sh .cgi -Options -ExecCGI +############################################ +## Don't permit execution of CGI scripts + + AddHandler cgi-script .php .pl .py .jsp .asp .sh .cgi + Options -ExecCGI diff --git a/skin/.htaccess b/skin/.htaccess new file mode 100644 index 00000000000..f691fb1412d --- /dev/null +++ b/skin/.htaccess @@ -0,0 +1,16 @@ +############################################ +## Disable PHP code execution + + + php_flag engine 0 + + + + php_flag engine 0 + + +############################################ +## Don't permit execution of CGI scripts + + AddHandler cgi-script .php .pl .py .jsp .asp .sh .cgi + Options -ExecCGI From 61e3c4d6248e3800c1476ae2da47fdfdf340da35 Mon Sep 17 00:00:00 2001 From: Mohamed ELIDRISSI <67818913+elidrissidev@users.noreply.github.com> Date: Fri, 8 Jul 2022 20:06:53 +0100 Subject: [PATCH 09/61] Add `magento-composer-installer` to allowed plugins (#2296) --- composer.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/composer.json b/composer.json index 2fbc1fb4a05..a3de02c1e69 100644 --- a/composer.json +++ b/composer.json @@ -48,5 +48,10 @@ "dev-main": "1.9.4.x-dev" }, "magento-root-dir": "root" + }, + "config": { + "allow-plugins": { + "magento-hackathon/magento-composer-installer": true + } } } From 7c70e0b433b062dc7b59edbdd8172f0d3736f3d6 Mon Sep 17 00:00:00 2001 From: ADDISON <8360474+ADDISON74@users.noreply.github.com> Date: Sat, 9 Jul 2022 11:40:01 +0300 Subject: [PATCH 10/61] Deleted .htaccess.sample (#2293) --- .htaccess.sample | 192 ----------------------------------------------- 1 file changed, 192 deletions(-) delete mode 100644 .htaccess.sample diff --git a/.htaccess.sample b/.htaccess.sample deleted file mode 100644 index b24dc2f4834..00000000000 --- a/.htaccess.sample +++ /dev/null @@ -1,192 +0,0 @@ -############################################ -## GoDaddy specific options - -# Options -MultiViews - -## you might also need to add this line to php.ini -## cgi.fix_pathinfo = 1 -## if it still doesn't work, rename php.ini to php5.ini - -############################################ -## default index file - - DirectoryIndex index.php - - - -############################################ -## adjust max execution time - - php_value max_execution_time 18000 - -############################################ -## disable automatic session start -## before autoload was initialized - - php_flag session.auto_start off - -############################################ -## enable resulting html compression - - #php_flag zlib.output_compression on - -########################################### -# disable user agent verification to not break multiple image upload - - php_flag suhosin.session.cryptua off - - - - -########################################### -# disable POST processing to not break multiple image upload - - SecFilterEngine Off - SecFilterScanPOST Off - - - - -############################################ -## enable apache served files compression -## http://developer.yahoo.com/performance/rules.html#gzip - - # Insert filter on all content - ###SetOutputFilter DEFLATE - # Insert filter on selected content types only - #AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript - - # Netscape 4.x has some problems... - #BrowserMatch ^Mozilla/4 gzip-only-text/html - - # Netscape 4.06-4.08 have some more problems - #BrowserMatch ^Mozilla/4\.0[678] no-gzip - - # MSIE masquerades as Netscape, but it is fine - #BrowserMatch \bMSIE !no-gzip !gzip-only-text/html - - # Don't compress images - #SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip dont-vary - - # Make sure proxies don't deliver the wrong content - #Header append Vary User-Agent env=!dont-vary - - - - - -############################################ -## make HTTPS env vars available for CGI mode - - SSLOptions StdEnvVars - - - - - -############################################ -## enable rewrites - - Options +FollowSymLinks - RewriteEngine on - -############################################ -## you can put here your magento root folder -## path relative to web root - - #RewriteBase /magento/ - -############################################ -## workaround for HTTP authorization -## in CGI environment - - RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}] - - - - - ############################################ - # X-Content-Type-Options: nosniff disable content-type sniffing on some browsers. - Header set X-Content-Type-Options: nosniff - - ############################################ - # This header forces to enables the Cross-site scripting (XSS) filter in browsers (if disabled) - BrowserMatch \bMSIE\s8 ie8 - Header set X-XSS-Protection: "1; mode=block" env=!ie8 - - - - -############################################ -## always send 404 on missing files in these folders - - RewriteCond %{REQUEST_URI} !^/(media|skin|js)/ - -############################################ -## never rewrite for existing files, directories and links - - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - RewriteCond %{REQUEST_FILENAME} !-l - -############################################ -## rewrite everything else to index.php - - RewriteRule .* index.php [L] - - - - -############################################ -## Prevent character encoding issues from server overrides -## If you still have problems, use the second line instead - - AddDefaultCharset Off - #AddDefaultCharset UTF-8 - - - -############################################ -## Add default Expires header -## http://developer.yahoo.com/performance/rules.html#expires - - ExpiresDefault "access plus 1 year" - - - -############################################ -## By default allow all access - - Order allow,deny - Allow from all - -############################################ -## If running in cluster environment, uncomment this -## http://developer.yahoo.com/performance/rules.html#etags - - #FileETag none - -########################################### -## Deny access to cron.php - - -############################################ -## uncomment next lines to enable cron access with base HTTP authorization -## http://httpd.apache.org/docs/2.2/howto/auth.html -## -## Warning: .htpasswd file should be placed somewhere not accessible from the web. -## This is so that folks cannot download the password file. -## For example, if your documents are served out of /usr/local/apache/htdocs -## you might want to put the password file(s) in /usr/local/apache/. - - #AuthName "Cron auth" - #AuthUserFile ../.htpasswd - #AuthType basic - #Require valid-user - -############################################ - - Order allow,deny - Deny from all - - From e90e35f217781ad4db44187a67149c728f529743 Mon Sep 17 00:00:00 2001 From: ADDISON <8360474+ADDISON74@users.noreply.github.com> Date: Sat, 9 Jul 2022 14:24:24 +0300 Subject: [PATCH 11/61] Updated php.ini.sample (#2292) --- php.ini.sample | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/php.ini.sample b/php.ini.sample index e6c5376083b..ef34ea33fda 100644 --- a/php.ini.sample +++ b/php.ini.sample @@ -1,38 +1,31 @@ -; This file is for CGI/FastCGI installations. -; Try copying it to php5.ini, if it doesn't work +; This file is for CGI/FastCGI installations +; Try copying it to php7.ini or php8 if it doesn't work -; adjust memory limit +; Adjust memory limit memory_limit = 64M - max_execution_time = 18000 -; disable magic quotes for php request vars +; Disable magic quotes for PHP request vars magic_quotes_gpc = off -; disable automatic session start -; before autoload was initialized +; Disable automatic session start before autoload was initialized flag session.auto_start = off -; enable resulting html compression +; Enable resulting html compression zlib.output_compression = on -; disable user agent verification to not break multiple image upload +; Disable user agent verification to not break multiple image upload suhosin.session.cryptua = off -; turn off compatibility with PHP4 when dealing with objects - -zend.ze1_compatibility_mode = off - -; PHP for some reason ignores this setting in system php.ini -; and disables mcrypt if this line is missing in local php.ini +; If this line is missing in local php.ini for some reason PHP ignores this setting in system php.ini and disables mcrypt extension=mcrypt.so -; Disable PHP errors, notices and warnings output in production mode to prevent exposing sensitive information. +; Disable PHP errors, notices and warnings output in production mode to prevent exposing sensitive information display_errors = Off From 8624d5e6e4ded1e9d0e0248a3522276a594b1e40 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Sat, 9 Jul 2022 13:44:19 +0200 Subject: [PATCH 12/61] Fix editing special price in product mass attribute update (#2287) --- js/prototype/validation.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/prototype/validation.js b/js/prototype/validation.js index d71d62424b0..86776435273 100644 --- a/js/prototype/validation.js +++ b/js/prototype/validation.js @@ -682,6 +682,7 @@ Validation.addAllThese([ // Passed on non-related validators conditions (to not change order of validation) if( !priceInput + || !$F(priceInput) || Validation.get('IsEmpty').test(v) || !Validation.get('validate-number').test(v) ) { From e06fe2d34450240b504bbdaecd4846966d8f7c64 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Mon, 11 Jul 2022 00:00:27 +0200 Subject: [PATCH 13/61] Added required PHP modules to composer.json (#2064) --- composer.json | 11 +++++++++++ composer.lock | 15 +++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index a3de02c1e69..799328c4f2e 100644 --- a/composer.json +++ b/composer.json @@ -8,6 +8,17 @@ "type": "magento-source", "require": { "php": ">=7.0 <7.5 || >=8.0 <8.1", + "ext-curl": "*", + "ext-gd": "*", + "ext-json": "*", + "ext-mbstring": "*", + "ext-pdo": "*", + "ext-simplexml": "*", + "ext-dom": "*", + "ext-libxml": "*", + "ext-soap": "*", + "ext-iconv": "*", + "ext-zlib": "*", "magento-hackathon/magento-composer-installer": "^3.1 || ^2.1 || ^4.0" }, "require-dev": { diff --git a/composer.lock b/composer.lock index f50bd09da3e..9c018cf41e1 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8646f86423533d4626e41874f669c360", + "content-hash": "2299d18979b1136a95773f7421ba16d4", "packages": [ { "name": "eloquent/enumeration", @@ -1268,7 +1268,18 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=7.0 <7.5 || >=8.0 <8.1" + "php": ">=7.0 <7.5 || >=8.0 <8.1", + "ext-curl": "*", + "ext-gd": "*", + "ext-json": "*", + "ext-mbstring": "*", + "ext-pdo": "*", + "ext-simplexml": "*", + "ext-dom": "*", + "ext-libxml": "*", + "ext-soap": "*", + "ext-iconv": "*", + "ext-zlib": "*" }, "platform-dev": [], "plugin-api-version": "2.3.0" From a11d247c853e30a6304da3c58da572f9dea7a8f0 Mon Sep 17 00:00:00 2001 From: ADDISON <8360474+ADDISON74@users.noreply.github.com> Date: Tue, 12 Jul 2022 10:17:33 +0300 Subject: [PATCH 14/61] Update robots.txt.sample (#2307) --- robots.txt.sample | 48 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/robots.txt.sample b/robots.txt.sample index 977b8cfde67..1735e56422f 100644 --- a/robots.txt.sample +++ b/robots.txt.sample @@ -1,12 +1,12 @@ ############################################ -## For more information about the robots.txt standard, see: +## For more information about the robots.txt standard visit ## http://www.robotstxt.org/orig.html ## -## For syntax checking, see: +## For syntax checking visit ## http://tool.motoricerca.info/robots-checker.phtml ############################################ -## Crawl the Sitemap. Set the correct url before uncomment +## Crawl the Sitemap. Set the correct URL before uncomment # Sitemap: https://example.com/sitemap.xml @@ -15,12 +15,19 @@ User-agent: * +## How many seconds a crawler should wait before loading and crawling page content +## Set a custom crawl rate if you are experiencing traffic issues with your server +## https://www.contentkingapp.com/academy/robotstxt/faq/crawl-delay-10/ + +Crawl-delay: 10 + ############################################ ## Allow to crawl paging (paging inside a listing with more params are disallowed below) + Allow: /*?p= ############################################ -## Do not crawl non-SEF paths and generated content (if you use a shop id in URL, you must prefix with * or copy for each shop) +## Do not crawl non-SEF paths and generated content (if you use a store id in URL you must prefix with * or copy for each store) Disallow: */index.php/ Disallow: */catalog/product_compare/ @@ -28,6 +35,9 @@ Disallow: */catalog/category/view/ Disallow: */catalog/product/view/ Disallow: */catalog/product/gallery/ Disallow: */catalogsearch/ +#Allow: */catalogsearch/seo_sitemap +#Allow: */catalogsearch/term/popular +Disallow: */checkout/ Disallow: */control/ Disallow: */contacts/ Disallow: */customer/ @@ -35,6 +45,7 @@ Disallow: */customize/ Disallow: */newsletter/ Disallow: */poll/ Disallow: */review/ +Disallow: */sales/ Disallow: */sendfriend/ Disallow: */tag/ Disallow: */wishlist/ @@ -59,3 +70,32 @@ Disallow: /*?q=* Disallow: /*?p=*& Disallow: /*.php$ Disallow: /*?SID= + +############################################ +## Do not allow media indexing for the following bots +## Disallow all or add custom paths. For example */media/ or */skin/ + +# User-agent: baiduspider-image +# Disallow: / +# Disallow: */media/ +# Disallow: */skin/ + +# User-agent: baiduspider-video +# Disallow: / +# Disallow: */media/ +# Disallow: */skin/ + +# User-agent: msnbot-media +# Disallow: / +# Disallow: */media/ +# Disallow: */skin/ + +# User-agent: Googlebot-Image +# Disallow: / +# Disallow: */media/ +# Disallow: */skin/ + +# User-agent: Googlebot-Video +# Disallow: / +# Disallow: */media/ +# Disallow: */skin/ From 24c8721621e5371a231a678c4b2430cff1aedb97 Mon Sep 17 00:00:00 2001 From: Mohamed ELIDRISSI <67818913+elidrissidev@users.noreply.github.com> Date: Tue, 12 Jul 2022 11:55:19 +0100 Subject: [PATCH 15/61] Include exception message when generating error report (#2311) --- app/Mage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Mage.php b/app/Mage.php index 8e90d2a254a..89184317b46 100644 --- a/app/Mage.php +++ b/app/Mage.php @@ -982,7 +982,7 @@ public static function printException(Throwable $e, $extra = '') } else { $reportData = array( - !empty($extra) ? $extra . "\n\n" : '' . $e->getMessage(), + (!empty($extra) ? $extra . "\n\n" : '') . $e->getMessage(), $e->getTraceAsString() ); From c604fd12d579bc25ccb824795c8ae02b82fc4234 Mon Sep 17 00:00:00 2001 From: Daniel Fahlke Date: Tue, 12 Jul 2022 16:11:03 +0200 Subject: [PATCH 16/61] Add some ReturnTypeWillChange annotations to Varien_object (#2301) --- lib/Varien/Object.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/Varien/Object.php b/lib/Varien/Object.php index b7638f859eb..90c8e973aa2 100644 --- a/lib/Varien/Object.php +++ b/lib/Varien/Object.php @@ -842,6 +842,7 @@ public function debug($data=null, &$objects=array()) * @param string $offset * @param mixed $value */ + #[ReturnTypeWillChange] public function offsetSet($offset, $value) { $this->_data[$offset] = $value; @@ -854,6 +855,7 @@ public function offsetSet($offset, $value) * @param string $offset * @return boolean */ + #[ReturnTypeWillChange] public function offsetExists($offset) { return isset($this->_data[$offset]); @@ -865,6 +867,7 @@ public function offsetExists($offset) * @link http://www.php.net/manual/en/arrayaccess.offsetunset.php * @param string $offset */ + #[ReturnTypeWillChange] public function offsetUnset($offset) { unset($this->_data[$offset]); @@ -877,6 +880,7 @@ public function offsetUnset($offset) * @param string $offset * @return mixed */ + #[ReturnTypeWillChange] public function offsetGet($offset) { return isset($this->_data[$offset]) ? $this->_data[$offset] : null; From 4af820722adc89bee0e46015dbf9c257d980acab Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 12 Jul 2022 16:11:26 +0200 Subject: [PATCH 17/61] Fix xml validation problems (#2242) --- .../core/Mage/Api/Model/Wsdl/Config/Base.php | 2 +- app/code/core/Mage/Api/etc/wsdl.xml | 40 +-- app/code/core/Mage/Api/etc/wsdl2.xml | 32 +- app/code/core/Mage/Api/etc/wsi.xml | 10 +- app/code/core/Mage/Catalog/etc/wsdl.xml | 288 +++++++++--------- app/code/core/Mage/Catalog/etc/wsi.xml | 10 +- .../core/Mage/CatalogInventory/etc/wsdl.xml | 20 +- .../core/Mage/CatalogInventory/etc/wsi.xml | 10 +- app/code/core/Mage/Checkout/etc/wsdl.xml | 78 ++--- app/code/core/Mage/Checkout/etc/wsi.xml | 8 +- app/code/core/Mage/Core/etc/wsdl.xml | 20 +- app/code/core/Mage/Core/etc/wsi.xml | 10 +- app/code/core/Mage/Customer/etc/wsdl.xml | 50 +-- app/code/core/Mage/Customer/etc/wsi.xml | 8 +- app/code/core/Mage/Directory/etc/wsdl.xml | 16 +- app/code/core/Mage/Directory/etc/wsi.xml | 10 +- app/code/core/Mage/Downloadable/etc/wsdl.xml | 20 +- app/code/core/Mage/Downloadable/etc/wsi.xml | 8 +- app/code/core/Mage/GiftMessage/etc/wsdl.xml | 20 +- app/code/core/Mage/GiftMessage/etc/wsi.xml | 8 +- app/code/core/Mage/Sales/etc/wsdl.xml | 112 +++---- app/code/core/Mage/Sales/etc/wsi.xml | 10 +- app/code/core/Mage/Tag/etc/wsdl.xml | 28 +- app/code/core/Mage/Tag/etc/wsi.xml | 10 +- 24 files changed, 414 insertions(+), 414 deletions(-) diff --git a/app/code/core/Mage/Api/Model/Wsdl/Config/Base.php b/app/code/core/Mage/Api/Model/Wsdl/Config/Base.php index b3d21401e6f..a142f99e51f 100644 --- a/app/code/core/Mage/Api/Model/Wsdl/Config/Base.php +++ b/app/code/core/Mage/Api/Model/Wsdl/Config/Base.php @@ -56,7 +56,7 @@ public function __construct($sourceData = null) // set up default WSDL template variables $this->_wsdlVariables = new Varien_Object( array( - 'name' => 'Magento', + 'name' => 'OpenMage', 'url' => Mage::helper('api')->getServiceUrl('*/*/*', array('_query' => $queryParams), true) ) ); diff --git a/app/code/core/Mage/Api/etc/wsdl.xml b/app/code/core/Mage/Api/etc/wsdl.xml index 49b0a241e4d..ed7d6f20d18 100644 --- a/app/code/core/Mage/Api/etc/wsdl.xml +++ b/app/code/core/Mage/Api/etc/wsdl.xml @@ -1,9 +1,9 @@ - + name="OpenMage" targetNamespace="urn:OpenMage"> - + @@ -113,77 +113,77 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/app/code/core/Mage/Api/etc/wsdl2.xml b/app/code/core/Mage/Api/etc/wsdl2.xml index fae9dc98c8e..423d252dc06 100644 --- a/app/code/core/Mage/Api/etc/wsdl2.xml +++ b/app/code/core/Mage/Api/etc/wsdl2.xml @@ -1,9 +1,9 @@ - + name="OpenMage" targetNamespace="urn:OpenMage"> - + @@ -182,59 +182,59 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/app/code/core/Mage/Api/etc/wsi.xml b/app/code/core/Mage/Api/etc/wsi.xml index 62f93bd4697..3457647ee2c 100644 --- a/app/code/core/Mage/Api/etc/wsi.xml +++ b/app/code/core/Mage/Api/etc/wsi.xml @@ -1,13 +1,13 @@ - + name="OpenMage" + targetNamespace="OpenMage"> - + @@ -373,7 +373,7 @@ - + diff --git a/app/code/core/Mage/Catalog/etc/wsdl.xml b/app/code/core/Mage/Catalog/etc/wsdl.xml index a6b80a6d03c..8b639cb8ee9 100644 --- a/app/code/core/Mage/Catalog/etc/wsdl.xml +++ b/app/code/core/Mage/Catalog/etc/wsdl.xml @@ -1,11 +1,11 @@ - + name="OpenMage" targetNamespace="urn:OpenMage"> - + @@ -1562,775 +1562,775 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/app/code/core/Mage/Catalog/etc/wsi.xml b/app/code/core/Mage/Catalog/etc/wsi.xml index 03e7b4b46c8..5abbda91213 100644 --- a/app/code/core/Mage/Catalog/etc/wsi.xml +++ b/app/code/core/Mage/Catalog/etc/wsi.xml @@ -1,13 +1,13 @@ - + name="OpenMage" + targetNamespace="urn:OpenMage"> - + @@ -3013,7 +3013,7 @@ - + diff --git a/app/code/core/Mage/CatalogInventory/etc/wsdl.xml b/app/code/core/Mage/CatalogInventory/etc/wsdl.xml index 5947ef4a064..cfd2d9906b6 100644 --- a/app/code/core/Mage/CatalogInventory/etc/wsdl.xml +++ b/app/code/core/Mage/CatalogInventory/etc/wsdl.xml @@ -1,9 +1,9 @@ - + name="OpenMage" targetNamespace="urn:OpenMage"> - + @@ -98,34 +98,34 @@ - + - + - + - + - - - + diff --git a/app/code/core/Mage/CatalogInventory/etc/wsi.xml b/app/code/core/Mage/CatalogInventory/etc/wsi.xml index b5622f58286..d2ef5bfc902 100644 --- a/app/code/core/Mage/CatalogInventory/etc/wsi.xml +++ b/app/code/core/Mage/CatalogInventory/etc/wsi.xml @@ -1,13 +1,13 @@ - + name="OpenMage" + targetNamespace="urn:OpenMage"> - + @@ -166,7 +166,7 @@ - + diff --git a/app/code/core/Mage/Checkout/etc/wsdl.xml b/app/code/core/Mage/Checkout/etc/wsdl.xml index 44c68694234..0e4f17eed67 100644 --- a/app/code/core/Mage/Checkout/etc/wsdl.xml +++ b/app/code/core/Mage/Checkout/etc/wsdl.xml @@ -1,11 +1,11 @@ - + name="OpenMage" targetNamespace="urn:OpenMage"> - + @@ -580,198 +580,198 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/code/core/Mage/Checkout/etc/wsi.xml b/app/code/core/Mage/Checkout/etc/wsi.xml index c1ed1325c54..515bf1c20c0 100644 --- a/app/code/core/Mage/Checkout/etc/wsi.xml +++ b/app/code/core/Mage/Checkout/etc/wsi.xml @@ -1,13 +1,13 @@ - + name="OpenMage" + targetNamespace="urn:OpenMage"> - + diff --git a/app/code/core/Mage/Core/etc/wsdl.xml b/app/code/core/Mage/Core/etc/wsdl.xml index 8f3116b73f2..caf08a9ba00 100644 --- a/app/code/core/Mage/Core/etc/wsdl.xml +++ b/app/code/core/Mage/Core/etc/wsdl.xml @@ -1,9 +1,9 @@ - + name="OpenMage" targetNamespace="urn:OpenMage"> - + @@ -72,32 +72,32 @@ - + - + - + - + - + - + - + diff --git a/app/code/core/Mage/Core/etc/wsi.xml b/app/code/core/Mage/Core/etc/wsi.xml index 7e2b3b71557..94b518dacf2 100644 --- a/app/code/core/Mage/Core/etc/wsi.xml +++ b/app/code/core/Mage/Core/etc/wsi.xml @@ -1,13 +1,13 @@ - + name="OpenMage" + targetNamespace="urn:OpenMage"> - + @@ -140,7 +140,7 @@ - + diff --git a/app/code/core/Mage/Customer/etc/wsdl.xml b/app/code/core/Mage/Customer/etc/wsdl.xml index 616a48c291b..6ffe1bc8d00 100644 --- a/app/code/core/Mage/Customer/etc/wsdl.xml +++ b/app/code/core/Mage/Customer/etc/wsdl.xml @@ -1,9 +1,9 @@ - + name="OpenMage" targetNamespace="urn:OpenMage"> - + @@ -260,100 +260,100 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/app/code/core/Mage/Customer/etc/wsi.xml b/app/code/core/Mage/Customer/etc/wsi.xml index 74e78edcaee..76f7d1ca167 100644 --- a/app/code/core/Mage/Customer/etc/wsi.xml +++ b/app/code/core/Mage/Customer/etc/wsi.xml @@ -1,13 +1,13 @@ - + name="OpenMage" + targetNamespace="urn:OpenMage"> - + diff --git a/app/code/core/Mage/Directory/etc/wsdl.xml b/app/code/core/Mage/Directory/etc/wsdl.xml index 5ace2242939..45236e99cfe 100644 --- a/app/code/core/Mage/Directory/etc/wsdl.xml +++ b/app/code/core/Mage/Directory/etc/wsdl.xml @@ -1,9 +1,9 @@ - + name="OpenMage" targetNamespace="urn:OpenMage"> - + @@ -66,23 +66,23 @@ - + - + - + - + - + diff --git a/app/code/core/Mage/Directory/etc/wsi.xml b/app/code/core/Mage/Directory/etc/wsi.xml index eca62b5d0cb..b558a032f92 100644 --- a/app/code/core/Mage/Directory/etc/wsi.xml +++ b/app/code/core/Mage/Directory/etc/wsi.xml @@ -1,13 +1,13 @@ - + name="OpenMage" + targetNamespace="urn:OpenMage"> - + @@ -111,7 +111,7 @@ - + diff --git a/app/code/core/Mage/Downloadable/etc/wsdl.xml b/app/code/core/Mage/Downloadable/etc/wsdl.xml index b463be954b2..9c492fb6136 100644 --- a/app/code/core/Mage/Downloadable/etc/wsdl.xml +++ b/app/code/core/Mage/Downloadable/etc/wsdl.xml @@ -1,11 +1,11 @@ - + name="OpenMage" targetNamespace="urn:OpenMage"> - + @@ -154,38 +154,38 @@ - - - - - - - + diff --git a/app/code/core/Mage/Downloadable/etc/wsi.xml b/app/code/core/Mage/Downloadable/etc/wsi.xml index 498eb427f3c..a00b489b28b 100644 --- a/app/code/core/Mage/Downloadable/etc/wsi.xml +++ b/app/code/core/Mage/Downloadable/etc/wsi.xml @@ -1,13 +1,13 @@ - + name="OpenMage" + targetNamespace="urn:OpenMage"> - + diff --git a/app/code/core/Mage/GiftMessage/etc/wsdl.xml b/app/code/core/Mage/GiftMessage/etc/wsdl.xml index 9fd677d2cac..5786c6de48a 100644 --- a/app/code/core/Mage/GiftMessage/etc/wsdl.xml +++ b/app/code/core/Mage/GiftMessage/etc/wsdl.xml @@ -1,9 +1,9 @@ - + name="OpenMage" targetNamespace="urn:OpenMage"> - + @@ -90,32 +90,32 @@ - + - + - + - + - + - + - + diff --git a/app/code/core/Mage/GiftMessage/etc/wsi.xml b/app/code/core/Mage/GiftMessage/etc/wsi.xml index 155d52646b5..a0c0729ac9c 100644 --- a/app/code/core/Mage/GiftMessage/etc/wsi.xml +++ b/app/code/core/Mage/GiftMessage/etc/wsi.xml @@ -1,13 +1,13 @@ - + name="OpenMage" + targetNamespace="urn:OpenMage"> - + diff --git a/app/code/core/Mage/Sales/etc/wsdl.xml b/app/code/core/Mage/Sales/etc/wsdl.xml index f17299402f9..41ee83117c1 100644 --- a/app/code/core/Mage/Sales/etc/wsdl.xml +++ b/app/code/core/Mage/Sales/etc/wsdl.xml @@ -1,9 +1,9 @@ - + name="OpenMage" targetNamespace="urn:OpenMage"> - + @@ -1107,239 +1107,239 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/app/code/core/Mage/Sales/etc/wsi.xml b/app/code/core/Mage/Sales/etc/wsi.xml index 6ed5b675471..2e145dbb85c 100644 --- a/app/code/core/Mage/Sales/etc/wsi.xml +++ b/app/code/core/Mage/Sales/etc/wsi.xml @@ -1,13 +1,13 @@ - + name="OpenMage" + targetNamespace="urn:OpenMage"> - + @@ -1679,7 +1679,7 @@ - + diff --git a/app/code/core/Mage/Tag/etc/wsdl.xml b/app/code/core/Mage/Tag/etc/wsdl.xml index c7d114736c7..b491da79098 100644 --- a/app/code/core/Mage/Tag/etc/wsdl.xml +++ b/app/code/core/Mage/Tag/etc/wsdl.xml @@ -1,9 +1,9 @@ - + name="OpenMage" targetNamespace="urn:OpenMage"> - + @@ -125,10 +125,10 @@ - + - + @@ -137,10 +137,10 @@ - + - + @@ -149,10 +149,10 @@ - + - + @@ -161,10 +161,10 @@ - + - + @@ -173,15 +173,15 @@ - + - + - + diff --git a/app/code/core/Mage/Tag/etc/wsi.xml b/app/code/core/Mage/Tag/etc/wsi.xml index 615e2a44583..501967b5297 100644 --- a/app/code/core/Mage/Tag/etc/wsi.xml +++ b/app/code/core/Mage/Tag/etc/wsi.xml @@ -1,14 +1,14 @@ - + name="OpenMage" + targetNamespace="urn:OpenMage"> - + @@ -254,7 +254,7 @@ - + From 0fe01a39e11ada0350a6ad3650eaeb39a54aa46b Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Wed, 13 Jul 2022 12:21:07 +0200 Subject: [PATCH 18/61] rebased --- app/code/core/Mage/Adminhtml/Block/Backup.php | 117 ----- .../Mage/Adminhtml/Block/Backup/Dialogs.php | 53 --- .../core/Mage/Adminhtml/Block/Backup/Grid.php | 141 ------ .../Adminhtml/Block/System/Store/Delete.php | 99 ----- .../Block/System/Store/Delete/Form.php | 80 ---- .../Block/System/Store/Delete/Group.php | 70 --- .../Block/System/Store/Delete/Website.php | 71 ---- .../Adminhtml/Block/System/Store/Edit.php | 16 +- .../controllers/System/BackupController.php | 386 ----------------- .../controllers/System/StoreController.php | 41 -- app/code/core/Mage/Backup/Exception.php | 29 -- app/code/core/Mage/Backup/Helper/Data.php | 323 -------------- app/code/core/Mage/Backup/Model/Backup.php | 402 ------------------ .../Mage/Backup/Model/Config/Backend/Cron.php | 90 ---- .../Mage/Backup/Model/Config/Source/Type.php | 52 --- app/code/core/Mage/Backup/Model/Db.php | 185 -------- .../core/Mage/Backup/Model/Fs/Collection.php | 93 ---- app/code/core/Mage/Backup/Model/Mysql4/Db.php | 38 -- app/code/core/Mage/Backup/Model/Observer.php | 95 ----- .../core/Mage/Backup/Model/Resource/Db.php | 316 -------------- .../Backup/Model/Resource/Helper/Mysql4.php | 322 -------------- app/code/core/Mage/Backup/etc/adminhtml.xml | 67 --- app/code/core/Mage/Backup/etc/config.xml | 73 ---- app/code/core/Mage/Backup/etc/system.xml | 94 ---- .../core_setup/upgrade-1.6.0.7-1.6.0.8.php | 41 -- .../default/template/backup/dialogs.phtml | 198 --------- .../default/template/backup/left.phtml | 27 -- .../default/template/backup/list.phtml | 40 -- app/etc/modules/Mage_All.xml | 7 - app/locale/en_US/Mage_Backup.csv | 55 --- js/mage/adminhtml/backup.js | 193 --------- lib/Mage/Backup.php | 59 --- lib/Mage/Backup/Abstract.php | 318 -------------- lib/Mage/Backup/Archive/Tar.php | 82 ---- lib/Mage/Backup/Db.php | 119 ------ lib/Mage/Backup/Exception.php | 36 -- .../Backup/Exception/CantLoadSnapshot.php | 36 -- .../Backup/Exception/FtpConnectionFailed.php | 36 -- .../Backup/Exception/FtpValidationFailed.php | 36 -- .../Backup/Exception/NotEnoughFreeSpace.php | 36 -- .../Backup/Exception/NotEnoughPermissions.php | 36 -- lib/Mage/Backup/Filesystem.php | 284 ------------- lib/Mage/Backup/Filesystem/Helper.php | 141 ------ lib/Mage/Backup/Filesystem/Iterator/File.php | 112 ----- .../Backup/Filesystem/Iterator/Filter.php | 77 ---- .../Backup/Filesystem/Rollback/Abstract.php | 57 --- lib/Mage/Backup/Filesystem/Rollback/Fs.php | 78 ---- lib/Mage/Backup/Filesystem/Rollback/Ftp.php | 198 --------- lib/Mage/Backup/Interface.php | 88 ---- lib/Mage/Backup/Media.php | 99 ----- lib/Mage/Backup/Nomedia.php | 82 ---- lib/Mage/Backup/Snapshot.php | 140 ------ 52 files changed, 8 insertions(+), 5956 deletions(-) delete mode 100644 app/code/core/Mage/Adminhtml/Block/Backup.php delete mode 100644 app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php delete mode 100644 app/code/core/Mage/Adminhtml/Block/Backup/Grid.php delete mode 100644 app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php delete mode 100644 app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php delete mode 100644 app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php delete mode 100644 app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php delete mode 100644 app/code/core/Mage/Adminhtml/controllers/System/BackupController.php delete mode 100644 app/code/core/Mage/Backup/Exception.php delete mode 100644 app/code/core/Mage/Backup/Helper/Data.php delete mode 100644 app/code/core/Mage/Backup/Model/Backup.php delete mode 100644 app/code/core/Mage/Backup/Model/Config/Backend/Cron.php delete mode 100644 app/code/core/Mage/Backup/Model/Config/Source/Type.php delete mode 100644 app/code/core/Mage/Backup/Model/Db.php delete mode 100644 app/code/core/Mage/Backup/Model/Fs/Collection.php delete mode 100644 app/code/core/Mage/Backup/Model/Mysql4/Db.php delete mode 100644 app/code/core/Mage/Backup/Model/Observer.php delete mode 100644 app/code/core/Mage/Backup/Model/Resource/Db.php delete mode 100644 app/code/core/Mage/Backup/Model/Resource/Helper/Mysql4.php delete mode 100644 app/code/core/Mage/Backup/etc/adminhtml.xml delete mode 100644 app/code/core/Mage/Backup/etc/config.xml delete mode 100644 app/code/core/Mage/Backup/etc/system.xml delete mode 100644 app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.7-1.6.0.8.php delete mode 100644 app/design/adminhtml/default/default/template/backup/dialogs.phtml delete mode 100644 app/design/adminhtml/default/default/template/backup/left.phtml delete mode 100644 app/design/adminhtml/default/default/template/backup/list.phtml delete mode 100644 app/locale/en_US/Mage_Backup.csv delete mode 100644 js/mage/adminhtml/backup.js delete mode 100644 lib/Mage/Backup.php delete mode 100644 lib/Mage/Backup/Abstract.php delete mode 100644 lib/Mage/Backup/Archive/Tar.php delete mode 100644 lib/Mage/Backup/Db.php delete mode 100644 lib/Mage/Backup/Exception.php delete mode 100644 lib/Mage/Backup/Exception/CantLoadSnapshot.php delete mode 100644 lib/Mage/Backup/Exception/FtpConnectionFailed.php delete mode 100644 lib/Mage/Backup/Exception/FtpValidationFailed.php delete mode 100644 lib/Mage/Backup/Exception/NotEnoughFreeSpace.php delete mode 100644 lib/Mage/Backup/Exception/NotEnoughPermissions.php delete mode 100644 lib/Mage/Backup/Filesystem.php delete mode 100644 lib/Mage/Backup/Filesystem/Helper.php delete mode 100644 lib/Mage/Backup/Filesystem/Iterator/File.php delete mode 100644 lib/Mage/Backup/Filesystem/Iterator/Filter.php delete mode 100644 lib/Mage/Backup/Filesystem/Rollback/Abstract.php delete mode 100644 lib/Mage/Backup/Filesystem/Rollback/Fs.php delete mode 100644 lib/Mage/Backup/Filesystem/Rollback/Ftp.php delete mode 100644 lib/Mage/Backup/Interface.php delete mode 100644 lib/Mage/Backup/Media.php delete mode 100644 lib/Mage/Backup/Nomedia.php delete mode 100644 lib/Mage/Backup/Snapshot.php diff --git a/app/code/core/Mage/Adminhtml/Block/Backup.php b/app/code/core/Mage/Adminhtml/Block/Backup.php deleted file mode 100644 index 48b44ee040d..00000000000 --- a/app/code/core/Mage/Adminhtml/Block/Backup.php +++ /dev/null @@ -1,117 +0,0 @@ - - */ -class Mage_Adminhtml_Block_Backup extends Mage_Adminhtml_Block_Template -{ - /** - * Block's template - * - * @var string - */ - protected $_template = 'backup/list.phtml'; - - protected function _prepareLayout() - { - parent::_prepareLayout(); - $this->setChild('createButton', - $this->getLayout()->createBlock('adminhtml/widget_button') - ->setData(array( - 'label' => Mage::helper('backup')->__('Database Backup'), - 'onclick' => "return backup.backup('" . Mage_Backup_Helper_Data::TYPE_DB . "')", - 'class' => 'task' - )) - ); - $this->setChild('createSnapshotButton', - $this->getLayout()->createBlock('adminhtml/widget_button') - ->setData(array( - 'label' => Mage::helper('backup')->__('System Backup'), - 'onclick' => "return backup.backup('" . Mage_Backup_Helper_Data::TYPE_SYSTEM_SNAPSHOT . "')", - 'class' => '' - )) - ); - $this->setChild('createMediaBackupButton', - $this->getLayout()->createBlock('adminhtml/widget_button') - ->setData(array( - 'label' => Mage::helper('backup')->__('Database and Media Backup'), - 'onclick' => "return backup.backup('" . Mage_Backup_Helper_Data::TYPE_MEDIA . "')", - 'class' => '' - )) - ); - $this->setChild('backupsGrid', - $this->getLayout()->createBlock('adminhtml/backup_grid') - ); - - $this->setChild('dialogs', $this->getLayout()->createBlock('adminhtml/backup_dialogs')); - return $this; - } - - public function getCreateButtonHtml() - { - return $this->getChildHtml('createButton'); - } - - /** - * Generate html code for "Create System Snapshot" button - * - * @return string - */ - public function getCreateSnapshotButtonHtml() - { - return $this->getChildHtml('createSnapshotButton'); - } - - /** - * Generate html code for "Create Media Backup" button - * - * @return string - */ - public function getCreateMediaBackupButtonHtml() - { - return $this->getChildHtml('createMediaBackupButton'); - } - - public function getGridHtml() - { - return $this->getChildHtml('backupsGrid'); - } - - /** - * Generate html code for pop-up messages that will appear when user click on "Rollback" link - * - * @return string - */ - public function getDialogsHtml() - { - return $this->getChildHtml('dialogs'); - } -} diff --git a/app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php b/app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php deleted file mode 100644 index f67d700f249..00000000000 --- a/app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php +++ /dev/null @@ -1,53 +0,0 @@ - - */ -class Mage_Adminhtml_Block_Backup_Dialogs extends Mage_Adminhtml_Block_Template -{ - /** - * Block's template - * - * @var string - */ - protected $_template = 'backup/dialogs.phtml'; - - /** - * Include backup.js file in page before rendering - * - * @see Mage_Core_Block_Abstract::_prepareLayout() - */ - protected function _prepareLayout() - { - $this->getLayout()->getBlock('head')->addJs('mage/adminhtml/backup.js'); - return parent::_prepareLayout(); - } -} diff --git a/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php b/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php deleted file mode 100644 index b4b8e40c122..00000000000 --- a/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php +++ /dev/null @@ -1,141 +0,0 @@ - - */ -class Mage_Adminhtml_Block_Backup_Grid extends Mage_Adminhtml_Block_Widget_Grid -{ - - protected function _construct() - { - $this->setSaveParametersInSession(true); - $this->setId('backupsGrid'); - $this->setDefaultSort('time', 'desc'); - } - - /** - * Init backups collection - */ - protected function _prepareCollection() - { - $collection = Mage::getSingleton('backup/fs_collection'); - $this->setCollection($collection); - return parent::_prepareCollection(); - } - - /** - * Prepare mass action controls - * - * @return $this - */ - protected function _prepareMassaction() - { - $this->setMassactionIdField('id'); - $this->getMassactionBlock()->setFormFieldName('ids'); - - $this->getMassactionBlock()->addItem('delete', array( - 'label'=> Mage::helper('adminhtml')->__('Delete'), - 'url' => $this->getUrl('*/*/massDelete'), - 'confirm' => Mage::helper('backup')->__('Are you sure you want to delete the selected backup(s)?') - )); - - return $this; - } - - /** - * Configuration of grid - * - * @return $this - */ - protected function _prepareColumns() - { - $url7zip = Mage::helper('adminhtml')->__('The archive can be uncompressed with %s on Windows systems', 'http://www.7-zip.org/', '7-Zip'); - - $this->addColumn('time', array( - 'header' => Mage::helper('backup')->__('Time'), - 'index' => 'date_object', - 'type' => 'datetime', - 'width' => 200 - )); - - $this->addColumn('display_name', array( - 'header' => Mage::helper('backup')->__('Name'), - 'index' => 'display_name', - 'filter' => false, - 'sortable' => true, - 'width' => 350 - )); - - $this->addColumn('size', array( - 'header' => Mage::helper('backup')->__('Size, Bytes'), - 'index' => 'size', - 'type' => 'number', - 'sortable' => true, - 'filter' => false - )); - - $this->addColumn('type', array( - 'header' => Mage::helper('backup')->__('Type'), - 'type' => 'options', - 'options' => Mage::helper('backup')->getBackupTypes(), - 'index' => 'type', - 'width' => 300 - )); - - $this->addColumn('download', array( - 'header' => Mage::helper('backup')->__('Download'), - 'format' => '$extension   ('.$url7zip.')', - 'index' => 'type', - 'sortable' => false, - 'filter' => false - )); - - if (Mage::helper('backup')->isRollbackAllowed()){ - $this->addColumn('action', array( - 'header' => Mage::helper('backup')->__('Action'), - 'type' => 'action', - 'width' => '80px', - 'filter' => false, - 'actions' => array(array( - 'url' => '#', - 'caption' => Mage::helper('backup')->__('Rollback'), - 'onclick' => 'return backup.rollback(\'$type\', \'$time\');' - )), - 'index' => 'type', - 'sortable' => false - )); - } - - return $this; - } - -} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php deleted file mode 100644 index 89747840dc4..00000000000 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php +++ /dev/null @@ -1,99 +0,0 @@ - - */ -class Mage_Adminhtml_Block_System_Store_Delete extends Mage_Adminhtml_Block_Widget_Form_Container -{ - - /** - * Class constructor - * - */ - public function __construct() - { - $this->_objectId = 'item_id'; - $this->_mode = 'delete'; - $this->_controller = 'system_store'; - - parent::__construct(); - - $this->_removeButton('save'); - $this->_removeButton('reset'); - - $this->_updateButton('delete', 'area', 'footer'); - $this->_updateButton('delete', 'onclick', 'editForm.submit();'); - - $this->_addButton('cancel', array( - 'label' => Mage::helper('adminhtml')->__('Cancel'), - 'onclick' => 'setLocation(\'' . $this->getBackUrl() . '\')', - ), 2, 100, 'footer'); - - } - - /** - * Get edit form container header text - * - * @return string - */ - public function getHeaderText() - { - return Mage::helper('adminhtml')->__("Delete %s '%s'", $this->getStoreTypeTitle(), $this->escapeHtml($this->getChild('form')->getDataObject()->getName())); - } - - /** - * Set store type title - * - * @param string $title - * @return $this - */ - public function setStoreTypeTitle($title) - { - $this->_updateButton('delete', 'label', Mage::helper('adminhtml')->__('Delete %s', $title)); - return $this->setData('store_type_title', $title); - } - - /** - * Set back URL for "Cancel" and "Back" buttons - * - * @param string $url - * @return $this - */ - public function setBackUrl($url) - { - $this->setData('back_url', $url); - $this->_updateButton('cancel', 'onclick', "setLocation('" . $url . "')"); - $this->_updateButton('back', 'onclick', "setLocation('" . $url . "')"); - return $this; - } - -} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php deleted file mode 100644 index af126a7e191..00000000000 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php +++ /dev/null @@ -1,80 +0,0 @@ - - */ -class Mage_Adminhtml_Block_System_Store_Delete_Form extends Mage_Adminhtml_Block_Widget_Form -{ - - /** - * Init form - */ - public function __construct() - { - parent::__construct(); - $this->setId('store_delete_form'); - $this->setTitle(Mage::helper('cms')->__('Block Information')); - } - - protected function _prepareForm() - { - $dataObject = $this->getDataObject(); - - $form = new Varien_Data_Form(array('id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post')); - - $form->setHtmlIdPrefix('store_'); - - $fieldset = $form->addFieldset('base_fieldset', array('legend' => Mage::helper('core')->__('Backup Options'), 'class' => 'fieldset-wide')); - - $fieldset->addField('item_id', 'hidden', array( - 'name' => 'item_id', - 'value' => $dataObject->getId(), - )); - - $fieldset->addField('create_backup', 'select', array( - 'label' => Mage::helper('adminhtml')->__('Create DB Backup'), - 'title' => Mage::helper('adminhtml')->__('Create DB Backup'), - 'name' => 'create_backup', - 'options' => array( - '1' => Mage::helper('adminhtml')->__('Yes'), - '0' => Mage::helper('adminhtml')->__('No'), - ), - 'value' => '1', - )); - - $form->setUseContainer(true); - $this->setForm($form); - - return parent::_prepareForm(); - } - -} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php deleted file mode 100644 index a4275b1fdf2..00000000000 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php +++ /dev/null @@ -1,70 +0,0 @@ - - */ - -class Mage_Adminhtml_Block_System_Store_Delete_Group extends Mage_Adminhtml_Block_Template -{ - protected function _prepareLayout() - { - $itemId = $this->getRequest()->getParam('group_id'); - - $this->setTemplate('system/store/delete_group.phtml'); - $this->setAction($this->getUrl('*/*/deleteGroupPost', array('group_id'=>$itemId))); - $this->setChild('confirm_deletion_button', - $this->getLayout()->createBlock('adminhtml/widget_button') - ->setData(array( - 'label' => Mage::helper('core')->__('Delete Store'), - 'onclick' => "deleteForm.submit()", - 'class' => 'cancel' - )) - ); - $onClick = "setLocation('".$this->getUrl('*/*/editGroup', array('group_id'=>$itemId))."')"; - $this->setChild('cancel_button', - $this->getLayout()->createBlock('adminhtml/widget_button') - ->setData(array( - 'label' => Mage::helper('core')->__('Cancel'), - 'onclick' => $onClick, - 'class' => 'cancel' - )) - ); - $this->setChild('back_button', - $this->getLayout()->createBlock('adminhtml/widget_button') - ->setData(array( - 'label' => Mage::helper('core')->__('Back'), - 'onclick' => $onClick, - 'class' => 'cancel' - )) - ); - return parent::_prepareLayout(); - } -} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php deleted file mode 100644 index db60e9f1fe0..00000000000 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php +++ /dev/null @@ -1,71 +0,0 @@ - - */ -class Mage_Adminhtml_Block_System_Store_Delete_Website extends Mage_Adminhtml_Block_Template -{ - - protected function _prepareLayout() - { - $itemId = $this->getRequest()->getParam('website_id'); - - $this->setTemplate('system/store/delete_website.phtml'); - $this->setAction($this->getUrl('*/*/deleteWebsitePost', array('website_id'=>$itemId))); - $this->setChild('confirm_deletion_button', - $this->getLayout()->createBlock('adminhtml/widget_button') - ->setData(array( - 'label' => Mage::helper('core')->__('Delete Website'), - 'onclick' => "deleteForm.submit()", - 'class' => 'cancel' - )) - ); - $onClick = "setLocation('".$this->getUrl('*/*/editWebsite', array('website_id'=>$itemId))."')"; - $this->setChild('cancel_button', - $this->getLayout()->createBlock('adminhtml/widget_button') - ->setData(array( - 'label' => Mage::helper('core')->__('Cancel'), - 'onclick' => $onClick, - 'class' => 'cancel' - )) - ); - $this->setChild('back_button', - $this->getLayout()->createBlock('adminhtml/widget_button') - ->setData(array( - 'label' => Mage::helper('core')->__('Back'), - 'onclick' => $onClick, - 'class' => 'cancel' - )) - ); - return parent::_prepareLayout(); - } - -} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php index 888293dbbf6..d8b04ea2531 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php @@ -40,28 +40,24 @@ class Mage_Adminhtml_Block_System_Store_Edit extends Mage_Adminhtml_Block_Widget */ public function __construct() { - $backupAvailable = - Mage::getSingleton('admin/session')->isAllowed('system/tools/backup') - && Mage::helper('core')->isModuleEnabled('Mage_Backup') - && !Mage::getStoreConfigFlag('advanced/modules_disable_output/Mage_Backup'); switch (Mage::registry('store_type')) { case 'website': $this->_objectId = 'website_id'; $saveLabel = Mage::helper('core')->__('Save Website'); $deleteLabel = Mage::helper('core')->__('Delete Website'); - $deleteUrl = $this->_getDeleteUrl(Mage::registry('store_type'), $backupAvailable); + $deleteUrl = $this->_getDeleteUrl(Mage::registry('store_type')); break; case 'group': $this->_objectId = 'group_id'; $saveLabel = Mage::helper('core')->__('Save Store'); $deleteLabel = Mage::helper('core')->__('Delete Store'); - $deleteUrl = $this->_getDeleteUrl(Mage::registry('store_type'), $backupAvailable); + $deleteUrl = $this->_getDeleteUrl(Mage::registry('store_type')); break; case 'store': $this->_objectId = 'store_id'; $saveLabel = Mage::helper('core')->__('Save Store View'); $deleteLabel = Mage::helper('core')->__('Delete Store View'); - $deleteUrl = $this->_getDeleteUrl(Mage::registry('store_type'), $backupAvailable); + $deleteUrl = $this->_getDeleteUrl(Mage::registry('store_type')); break; } $this->_controller = 'system_store'; @@ -70,7 +66,11 @@ public function __construct() $this->_updateButton('save', 'label', $saveLabel); $this->_updateButton('delete', 'label', $deleteLabel); - $this->_updateButton('delete', 'onclick', 'setLocation(\''.$deleteUrl.'\');'); + $this->_updateButton('delete', 'onclick', 'deleteConfirm(\'' + . Mage::helper('core')->jsQuoteEscape( + Mage::helper('adminhtml')->__('Are you sure you want to do this?') + ) + .'\', \'' . $deleteUrl . '\')'); if (!Mage::registry('store_data')->isCanDelete()) { $this->_removeButton('delete'); diff --git a/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php b/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php deleted file mode 100644 index 6ab8c45189f..00000000000 --- a/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php +++ /dev/null @@ -1,386 +0,0 @@ - - */ -class Mage_Adminhtml_System_BackupController extends Mage_Adminhtml_Controller_Action -{ - /** - * Controller predispatch method - * - * @return Mage_Adminhtml_Controller_Action - */ - public function preDispatch() - { - $this->_setForcedFormKeyActions(array('create', 'massDelete')); - return parent::preDispatch(); - } - - /** - * Backup list action - */ - public function indexAction() - { - $this->_title($this->__('System'))->_title($this->__('Tools'))->_title($this->__('Backups')); - - if($this->getRequest()->getParam('ajax')) { - $this->_forward('grid'); - return; - } - - $this->loadLayout(); - $this->_setActiveMenu('system'); - $this->_addBreadcrumb(Mage::helper('adminhtml')->__('System'), Mage::helper('adminhtml')->__('System')); - $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Tools'), Mage::helper('adminhtml')->__('Tools')); - $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Backups'), Mage::helper('adminhtml')->__('Backup')); - - $this->_addContent($this->getLayout()->createBlock('adminhtml/backup', 'backup')); - - $this->renderLayout(); - } - - /** - * Backup list action - */ - public function gridAction() - { - $this->getResponse()->setBody($this->getLayout()->createBlock('adminhtml/backup_grid')->toHtml()); - } - - /** - * Create backup action - * - * @return Mage_Adminhtml_Controller_Action - */ - public function createAction() - { - if (!$this->getRequest()->isAjax()) { - return $this->getUrl('*/*/index'); - } - - $response = new Varien_Object(); - - /** - * @var Mage_Backup_Helper_Data $helper - */ - $helper = Mage::helper('backup'); - - try { - $type = $this->getRequest()->getParam('type'); - - if ($type == Mage_Backup_Helper_Data::TYPE_SYSTEM_SNAPSHOT - && $this->getRequest()->getParam('exclude_media') - ) { - $type = Mage_Backup_Helper_Data::TYPE_SNAPSHOT_WITHOUT_MEDIA; - } - - $backupManager = Mage_Backup::getBackupInstance($type) - ->setBackupExtension($helper->getExtensionByType($type)) - ->setTime(time()) - ->setBackupsDir($helper->getBackupsDir()); - - $backupManager->setName($this->getRequest()->getParam('backup_name')); - - Mage::register('backup_manager', $backupManager); - - if ($this->getRequest()->getParam('maintenance_mode')) { - $turnedOn = $helper->turnOnMaintenanceMode(); - - if (!$turnedOn) { - $response->setError( - Mage::helper('backup')->__('You do not have sufficient permissions to enable Maintenance Mode during this operation.') - . ' ' . Mage::helper('backup')->__('Please either unselect the "Put store on the maintenance mode" checkbox or update your permissions to proceed with the backup."') - ); - $backupManager->setErrorMessage(Mage::helper('backup')->__("System couldn't put store on the maintenance mode")); - return $this->getResponse()->setBody($response->toJson()); - } - } - - if ($type != Mage_Backup_Helper_Data::TYPE_DB) { - $backupManager->setRootDir(Mage::getBaseDir()) - ->addIgnorePaths($helper->getBackupIgnorePaths()); - } - - $successMessage = $helper->getCreateSuccessMessageByType($type); - - $backupManager->create(); - - $this->_getSession()->addSuccess($successMessage); - - $response->setRedirectUrl($this->getUrl('*/*/index')); - } catch (Mage_Backup_Exception_NotEnoughFreeSpace $e) { - $errorMessage = Mage::helper('backup')->__('Not enough free space to create backup.'); - } catch (Mage_Backup_Exception_NotEnoughPermissions $e) { - Mage::log($e->getMessage()); - $errorMessage = Mage::helper('backup')->__('Not enough permissions to create backup.'); - } catch (Exception $e) { - Mage::log($e->getMessage()); - $errorMessage = Mage::helper('backup')->__('An error occurred while creating the backup.'); - } - - if (!empty($errorMessage)) { - $response->setError($errorMessage); - $backupManager->setErrorMessage($errorMessage); - } - - if ($this->getRequest()->getParam('maintenance_mode')) { - $helper->turnOffMaintenanceMode(); - } - - $this->getResponse()->setBody($response->toJson()); - } - - /** - * Download backup action - * - * @return Mage_Adminhtml_Controller_Action - */ - public function downloadAction() - { - /* @var $backup Mage_Backup_Model_Backup */ - $backup = Mage::getModel('backup/backup')->loadByTimeAndType( - $this->getRequest()->getParam('time'), - $this->getRequest()->getParam('type') - ); - - if (!$backup->getTime() || !$backup->exists()) { - return $this->_redirect('*/*'); - } - - $fileName = Mage::helper('backup')->generateBackupDownloadName($backup); - - $this->_prepareDownloadResponse($fileName, null, 'application/octet-stream', $backup->getSize()); - - $this->getResponse()->sendHeaders(); - - $backup->output(); - exit(); - } - - /** - * Rollback Action - * - * @return Mage_Adminhtml_Controller_Action - */ - public function rollbackAction() - { - if (!Mage::helper('backup')->isRollbackAllowed()){ - return $this->_forward('denied'); - } - - if (!$this->getRequest()->isAjax()) { - return $this->getUrl('*/*/index'); - } - - $helper = Mage::helper('backup'); - $response = new Varien_Object(); - - try { - /* @var $backup Mage_Backup_Model_Backup */ - $backup = Mage::getModel('backup/backup')->loadByTimeAndType( - $this->getRequest()->getParam('time'), - $this->getRequest()->getParam('type') - ); - - if (!$backup->getTime() || !$backup->exists()) { - return $this->_redirect('*/*'); - } - - if (!$backup->getTime()) { - throw new Mage_Backup_Exception_CantLoadSnapshot(); - } - - $type = $backup->getType(); - - $backupManager = Mage_Backup::getBackupInstance($type) - ->setBackupExtension($helper->getExtensionByType($type)) - ->setTime($backup->getTime()) - ->setBackupsDir($helper->getBackupsDir()) - ->setName($backup->getName(), false) - ->setResourceModel(Mage::getResourceModel('backup/db')); - - Mage::register('backup_manager', $backupManager); - - $passwordValid = Mage::getModel('backup/backup')->validateUserPassword( - $this->getRequest()->getParam('password') - ); - - if (!$passwordValid) { - $response->setError(Mage::helper('backup')->__('Invalid Password.')); - $backupManager->setErrorMessage(Mage::helper('backup')->__('Invalid Password.')); - return $this->getResponse()->setBody($response->toJson()); - } - - if ($this->getRequest()->getParam('maintenance_mode')) { - $turnedOn = $helper->turnOnMaintenanceMode(); - - if (!$turnedOn) { - $response->setError( - Mage::helper('backup')->__('You do not have sufficient permissions to enable Maintenance Mode during this operation.') - . ' ' . Mage::helper('backup')->__('Please either unselect the "Put store on the maintenance mode" checkbox or update your permissions to proceed with the rollback."') - ); - $backupManager->setErrorMessage(Mage::helper('backup')->__("System couldn't put store on the maintenance mode")); - return $this->getResponse()->setBody($response->toJson()); - } - } - - if ($type != Mage_Backup_Helper_Data::TYPE_DB) { - - $backupManager->setRootDir(Mage::getBaseDir()) - ->addIgnorePaths($helper->getRollbackIgnorePaths()); - - if ($this->getRequest()->getParam('use_ftp', false)) { - $backupManager->setUseFtp( - $this->getRequest()->getParam('ftp_host', ''), - $this->getRequest()->getParam('ftp_user', ''), - $this->getRequest()->getParam('ftp_pass', ''), - $this->getRequest()->getParam('ftp_path', '') - ); - } - } - - $backupManager->rollback(); - - $helper->invalidateCache()->invalidateIndexer(); - - $adminSession = $this->_getSession(); - $adminSession->unsetAll(); - $adminSession->getCookie()->delete($adminSession->getSessionName()); - - $response->setRedirectUrl($this->getUrl('*')); - } catch (Mage_Backup_Exception_CantLoadSnapshot $e) { - $errorMsg = Mage::helper('backup')->__('Backup file not found'); - } catch (Mage_Backup_Exception_FtpConnectionFailed $e) { - $errorMsg = Mage::helper('backup')->__('Failed to connect to FTP'); - } catch (Mage_Backup_Exception_FtpValidationFailed $e) { - $errorMsg = Mage::helper('backup')->__('Failed to validate FTP'); - } catch (Mage_Backup_Exception_NotEnoughPermissions $e) { - Mage::log($e->getMessage()); - $errorMsg = Mage::helper('backup')->__('Not enough permissions to perform rollback'); - } catch (Exception $e) { - Mage::log($e->getMessage()); - $errorMsg = Mage::helper('backup')->__('Failed to rollback'); - } - - if (!empty($errorMsg)) { - $response->setError($errorMsg); - $backupManager->setErrorMessage($errorMsg); - } - - if ($this->getRequest()->getParam('maintenance_mode')) { - $helper->turnOffMaintenanceMode(); - } - - $this->getResponse()->setBody($response->toJson()); - } - - /** - * Delete backups mass action - * - * @return Mage_Adminhtml_Controller_Action - */ - public function massDeleteAction() - { - $backupIds = $this->getRequest()->getParam('ids', array()); - - if (!is_array($backupIds) || !count($backupIds)) { - return $this->_redirect('*/*/index'); - } - - /** @var Mage_Backup_Model_Backup $backupModel */ - $backupModel = Mage::getModel('backup/backup'); - $resultData = new Varien_Object(); - $resultData->setIsSuccess(false); - $resultData->setDeleteResult(array()); - Mage::register('backup_manager', $resultData); - - $deleteFailMessage = Mage::helper('backup')->__('Failed to delete one or several backups.'); - - try { - $allBackupsDeleted = true; - - foreach ($backupIds as $id) { - list($time, $type) = explode('_', $id); - $backupModel - ->loadByTimeAndType($time, $type) - ->deleteFile(); - - if ($backupModel->exists()) { - $allBackupsDeleted = false; - $result = Mage::helper('adminhtml')->__('failed'); - } else { - $result = Mage::helper('adminhtml')->__('successful'); - } - - $resultData->setDeleteResult( - array_merge($resultData->getDeleteResult(), array($backupModel->getFileName() . ' ' . $result)) - ); - } - - $resultData->setIsSuccess(true); - if ($allBackupsDeleted) { - $this->_getSession()->addSuccess( - Mage::helper('backup')->__('The selected backup(s) has been deleted.') - ); - } - else { - throw new Exception($deleteFailMessage); - } - } catch (Exception $e) { - $resultData->setIsSuccess(false); - $this->_getSession()->addError($deleteFailMessage); - } - - return $this->_redirect('*/*/index'); - } - - /** - * Check Permissions for all actions - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/tools/backup') - && Mage::helper('core')->isModuleEnabled('Mage_Backup') - && !Mage::getStoreConfigFlag('advanced/modules_disable_output/Mage_Backup'); - } - - /** - * Retrieve adminhtml session model - * - * @return Mage_Adminhtml_Model_Session - */ - protected function _getSession() - { - return Mage::getSingleton('adminhtml/session'); - } -} diff --git a/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php b/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php index 684f38e23c2..03684814533 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php @@ -368,8 +368,6 @@ public function deleteWebsitePostAction() return ; } - $this->_backupDatabase('*/*/editWebsite', array('website_id' => $itemId)); - try { $model->delete(); $this->_getSession()->addSuccess(Mage::helper('core')->__('The website has been deleted.')); @@ -400,8 +398,6 @@ public function deleteGroupPostAction() return ; } - $this->_backupDatabase('*/*/editGroup', array('group_id' => $itemId)); - try { $model->delete(); $this->_getSession()->addSuccess(Mage::helper('core')->__('The store has been deleted.')); @@ -436,8 +432,6 @@ public function deleteStorePostAction() return ; } - $this->_backupDatabase('*/*/editStore', array('store_id' => $itemId)); - try { $model->delete(); @@ -461,41 +455,6 @@ protected function _isAllowed() return Mage::getSingleton('admin/session')->isAllowed('system/store'); } - /** - * Backup database - * - * @param string $failPath redirect path if backup failed - * @param array $arguments - * @return $this - */ - protected function _backupDatabase($failPath, $arguments=array()) - { - if (! $this->getRequest()->getParam('create_backup')) { - return $this; - } - try { - $backupDb = Mage::getModel('backup/db'); - $backup = Mage::getModel('backup/backup') - ->setTime(time()) - ->setType('db') - ->setPath(Mage::getBaseDir('var') . DS . 'backups'); - - $backupDb->createBackup($backup); - $this->_getSession()->addSuccess(Mage::helper('backup')->__('Database was successfuly backed up.')); - } - catch (Mage_Core_Exception $e) { - $this->_getSession()->addError($e->getMessage()); - $this->_redirect($failPath, $arguments); - return ; - } - catch (Exception $e) { - $this->_getSession()->addException($e, Mage::helper('backup')->__('Unable to create backup. Please, try again later.')); - $this->_redirect($failPath, $arguments); - return ; - } - return $this; - } - /** * Add notification on deleting store / store view / website * diff --git a/app/code/core/Mage/Backup/Exception.php b/app/code/core/Mage/Backup/Exception.php deleted file mode 100644 index 55cd36caa4a..00000000000 --- a/app/code/core/Mage/Backup/Exception.php +++ /dev/null @@ -1,29 +0,0 @@ - $this->__('Database'), - self::TYPE_MEDIA => $this->__('Database and Media'), - self::TYPE_SYSTEM_SNAPSHOT => $this->__('System'), - self::TYPE_SNAPSHOT_WITHOUT_MEDIA => $this->__('System (excluding Media)') - ); - } - - /** - * Get all possible backup type values - * - * @return array - */ - public function getBackupTypesList() - { - return array( - self::TYPE_DB, - self::TYPE_SYSTEM_SNAPSHOT, - self::TYPE_SNAPSHOT_WITHOUT_MEDIA, - self::TYPE_MEDIA - ); - } - - /** - * Get default backup type value - * - * @return string - */ - public function getDefaultBackupType() - { - return self::TYPE_DB; - } - - /** - * Get directory path where backups stored - * - * @return string - */ - public function getBackupsDir() - { - return Mage::getBaseDir('var') . DS . 'backups'; - } - - /** - * Get backup file extension by backup type - * - * @param string $type - * @return string - */ - public function getExtensionByType($type) - { - $extensions = $this->getExtensions(); - return isset($extensions[$type]) ? $extensions[$type] : ''; - } - - /** - * Get all types to extensions map - * - * @return array - */ - public function getExtensions() - { - return array( - self::TYPE_SYSTEM_SNAPSHOT => 'tgz', - self::TYPE_SNAPSHOT_WITHOUT_MEDIA => 'tgz', - self::TYPE_MEDIA => 'tgz', - self::TYPE_DB => 'gz' - ); - } - - /** - * Generate backup download name - * - * @param Mage_Backup_Model_Backup $backup - * @return string - */ - public function generateBackupDownloadName(Mage_Backup_Model_Backup $backup) - { - $additionalExtension = $backup->getType() == self::TYPE_DB ? '.sql' : ''; - return $backup->getType() . '-' . date('YmdHis', $backup->getTime()) . $additionalExtension . '.' - . $this->getExtensionByType($backup->getType()); - } - - /** - * Check Permission for Rollback - * - * @return boolean - */ - public function isRollbackAllowed(){ - return Mage::getSingleton('admin/session')->isAllowed('system/tools/backup/rollback' ); - } - - /** - * Get paths that should be ignored when creating system snapshots - * - * @return array - */ - public function getBackupIgnorePaths() - { - return array( - '.svn', - 'maintenance.flag', - Mage::getBaseDir('var') . DS . 'session', - Mage::getBaseDir('var') . DS . 'cache', - Mage::getBaseDir('var') . DS . 'full_page_cache', - Mage::getBaseDir('var') . DS . 'locks', - Mage::getBaseDir('var') . DS . 'log', - Mage::getBaseDir('var') . DS . 'report' - ); - } - - /** - * Get paths that should be ignored when rolling back system snapshots - * - * @return array - */ - public function getRollbackIgnorePaths() - { - return array( - '.svn', - 'maintenance.flag', - Mage::getBaseDir('var') . DS . 'session', - Mage::getBaseDir('var') . DS . 'locks', - Mage::getBaseDir('var') . DS . 'log', - Mage::getBaseDir('var') . DS . 'report', - Mage::getBaseDir('app') . DS . 'Mage.php', - Mage::getBaseDir() . DS . 'errors', - Mage::getBaseDir() . DS . 'index.php' - ); - } - - /** - * Put store into maintenance mode - * - * @return bool - */ - public function turnOnMaintenanceMode() - { - $maintenanceFlagFile = $this->getMaintenanceFlagFilePath(); - $result = file_put_contents($maintenanceFlagFile, 'maintenance'); - - return $result !== false; - } - - /** - * Turn off store maintenance mode - */ - public function turnOffMaintenanceMode() - { - $maintenanceFlagFile = $this->getMaintenanceFlagFilePath(); - @unlink($maintenanceFlagFile); - } - - /** - * Get backup create success message by backup type - * - * @param string $type - * @return string - */ - public function getCreateSuccessMessageByType($type) - { - $messagesMap = array( - self::TYPE_SYSTEM_SNAPSHOT => $this->__('The system backup has been created.'), - self::TYPE_SNAPSHOT_WITHOUT_MEDIA => $this->__('The system (excluding Media) backup has been created.'), - self::TYPE_MEDIA => $this->__('The database and media backup has been created.'), - self::TYPE_DB => $this->__('The database backup has been created.') - ); - - if (!isset($messagesMap[$type])) { - return; - } - - return $messagesMap[$type]; - } - - /** - * Get path to maintenance flag file - * - * @return string - */ - protected function getMaintenanceFlagFilePath() - { - return Mage::getBaseDir() . DS . 'maintenance.flag'; - } - - /** - * Invalidate Cache - * @return $this - */ - public function invalidateCache() - { - if ($cacheTypesNode = Mage::getConfig()->getNode(Mage_Core_Model_Cache::XML_PATH_TYPES)) { - $cacheTypesList = array_keys($cacheTypesNode->asArray()); - Mage::app()->getCacheInstance()->invalidateType($cacheTypesList); - } - return $this; - } - - /** - * Invalidate Indexer - * - * @return $this - */ - public function invalidateIndexer() - { - foreach (Mage::getResourceModel('index/process_collection') as $process){ - $process->changeStatus(Mage_Index_Model_Process::STATUS_REQUIRE_REINDEX); - } - return $this; - } - - /** - * Creates backup's display name from it's name - * - * @param string $name - * @return string - */ - public function nameToDisplayName($name) - { - return str_replace('_', ' ', $name); - } - - /** - * Extracts information from backup's filename - * - * @param string $filename - * @return Varien_Object - */ - public function extractDataFromFilename($filename) - { - $extensions = $this->getExtensions(); - - $filenameWithoutExtension = $filename; - - foreach ($extensions as $extension) { - $filenameWithoutExtension = preg_replace('/' . preg_quote($extension, '/') . '$/', '', - $filenameWithoutExtension - ); - } - - $filenameWithoutExtension = substr($filenameWithoutExtension, 0, strrpos($filenameWithoutExtension, ".")); - - list($time, $type) = explode("_", $filenameWithoutExtension); - - $name = str_replace($time . '_' . $type, '', $filenameWithoutExtension); - - if (!empty($name)) { - $name = substr($name, 1); - } - - $result = new Varien_Object(); - $result->addData(array( - 'name' => $name, - 'type' => $type, - 'time' => $time - )); - - return $result; - } -} diff --git a/app/code/core/Mage/Backup/Model/Backup.php b/app/code/core/Mage/Backup/Model/Backup.php deleted file mode 100644 index 467d88160d2..00000000000 --- a/app/code/core/Mage/Backup/Model/Backup.php +++ /dev/null @@ -1,402 +0,0 @@ - - */ -class Mage_Backup_Model_Backup extends Varien_Object -{ - /* internal constants */ - const COMPRESS_RATE = 9; - - /** - * Type of backup file - * - * @var string - */ - private $_type = 'db'; - - /** - * Gz file pointer - * - * @var resource - */ - protected $_handler = null; - - /** - * Load backup file info - * - * @param string fileName - * @param string filePath - * @return $this - */ - public function load($fileName, $filePath) - { - $backupData = Mage::helper('backup')->extractDataFromFilename($fileName); - - $this->addData(array( - 'id' => $filePath . DS . $fileName, - 'time' => (int)$backupData->getTime(), - 'path' => $filePath, - 'extension' => Mage::helper('backup')->getExtensionByType($backupData->getType()), - 'display_name' => Mage::helper('backup')->nameToDisplayName($backupData->getName()), - 'name' => $backupData->getName(), - 'date_object' => new Zend_Date((int)$backupData->getTime(), Mage::app()->getLocale()->getLocaleCode()) - )); - - $this->setType($backupData->getType()); - return $this; - } - - /** - * Checks backup file exists. - * - * @return boolean - */ - public function exists() - { - return is_file($this->getPath() . DS . $this->getFileName()); - } - - /** - * Return file name of backup file - * - * @return string - */ - public function getFileName() - { - $filename = $this->getTime() . "_" . $this->getType(); - $backupName = $this->getName(); - - if (!empty($backupName)) { - $filename .= '_' . $backupName; - } - - $filename .= '.' . Mage::helper('backup')->getExtensionByType($this->getType()); - - return $filename; - } - - /** - * Sets type of file - * - * @param string $value - * @return $this - */ - public function setType($value='db') - { - $possibleTypes = Mage::helper('backup')->getBackupTypesList(); - if(!in_array($value, $possibleTypes)) { - $value = Mage::helper('backup')->getDefaultBackupType(); - } - - $this->_type = $value; - $this->setData('type', $this->_type); - - return $this; - } - - /** - * Returns type of backup file - * - * @return string - */ - public function getType() - { - return $this->_type; - } - - /** - * Set the backup file content - * - * @param string $content - * @return $this - * @throws Mage_Backup_Exception - */ - public function setFile(&$content) - { - if (!$this->hasData('time') || !$this->hasData('type') || !$this->hasData('path')) { - Mage::throwException(Mage::helper('backup')->__('Wrong order of creation for new backup.')); - } - - $ioProxy = new Varien_Io_File(); - $ioProxy->setAllowCreateFolders(true); - $ioProxy->open(array('path'=>$this->getPath())); - - $compress = 0; - if (extension_loaded("zlib")) { - $compress = 1; - } - - $rawContent = ''; - if ( $compress ) { - $rawContent = gzcompress( $content, self::COMPRESS_RATE ); - } else { - $rawContent = $content; - } - - $fileHeaders = pack("ll", $compress, strlen($rawContent)); - $ioProxy->write($this->getFileName(), $fileHeaders . $rawContent); - return $this; - } - - /** - * Return content of backup file - * - * @todo rewrite to Varien_IO, but there no possibility read part of files. - * @return string - * @throws Mage_Backup_Exception - */ - public function &getFile() - { - - if (!$this->exists()) { - Mage::throwException(Mage::helper('backup')->__("Backup file does not exist.")); - } - - $fResource = @fopen($this->getPath() . DS . $this->getFileName(), "rb"); - if (!$fResource) { - Mage::throwException(Mage::helper('backup')->__("Cannot read backup file.")); - } - - $content = ''; - $compressed = 0; - - $info = unpack("lcompress/llength", fread($fResource, 8)); - if ($info['compress']) { // If file compressed by zlib - $compressed = 1; - } - - if ($compressed && !extension_loaded("zlib")) { - fclose($fResource); - Mage::throwException(Mage::helper('backup')->__('The file was compressed with Zlib, but this extension is not installed on server.')); - } - - if ($compressed) { - $content = gzuncompress(fread($fResource, $info['length'])); - } else { - $content = fread($fResource, $info['length']); - } - - fclose($fResource); - - return $content; - } - - /** - * Delete backup file - * - * @throws Mage_Backup_Exception - * @return $this - */ - public function deleteFile() - { - if (!$this->exists()) { - Mage::throwException(Mage::helper('backup')->__("Backup file does not exist.")); - } - - $ioProxy = new Varien_Io_File(); - $ioProxy->open(array('path'=>$this->getPath())); - $ioProxy->rm($this->getFileName()); - return $this; - } - - /** - * Open backup file (write or read mode) - * - * @param bool $write - * @return $this - */ - public function open($write = false) - { - if (is_null($this->getPath())) { - Mage::exception('Mage_Backup', Mage::helper('backup')->__('Backup file path was not specified.')); - } - - $ioAdapter = new Varien_Io_File(); - try { - $path = $ioAdapter->getCleanPath($this->getPath()); - $ioAdapter->checkAndCreateFolder($path); - $filePath = $path . DS . $this->getFileName(); - } - catch (Exception $e) { - Mage::exception('Mage_Backup', $e->getMessage()); - } - - if ($write && $ioAdapter->fileExists($filePath)) { - $ioAdapter->rm($filePath); - } - if (!$write && !$ioAdapter->fileExists($filePath)) { - Mage::exception('Mage_Backup', Mage::helper('backup')->__('Backup file "%s" does not exist.', $this->getFileName())); - } - - $mode = $write ? 'wb' . self::COMPRESS_RATE : 'rb'; - - $this->_handler = @gzopen($filePath, $mode); - - if (!$this->_handler) { - throw new Mage_Backup_Exception_NotEnoughPermissions( - Mage::helper('backup')->__('Backup file "%s" cannot be read from or written to.', $this->getFileName()) - ); - } - - return $this; - } - - /** - * Read backup uncomressed data - * - * @param int $length - * @return string - */ - public function read($length) - { - if (is_null($this->_handler)) { - Mage::exception('Mage_Backup', Mage::helper('backup')->__('Backup file handler was unspecified.')); - } - - return gzread($this->_handler, $length); - } - - public function eof() - { - if (is_null($this->_handler)) { - Mage::exception('Mage_Backup', Mage::helper('backup')->__('Backup file handler was unspecified.')); - } - - return gzeof($this->_handler); - } - - /** - * Write to backup file - * - * @param string $string - * @return $this - */ - public function write($string) - { - if (is_null($this->_handler)) { - Mage::exception('Mage_Backup', Mage::helper('backup')->__('Backup file handler was unspecified.')); - } - - try { - gzwrite($this->_handler, $string); - } - catch (Exception $e) { - Mage::exception('Mage_Backup', Mage::helper('backup')->__('An error occurred while writing to the backup file "%s".', $this->getFileName())); - } - - return $this; - } - - /** - * Close open backup file - * - * @return $this - */ - public function close() - { - @gzclose($this->_handler); - $this->_handler = null; - - return $this; - } - - /** - * Print output - * - */ - public function output() - { - if (!$this->exists()) { - return ; - } - - $ioAdapter = new Varien_Io_File(); - $ioAdapter->open(array('path' => $this->getPath())); - - $ioAdapter->streamOpen($this->getFileName(), 'r'); - while ($buffer = $ioAdapter->streamRead()) { - echo $buffer; - } - $ioAdapter->streamClose(); - } - - public function getSize() - { - if (!is_null($this->getData('size'))) { - return $this->getData('size'); - } - - if ($this->exists()) { - $this->setData('size', filesize($this->getPath() . DS . $this->getFileName())); - return $this->getData('size'); - } - - return 0; - } - - /** - * Validate user password - * - * @param string $password - * @return bool - */ - public function validateUserPassword($password) - { - $userPasswordHash = Mage::getModel('admin/session')->getUser()->getPassword(); - return Mage::helper('core')->validateHash($password, $userPasswordHash); - } - - /** - * Load backup by it's type and creation timestamp - * - * @param int $timestamp - * @param string $type - * @return $this - */ - public function loadByTimeAndType($timestamp, $type) - { - $backupsCollection = Mage::getSingleton('backup/fs_collection'); - $backupId = $timestamp . '_' . $type; - - foreach ($backupsCollection as $backup) { - if ($backup->getId() == $backupId) { - $this->setType($backup->getType()) - ->setTime($backup->getTime()) - ->setName($backup->getName()) - ->setPath($backup->getPath()); - break; - } - } - - return $this; - } -} diff --git a/app/code/core/Mage/Backup/Model/Config/Backend/Cron.php b/app/code/core/Mage/Backup/Model/Config/Backend/Cron.php deleted file mode 100644 index 462e4f89780..00000000000 --- a/app/code/core/Mage/Backup/Model/Config/Backend/Cron.php +++ /dev/null @@ -1,90 +0,0 @@ - - */ -class Mage_Backup_Model_Config_Backend_Cron extends Mage_Core_Model_Config_Data -{ - const CRON_STRING_PATH = 'crontab/jobs/system_backup/schedule/cron_expr'; - const CRON_MODEL_PATH = 'crontab/jobs/system_backup/run/model'; - - const XML_PATH_BACKUP_ENABLED = 'groups/backup/fields/enabled/value'; - const XML_PATH_BACKUP_TIME = 'groups/backup/fields/time/value'; - const XML_PATH_BACKUP_FREQUENCY = 'groups/backup/fields/frequency/value'; - - /** - * Cron settings after save - * - * @return $this - */ - protected function _afterSave() - { - $enabled = $this->getData(self::XML_PATH_BACKUP_ENABLED); - $time = $this->getData(self::XML_PATH_BACKUP_TIME); - $frequency = $this->getData(self::XML_PATH_BACKUP_FREQUENCY); - - $frequencyWeekly = Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency::CRON_WEEKLY; - $frequencyMonthly = Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency::CRON_MONTHLY; - - if ($enabled) { - $cronExprArray = array( - intval($time[1]), # Minute - intval($time[0]), # Hour - ($frequency == $frequencyMonthly) ? '1' : '*', # Day of the Month - '*', # Month of the Year - ($frequency == $frequencyWeekly) ? '1' : '*', # Day of the Week - ); - $cronExprString = implode(' ', $cronExprArray); - } - else { - $cronExprString = ''; - } - - try { - Mage::getModel('core/config_data') - ->load(self::CRON_STRING_PATH, 'path') - ->setValue($cronExprString) - ->setPath(self::CRON_STRING_PATH) - ->save(); - - Mage::getModel('core/config_data') - ->load(self::CRON_MODEL_PATH, 'path') - ->setValue((string) Mage::getConfig()->getNode(self::CRON_MODEL_PATH)) - ->setPath(self::CRON_MODEL_PATH) - ->save(); - } - catch (Exception $e) { - Mage::throwException(Mage::helper('backup')->__('Unable to save the cron expression.')); - } - return $this; - } -} diff --git a/app/code/core/Mage/Backup/Model/Config/Source/Type.php b/app/code/core/Mage/Backup/Model/Config/Source/Type.php deleted file mode 100644 index 894212be414..00000000000 --- a/app/code/core/Mage/Backup/Model/Config/Source/Type.php +++ /dev/null @@ -1,52 +0,0 @@ - - */ -class Mage_Backup_Model_Config_Source_Type -{ - /** - * return possible options - * - * @return array - */ - public function toOptionArray() - { - $backupTypes = array(); - foreach(Mage::helper('backup')->getBackupTypes() as $type => $label) { - $backupTypes[] = array( - 'label' => $label, - 'value' => $type, - ); - } - return $backupTypes; - } -} diff --git a/app/code/core/Mage/Backup/Model/Db.php b/app/code/core/Mage/Backup/Model/Db.php deleted file mode 100644 index cf99504840b..00000000000 --- a/app/code/core/Mage/Backup/Model/Db.php +++ /dev/null @@ -1,185 +0,0 @@ - - */ -class Mage_Backup_Model_Db -{ - - /** - * Buffer length for multi rows - * default 100 Kb - * - */ - const BUFFER_LENGTH = 102400; - - /** - * List of tables which data should not be backed up - * - * @var array - */ - protected $_ignoreDataTablesList = array( - 'importexport/importdata' - ); - - /** - * Retrieve resource model - * - * @return Mage_Backup_Model_Mysql4_Db - */ - public function getResource() - { - return Mage::getResourceSingleton('backup/db'); - } - - public function getTables() - { - return $this->getResource()->getTables(); - } - - public function getTableCreateScript($tableName, $addDropIfExists=false) - { - return $this->getResource()->getTableCreateScript($tableName, $addDropIfExists); - } - - public function getTableDataDump($tableName) - { - return $this->getResource()->getTableDataDump($tableName); - } - - public function getHeader() - { - return $this->getResource()->getHeader(); - } - - public function getFooter() - { - return $this->getResource()->getFooter(); - } - - public function renderSql() - { - ini_set('max_execution_time', 0); - $sql = $this->getHeader(); - - $tables = $this->getTables(); - foreach ($tables as $tableName) { - $sql.= $this->getTableCreateScript($tableName, true); - $sql.= $this->getTableDataDump($tableName); - } - - $sql.= $this->getFooter(); - return $sql; - } - - /** - * Create backup and stream write to adapter - * - * @param Mage_Backup_Model_Backup $backup - * @return $this - */ - public function createBackup(Mage_Backup_Model_Backup $backup) - { - $backup->open(true); - - $this->getResource()->beginTransaction(); - try { - $tables = $this->getResource()->getTables(); - - $backup->write($this->getResource()->getHeader()); - - $ignoreDataTablesList = $this->getIgnoreDataTablesList(); - - foreach ($tables as $table) { - $backup->write($this->getResource()->getTableHeader($table) - . $this->getResource()->getTableDropSql($table) . "\n"); - $backup->write($this->getResource()->getTableCreateSql($table, false) . "\n"); - - $tableStatus = $this->getResource()->getTableStatus($table); - - if ($tableStatus->getRows() && !in_array($table, $ignoreDataTablesList)) { - $backup->write($this->getResource()->getTableDataBeforeSql($table)); - - if ($tableStatus->getDataLength() > self::BUFFER_LENGTH) { - if ($tableStatus->getAvgRowLength() > 0 && $tableStatus->getAvgRowLength() < self::BUFFER_LENGTH) { - // Process rows in batches - $limit = floor(self::BUFFER_LENGTH / $tableStatus->getAvgRowLength()); - $multiRowsLength = ceil($tableStatus->getRows() / $limit); - } else { - // Process rows one by one - $limit = 1; - $multiRowsLength = $tableStatus->getRows(); - } - } else { - // Process all rows at once - $limit = $tableStatus->getRows(); - $multiRowsLength = 1; - } - - for ($i = 0; $i < $multiRowsLength; $i++) { - $backup->write($this->getResource()->getTableDataSql($table, $limit, $i * $limit)); - } - - $backup->write($this->getResource()->getTableDataAfterSql($table)); - } - } - $backup->write($this->getResource()->getTableForeignKeysSql()); - $backup->write($this->getResource()->getFooter()); - - $this->getResource()->commitTransaction(); - } catch (Exception $e) { - $this->getResource()->rollBackTransaction(); - throw $e; - } - - $backup->close(); - - return $this; - } - - /**. - * Returns the list of tables which data should not be backed up - * - * @return array - */ - public function getIgnoreDataTablesList() - { - $result = array(); - $resource = Mage::getSingleton('core/resource'); - - foreach ($this->_ignoreDataTablesList as $table) { - $result[] = $resource->getTableName($table); - } - - return $result; - } -} diff --git a/app/code/core/Mage/Backup/Model/Fs/Collection.php b/app/code/core/Mage/Backup/Model/Fs/Collection.php deleted file mode 100644 index e6a2b86e1d6..00000000000 --- a/app/code/core/Mage/Backup/Model/Fs/Collection.php +++ /dev/null @@ -1,93 +0,0 @@ - - */ -class Mage_Backup_Model_Fs_Collection extends Varien_Data_Collection_Filesystem -{ - /** - * Folder, where all backups are stored - * - * @var string - */ - protected $_baseDir; - - /** - * Set collection specific parameters and make sure backups folder will exist - */ - public function __construct() - { - parent::__construct(); - - $this->_baseDir = Mage::getBaseDir('var') . DS . 'backups'; - - // check for valid base dir - $ioProxy = new Varien_Io_File(); - $ioProxy->mkdir($this->_baseDir); - if (!is_file($this->_baseDir . DS . '.htaccess')) { - $ioProxy->open(array('path' => $this->_baseDir)); - $ioProxy->write('.htaccess', 'deny from all', 0644); - } - - // set collection specific params - $extensions = Mage::helper('backup')->getExtensions(); - - foreach ($extensions as $key => $value) { - $extensions[] = '(' . preg_quote($value, '/') . ')'; - } - $extensions = implode('|', $extensions); - - $this - ->setOrder('time', self::SORT_ORDER_DESC) - ->addTargetDir($this->_baseDir) - ->setFilesFilter('/^[a-z0-9\-\_]+\.' . $extensions . '$/') - ->setCollectRecursively(false) - ; - } - - /** - * Get backup-specific data from model for each row - * - * @param string $filename - * @return array - */ - protected function _generateRow($filename) - { - $row = parent::_generateRow($filename); - foreach (Mage::getSingleton('backup/backup')->load($row['basename'], $this->_baseDir) - ->getData() as $key => $value) { - $row[$key] = $value; - } - $row['size'] = filesize($filename); - $row['id'] = $row['time'] . '_' . $row['type']; - return $row; - } -} diff --git a/app/code/core/Mage/Backup/Model/Mysql4/Db.php b/app/code/core/Mage/Backup/Model/Mysql4/Db.php deleted file mode 100644 index 48c15f475b6..00000000000 --- a/app/code/core/Mage/Backup/Model/Mysql4/Db.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @deprecated - */ -class Mage_Backup_Model_Mysql4_Db extends Mage_Backup_Model_Resource_Db -{ -} diff --git a/app/code/core/Mage/Backup/Model/Observer.php b/app/code/core/Mage/Backup/Model/Observer.php deleted file mode 100644 index 82429df61d8..00000000000 --- a/app/code/core/Mage/Backup/Model/Observer.php +++ /dev/null @@ -1,95 +0,0 @@ - - */ -class Mage_Backup_Model_Observer -{ - const XML_PATH_BACKUP_ENABLED = 'system/backup/enabled'; - const XML_PATH_BACKUP_TYPE = 'system/backup/type'; - const XML_PATH_BACKUP_MAINTENANCE_MODE = 'system/backup/maintenance'; - - /** - * Error messages - * - * @var array - */ - protected $_errors = array(); - - /** - * Create Backup - * - * @return Mage_Log_Model_Cron - */ - public function scheduledBackup() - { - if (!Mage::getStoreConfigFlag(self::XML_PATH_BACKUP_ENABLED)) { - return $this; - } - - if (Mage::getStoreConfigFlag(self::XML_PATH_BACKUP_MAINTENANCE_MODE)) { - Mage::helper('backup')->turnOnMaintenanceMode(); - } - - $type = Mage::getStoreConfig(self::XML_PATH_BACKUP_TYPE); - - $this->_errors = array(); - try { - $backupManager = Mage_Backup::getBackupInstance($type) - ->setBackupExtension(Mage::helper('backup')->getExtensionByType($type)) - ->setTime(time()) - ->setBackupsDir(Mage::helper('backup')->getBackupsDir()); - - Mage::register('backup_manager', $backupManager); - - if ($type != Mage_Backup_Helper_Data::TYPE_DB) { - $backupManager->setRootDir(Mage::getBaseDir()) - ->addIgnorePaths(Mage::helper('backup')->getBackupIgnorePaths()); - } - - $backupManager->create(); - Mage::log(Mage::helper('backup')->getCreateSuccessMessageByType($type)); - } - catch (Exception $e) { - $this->_errors[] = $e->getMessage(); - $this->_errors[] = $e->getTrace(); - Mage::log($e->getMessage(), Zend_Log::ERR); - Mage::logException($e); - } - - if (Mage::getStoreConfigFlag(self::XML_PATH_BACKUP_MAINTENANCE_MODE)) { - Mage::helper('backup')->turnOffMaintenanceMode(); - } - - return $this; - } -} diff --git a/app/code/core/Mage/Backup/Model/Resource/Db.php b/app/code/core/Mage/Backup/Model/Resource/Db.php deleted file mode 100644 index dd039f7558d..00000000000 --- a/app/code/core/Mage/Backup/Model/Resource/Db.php +++ /dev/null @@ -1,316 +0,0 @@ - - */ -class Mage_Backup_Model_Resource_Db -{ - /** - * Database connection adapter - * - * @var Varien_Db_Adapter_Pdo_Mysql - */ - protected $_write; - - /** - * tables Foreign key data array - * [tbl_name] = array(create foreign key strings) - * - * @var array - */ - protected $_foreignKeys = array(); - - /** - * Initialize Backup DB resource model - * - */ - public function __construct() - { - $this->_write = Mage::getSingleton('core/resource')->getConnection('backup_write'); - } - - /** - * Enter description here ... - * - * @deprecated after 1.4.0.0-alpha2 - * - */ - public function crear() - { - $this->clear(); - } - - /** - * Clear data - * - */ - public function clear() - { - $this->_foreignKeys = array(); - } - - /** - * Retrieve table list - * - * @return array - */ - public function getTables() - { - return $this->_write->listTables(); - } - - /** - * Retrieve SQL fragment for drop table - * - * @param string $tableName - * @return string - */ - public function getTableDropSql($tableName) - { - return Mage::getResourceHelper('backup')->getTableDropSql($tableName); - } - - /** - * Retrieve SQL fragment for create table - * - * @param string $tableName - * @param bool $withForeignKeys - * @return string - */ - public function getTableCreateSql($tableName, $withForeignKeys = false) - { - return Mage::getResourceHelper('backup')->getTableCreateSql($tableName, $withForeignKeys = false); - } - - /** - * Retrieve foreign keys for table(s) - * - * @param string|null $tableName - * @return string - */ - public function getTableForeignKeysSql($tableName = null) - { - $fkScript = ''; - if (!$tableName) { - $tables = $this->getTables(); - foreach($tables as $table) { - $tableFkScript = Mage::getResourceHelper('backup')->getTableForeignKeysSql($table); - if (!empty($tableFkScript)) { - $fkScript .= "\n" . $tableFkScript; - } - } - } else { - $fkScript = $this->getTableForeignKeysSql($tableName); - } - return $fkScript; - } - - /** - * Retrieve table status - * - * @param string $tableName - * @return Varien_Object|false - */ - public function getTableStatus($tableName) - { - $row = $this->_write->showTableStatus($tableName); - - if ($row) { - $statusObject = new Varien_Object(); - $statusObject->setIdFieldName('name'); - foreach ($row as $field => $value) { - $statusObject->setData(strtolower($field), $value); - } - - $cntRow = $this->_write->fetchRow( - $this->_write->select()->from($tableName, 'COUNT(1) as rows')); - $statusObject->setRows($cntRow['rows']); - - return $statusObject; - } - - return false; - } - - /** - * Quote Table Row - * - * @deprecated - * - * @param string $tableName - * @param array $row - * @return array - */ - protected function _quoteRow($tableName, array $row) - { - return $row; - } - - /** - * Retrieve table partical data SQL insert - * - * @param string $tableName - * @param int $count - * @param int $offset - * @return string - */ - public function getTableDataSql($tableName, $count = null, $offset = null) - { - return Mage::getResourceHelper('backup')->getPartInsertSql($tableName, $count, $offset); - } - - /** - * Enter description here... - * - * @param string $tableName - * @param bool $addDropIfExists - * @return string - */ - public function getTableCreateScript($tableName, $addDropIfExists = false) - { - return Mage::getResourceHelper('backup')->getTableCreateScript($tableName, $addDropIfExists); - } - - /** - * Retrieve table header comment - * - * @param string $tableName - * @return string - */ - public function getTableHeader($tableName) - { - $quotedTableName = $this->_write->quoteIdentifier($tableName); - return "\n--\n" - . "-- Table structure for table {$quotedTableName}\n" - . "--\n\n"; - } - - /** - * Return table data dump - * - * @param string $tableName - * @param bool $step - * @return string - */ - public function getTableDataDump($tableName, $step = false) - { - return $this->getTableDataSql($tableName); - } - - /** - * Returns SQL header data - * - * @return string - */ - public function getHeader() - { - return Mage::getResourceHelper('backup')->getHeader(); - } - - /** - * Returns SQL footer data - * - * @return string - */ - public function getFooter() - { - return Mage::getResourceHelper('backup')->getFooter(); - } - - /** - * Retrieve before insert data SQL fragment - * - * @param string $tableName - * @return string - */ - public function getTableDataBeforeSql($tableName) - { - return Mage::getResourceHelper('backup')->getTableDataBeforeSql($tableName); - } - - /** - * Retrieve after insert data SQL fragment - * - * @param string $tableName - * @return string - */ - public function getTableDataAfterSql($tableName) - { - return Mage::getResourceHelper('backup')->getTableDataAfterSql($tableName); - } - - /** - * Start transaction mode - * - * @return $this - */ - public function beginTransaction() - { - Mage::getResourceHelper('backup')->turnOnSerializableMode(); - $this->_write->beginTransaction(); - return $this; - } - - /** - * Commit transaction - * - * @return $this - */ - public function commitTransaction() - { - $this->_write->commit(); - Mage::getResourceHelper('backup')->turnOnReadCommittedMode(); - return $this; - } - - /** - * Rollback transaction - * - * @return $this - */ - public function rollBackTransaction() - { - $this->_write->rollBack(); - return $this; - } - - /** - * Run sql code - * - * @param string|Zend_Db_Select $command - * @return $this - */ - public function runCommand($command){ - $this->_write->query($command); - return $this; - } -} diff --git a/app/code/core/Mage/Backup/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/Backup/Model/Resource/Helper/Mysql4.php deleted file mode 100644 index 48760bb908c..00000000000 --- a/app/code/core/Mage/Backup/Model/Resource/Helper/Mysql4.php +++ /dev/null @@ -1,322 +0,0 @@ -_getReadAdapter()->quoteIdentifier($tableName); - return sprintf('DROP TABLE IF EXISTS %s;', $quotedTableName); - } - - /** - * Retrieve foreign keys for table(s) - * - * @param string|null $tableName - * @return string|false - */ - public function getTableForeignKeysSql($tableName = null) - { - $sql = false; - - if ($tableName === null) { - $sql = ''; - foreach ($this->_foreignKeys as $table => $foreignKeys) { - $sql .= $this->_buildForeignKeysAlterTableSql($table, $foreignKeys); - } - } else if (isset($this->_foreignKeys[$tableName])) { - $foreignKeys = $this->_foreignKeys[$tableName]; - $sql = $this->_buildForeignKeysAlterTableSql($tableName, $foreignKeys); - } - - return $sql; - } - - /** - * Build sql that will add foreign keys to it - * - * @param string $tableName - * @param array $foreignKeys - * @return string - */ - protected function _buildForeignKeysAlterTableSql($tableName, $foreignKeys) - { - if (!is_array($foreignKeys) || empty($foreignKeys)) { - return ''; - } - - return sprintf("ALTER TABLE %s\n %s;\n", - $this->_getReadAdapter()->quoteIdentifier($tableName), - implode(",\n ", $foreignKeys) - ); - } - - /** - * Get create script for table - * - * @param string $tableName - * @param boolean $addDropIfExists - * @return string - */ - public function getTableCreateScript($tableName, $addDropIfExists = false) - { - $script = ''; - $quotedTableName = $this->_getReadAdapter()->quoteIdentifier($tableName); - - if ($addDropIfExists) { - $script .= 'DROP TABLE IF EXISTS ' . $quotedTableName .";\n"; - } - //TODO fix me - $sql = 'SHOW CREATE TABLE ' . $quotedTableName; - $data = $this->_getReadAdapter()->fetchRow($sql); - $script .= isset($data['Create Table']) ? $data['Create Table'].";\n" : ''; - - return $script; - } - /** - * Retrieve SQL fragment for create table - * - * @param string $tableName - * @param bool $withForeignKeys - * @return string - */ - public function getTableCreateSql($tableName, $withForeignKeys = false) - { - $adapter = $this->_getReadAdapter(); - $quotedTableName = $adapter->quoteIdentifier($tableName); - $query = 'SHOW CREATE TABLE ' . $quotedTableName; - $row = $adapter->fetchRow($query); - - if (!$row || !isset($row['Table']) || !isset($row['Create Table'])) { - return false; - } - - $regExp = '/,\s+CONSTRAINT `([^`]*)` FOREIGN KEY \(`([^`]*)`\) ' - . 'REFERENCES `([^`]*)` \(`([^`]*)`\)' - . '( ON DELETE (RESTRICT|CASCADE|SET NULL|NO ACTION))?' - . '( ON UPDATE (RESTRICT|CASCADE|SET NULL|NO ACTION))?/'; - $matches = array(); - preg_match_all($regExp, $row['Create Table'], $matches, PREG_SET_ORDER); - - if (is_array($matches)) { - foreach ($matches as $match) { - $this->_foreignKeys[$tableName][] = sprintf('ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s)%s%s', - $adapter->quoteIdentifier($match[1]), - $adapter->quoteIdentifier($match[2]), - $adapter->quoteIdentifier($match[3]), - $adapter->quoteIdentifier($match[4]), - isset($match[5]) ? $match[5] : '', - isset($match[7]) ? $match[7] : '' - ); - } - } - - if ($withForeignKeys) { - $sql = $row['Create Table']; - } else { - $sql = preg_replace($regExp, '', $row['Create Table']); - } - - return $sql . ';'; - } - /** - * Returns SQL header data, move from original resource model - * - * @return string - */ - public function getHeader() - { - $dbConfig = $this->_getReadAdapter()->getConfig(); - - $versionRow = $this->_getReadAdapter()->fetchRow('SHOW VARIABLES LIKE \'version\''); - $hostName = !empty($dbConfig['unix_socket']) ? $dbConfig['unix_socket'] - : (!empty($dbConfig['host']) ? $dbConfig['host'] : 'localhost'); - - $header = "-- Magento DB backup\n" - . "--\n" - . "-- Host: {$hostName} Database: {$dbConfig['dbname']}\n" - . "-- ------------------------------------------------------\n" - . "-- Server version: {$versionRow['Value']}\n\n" - . "/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;\n" - . "/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;\n" - . "/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;\n" - . "/*!40101 SET NAMES utf8 */;\n" - . "/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;\n" - . "/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;\n" - . "/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;\n" - . "/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;\n"; - - return $header; - } - - /** - * Returns SQL footer data, move from original resource model - * - * @return string - */ - public function getFooter() - { - $footer = "\n/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;\n" - . "/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; \n" - . "/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;\n" - . "/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;\n" - . "/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;\n" - . "/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;\n" - . "/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;\n" - . "\n-- Dump completed on " . Mage::getSingleton('core/date')->gmtDate() . " GMT"; - - return $footer; - } - - /** - * Retrieve before insert data SQL fragment - * - * @param string $tableName - * @return string - */ - public function getTableDataBeforeSql($tableName) - { - $quotedTableName = $this->_getReadAdapter()->quoteIdentifier($tableName); - return "\n--\n" - . "-- Dumping data for table {$quotedTableName}\n" - . "--\n\n" - . "LOCK TABLES {$quotedTableName} WRITE;\n" - . "/*!40000 ALTER TABLE {$quotedTableName} DISABLE KEYS */;\n"; - } - - /** - * Retrieve after insert data SQL fragment - * - * @param string $tableName - * @return string - */ - public function getTableDataAfterSql($tableName) - { - $quotedTableName = $this->_getReadAdapter()->quoteIdentifier($tableName); - return "/*!40000 ALTER TABLE {$quotedTableName} ENABLE KEYS */;\n" - . "UNLOCK TABLES;\n"; - } - - /** - * Return table part data SQL insert - * - * @param string $tableName - * @param int $count - * @param int $offset - * @return string - */ - public function getPartInsertSql($tableName, $count = null, $offset = null) - { - $sql = null; - $adapter = $this->_getWriteAdapter(); - $select = $adapter->select() - ->from($tableName) - ->limit($count, $offset); - $query = $adapter->query($select); - - while ($row = $query->fetch()) { - if ($sql === null) { - $sql = sprintf('INSERT INTO %s VALUES ', $adapter->quoteIdentifier($tableName)); - } else { - $sql .= ','; - } - - $sql .= $this->_quoteRow($tableName, $row); - } - - if ($sql !== null) { - $sql .= ';' . "\n"; - } - - return $sql; - } - /** - * Return table data SQL insert - * - * @param string $tableName - * @return string - */ - public function getInsertSql($tableName) - { - return $this->getPartInsertSql($tableName); - } - /** - * Quote Table Row - * - * @param string $tableName - * @param array $row - * @return string - */ - protected function _quoteRow($tableName, array $row) - { - $adapter = $this->_getReadAdapter(); - $describe = $adapter->describeTable($tableName); - $dataTypes = array('bigint', 'mediumint', 'smallint', 'tinyint'); - $rowData = array(); - foreach ($row as $k => $v) { - if ($v === null) { - $value = 'NULL'; - } elseif (in_array(strtolower($describe[$k]['DATA_TYPE']), $dataTypes)) { - $value = $v; - } else { - $value = $adapter->quoteInto('?', $v); - } - $rowData[] = $value; - } - - return sprintf('(%s)', implode(',', $rowData)); - } - - /** - * Turn on serializable mode - */ - public function turnOnSerializableMode() - { - $this->_getReadAdapter()->query("SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE"); - } - - /** - * Turn on read committed mode - */ - public function turnOnReadCommittedMode() - { - $this->_getReadAdapter()->query("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"); - } -} diff --git a/app/code/core/Mage/Backup/etc/adminhtml.xml b/app/code/core/Mage/Backup/etc/adminhtml.xml deleted file mode 100644 index ca9f81cd752..00000000000 --- a/app/code/core/Mage/Backup/etc/adminhtml.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - Backups - adminhtml/system_backup - - - - - - - - - - - - - - - - Backups - - - Rollback - - - - - - - - - - - - diff --git a/app/code/core/Mage/Backup/etc/config.xml b/app/code/core/Mage/Backup/etc/config.xml deleted file mode 100644 index d315ac57061..00000000000 --- a/app/code/core/Mage/Backup/etc/config.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - 1.6.0.0 - - - - - - Mage_Backup_Model - backup_resource - - - Mage_Backup_Model_Resource - backup_mysql4 - - - - - - Mage_Backup - - - - - - - - - - Mage_Backup.csv - - - - - - - - - - backup/observer::scheduledBackup - - - - - diff --git a/app/code/core/Mage/Backup/etc/system.xml b/app/code/core/Mage/Backup/etc/system.xml deleted file mode 100644 index 66d1808f58e..00000000000 --- a/app/code/core/Mage/Backup/etc/system.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - 500 - 1 - 0 - 0 - - - - select - adminhtml/system_config_source_yesno - 10 - 1 - 0 - 0 - - - - select - 1 - backup/config_source_type - 20 - 1 - 0 - 0 - - - - - select - 1 - adminhtml/system_config_source_cron_frequency - backup/config_backend_cron - 40 - 1 - 0 - 0 - - - - Put store on the maintenance mode while backup's creation - select - 1 - adminhtml/system_config_source_yesno - 50 - 1 - 0 - 0 - - - - - - - diff --git a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.7-1.6.0.8.php b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.7-1.6.0.8.php deleted file mode 100644 index 0351e84e881..00000000000 --- a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.7-1.6.0.8.php +++ /dev/null @@ -1,41 +0,0 @@ -startSetup(); -$connection = $installer->getConnection(); - -$connection->delete( - $this->getTable('core_config_data'), - $connection->prepareSqlCondition('path', array( - 'like' => 'system/backup/enabled' - )) -); -$installer->setConfigData('advanced/modules_disable_output/Mage_Backup', 1); - -$installer->endSetup(); diff --git a/app/design/adminhtml/default/default/template/backup/dialogs.phtml b/app/design/adminhtml/default/default/template/backup/dialogs.phtml deleted file mode 100644 index 401dcb1858b..00000000000 --- a/app/design/adminhtml/default/default/template/backup/dialogs.phtml +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - - - - -getUrl('*/*/rollback'); - $backupUrl = $this->getUrl('*/*/create'); -?> - - diff --git a/app/design/adminhtml/default/default/template/backup/left.phtml b/app/design/adminhtml/default/default/template/backup/left.phtml deleted file mode 100644 index 13bb9c08d36..00000000000 --- a/app/design/adminhtml/default/default/template/backup/left.phtml +++ /dev/null @@ -1,27 +0,0 @@ - -

__('Create Backup') ?>

diff --git a/app/design/adminhtml/default/default/template/backup/list.phtml b/app/design/adminhtml/default/default/template/backup/list.phtml deleted file mode 100644 index 5189b12a0ad..00000000000 --- a/app/design/adminhtml/default/default/template/backup/list.phtml +++ /dev/null @@ -1,40 +0,0 @@ - -
- - - - - -

__('Backups') ?>

 - getCreateSnapshotButtonHtml(); ?> - getCreateMediaBackupButtonHtml(); ?> - getCreateButtonHtml(); ?> -
-
-getGridHtml() ?> -getDialogsHtml() ?> diff --git a/app/etc/modules/Mage_All.xml b/app/etc/modules/Mage_All.xml index 054a44d952f..6d4604e8d23 100644 --- a/app/etc/modules/Mage_All.xml +++ b/app/etc/modules/Mage_All.xml @@ -233,13 +233,6 @@ - - false - core - - - - true core diff --git a/app/locale/en_US/Mage_Backup.csv b/app/locale/en_US/Mage_Backup.csv deleted file mode 100644 index be22b2b719d..00000000000 --- a/app/locale/en_US/Mage_Backup.csv +++ /dev/null @@ -1,55 +0,0 @@ -"Action","Action" -"An error occurred while creating the backup.","An error occurred while creating the backup." -"An error occurred while writing to the backup file ""%s"".","An error occurred while writing to the backup file ""%s""." -"Are you sure you want to delete the selected backup(s)?","Are you sure you want to delete the selected backup(s)?" -"Backup Type","Backup Type" -"Backup file ""%s"" cannot be read from or written to.","Backup file ""%s"" cannot be read from or written to." -"Backup file ""%s"" does not exist.","Backup file ""%s"" does not exist." -"Backup file does not exist.","Backup file does not exist." -"Backup file handler was unspecified.","Backup file handler was unspecified." -"Backup file not found","Backup file not found" -"Backup file path was not specified.","Backup file path was not specified." -"Backups","Backups" -"Cannot read backup file.","Cannot read backup file." -"Create Backup","Create Backup" -"Database","Database" -"Database Backup","Database Backup" -"Database and Media","Database and Media" -"Database and Media Backup","Database and Media Backup" -"Database was successfuly backed up.","Database was successfuly backed up." -"Download","Download" -"Enable Scheduled Backup","Enable Scheduled Backup" -"Failed to connect to FTP","Failed to connect to FTP" -"Failed to delete one or several backups.","Failed to delete one or several backups." -"Failed to rollback","Failed to rollback" -"Failed to validate FTP","Failed to validate FTP" -"Frequency","Frequency" -"Invalid Password.","Invalid Password." -"Maintenance Mode","Maintenance Mode" -"Name","Name" -"Not enough free space to create backup.","Not enough free space to create backup." -"Not enough permissions to create backup.","Not enough permissions to create backup." -"Not enough permissions to perform rollback","Not enough permissions to perform rollback" -"Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the backup.""","Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the backup.""" -"Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the rollback.""","Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the rollback.""" -"Put store on the maintenance mode while backup's creation","Put store on the maintenance mode while backup's creation" -"Rollback","Rollback" -"Scheduled Backup Settings","Scheduled Backup Settings" -"Size, Bytes","Size, Bytes" -"Start Time","Start Time" -"System","System" -"System (excluding Media)","System (excluding Media)" -"System Backup","System Backup" -"System couldn't put store on the maintenance mode","System couldn't put store on the maintenance mode" -"The database and media backup has been created.","The database and media backup has been created." -"The database backup has been created.","The database backup has been created." -"The file was compressed with Zlib, but this extension is not installed on server.","The file was compressed with Zlib, but this extension is not installed on server." -"The selected backup(s) has been deleted.","The selected backup(s) has been deleted." -"The system (excluding Media) backup has been created.","The system (excluding Media) backup has been created." -"The system backup has been created.","The system backup has been created." -"Time","Time" -"Type","Type" -"Unable to create backup. Please, try again later.","Unable to create backup. Please, try again later." -"Unable to save the cron expression.","Unable to save the cron expression." -"Wrong order of creation for new backup.","Wrong order of creation for new backup." -"You do not have sufficient permissions to enable Maintenance Mode during this operation.","You do not have sufficient permissions to enable Maintenance Mode during this operation." diff --git a/js/mage/adminhtml/backup.js b/js/mage/adminhtml/backup.js deleted file mode 100644 index e0407fdc6fc..00000000000 --- a/js/mage/adminhtml/backup.js +++ /dev/null @@ -1,193 +0,0 @@ -/** - * Magento - * - * NOTICE OF LICENSE - * - * This source file is subject to the Academic Free License (AFL 3.0) - * that is bundled with this package in the file LICENSE_AFL.txt. - * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@magento.com so we can send you a copy immediately. - * - * DISCLAIMER - * - * Do not edit or add to this file if you wish to upgrade Magento to newer - * versions in the future. If you wish to customize Magento for your - * needs please refer to http://www.magento.com for more information. - * - * @category Mage - * @package Mage_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) - */ -var AdminBackup = new Class.create(); -AdminBackup.prototype = { - initialize : function(a, b){ - this.reset(); - this.rollbackUrl = this.backupUrl = ''; - this.rollbackValidator = new Validation($('rollback-form')); - this.backupValidator = new Validation($('backup-form')); - }, - - reset: function() { - this.time = 0; - this.type = ''; - $('use-ftp-checkbox-row').hide(); - $('use_ftp').checked = false; - $('ftp-credentials-container').hide(); - $$('#ftp-credentials-container input').each(function(item) { - item.removeClassName('required-entry'); - }); - $('backup_maintenance_mode').checked = false; - $('rollback_maintenance_mode').checked = false; - $('exclude_media').checked = false; - $('password').value = ''; - $('backup_name').value = ''; - $$('.validation-advice').invoke('remove'); - $$('input').invoke('removeClassName', 'validation-failed'); - $$('input').invoke('removeClassName', 'validation-passed'); - $$('.backup-messages').invoke('hide'); - $$('#ftp-credentials-container input').each(function(item) { - item.value = ''; - }); - }, - - backup: function(type) { - this.reset(); - this.type = type; - this.showBackupWarning(); - return false; - }, - - rollback: function(type, time) { - this.reset(); - this.time = time; - this.type = type; - this.showRollbackWarning(); - return false; - }, - - showBackupWarning: function() { - this.showPopup('backup-warning'); - }, - - showRollbackWarning: function() { - this.showPopup('rollback-warning'); - }, - - requestBackupOptions: function() { - this.hidePopups(); - var action = this.type != 'snapshot' ? 'hide' : 'show'; - $$('#exclude-media-checkbox-container').invoke(action); - this.showPopup('backup-options'); - }, - - requestPassword: function() { - this.hidePopups(); - this.type != 'db' ? $('use-ftp-checkbox-row').show() : $('use-ftp-checkbox-row').hide(); - this.showPopup('rollback-request-password'); - }, - - toggleFtpCredentialsForm: function() { - $('use_ftp').checked ? $('ftp-credentials-container').show() - : $('ftp-credentials-container').hide(); - var divId = 'rollback-request-password'; - - $$('#ftp-credentials-container input').each(function(item) { - if (item.name == 'ftp_path') return; - $('use_ftp').checked && item.name != 'dummy' ? - item.addClassName('required-entry') : item.removeClassName('required-entry'); - }); - - $(divId).show().setStyle({ - 'marginTop': -$(divId).getDimensions().height / 2 + 'px' - }); - }, - - submitBackup: function () { - if (!!this.backupValidator && this.backupValidator.validate()) { - this.hidePopups(); - var data = { - 'type': this.type, - 'maintenance_mode': $('backup_maintenance_mode').checked ? 1 : 0, - 'backup_name': $('backup_name').value, - 'exclude_media': $('exclude_media').checked ? 1 : 0 - }; - - new Ajax.Request(this.backupUrl, { - onSuccess: function(transport) { - this.processResponse(transport, 'backup-options'); - }.bind(this), - method: 'post', - parameters: data - }); - } - return false; - }, - - submitRollback: function() { - if (!!this.rollbackValidator && this.rollbackValidator.validate()) { - var data = this.getPostData(); - this.hidePopups(); - new Ajax.Request(this.rollbackUrl, { - onSuccess: function(transport) { - this.processResponse(transport, 'rollback-request-password'); - }.bind(this), - method: 'post', - parameters: data - }); - } - return false; - }, - - processResponse: function(transport, popupId) { - if (!transport.responseText.isJSON()) { - return; - } - - var json = transport.responseText.evalJSON(); - - if (!!json.error) { - this.displayError(popupId, json.error); - this.showPopup(popupId); - return; - } - - if (!!json.redirect_url) { - setLocation(json.redirect_url); - } - }, - - displayError: function(parentContainer, message) { - var messageHtml = this.getErrorMessageHtml(message); - $$('#' + parentContainer + ' .backup-messages .messages').invoke('update', messageHtml); - $$('#' + parentContainer + ' .backup-messages').invoke('show'); - }, - - getErrorMessageHtml: function(message) { - return '
    • ' + message + '
    • '; - }, - - getPostData: function() { - var data = $('rollback-form').serialize(true); - data['time'] = this.time; - data['type'] = this.type; - return data; - }, - - showPopup: function(divId) { - $(divId).show().setStyle({ - 'marginTop': -$(divId).getDimensions().height / 2 + 'px' - }); - $('popup-window-mask').setStyle({ - height: $('html-body').getHeight() + 'px' - }).show(); - }, - - hidePopups: function() { - $$('.backup-dialog').each(Element.hide); - $('popup-window-mask').hide(); - } -}; diff --git a/lib/Mage/Backup.php b/lib/Mage/Backup.php deleted file mode 100644 index 3eb7b315f19..00000000000 --- a/lib/Mage/Backup.php +++ /dev/null @@ -1,59 +0,0 @@ - - */ -class Mage_Backup -{ - /** - * List of supported a backup types - * - * @var array - */ - static protected $_allowedBackupTypes = array('db', 'snapshot', 'filesystem', 'media', 'nomedia'); - - /** - * get Backup Instance By File Name - * - * @param string $type - * @return Mage_Backup_Interface - */ - static public function getBackupInstance($type) - { - $class = 'Mage_Backup_' . ucfirst($type); - - if (!in_array($type, self::$_allowedBackupTypes) || !class_exists($class, true)){ - throw new Mage_Exception('Current implementation not supported this type (' . $type . ') of backup.'); - } - - return new $class(); - } -} diff --git a/lib/Mage/Backup/Abstract.php b/lib/Mage/Backup/Abstract.php deleted file mode 100644 index c14e73bd9b0..00000000000 --- a/lib/Mage/Backup/Abstract.php +++ /dev/null @@ -1,318 +0,0 @@ - - */ -abstract class Mage_Backup_Abstract implements Mage_Backup_Interface -{ - /** - * Backup name - * - * @var string - */ - protected $_name; - - /** - * Backup creation date - * - * @var int - */ - protected $_time; - - /** - * Backup file extension - * - * @var string - */ - protected $_backupExtension; - - /** - * Resource model - * - * @var object - */ - protected $_resourceModel; - - /** - * Magento's root directory - * - * @var string - */ - protected $_rootDir; - - /** - * Path to directory where backups stored - * - * @var string - */ - protected $_backupsDir; - - /** - * Is last operation completed successfully - * - * @var bool - */ - protected $_lastOperationSucceed = false; - - /** - * Last failed operation error message - * - * @var string - */ - protected $_lastErrorMessage; - - - /** - * Set Backup Extension - * - * @param string $backupExtension - * @return Mage_Backup_Interface - */ - public function setBackupExtension($backupExtension) - { - $this->_backupExtension = $backupExtension; - return $this; - } - - /** - * Get Backup Extension - * - * @return string - */ - public function getBackupExtension() - { - return $this->_backupExtension; - } - - /** - * Set Resource Model - * - * @param object $resourceModel - * @return Mage_Backup_Interface - */ - public function setResourceModel($resourceModel) - { - $this->_resourceModel = $resourceModel; - return $this; - } - - /** - * Get Resource Model - * - * @return object - */ - public function getResourceModel() - { - return $this->_resourceModel; - } - - /** - * Set Time - * - * @param int $time - * @return Mage_Backup_Interface - */ - public function setTime($time) - { - $this->_time = $time; - return $this; - } - - /** - * Get Time - * - * @return int - */ - public function getTime() - { - return $this->_time; - } - - /** - * Set root directory of Magento installation - * - * @param string $rootDir - * @throws Mage_Exception - * @return Mage_Backup_Interface - */ - public function setRootDir($rootDir) - { - if (!is_dir($rootDir)) { - throw new Mage_Exception('Bad root directory'); - } - - $this->_rootDir = $rootDir; - return $this; - } - - /** - * Get Magento's root directory - * @return string - */ - public function getRootDir() - { - return $this->_rootDir; - } - - /** - * Set path to directory where backups stored - * - * @param string $backupsDir - * @return Mage_Backup_Interface - */ - public function setBackupsDir($backupsDir) - { - $this->_backupsDir = $backupsDir; - return $this; - } - - /** - * Get path to directory where backups stored - * - * @return string - */ - public function getBackupsDir() - { - return $this->_backupsDir; - } - - /** - * Get path to backup - * - * @return string - */ - public function getBackupPath() - { - return $this->getBackupsDir() . DS . $this->getBackupFilename(); - } - - /** - * Get backup file name - * - * @return string - */ - public function getBackupFilename() - { - $filename = $this->getTime() . '_' . $this->getType(); - - $name = $this->getName(); - - if (!empty($name)) { - $filename .= '_' . $name; - } - - $filename .= '.' . $this->getBackupExtension(); - - return $filename; - } - - /** - * Check whether last operation completed successfully - * - * @return bool - */ - public function getIsSuccess() - { - return $this->_lastOperationSucceed; - } - - /** - * Get last error message - * - * @return string - */ - public function getErrorMessage() - { - return $this->_lastErrorMessage; - } - - /** - * Set error message - * - * @param string $errorMessage - * @return string - */ - public function setErrorMessage($errorMessage) - { - $this->_lastErrorMessage = $errorMessage; - } - - /** - * Set backup name - * - * @param string $name - * @param bool $applyFilter - * @return Mage_Backup_Interface - */ - public function setName($name, $applyFilter = true) - { - if ($applyFilter) { - $name = $this->_filterName($name); - } - $this->_name = $name; - return $this; - } - - /** - * Get backup name - * - * @return string - */ - public function getName() - { - return $this->_name; - } - - /** - * Get backup display name - * - * @return string - */ - public function getDisplayName() - { - return str_replace('_', ' ', $this->_name); - } - - /** - * Removes disallowed characters and replaces spaces with underscores - * - * @param string $name - * @return string - */ - protected function _filterName($name) - { - $name = trim(preg_replace('/[^\da-zA-Z ]/', '', $name)); - $name = preg_replace('/\s{2,}/', ' ', $name); - $name = str_replace(' ', '_', $name); - - return $name; - } -} diff --git a/lib/Mage/Backup/Archive/Tar.php b/lib/Mage/Backup/Archive/Tar.php deleted file mode 100644 index c1e3a20b4e4..00000000000 --- a/lib/Mage/Backup/Archive/Tar.php +++ /dev/null @@ -1,82 +0,0 @@ - - */ -class Mage_Backup_Archive_Tar extends Mage_Archive_Tar -{ - /** - * Filenames or filename parts that are used for filtering files - * - * @var array() - */ - protected $_skipFiles = array(); - - /** - * Overridden Mage_Archive_Tar::_createTar method that does the same actions as it's parent but filters - * files using Mage_Backup_Filesystem_Iterator_Filter - * - * @see Mage_Archive_Tar::_createTar() - * @param bool $skipRoot - * @param bool $finalize - */ - protected function _createTar($skipRoot = false, $finalize = false) - { - $path = $this->_getCurrentFile(); - - $filesystemIterator = new RecursiveIteratorIterator( - new RecursiveDirectoryIterator($path), RecursiveIteratorIterator::SELF_FIRST - ); - - $iterator = new Mage_Backup_Filesystem_Iterator_Filter($filesystemIterator, $this->_skipFiles); - - foreach ($iterator as $item) { - $this->_setCurrentFile($item->getPathname()); - $this->_packAndWriteCurrentFile(); - } - - if ($finalize) { - $this->_getWriter()->write(str_repeat("\0", self::TAR_BLOCK_SIZE * 12)); - } - } - - /** - * Set files that shouldn't be added to tarball - * - * @param array $skipFiles - * @return Mage_Backup_Archive_Tar - */ - public function setSkipFiles(array $skipFiles) - { - $this->_skipFiles = $skipFiles; - return $this; - } -} diff --git a/lib/Mage/Backup/Db.php b/lib/Mage/Backup/Db.php deleted file mode 100644 index f6333024885..00000000000 --- a/lib/Mage/Backup/Db.php +++ /dev/null @@ -1,119 +0,0 @@ - - */ -class Mage_Backup_Db extends Mage_Backup_Abstract -{ - /** - * Implements Rollback functionality for Db - * - * @return bool - */ - public function rollback() - { - set_time_limit(0); - ignore_user_abort(true); - - $this->_lastOperationSucceed = false; - - $archiveManager = new Mage_Archive(); - $source = $archiveManager->unpack($this->getBackupPath(), $this->getBackupsDir()); - - $file = new Mage_Backup_Filesystem_Iterator_File($source); - foreach ($file as $statement) { - $this->getResourceModel()->runCommand($statement); - } - @unlink($source); - - $this->_lastOperationSucceed = true; - - return true; - } - - /** - * Checks whether the line is last in sql command - * - * @param $line - * @return bool - */ - protected function _isLineLastInCommand($line) - { - $cleanLine = trim($line); - $lineLength = strlen($cleanLine); - - $returnResult = false; - if ($lineLength > 0){ - $lastSymbolIndex = $lineLength-1; - if ($cleanLine[$lastSymbolIndex] == ';'){ - $returnResult = true; - } - } - - return $returnResult; - } - - /** - * Implements Create Backup functionality for Db - * - * @return bool - */ - public function create() - { - set_time_limit(0); - ignore_user_abort(true); - - $this->_lastOperationSucceed = false; - - $backup = Mage::getModel('backup/backup') - ->setTime($this->getTime()) - ->setType($this->getType()) - ->setPath($this->getBackupsDir()) - ->setName($this->getName()); - - $backupDb = Mage::getModel('backup/db'); - $backupDb->createBackup($backup); - - $this->_lastOperationSucceed = true; - - return true; - } - - /** - * Get Backup Type - * - * @return string - */ - public function getType() - { - return 'db'; - } -} diff --git a/lib/Mage/Backup/Exception.php b/lib/Mage/Backup/Exception.php deleted file mode 100644 index bef1a1d8def..00000000000 --- a/lib/Mage/Backup/Exception.php +++ /dev/null @@ -1,36 +0,0 @@ - - */ -class Mage_Backup_Exception extends Mage_Exception -{ -} diff --git a/lib/Mage/Backup/Exception/CantLoadSnapshot.php b/lib/Mage/Backup/Exception/CantLoadSnapshot.php deleted file mode 100644 index cd112d098ac..00000000000 --- a/lib/Mage/Backup/Exception/CantLoadSnapshot.php +++ /dev/null @@ -1,36 +0,0 @@ - - */ -class Mage_Backup_Exception_CantLoadSnapshot extends Mage_Backup_Exception -{ -} diff --git a/lib/Mage/Backup/Exception/FtpConnectionFailed.php b/lib/Mage/Backup/Exception/FtpConnectionFailed.php deleted file mode 100644 index a0fa41ac324..00000000000 --- a/lib/Mage/Backup/Exception/FtpConnectionFailed.php +++ /dev/null @@ -1,36 +0,0 @@ - - */ -class Mage_Backup_Exception_FtpConnectionFailed extends Mage_Backup_Exception -{ -} diff --git a/lib/Mage/Backup/Exception/FtpValidationFailed.php b/lib/Mage/Backup/Exception/FtpValidationFailed.php deleted file mode 100644 index d1eb04bf43d..00000000000 --- a/lib/Mage/Backup/Exception/FtpValidationFailed.php +++ /dev/null @@ -1,36 +0,0 @@ - - */ -class Mage_Backup_Exception_FtpValidationFailed extends Mage_Backup_Exception -{ -} diff --git a/lib/Mage/Backup/Exception/NotEnoughFreeSpace.php b/lib/Mage/Backup/Exception/NotEnoughFreeSpace.php deleted file mode 100644 index 37a64e79795..00000000000 --- a/lib/Mage/Backup/Exception/NotEnoughFreeSpace.php +++ /dev/null @@ -1,36 +0,0 @@ - - */ -class Mage_Backup_Exception_NotEnoughFreeSpace extends Mage_Backup_Exception -{ -} diff --git a/lib/Mage/Backup/Exception/NotEnoughPermissions.php b/lib/Mage/Backup/Exception/NotEnoughPermissions.php deleted file mode 100644 index 6db5b1b4946..00000000000 --- a/lib/Mage/Backup/Exception/NotEnoughPermissions.php +++ /dev/null @@ -1,36 +0,0 @@ - - */ -class Mage_Backup_Exception_NotEnoughPermissions extends Mage_Backup_Exception -{ -} diff --git a/lib/Mage/Backup/Filesystem.php b/lib/Mage/Backup/Filesystem.php deleted file mode 100644 index aae5222d978..00000000000 --- a/lib/Mage/Backup/Filesystem.php +++ /dev/null @@ -1,284 +0,0 @@ - - */ -class Mage_Backup_Filesystem extends Mage_Backup_Abstract -{ - /** - * Paths that ignored when creating or rolling back snapshot - * - * @var array - */ - protected $_ignorePaths = array(); - - /** - * Whether use ftp account for rollback procedure - * - * @var bool - */ - protected $_useFtp = false; - - /** - * Ftp host - * - * @var string - */ - protected $_ftpHost; - - /** - * Ftp username - * - * @var string - */ - protected $_ftpUser; - - /** - * Password to ftp account - * - * @var string - */ - protected $_ftpPass; - - /** - * Ftp path to Magento installation - * - * @var string - */ - protected $_ftpPath; - - /** - * Implementation Rollback functionality for Filesystem - * - * @throws Mage_Exception - * @return bool - */ - public function rollback() - { - $this->_lastOperationSucceed = false; - - set_time_limit(0); - ignore_user_abort(true); - - $rollbackWorker = $this->_useFtp ? new Mage_Backup_Filesystem_Rollback_Ftp($this) - : new Mage_Backup_Filesystem_Rollback_Fs($this); - $rollbackWorker->run(); - - $this->_lastOperationSucceed = true; - } - - /** - * Implementation Create Backup functionality for Filesystem - * - * @throws Mage_Exception - * @return boolean - */ - public function create() - { - set_time_limit(0); - ignore_user_abort(true); - - $this->_lastOperationSucceed = false; - - $this->_checkBackupsDir(); - - $fsHelper = new Mage_Backup_Filesystem_Helper(); - - $filesInfo = $fsHelper->getInfo( - $this->getRootDir(), - Mage_Backup_Filesystem_Helper::INFO_READABLE | Mage_Backup_Filesystem_Helper::INFO_SIZE, - $this->getIgnorePaths() - ); - - if (!$filesInfo['readable']) { - throw new Mage_Backup_Exception_NotEnoughPermissions('Not enough permissions to read files for backup'); - } - - $freeSpace = disk_free_space($this->getBackupsDir()); - - if (2 * $filesInfo['size'] > $freeSpace) { - throw new Mage_Backup_Exception_NotEnoughFreeSpace('Not enough free space to create backup'); - } - - $tarTmpPath = $this->_getTarTmpPath(); - - $tarPacker = new Mage_Backup_Archive_Tar(); - $tarPacker->setSkipFiles($this->getIgnorePaths()) - ->pack($this->getRootDir(), $tarTmpPath, true); - - if (!is_file($tarTmpPath) || filesize($tarTmpPath) == 0) { - throw new Mage_Exception('Failed to create backup'); - } - - $backupPath = $this->getBackupPath(); - - $gzPacker = new Mage_Archive_Gz(); - $gzPacker->pack($tarTmpPath, $backupPath); - - if (!is_file($backupPath) || filesize($backupPath) == 0) { - throw new Mage_Exception('Failed to create backup'); - } - - @unlink($tarTmpPath); - - $this->_lastOperationSucceed = true; - } - - /** - * Force class to use ftp for rollback procedure - * - * @param string $host - * @param string $username - * @param string $password - * @param string $path - * @return Mage_Backup_Filesystem - */ - public function setUseFtp($host, $username, $password, $path) - { - $this->_useFtp = true; - $this->_ftpHost = $host; - $this->_ftpUser = $username; - $this->_ftpPass = $password; - $this->_ftpPath = $path; - return $this; - } - - /** - * Get backup type - * - * @see Mage_Backup_Interface::getType() - * @return string - */ - public function getType() - { - return 'filesystem'; - } - - /** - * Add path that should be ignoring when creating or rolling back backup - * - * @param string|array $paths - * @return Mage_Backup_Filesystem - */ - public function addIgnorePaths($paths) - { - if (is_string($paths)) { - if (!in_array($paths, $this->_ignorePaths)) { - $this->_ignorePaths[] = $paths; - } - } - else if (is_array($paths)) { - foreach ($paths as $path) { - $this->addIgnorePaths($path); - } - } - - return $this; - } - - /** - * Get paths that should be ignored while creating or rolling back backup procedure - * - * @return array - */ - public function getIgnorePaths() - { - return $this->_ignorePaths; - } - - /** - * Set directory where backups saved and add it to ignore paths - * - * @see Mage_Backup_Abstract::setBackupsDir() - * @param string $backupsDir - * @return Mage_Backup_Filesystem - */ - public function setBackupsDir($backupsDir) - { - parent::setBackupsDir($backupsDir); - $this->addIgnorePaths($backupsDir); - return $this; - } - - /** - * getter for $_ftpPath variable - * - * @return string - */ - public function getFtpPath() - { - return $this->_ftpPath; - } - - /** - * Get ftp connection string - * - * @return string - */ - public function getFtpConnectString() - { - return 'ftp://' . $this->_ftpUser . ':' . $this->_ftpPass . '@' . $this->_ftpHost . $this->_ftpPath; - } - - /** - * Check backups directory existance and whether it's writeable - * - * @throws Mage_Exception - */ - protected function _checkBackupsDir() - { - $backupsDir = $this->getBackupsDir(); - - if (!is_dir($backupsDir)) { - $backupsDirParentDirectory = basename($backupsDir); - - if (!is_writeable($backupsDirParentDirectory)) { - throw new Mage_Backup_Exception_NotEnoughPermissions('Cant create backups directory'); - } - - mkdir($backupsDir); - chmod($backupsDir, 0777); - } - - if (!is_writable($backupsDir)) { - throw new Mage_Backup_Exception_NotEnoughPermissions('Backups directory is not writeable'); - } - } - - /** - * Generate tmp name for tarball - */ - protected function _getTarTmpPath() - { - $tmpName = '~tmp-'. microtime(true) . '.tar'; - return $this->getBackupsDir() . DS . $tmpName; - } -} diff --git a/lib/Mage/Backup/Filesystem/Helper.php b/lib/Mage/Backup/Filesystem/Helper.php deleted file mode 100644 index 25c28dab775..00000000000 --- a/lib/Mage/Backup/Filesystem/Helper.php +++ /dev/null @@ -1,141 +0,0 @@ - - */ -class Mage_Backup_Filesystem_Helper -{ - /** - * Constant can be used in getInfo() function as second parameter. - * Check whether directory and all files/sub directories are writable - * - * @const int - */ - const INFO_WRITABLE = 1; - - /** - * Constant can be used in getInfo() function as second parameter. - * Check whether directory and all files/sub directories are readable - * - * @const int - */ - const INFO_READABLE = 2; - - /** - * Constant can be used in getInfo() function as second parameter. - * Get directory size - * - * @const int - */ - const INFO_SIZE = 4; - - /** - * Constant can be used in getInfo() function as second parameter. - * Combination of INFO_WRITABLE, INFO_READABLE, INFO_SIZE - * - * @const int - */ - const INFO_ALL = 7; - - /** - * Recursively delete $path - * - * @param string $path - * @param array $skipPaths - * @param bool $removeRoot - * @throws Mage_Exception - */ - public function rm($path, $skipPaths = array(), $removeRoot = false) - { - $filesystemIterator = new RecursiveIteratorIterator( - new RecursiveDirectoryIterator($path), RecursiveIteratorIterator::CHILD_FIRST - ); - - $iterator = new Mage_Backup_Filesystem_Iterator_Filter($filesystemIterator, $skipPaths); - - foreach ($iterator as $item) { - $item->isDir() ? @rmdir($item->__toString()) : @unlink($item->__toString()); - } - - if ($removeRoot && is_dir($path)) { - @rmdir($path); - } - } - - /** - * Get information (readable, writable, size) about $path - * - * @param string $path - * @param int $infoOptions - * @param array $skipFiles - */ - public function getInfo($path, $infoOptions = self::INFO_ALL, $skipFiles = array()) - { - $info = array(); - if ($infoOptions & self::INFO_READABLE) { - $info['readable'] = true; - } - - if ($infoOptions & self::INFO_WRITABLE) { - $info['writable'] = true; - } - - if ($infoOptions & self::INFO_SIZE) { - $info['size'] = 0; - } - - $filesystemIterator = new RecursiveIteratorIterator( - new RecursiveDirectoryIterator($path), RecursiveIteratorIterator::CHILD_FIRST - ); - - $iterator = new Mage_Backup_Filesystem_Iterator_Filter($filesystemIterator, $skipFiles); - - foreach ($iterator as $item) { - if ($item->isLink()) { - continue; - } - - if (($infoOptions & self::INFO_WRITABLE) && !$item->isWritable()) { - $info['writable'] = false; - } - - if (($infoOptions & self::INFO_READABLE) && !$item->isReadable()) { - $info['readable'] = false; - } - - if ($infoOptions & self::INFO_SIZE && !$item->isDir()) { - $info['size'] += $item->getSize(); - } - } - - return $info; - } -} diff --git a/lib/Mage/Backup/Filesystem/Iterator/File.php b/lib/Mage/Backup/Filesystem/Iterator/File.php deleted file mode 100644 index bdc8739712f..00000000000 --- a/lib/Mage/Backup/Filesystem/Iterator/File.php +++ /dev/null @@ -1,112 +0,0 @@ - - */ -class Mage_Backup_Filesystem_Iterator_File extends SplFileObject -{ - /** - * The statement that was last read during iteration - * - * @var string - */ - protected $_currentStatement = ''; - - /** - * Return current sql statement - * - * @return string - */ - public function current() - { - return $this->_currentStatement; - } - - /** - * Iterate to next sql statement in file - */ - public function next() - { - $this->_currentStatement = ''; - while (!$this->eof()) { - $line = $this->fgets(); - if (strlen(trim($line))) { - $this->_currentStatement .= $line; - if ($this->_isLineLastInCommand($line)) { - break; - } - } - } - } - - /** - * Return to first statement - */ - public function rewind() - { - parent::rewind(); - $this->next(); - } - - /** - * Check whether provided string is comment - * - * @param string $line - * @return bool - */ - protected function _isComment($line) - { - return $line[0] == '#' || substr($line, 0, 2) == '--'; - } - - /** - * Check is line a last in sql command - * - * @param string $line - * @return bool - */ - protected function _isLineLastInCommand($line) - { - $cleanLine = trim($line); - $lineLength = strlen($cleanLine); - - $returnResult = false; - if ($lineLength > 0) { - $lastSymbolIndex = $lineLength - 1; - if ($cleanLine[$lastSymbolIndex] == ';') { - $returnResult = true; - } - } - - return $returnResult; - } -} diff --git a/lib/Mage/Backup/Filesystem/Iterator/Filter.php b/lib/Mage/Backup/Filesystem/Iterator/Filter.php deleted file mode 100644 index 1de96f7f1db..00000000000 --- a/lib/Mage/Backup/Filesystem/Iterator/Filter.php +++ /dev/null @@ -1,77 +0,0 @@ - - */ -class Mage_Backup_Filesystem_Iterator_Filter extends FilterIterator -{ - /** - * Array that is used for filtering - * - * @var array - */ - protected $_filters; - - /** - * Constructor - * - * @param Iterator $iterator - * @param array $filters list of files to skip - */ - public function __construct(Iterator $iterator, array $filters) - { - parent::__construct($iterator); - $this->_filters = $filters; - } - - /** - * Check whether the current element of the iterator is acceptable - * - * @return bool - */ - public function accept() - { - $current = $this->current()->__toString(); - $currentFilename = $this->current()->getFilename(); - - if ($currentFilename == '.' || $currentFilename == '..') { - return false; - } - - foreach ($this->_filters as $filter) { - if (false !== strpos($current, $filter)) { - return false; - } - } - - return true; - } -} diff --git a/lib/Mage/Backup/Filesystem/Rollback/Abstract.php b/lib/Mage/Backup/Filesystem/Rollback/Abstract.php deleted file mode 100644 index e131284ad7a..00000000000 --- a/lib/Mage/Backup/Filesystem/Rollback/Abstract.php +++ /dev/null @@ -1,57 +0,0 @@ - - */ -abstract class Mage_Backup_Filesystem_Rollback_Abstract -{ - /** - * Snapshot object - * - * @var Mage_Backup_Filesystem - */ - protected $_snapshot; - - /** - * Default worker constructor - * - * @param Mage_Backup_Filesystem $snapshotObject - */ - public function __construct(Mage_Backup_Filesystem $snapshotObject) - { - $this->_snapshot = $snapshotObject; - } - - /** - * Main worker's function that makes files rollback - */ - abstract public function run(); -} diff --git a/lib/Mage/Backup/Filesystem/Rollback/Fs.php b/lib/Mage/Backup/Filesystem/Rollback/Fs.php deleted file mode 100644 index 84d198cfe59..00000000000 --- a/lib/Mage/Backup/Filesystem/Rollback/Fs.php +++ /dev/null @@ -1,78 +0,0 @@ - - */ -class Mage_Backup_Filesystem_Rollback_Fs extends Mage_Backup_Filesystem_Rollback_Abstract -{ - /** - * Files rollback implementation via local filesystem - * - * @see Mage_Backup_Filesystem_Rollback_Abstract::run() - * @throws Mage_Exception - */ - public function run() - { - $snapshotPath = $this->_snapshot->getBackupPath(); - - if (!is_file($snapshotPath) || !is_readable($snapshotPath)) { - throw new Mage_Backup_Exception_CantLoadSnapshot('Cant load snapshot archive'); - } - - $fsHelper = new Mage_Backup_Filesystem_Helper(); - - $filesInfo = $fsHelper->getInfo( - $this->_snapshot->getRootDir(), - Mage_Backup_Filesystem_Helper::INFO_WRITABLE, - $this->_snapshot->getIgnorePaths() - ); - - if (!$filesInfo['writable']) { - throw new Mage_Backup_Exception_NotEnoughPermissions( - 'Unable to make rollback because not all files are writable' - ); - } - - $archiver = new Mage_Archive(); - - /** - * we need these fake initializations because all magento's files in filesystem will be deleted and autoloader - * wont be able to load classes that we need for unpacking - */ - new Mage_Archive_Tar(); - new Mage_Archive_Gz(); - new Mage_Archive_Helper_File(''); - new Mage_Archive_Helper_File_Gz(''); - - $fsHelper->rm($this->_snapshot->getRootDir(), $this->_snapshot->getIgnorePaths()); - $archiver->unpack($snapshotPath, $this->_snapshot->getRootDir()); - } -} diff --git a/lib/Mage/Backup/Filesystem/Rollback/Ftp.php b/lib/Mage/Backup/Filesystem/Rollback/Ftp.php deleted file mode 100644 index 7a1f803e0ee..00000000000 --- a/lib/Mage/Backup/Filesystem/Rollback/Ftp.php +++ /dev/null @@ -1,198 +0,0 @@ - - */ -class Mage_Backup_Filesystem_Rollback_Ftp extends Mage_Backup_Filesystem_Rollback_Abstract -{ - /** - * Ftp client - * - * @var Mage_System_Ftp - */ - protected $_ftpClient; - - /** - * Files rollback implementation via ftp - * - * @see Mage_Backup_Filesystem_Rollback_Abstract::run() - * @throws Mage_Exception - */ - public function run() - { - $snapshotPath = $this->_snapshot->getBackupPath(); - - if (!is_file($snapshotPath) || !is_readable($snapshotPath)) { - throw new Mage_Backup_Exception_CantLoadSnapshot('Cant load snapshot archive'); - } - - $this->_initFtpClient(); - $this->_validateFtp(); - - $tmpDir = $this->_createTmpDir(); - $this->_unpackSnapshot($tmpDir); - - $fsHelper = new Mage_Backup_Filesystem_Helper(); - - $this->_cleanupFtp(); - $this->_uploadBackupToFtp($tmpDir); - - $fsHelper->rm($tmpDir, array(), true); - } - - /** - * Initialize ftp client and connect to ftp - * - * @throws Mage_Backup_Exception_FtpConnectionFailed - */ - protected function _initFtpClient() - { - try { - $this->_ftpClient = new Mage_System_Ftp(); - $this->_ftpClient->connect($this->_snapshot->getFtpConnectString()); - } catch (Exception $e) { - throw new Mage_Backup_Exception_FtpConnectionFailed($e->getMessage()); - } - } - - /** - * Perform ftp validation. Check whether ftp account provided points to current magento installation - * - * @throws Mage_Exception - */ - protected function _validateFtp() - { - $validationFilename = '~validation-' . microtime(true) . '.tmp'; - $validationFilePath = $this->_snapshot->getBackupsDir() . DS . $validationFilename; - - $fh = @fopen($validationFilePath, 'w'); - @fclose($fh); - - if (!is_file($validationFilePath)) { - throw new Mage_Exception('Unable to validate ftp account'); - } - - $rootDir = $this->_snapshot->getRootDir(); - $ftpPath = $this->_snapshot->getFtpPath() . DS . str_replace($rootDir, '', $validationFilePath); - - $fileExistsOnFtp = $this->_ftpClient->fileExists($ftpPath); - @unlink($validationFilePath); - - if (!$fileExistsOnFtp) { - throw new Mage_Backup_Exception_FtpValidationFailed('Failed to validate ftp account'); - } - } - - /** - * Unpack snapshot - * - * @param string $tmpDir - */ - protected function _unpackSnapshot($tmpDir) - { - $snapshotPath = $this->_snapshot->getBackupPath(); - - $archiver = new Mage_Archive(); - $archiver->unpack($snapshotPath, $tmpDir); - } - - /** - * @throws Mage_Exception - * @return string - */ - protected function _createTmpDir() - { - $tmpDir = $this->_snapshot->getBackupsDir() . DS . '~tmp-' . microtime(true); - - $result = @mkdir($tmpDir); - - if (false === $result) { - throw new Mage_Backup_Exception_NotEnoughPermissions('Failed to create directory ' . $tmpDir); - } - - return $tmpDir; - } - - /** - * Delete magento and all files from ftp - */ - protected function _cleanupFtp() - { - $rootDir = $this->_snapshot->getRootDir(); - - $filesystemIterator = new RecursiveIteratorIterator( - new RecursiveDirectoryIterator($rootDir), RecursiveIteratorIterator::CHILD_FIRST - ); - - $iterator = new Mage_Backup_Filesystem_Iterator_Filter($filesystemIterator, $this->_snapshot->getIgnorePaths()); - - foreach ($iterator as $item) { - $ftpPath = $this->_snapshot->getFtpPath() . DS . str_replace($rootDir, '', $item->__toString()); - $ftpPath = str_replace(DS, '/', $ftpPath); - - $this->_ftpClient->delete($ftpPath); - } - } - - /** - * Perform files rollback - * - * @param string $tmpDir - * @throws Mage_Exception - */ - protected function _uploadBackupToFtp($tmpDir) - { - $filesystemIterator = new RecursiveIteratorIterator( - new RecursiveDirectoryIterator($tmpDir), RecursiveIteratorIterator::SELF_FIRST - ); - - $iterator = new Mage_Backup_Filesystem_Iterator_Filter($filesystemIterator, $this->_snapshot->getIgnorePaths()); - - foreach ($filesystemIterator as $item) { - $ftpPath = $this->_snapshot->getFtpPath() . DS . str_replace($tmpDir, '', $item->__toString()); - $ftpPath = str_replace(DS, '/', $ftpPath); - - if ($item->isLink()) { - continue; - } - - if ($item->isDir()) { - $this->_ftpClient->mkdirRecursive($ftpPath); - } else { - $result = $this->_ftpClient->put($ftpPath, $item->__toString()); - if (false === $result) { - throw new Mage_Backup_Exception_NotEnoughPermissions('Failed to upload file ' - . $item->__toString() . ' to ftp'); - } - } - } - } -} diff --git a/lib/Mage/Backup/Interface.php b/lib/Mage/Backup/Interface.php deleted file mode 100644 index 958c7d0023a..00000000000 --- a/lib/Mage/Backup/Interface.php +++ /dev/null @@ -1,88 +0,0 @@ - - */ -interface Mage_Backup_Interface -{ - /** - * Create Backup - * - * @return boolean - */ - public function create(); - - /** - * Rollback Backup - * - * @return boolean - */ - public function rollback(); - - /** - * Set Backup Extension - * - * @param string $backupExtension - * @return Mage_Backup_Interface - */ - public function setBackupExtension($backupExtension); - - /** - * Set Resource Model - * - * @param object $resourceModel - * @return Mage_Backup_Interface - */ - public function setResourceModel($resourceModel); - - /** - * Set Time - * - * @param int $time - * @return Mage_Backup_Interface - */ - public function setTime($time); - - /** - * Get Backup Type - * - * @return string - */ - public function getType(); - - /** - * Set path to directory where backups stored - * - * @param string $backupsDir - * @return Mage_Backup_Interface - */ - public function setBackupsDir($backupsDir); -} diff --git a/lib/Mage/Backup/Media.php b/lib/Mage/Backup/Media.php deleted file mode 100644 index d44633687da..00000000000 --- a/lib/Mage/Backup/Media.php +++ /dev/null @@ -1,99 +0,0 @@ - - */ -class Mage_Backup_Media extends Mage_Backup_Snapshot -{ - /** - * Implementation Rollback functionality for Snapshot - * - * @throws Mage_Exception - * @return bool - */ - public function rollback() - { - $this->_prepareIgnoreList(); - return parent::rollback(); - } - - /** - * Implementation Create Backup functionality for Snapshot - * - * @throws Mage_Exception - * @return bool - */ - public function create() - { - $this->_prepareIgnoreList(); - return parent::create(); - } - - /** - * Overlap getType - * - * @return string - * @see Mage_Backup_Interface::getType() - */ - public function getType() - { - return 'media'; - } - - /** - * Add all folders and files except media and db backup to ignore list - * - * @return Mage_Backup_Media - */ - protected function _prepareIgnoreList() - { - $iterator = new DirectoryIterator($this->getRootDir()); - - foreach ($iterator as $item) { - $filename = $item->getFilename(); - if (!in_array($filename, array('media', 'var'))) { - $this->addIgnorePaths($item->getPathname()); - } - } - - $iterator = new DirectoryIterator($this->getRootDir() . DS . 'var'); - $dbBackupFilename = $this->_getDbBackupManager()->getBackupFilename(); - - foreach ($iterator as $item) { - $filename = $item->getFilename(); - if ($filename != $dbBackupFilename) { - $this->addIgnorePaths($item->getPathname()); - } - } - - return $this; - } -} diff --git a/lib/Mage/Backup/Nomedia.php b/lib/Mage/Backup/Nomedia.php deleted file mode 100644 index a57d561edaf..00000000000 --- a/lib/Mage/Backup/Nomedia.php +++ /dev/null @@ -1,82 +0,0 @@ - - */ -class Mage_Backup_Nomedia extends Mage_Backup_Snapshot -{ - /** - * Implementation Rollback functionality for Snapshot - * - * @throws Mage_Exception - * @return bool - */ - public function rollback() - { - $this->_prepareIgnoreList(); - return parent::rollback(); - } - - /** - * Implementation Create Backup functionality for Snapshot - * - * @throws Mage_Exception - * @return bool - */ - public function create() - { - $this->_prepareIgnoreList(); - return parent::create(); - } - - /** - * Overlap getType - * - * @return string - * @see Mage_Backup_Interface::getType() - */ - public function getType() - { - return 'nomedia'; - } - - /** - * Add media folder to ignore list - * - * @return Mage_Backup_Media - */ - protected function _prepareIgnoreList() - { - $this->addIgnorePaths($this->getRootDir() . DS . 'media'); - - return $this; - } -} diff --git a/lib/Mage/Backup/Snapshot.php b/lib/Mage/Backup/Snapshot.php deleted file mode 100644 index 160a2d5d67b..00000000000 --- a/lib/Mage/Backup/Snapshot.php +++ /dev/null @@ -1,140 +0,0 @@ - - */ -class Mage_Backup_Snapshot extends Mage_Backup_Filesystem -{ - /** - * Database backup manager - * - * @var Mage_Backup_Db - */ - protected $_dbBackupManager; - - /** - * Implementation Rollback functionality for Snapshot - * - * @throws Mage_Exception - * @return bool - */ - public function rollback() - { - $result = parent::rollback(); - - $this->_lastOperationSucceed = false; - - try { - $this->_getDbBackupManager()->rollback(); - } catch (Exception $e) { - $this->_removeDbBackup(); - throw $e; - } - - $this->_removeDbBackup(); - $this->_lastOperationSucceed = true; - - return $result; - } - - /** - * Implementation Create Backup functionality for Snapshot - * - * @throws Mage_Exception - * @return bool - */ - public function create() - { - $this->_getDbBackupManager()->create(); - - try { - $result = parent::create(); - } catch (Exception $e) { - $this->_removeDbBackup(); - throw $e; - } - - $this->_lastOperationSucceed = false; - $this->_removeDbBackup(); - $this->_lastOperationSucceed = true; - - return $result; - } - - /** - * Overlap getType - * - * @return string - * @see Mage_Backup_Interface::getType() - */ - public function getType() - { - return 'snapshot'; - } - - /** - * Create Db Instance - * - * @return Mage_Backup_Interface - */ - protected function _createDbBackupInstance() - { - return Mage_Backup::getBackupInstance(Mage_Backup_Helper_Data::TYPE_DB) - ->setBackupExtension(Mage::helper('backup')->getExtensionByType(Mage_Backup_Helper_Data::TYPE_DB)) - ->setTime($this->getTime()) - ->setBackupsDir(Mage::getBaseDir("var")) - ->setResourceModel($this->getResourceModel()); - } - - /** - * Get database backup manager - * - * @return Mage_Backup_Db - */ - protected function _getDbBackupManager() - { - if (is_null($this->_dbBackupManager)) { - $this->_dbBackupManager = $this->_createDbBackupInstance(); - } - - return $this->_dbBackupManager; - } - - /** - * Remove Db backup after added it to the snapshot - * - * @return Mage_Backup_Snapshot - */ - protected function _removeDbBackup(){ - @unlink($this->_getDbBackupManager()->getBackupPath()); - return $this; - } -} From 6e54dd3643b79cdf991d648ff8783daf151b1d5f Mon Sep 17 00:00:00 2001 From: luigifab <31816829+luigifab@users.noreply.github.com> Date: Wed, 13 Jul 2022 14:28:05 +0200 Subject: [PATCH 19/61] Fix argument 1 must contain at least one element (#2091) --- app/code/core/Mage/Bundle/Model/Product/Price.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/core/Mage/Bundle/Model/Product/Price.php b/app/code/core/Mage/Bundle/Model/Product/Price.php index 9c06490c93e..851dc352682 100644 --- a/app/code/core/Mage/Bundle/Model/Product/Price.php +++ b/app/code/core/Mage/Bundle/Model/Product/Price.php @@ -317,8 +317,8 @@ protected function _getMinimalBundleOptionsPrice($product, $includeTax, $takeTie } // condition is TRUE when all product options are NOT required if (!$hasRequiredOptions) { - $minimalPrice = min($selectionMinimalPrices); - $minimalPriceWithTax = min($selectionMinimalPricesWithTax); + $minimalPrice = empty($selectionMinimalPrices) ? 0 : min($selectionMinimalPrices); + $minimalPriceWithTax = empty($selectionMinimalPricesWithTax) ? max(0, $minimalPrice) : min($selectionMinimalPricesWithTax); } $taxConfig = $this->_getHelperData('tax')->getConfig(); From 1837f7401c9dca5db926b222ca1b0b5debd3519d Mon Sep 17 00:00:00 2001 From: Mohamed ELIDRISSI <67818913+elidrissidev@users.noreply.github.com> Date: Wed, 13 Jul 2022 13:29:45 +0100 Subject: [PATCH 20/61] Added order comment functionality to REST API (#2315) --- .../Sales/Model/Api2/Order/Comment/Rest.php | 1 + .../Api2/Order/Comment/Rest/Admin/V1.php | 63 +++++++++++++++++++ app/code/core/Mage/Sales/etc/api2.xml | 5 ++ 3 files changed, 69 insertions(+) diff --git a/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest.php b/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest.php index 6bdf1316d9b..fa4a216ac74 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest.php @@ -37,6 +37,7 @@ abstract class Mage_Sales_Model_Api2_Order_Comment_Rest extends Mage_Sales_Model * Parameters in request used in model (usually specified in route mask) */ const PARAM_ORDER_ID = 'id'; + const PARAM_COMMENT_ID = 'comment_id'; /**#@-*/ /** diff --git a/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php index 230b18d8548..275cedb538b 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php @@ -33,4 +33,67 @@ */ class Mage_Sales_Model_Api2_Order_Comment_Rest_Admin_V1 extends Mage_Sales_Model_Api2_Order_Comment_Rest { + /** + * Add comment to order + * + * @param array $data + * @return string + */ + protected function _create(array $data) + { + $orderId = $this->getRequest()->getParam(self::PARAM_ORDER_ID); + $order = $this->_loadOrderById($orderId); + + $status = $data['status'] ?? false; + $comment = $data['comment'] ?? ''; + $visibleOnFront = $data['is_visible_on_front'] ?? 0; + $notifyCustomer = array_key_exists('is_customer_notified', $data) ? $data['is_customer_notified'] : false; + + $historyItem = $order->addStatusHistoryComment($comment, $status); + $historyItem->setIsCustomerNotified($notifyCustomer) + ->setIsVisibleOnFront((int) $visibleOnFront) + ->save(); + + try { + if ($notifyCustomer && $comment) { + $oldStore = Mage::getDesign()->getStore(); + $oldArea = Mage::getDesign()->getArea(); + Mage::getDesign()->setStore($order->getStoreId()); + Mage::getDesign()->setArea('frontend'); + } + + $order->save(); + $order->sendOrderUpdateEmail((bool) $notifyCustomer, $comment); + + if ($notifyCustomer && $comment) { + Mage::getDesign()->setStore($oldStore); + Mage::getDesign()->setArea($oldArea); + } + } catch (Mage_Core_Exception $e) { + $this->_critical($e->getMessage(), self::RESOURCE_INTERNAL_ERROR); + } catch (Throwable $t) { + Mage::logException($t); + $this->_critical($t->getMessage(), self::RESOURCE_UNKNOWN_ERROR); + } + + return $this->_getLocation($historyItem); + } + + /** + * Retrieve order comment by id + * + * @return array + */ + protected function _retrieve() + { + $comment = Mage::getModel('sales/order_status_history')->load( + $this->getRequest()->getParam(self::PARAM_COMMENT_ID) + ); + + if (!$comment->getId()) { + $this->_critical(self::RESOURCE_NOT_FOUND); + } + + return $comment->getData(); + } } diff --git a/app/code/core/Mage/Sales/etc/api2.xml b/app/code/core/Mage/Sales/etc/api2.xml index c5c28ee3681..44ae5a07564 100644 --- a/app/code/core/Mage/Sales/etc/api2.xml +++ b/app/code/core/Mage/Sales/etc/api2.xml @@ -308,6 +308,7 @@ Order Comments + 1 1 @@ -328,6 +329,10 @@ + + /orders/comments/:comment_id + entity + /orders/:id/comments collection From 885449694a2947cad89b817b61528303f7239c1f Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Wed, 13 Jul 2022 14:30:09 +0200 Subject: [PATCH 21/61] Added validation workflow for XML files (#2314) --- .github/workflows/xml_validate.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/xml_validate.yml diff --git a/.github/workflows/xml_validate.yml b/.github/workflows/xml_validate.yml new file mode 100644 index 00000000000..531bbfcd63d --- /dev/null +++ b/.github/workflows/xml_validate.yml @@ -0,0 +1,17 @@ +name: XML Validation + +on: + push: + pull_request: + +jobs: + validate: + runs-on: ubuntu-latest + + steps: + - name: "Checkout repository" + uses: actions/checkout@master + - name: "Install xmllint" + run: "sudo apt-get -y install libxml2-utils" + - name: "Validate XMLs" + run: "find . -type f -iname '*.xml' | xargs -I '{}' xmllint --noout '{}'" From 042d4e5c979776debf97843e80b5c5aaf8b380e4 Mon Sep 17 00:00:00 2001 From: Daniel Fahlke Date: Wed, 13 Jul 2022 14:51:03 +0200 Subject: [PATCH 22/61] Add basic unitTest for xml validation (#2304) --- dev/tests/unit/Base/XmlFileLoadingTest.php | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 dev/tests/unit/Base/XmlFileLoadingTest.php diff --git a/dev/tests/unit/Base/XmlFileLoadingTest.php b/dev/tests/unit/Base/XmlFileLoadingTest.php new file mode 100644 index 00000000000..ce1eb56cb92 --- /dev/null +++ b/dev/tests/unit/Base/XmlFileLoadingTest.php @@ -0,0 +1,52 @@ +assertNotEmpty($simplexml->asXML()); + } + + /** + * + * @dataProvider provideXmlFiles + * @param $filepath + * @return void + */ + public function testXmlReaderIsValid($filepath): void + { + $xml = \XMLReader::open($filepath); + $xml->setParserProperty(\XMLReader::VALIDATE, true); + $this->assertTrue($xml->isValid()); + } +} From 4727c2daa696e2e479f24fa1697aa2b13cf05456 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Wed, 13 Jul 2022 15:24:14 +0200 Subject: [PATCH 23/61] regenerated baseline and phpstorm meta --- .github/labeler.yml | 6 - .github/phpstan-baseline.neon | 95 - .github/phpstan.neon | 4 - .phpstorm.meta.php/magento_blocks.meta.php | 8 - .../magento_blocks_methods.meta.php | 8 - .phpstorm.meta.php/magento_helpers.meta.php | 47 +- .../magento_helpers_methods.meta.php | 752 +- .phpstorm.meta.php/magento_models.meta.php | 1558 ++-- .../magento_models_methods.meta.php | 7007 ++++++++--------- 9 files changed, 4635 insertions(+), 4850 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 66495e0e992..a2799fcdf2e 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -95,12 +95,6 @@ - app/design/frontend/*/*/template/authorizenet/* - app/design/frontend/*/*/template/authorizenet/**/* -'Component: Backup': - - app/code/core/Mage/Backup/* - - app/code/core/Mage/Backup/**/* - - app/design/adminhtml/*/*/template/backup/* - - app/design/adminhtml/*/*/template/backup/**/* - 'Component: Bundle': - app/code/core/Mage/Bundle/* - app/code/core/Mage/Bundle/**/* diff --git a/.github/phpstan-baseline.neon b/.github/phpstan-baseline.neon index ea76d06fcc7..65aaff25db5 100644 --- a/.github/phpstan-baseline.neon +++ b/.github/phpstan-baseline.neon @@ -70,16 +70,6 @@ parameters: count: 2 path: ../app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php - - - message: "#^Cannot call method addJs\\(\\) on Mage_Core_Block_Abstract\\|false\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php - - - - message: "#^Method Mage_Adminhtml_Block_Widget_Grid\\:\\:setDefaultSort\\(\\) invoked with 2 parameters, 1 required\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Backup/Grid.php - - message: "#^Access to an undefined property Mage_Adminhtml_Block_Catalog_Category_Tab_Design\\:\\:\\$_category\\.$#" count: 1 @@ -2165,91 +2155,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Authorizenet/controllers/Directpost/PaymentController.php - - - message: "#^PHPDoc tag @param has invalid value \\(string fileName\\)\\: Unexpected token \"fileName\", expected variable at offset 61$#" - count: 1 - path: ../app/code/core/Mage/Backup/Model/Backup.php - - - - message: "#^PHPDoc tag @param has invalid value \\(string filePath\\)\\: Unexpected token \"filePath\", expected variable at offset 91$#" - count: 1 - path: ../app/code/core/Mage/Backup/Model/Backup.php - - - - message: "#^Variable \\$filePath might not be defined\\.$#" - count: 4 - path: ../app/code/core/Mage/Backup/Model/Backup.php - - - - message: "#^Call to an undefined method Varien_Data_Collection\\:\\:addTargetDir\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/Backup/Model/Fs/Collection.php - - - - message: "#^Call to an undefined method Mage_Backup_Interface\\:\\:setRootDir\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/Backup/Model/Observer.php - - - - message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getFooter\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/Backup/Model/Resource/Db.php - - - - message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getHeader\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/Backup/Model/Resource/Db.php - - - - message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getPartInsertSql\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/Backup/Model/Resource/Db.php - - - - message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getTableCreateScript\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/Backup/Model/Resource/Db.php - - - - message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getTableCreateSql\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/Backup/Model/Resource/Db.php - - - - message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getTableDataAfterSql\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/Backup/Model/Resource/Db.php - - - - message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getTableDataBeforeSql\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/Backup/Model/Resource/Db.php - - - - message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getTableDropSql\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/Backup/Model/Resource/Db.php - - - - message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getTableForeignKeysSql\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/Backup/Model/Resource/Db.php - - - - message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:turnOnReadCommittedMode\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/Backup/Model/Resource/Db.php - - - - message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:turnOnSerializableMode\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/Backup/Model/Resource/Db.php - - - - message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#" - count: 1 - path: ../app/code/core/Mage/Backup/Model/Resource/Db.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getOptionsCollection\\(\\)\\.$#" count: 1 diff --git a/.github/phpstan.neon b/.github/phpstan.neon index c6dd2eaed7d..2dc36a95ede 100644 --- a/.github/phpstan.neon +++ b/.github/phpstan.neon @@ -11,7 +11,6 @@ parameters: - %currentWorkingDirectory%/app/code/core/Mage/Api - %currentWorkingDirectory%/app/code/core/Mage/Api2 - %currentWorkingDirectory%/app/code/core/Mage/Authorizenet - - %currentWorkingDirectory%/app/code/core/Mage/Backup - %currentWorkingDirectory%/app/code/core/Mage/Bundle - %currentWorkingDirectory%/app/code/core/Mage/Captcha - %currentWorkingDirectory%/app/code/core/Mage/Catalog @@ -92,9 +91,6 @@ parameters: # Class phpseclib\Net\SSH2 not found. - */Paypal/Model/Report/Settlement.php - # Class backup/db was not found while trying to analyse it - - */Adminhtml/controllers/System/BackupController.php - # Dataflow/Model/Convert/Iterator.php - */Dataflow/Model/Convert/Iterator.php diff --git a/.phpstorm.meta.php/magento_blocks.meta.php b/.phpstorm.meta.php/magento_blocks.meta.php index 4dd68013afa..8663cd16289 100644 --- a/.phpstorm.meta.php/magento_blocks.meta.php +++ b/.phpstorm.meta.php/magento_blocks.meta.php @@ -22,9 +22,6 @@ 'adminhtml/api_user_edit_tabs' => \Mage_Adminhtml_Block_Api_User_Edit_Tabs::class, 'adminhtml/api_user_grid' => \Mage_Adminhtml_Block_Api_User_Grid::class, 'adminhtml/api_users' => \Mage_Adminhtml_Block_Api_Users::class, - 'adminhtml/backup' => \Mage_Adminhtml_Block_Backup::class, - 'adminhtml/backup_dialogs' => \Mage_Adminhtml_Block_Backup_Dialogs::class, - 'adminhtml/backup_grid' => \Mage_Adminhtml_Block_Backup_Grid::class, 'adminhtml/cache' => \Mage_Adminhtml_Block_Cache::class, 'adminhtml/cache_additional' => \Mage_Adminhtml_Block_Cache_Additional::class, 'adminhtml/cache_grid' => \Mage_Adminhtml_Block_Cache_Grid::class, @@ -279,7 +276,6 @@ 'adminhtml/notification_grid_renderer_severity' => \Mage_Adminhtml_Block_Notification_Grid_Renderer_Severity::class, 'adminhtml/notification_inbox' => \Mage_Adminhtml_Block_Notification_Inbox::class, 'adminhtml/notification_security' => \Mage_Adminhtml_Block_Notification_Security::class, - 'adminhtml/notification_survey' => \Mage_Adminhtml_Block_Notification_Survey::class, 'adminhtml/notification_toolbar' => \Mage_Adminhtml_Block_Notification_Toolbar::class, 'adminhtml/notification_window' => \Mage_Adminhtml_Block_Notification_Window::class, 'adminhtml/page' => \Mage_Adminhtml_Block_Page::class, @@ -661,10 +657,6 @@ 'adminhtml/system_email_template_grid_renderer_sender' => \Mage_Adminhtml_Block_System_Email_Template_Grid_Renderer_Sender::class, 'adminhtml/system_email_template_grid_renderer_type' => \Mage_Adminhtml_Block_System_Email_Template_Grid_Renderer_Type::class, 'adminhtml/system_email_template_preview' => \Mage_Adminhtml_Block_System_Email_Template_Preview::class, - 'adminhtml/system_store_delete' => \Mage_Adminhtml_Block_System_Store_Delete::class, - 'adminhtml/system_store_delete_form' => \Mage_Adminhtml_Block_System_Store_Delete_Form::class, - 'adminhtml/system_store_delete_group' => \Mage_Adminhtml_Block_System_Store_Delete_Group::class, - 'adminhtml/system_store_delete_website' => \Mage_Adminhtml_Block_System_Store_Delete_Website::class, 'adminhtml/system_store_edit' => \Mage_Adminhtml_Block_System_Store_Edit::class, 'adminhtml/system_store_edit_form' => \Mage_Adminhtml_Block_System_Store_Edit_Form::class, 'adminhtml/system_store_grid' => \Mage_Adminhtml_Block_System_Store_Grid::class, diff --git a/.phpstorm.meta.php/magento_blocks_methods.meta.php b/.phpstorm.meta.php/magento_blocks_methods.meta.php index 63fd94080e3..4df72cece0e 100644 --- a/.phpstorm.meta.php/magento_blocks_methods.meta.php +++ b/.phpstorm.meta.php/magento_blocks_methods.meta.php @@ -22,9 +22,6 @@ 'adminhtml/api_user_edit_tabs' => \Mage_Adminhtml_Block_Api_User_Edit_Tabs::class, 'adminhtml/api_user_grid' => \Mage_Adminhtml_Block_Api_User_Grid::class, 'adminhtml/api_users' => \Mage_Adminhtml_Block_Api_Users::class, - 'adminhtml/backup' => \Mage_Adminhtml_Block_Backup::class, - 'adminhtml/backup_dialogs' => \Mage_Adminhtml_Block_Backup_Dialogs::class, - 'adminhtml/backup_grid' => \Mage_Adminhtml_Block_Backup_Grid::class, 'adminhtml/cache' => \Mage_Adminhtml_Block_Cache::class, 'adminhtml/cache_additional' => \Mage_Adminhtml_Block_Cache_Additional::class, 'adminhtml/cache_grid' => \Mage_Adminhtml_Block_Cache_Grid::class, @@ -279,7 +276,6 @@ 'adminhtml/notification_grid_renderer_severity' => \Mage_Adminhtml_Block_Notification_Grid_Renderer_Severity::class, 'adminhtml/notification_inbox' => \Mage_Adminhtml_Block_Notification_Inbox::class, 'adminhtml/notification_security' => \Mage_Adminhtml_Block_Notification_Security::class, - 'adminhtml/notification_survey' => \Mage_Adminhtml_Block_Notification_Survey::class, 'adminhtml/notification_toolbar' => \Mage_Adminhtml_Block_Notification_Toolbar::class, 'adminhtml/notification_window' => \Mage_Adminhtml_Block_Notification_Window::class, 'adminhtml/page' => \Mage_Adminhtml_Block_Page::class, @@ -661,10 +657,6 @@ 'adminhtml/system_email_template_grid_renderer_sender' => \Mage_Adminhtml_Block_System_Email_Template_Grid_Renderer_Sender::class, 'adminhtml/system_email_template_grid_renderer_type' => \Mage_Adminhtml_Block_System_Email_Template_Grid_Renderer_Type::class, 'adminhtml/system_email_template_preview' => \Mage_Adminhtml_Block_System_Email_Template_Preview::class, - 'adminhtml/system_store_delete' => \Mage_Adminhtml_Block_System_Store_Delete::class, - 'adminhtml/system_store_delete_form' => \Mage_Adminhtml_Block_System_Store_Delete_Form::class, - 'adminhtml/system_store_delete_group' => \Mage_Adminhtml_Block_System_Store_Delete_Group::class, - 'adminhtml/system_store_delete_website' => \Mage_Adminhtml_Block_System_Store_Delete_Website::class, 'adminhtml/system_store_edit' => \Mage_Adminhtml_Block_System_Store_Edit::class, 'adminhtml/system_store_edit_form' => \Mage_Adminhtml_Block_System_Store_Edit_Form::class, 'adminhtml/system_store_grid' => \Mage_Adminhtml_Block_System_Store_Grid::class, diff --git a/.phpstorm.meta.php/magento_helpers.meta.php b/.phpstorm.meta.php/magento_helpers.meta.php index 0091174c8ad..7aad84e4444 100644 --- a/.phpstorm.meta.php/magento_helpers.meta.php +++ b/.phpstorm.meta.php/magento_helpers.meta.php @@ -2,8 +2,8 @@ namespace PHPSTORM_META { override( \Mage::helper(0), map( [ - 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'adminnotification' => \Mage_AdminNotification_Helper_Data::class, + 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'admin/block' => \Mage_Admin_Helper_Block::class, 'admin' => \Mage_Admin_Helper_Data::class, 'admin/data' => \Mage_Admin_Helper_Data::class, @@ -23,32 +23,30 @@ 'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class, 'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class, 'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class, - 'api2' => \Mage_Api2_Helper_Data::class, 'api2/data' => \Mage_Api2_Helper_Data::class, - 'api' => \Mage_Api_Helper_Data::class, + 'api2' => \Mage_Api2_Helper_Data::class, 'api/data' => \Mage_Api_Helper_Data::class, + 'api' => \Mage_Api_Helper_Data::class, 'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class, 'authorizenet' => \Mage_Authorizenet_Helper_Data::class, 'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class, - 'backup' => \Mage_Backup_Helper_Data::class, - 'backup/data' => \Mage_Backup_Helper_Data::class, 'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class, - 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'bundle' => \Mage_Bundle_Helper_Data::class, - 'captcha/data' => \Mage_Captcha_Helper_Data::class, + 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'captcha' => \Mage_Captcha_Helper_Data::class, - 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, + 'captcha/data' => \Mage_Captcha_Helper_Data::class, 'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class, + 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, 'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class, - 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class, + 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class, 'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class, 'catalog/category' => \Mage_Catalog_Helper_Category::class, 'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class, 'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class, - 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/data' => \Mage_Catalog_Helper_Data::class, + 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class, 'catalog/image' => \Mage_Catalog_Helper_Image::class, 'catalog/map' => \Mage_Catalog_Helper_Map::class, @@ -72,8 +70,8 @@ 'cms/data' => \Mage_Cms_Helper_Data::class, 'cms/page' => \Mage_Cms_Helper_Page::class, 'cms/wysiwyg_images' => \Mage_Cms_Helper_Wysiwyg_Images::class, - 'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class, 'configurableswatches' => \Mage_ConfigurableSwatches_Helper_Data::class, + 'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class, 'configurableswatches/list_price' => \Mage_ConfigurableSwatches_Helper_List_Price::class, 'configurableswatches/mediafallback' => \Mage_ConfigurableSwatches_Helper_Mediafallback::class, 'configurableswatches/productimg' => \Mage_ConfigurableSwatches_Helper_Productimg::class, @@ -89,6 +87,7 @@ 'core/hint' => \Mage_Core_Helper_Hint::class, 'core/http' => \Mage_Core_Helper_Http::class, 'core/js' => \Mage_Core_Helper_Js::class, + 'core/security' => \Mage_Core_Helper_Security::class, 'core/string' => \Mage_Core_Helper_String::class, 'core/translate' => \Mage_Core_Helper_Translate::class, 'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class, @@ -101,57 +100,57 @@ 'customer' => \Mage_Customer_Helper_Data::class, 'dataflow' => \Mage_Dataflow_Helper_Data::class, 'dataflow/data' => \Mage_Dataflow_Helper_Data::class, - 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory' => \Mage_Directory_Helper_Data::class, + 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory/url' => \Mage_Directory_Helper_Url::class, 'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class, 'downloadable' => \Mage_Downloadable_Helper_Data::class, 'downloadable/data' => \Mage_Downloadable_Helper_Data::class, 'downloadable/download' => \Mage_Downloadable_Helper_Download::class, 'downloadable/file' => \Mage_Downloadable_Helper_File::class, - 'eav' => \Mage_Eav_Helper_Data::class, 'eav/data' => \Mage_Eav_Helper_Data::class, + 'eav' => \Mage_Eav_Helper_Data::class, 'giftmessage' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class, 'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class, 'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class, 'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class, - 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'importexport' => \Mage_ImportExport_Helper_Data::class, - 'index/data' => \Mage_Index_Helper_Data::class, + 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'index' => \Mage_Index_Helper_Data::class, + 'index/data' => \Mage_Index_Helper_Data::class, 'install' => \Mage_Install_Helper_Data::class, 'install/data' => \Mage_Install_Helper_Data::class, 'log/data' => \Mage_Log_Helper_Data::class, 'log' => \Mage_Log_Helper_Data::class, 'media/data' => \Mage_Media_Helper_Data::class, 'media' => \Mage_Media_Helper_Data::class, - 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'newsletter' => \Mage_Newsletter_Helper_Data::class, + 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, 'pagecache' => \Mage_PageCache_Helper_Data::class, 'pagecache/data' => \Mage_PageCache_Helper_Data::class, - 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, + 'page' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, 'page/layout' => \Mage_Page_Helper_Layout::class, - 'payment' => \Mage_Payment_Helper_Data::class, 'payment/data' => \Mage_Payment_Helper_Data::class, - 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, + 'payment' => \Mage_Payment_Helper_Data::class, 'paypaluk' => \Mage_PaypalUk_Helper_Data::class, + 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, 'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class, 'paypal/data' => \Mage_Paypal_Helper_Data::class, 'paypal' => \Mage_Paypal_Helper_Data::class, 'paypal/hss' => \Mage_Paypal_Helper_Hss::class, - 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent' => \Mage_Persistent_Helper_Data::class, + 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent/session' => \Mage_Persistent_Helper_Session::class, - 'poll/data' => \Mage_Poll_Helper_Data::class, 'poll' => \Mage_Poll_Helper_Data::class, - 'productalert' => \Mage_ProductAlert_Helper_Data::class, + 'poll/data' => \Mage_Poll_Helper_Data::class, 'productalert/data' => \Mage_ProductAlert_Helper_Data::class, + 'productalert' => \Mage_ProductAlert_Helper_Data::class, 'rating' => \Mage_Rating_Helper_Data::class, 'rating/data' => \Mage_Rating_Helper_Data::class, 'reports/data' => \Mage_Reports_Helper_Data::class, @@ -175,10 +174,10 @@ 'sendfriend' => \Mage_Sendfriend_Helper_Data::class, 'shipping' => \Mage_Shipping_Helper_Data::class, 'shipping/data' => \Mage_Shipping_Helper_Data::class, - 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'sitemap' => \Mage_Sitemap_Helper_Data::class, - 'tag/data' => \Mage_Tag_Helper_Data::class, + 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'tag' => \Mage_Tag_Helper_Data::class, + 'tag/data' => \Mage_Tag_Helper_Data::class, 'tax' => \Mage_Tax_Helper_Data::class, 'tax/data' => \Mage_Tax_Helper_Data::class, 'uploader/data' => \Mage_Uploader_Helper_Data::class, diff --git a/.phpstorm.meta.php/magento_helpers_methods.meta.php b/.phpstorm.meta.php/magento_helpers_methods.meta.php index 13c7da87fe7..8a0186896e3 100644 --- a/.phpstorm.meta.php/magento_helpers_methods.meta.php +++ b/.phpstorm.meta.php/magento_helpers_methods.meta.php @@ -2,8 +2,8 @@ namespace PHPSTORM_META { override( \Mage_Admin_Model_User::_getHelper(0), map( [ - 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'adminnotification' => \Mage_AdminNotification_Helper_Data::class, + 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'admin/block' => \Mage_Admin_Helper_Block::class, 'admin' => \Mage_Admin_Helper_Data::class, 'admin/data' => \Mage_Admin_Helper_Data::class, @@ -23,32 +23,30 @@ 'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class, 'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class, 'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class, - 'api2' => \Mage_Api2_Helper_Data::class, 'api2/data' => \Mage_Api2_Helper_Data::class, - 'api' => \Mage_Api_Helper_Data::class, + 'api2' => \Mage_Api2_Helper_Data::class, 'api/data' => \Mage_Api_Helper_Data::class, + 'api' => \Mage_Api_Helper_Data::class, 'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class, 'authorizenet' => \Mage_Authorizenet_Helper_Data::class, 'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class, - 'backup' => \Mage_Backup_Helper_Data::class, - 'backup/data' => \Mage_Backup_Helper_Data::class, 'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class, - 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'bundle' => \Mage_Bundle_Helper_Data::class, - 'captcha/data' => \Mage_Captcha_Helper_Data::class, + 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'captcha' => \Mage_Captcha_Helper_Data::class, - 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, + 'captcha/data' => \Mage_Captcha_Helper_Data::class, 'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class, + 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, 'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class, - 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class, + 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class, 'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class, 'catalog/category' => \Mage_Catalog_Helper_Category::class, 'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class, 'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class, - 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/data' => \Mage_Catalog_Helper_Data::class, + 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class, 'catalog/image' => \Mage_Catalog_Helper_Image::class, 'catalog/map' => \Mage_Catalog_Helper_Map::class, @@ -62,8 +60,8 @@ 'catalog/product_url' => \Mage_Catalog_Helper_Product_Url::class, 'catalog/product_url_rewrite' => \Mage_Catalog_Helper_Product_Url_Rewrite::class, 'catalog/product_view' => \Mage_Catalog_Helper_Product_View::class, - 'centinel/data' => \Mage_Centinel_Helper_Data::class, 'centinel' => \Mage_Centinel_Helper_Data::class, + 'centinel/data' => \Mage_Centinel_Helper_Data::class, 'checkout/cart' => \Mage_Checkout_Helper_Cart::class, 'checkout' => \Mage_Checkout_Helper_Data::class, 'checkout/data' => \Mage_Checkout_Helper_Data::class, @@ -89,6 +87,7 @@ 'core/hint' => \Mage_Core_Helper_Hint::class, 'core/http' => \Mage_Core_Helper_Http::class, 'core/js' => \Mage_Core_Helper_Js::class, + 'core/security' => \Mage_Core_Helper_Security::class, 'core/string' => \Mage_Core_Helper_String::class, 'core/translate' => \Mage_Core_Helper_Translate::class, 'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class, @@ -101,57 +100,57 @@ 'customer' => \Mage_Customer_Helper_Data::class, 'dataflow' => \Mage_Dataflow_Helper_Data::class, 'dataflow/data' => \Mage_Dataflow_Helper_Data::class, - 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory' => \Mage_Directory_Helper_Data::class, + 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory/url' => \Mage_Directory_Helper_Url::class, 'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class, 'downloadable' => \Mage_Downloadable_Helper_Data::class, 'downloadable/data' => \Mage_Downloadable_Helper_Data::class, 'downloadable/download' => \Mage_Downloadable_Helper_Download::class, 'downloadable/file' => \Mage_Downloadable_Helper_File::class, - 'eav' => \Mage_Eav_Helper_Data::class, 'eav/data' => \Mage_Eav_Helper_Data::class, + 'eav' => \Mage_Eav_Helper_Data::class, 'giftmessage' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class, 'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class, 'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class, 'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class, - 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'importexport' => \Mage_ImportExport_Helper_Data::class, - 'index/data' => \Mage_Index_Helper_Data::class, + 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'index' => \Mage_Index_Helper_Data::class, + 'index/data' => \Mage_Index_Helper_Data::class, 'install' => \Mage_Install_Helper_Data::class, 'install/data' => \Mage_Install_Helper_Data::class, 'log/data' => \Mage_Log_Helper_Data::class, 'log' => \Mage_Log_Helper_Data::class, 'media/data' => \Mage_Media_Helper_Data::class, 'media' => \Mage_Media_Helper_Data::class, - 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'newsletter' => \Mage_Newsletter_Helper_Data::class, + 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, 'pagecache' => \Mage_PageCache_Helper_Data::class, 'pagecache/data' => \Mage_PageCache_Helper_Data::class, - 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, + 'page' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, 'page/layout' => \Mage_Page_Helper_Layout::class, - 'payment' => \Mage_Payment_Helper_Data::class, 'payment/data' => \Mage_Payment_Helper_Data::class, - 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, + 'payment' => \Mage_Payment_Helper_Data::class, 'paypaluk' => \Mage_PaypalUk_Helper_Data::class, + 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, 'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class, 'paypal/data' => \Mage_Paypal_Helper_Data::class, 'paypal' => \Mage_Paypal_Helper_Data::class, 'paypal/hss' => \Mage_Paypal_Helper_Hss::class, - 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent' => \Mage_Persistent_Helper_Data::class, + 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent/session' => \Mage_Persistent_Helper_Session::class, - 'poll/data' => \Mage_Poll_Helper_Data::class, 'poll' => \Mage_Poll_Helper_Data::class, - 'productalert' => \Mage_ProductAlert_Helper_Data::class, + 'poll/data' => \Mage_Poll_Helper_Data::class, 'productalert/data' => \Mage_ProductAlert_Helper_Data::class, + 'productalert' => \Mage_ProductAlert_Helper_Data::class, 'rating' => \Mage_Rating_Helper_Data::class, 'rating/data' => \Mage_Rating_Helper_Data::class, 'reports/data' => \Mage_Reports_Helper_Data::class, @@ -175,10 +174,10 @@ 'sendfriend' => \Mage_Sendfriend_Helper_Data::class, 'shipping' => \Mage_Shipping_Helper_Data::class, 'shipping/data' => \Mage_Shipping_Helper_Data::class, - 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'sitemap' => \Mage_Sitemap_Helper_Data::class, - 'tag/data' => \Mage_Tag_Helper_Data::class, + 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'tag' => \Mage_Tag_Helper_Data::class, + 'tag/data' => \Mage_Tag_Helper_Data::class, 'tax' => \Mage_Tax_Helper_Data::class, 'tax/data' => \Mage_Tax_Helper_Data::class, 'uploader/data' => \Mage_Uploader_Helper_Data::class, @@ -196,8 +195,8 @@ ); override( \Mage_Adminhtml_Controller_Rss_Abstract::_getHelper(0), map( [ - 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'adminnotification' => \Mage_AdminNotification_Helper_Data::class, + 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'admin/block' => \Mage_Admin_Helper_Block::class, 'admin' => \Mage_Admin_Helper_Data::class, 'admin/data' => \Mage_Admin_Helper_Data::class, @@ -217,32 +216,30 @@ 'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class, 'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class, 'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class, - 'api2' => \Mage_Api2_Helper_Data::class, 'api2/data' => \Mage_Api2_Helper_Data::class, - 'api' => \Mage_Api_Helper_Data::class, + 'api2' => \Mage_Api2_Helper_Data::class, 'api/data' => \Mage_Api_Helper_Data::class, + 'api' => \Mage_Api_Helper_Data::class, 'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class, 'authorizenet' => \Mage_Authorizenet_Helper_Data::class, 'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class, - 'backup' => \Mage_Backup_Helper_Data::class, - 'backup/data' => \Mage_Backup_Helper_Data::class, 'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class, - 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'bundle' => \Mage_Bundle_Helper_Data::class, - 'captcha/data' => \Mage_Captcha_Helper_Data::class, + 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'captcha' => \Mage_Captcha_Helper_Data::class, - 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, + 'captcha/data' => \Mage_Captcha_Helper_Data::class, 'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class, + 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, 'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class, - 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class, + 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class, 'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class, 'catalog/category' => \Mage_Catalog_Helper_Category::class, 'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class, 'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class, - 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/data' => \Mage_Catalog_Helper_Data::class, + 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class, 'catalog/image' => \Mage_Catalog_Helper_Image::class, 'catalog/map' => \Mage_Catalog_Helper_Map::class, @@ -266,8 +263,8 @@ 'cms/data' => \Mage_Cms_Helper_Data::class, 'cms/page' => \Mage_Cms_Helper_Page::class, 'cms/wysiwyg_images' => \Mage_Cms_Helper_Wysiwyg_Images::class, - 'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class, 'configurableswatches' => \Mage_ConfigurableSwatches_Helper_Data::class, + 'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class, 'configurableswatches/list_price' => \Mage_ConfigurableSwatches_Helper_List_Price::class, 'configurableswatches/mediafallback' => \Mage_ConfigurableSwatches_Helper_Mediafallback::class, 'configurableswatches/productimg' => \Mage_ConfigurableSwatches_Helper_Productimg::class, @@ -283,6 +280,7 @@ 'core/hint' => \Mage_Core_Helper_Hint::class, 'core/http' => \Mage_Core_Helper_Http::class, 'core/js' => \Mage_Core_Helper_Js::class, + 'core/security' => \Mage_Core_Helper_Security::class, 'core/string' => \Mage_Core_Helper_String::class, 'core/translate' => \Mage_Core_Helper_Translate::class, 'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class, @@ -295,57 +293,57 @@ 'customer' => \Mage_Customer_Helper_Data::class, 'dataflow' => \Mage_Dataflow_Helper_Data::class, 'dataflow/data' => \Mage_Dataflow_Helper_Data::class, - 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory' => \Mage_Directory_Helper_Data::class, + 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory/url' => \Mage_Directory_Helper_Url::class, 'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class, 'downloadable' => \Mage_Downloadable_Helper_Data::class, 'downloadable/data' => \Mage_Downloadable_Helper_Data::class, 'downloadable/download' => \Mage_Downloadable_Helper_Download::class, 'downloadable/file' => \Mage_Downloadable_Helper_File::class, - 'eav' => \Mage_Eav_Helper_Data::class, 'eav/data' => \Mage_Eav_Helper_Data::class, + 'eav' => \Mage_Eav_Helper_Data::class, 'giftmessage' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class, 'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class, 'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class, 'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class, - 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'importexport' => \Mage_ImportExport_Helper_Data::class, - 'index/data' => \Mage_Index_Helper_Data::class, + 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'index' => \Mage_Index_Helper_Data::class, + 'index/data' => \Mage_Index_Helper_Data::class, 'install' => \Mage_Install_Helper_Data::class, 'install/data' => \Mage_Install_Helper_Data::class, 'log/data' => \Mage_Log_Helper_Data::class, 'log' => \Mage_Log_Helper_Data::class, 'media/data' => \Mage_Media_Helper_Data::class, 'media' => \Mage_Media_Helper_Data::class, - 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'newsletter' => \Mage_Newsletter_Helper_Data::class, + 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, 'pagecache' => \Mage_PageCache_Helper_Data::class, 'pagecache/data' => \Mage_PageCache_Helper_Data::class, - 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, + 'page' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, 'page/layout' => \Mage_Page_Helper_Layout::class, - 'payment' => \Mage_Payment_Helper_Data::class, 'payment/data' => \Mage_Payment_Helper_Data::class, - 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, + 'payment' => \Mage_Payment_Helper_Data::class, 'paypaluk' => \Mage_PaypalUk_Helper_Data::class, + 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, 'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class, 'paypal/data' => \Mage_Paypal_Helper_Data::class, 'paypal' => \Mage_Paypal_Helper_Data::class, 'paypal/hss' => \Mage_Paypal_Helper_Hss::class, - 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent' => \Mage_Persistent_Helper_Data::class, + 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent/session' => \Mage_Persistent_Helper_Session::class, - 'poll/data' => \Mage_Poll_Helper_Data::class, 'poll' => \Mage_Poll_Helper_Data::class, - 'productalert' => \Mage_ProductAlert_Helper_Data::class, + 'poll/data' => \Mage_Poll_Helper_Data::class, 'productalert/data' => \Mage_ProductAlert_Helper_Data::class, + 'productalert' => \Mage_ProductAlert_Helper_Data::class, 'rating' => \Mage_Rating_Helper_Data::class, 'rating/data' => \Mage_Rating_Helper_Data::class, 'reports/data' => \Mage_Reports_Helper_Data::class, @@ -369,10 +367,10 @@ 'sendfriend' => \Mage_Sendfriend_Helper_Data::class, 'shipping' => \Mage_Shipping_Helper_Data::class, 'shipping/data' => \Mage_Shipping_Helper_Data::class, - 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'sitemap' => \Mage_Sitemap_Helper_Data::class, - 'tag/data' => \Mage_Tag_Helper_Data::class, + 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'tag' => \Mage_Tag_Helper_Data::class, + 'tag/data' => \Mage_Tag_Helper_Data::class, 'tax' => \Mage_Tax_Helper_Data::class, 'tax/data' => \Mage_Tax_Helper_Data::class, 'uploader/data' => \Mage_Uploader_Helper_Data::class, @@ -390,8 +388,8 @@ ); override( \Mage_Adminhtml_Tax_RuleController::_getHelperModel(0), map( [ - 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'adminnotification' => \Mage_AdminNotification_Helper_Data::class, + 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'admin/block' => \Mage_Admin_Helper_Block::class, 'admin' => \Mage_Admin_Helper_Data::class, 'admin/data' => \Mage_Admin_Helper_Data::class, @@ -411,32 +409,30 @@ 'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class, 'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class, 'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class, - 'api2' => \Mage_Api2_Helper_Data::class, 'api2/data' => \Mage_Api2_Helper_Data::class, - 'api' => \Mage_Api_Helper_Data::class, + 'api2' => \Mage_Api2_Helper_Data::class, 'api/data' => \Mage_Api_Helper_Data::class, + 'api' => \Mage_Api_Helper_Data::class, 'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class, 'authorizenet' => \Mage_Authorizenet_Helper_Data::class, 'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class, - 'backup' => \Mage_Backup_Helper_Data::class, - 'backup/data' => \Mage_Backup_Helper_Data::class, 'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class, - 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'bundle' => \Mage_Bundle_Helper_Data::class, - 'captcha/data' => \Mage_Captcha_Helper_Data::class, + 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'captcha' => \Mage_Captcha_Helper_Data::class, - 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, + 'captcha/data' => \Mage_Captcha_Helper_Data::class, 'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class, + 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, 'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class, - 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class, + 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class, 'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class, 'catalog/category' => \Mage_Catalog_Helper_Category::class, 'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class, 'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class, - 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/data' => \Mage_Catalog_Helper_Data::class, + 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class, 'catalog/image' => \Mage_Catalog_Helper_Image::class, 'catalog/map' => \Mage_Catalog_Helper_Map::class, @@ -450,8 +446,8 @@ 'catalog/product_url' => \Mage_Catalog_Helper_Product_Url::class, 'catalog/product_url_rewrite' => \Mage_Catalog_Helper_Product_Url_Rewrite::class, 'catalog/product_view' => \Mage_Catalog_Helper_Product_View::class, - 'centinel/data' => \Mage_Centinel_Helper_Data::class, 'centinel' => \Mage_Centinel_Helper_Data::class, + 'centinel/data' => \Mage_Centinel_Helper_Data::class, 'checkout/cart' => \Mage_Checkout_Helper_Cart::class, 'checkout' => \Mage_Checkout_Helper_Data::class, 'checkout/data' => \Mage_Checkout_Helper_Data::class, @@ -477,6 +473,7 @@ 'core/hint' => \Mage_Core_Helper_Hint::class, 'core/http' => \Mage_Core_Helper_Http::class, 'core/js' => \Mage_Core_Helper_Js::class, + 'core/security' => \Mage_Core_Helper_Security::class, 'core/string' => \Mage_Core_Helper_String::class, 'core/translate' => \Mage_Core_Helper_Translate::class, 'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class, @@ -489,57 +486,57 @@ 'customer' => \Mage_Customer_Helper_Data::class, 'dataflow' => \Mage_Dataflow_Helper_Data::class, 'dataflow/data' => \Mage_Dataflow_Helper_Data::class, - 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory' => \Mage_Directory_Helper_Data::class, + 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory/url' => \Mage_Directory_Helper_Url::class, 'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class, 'downloadable' => \Mage_Downloadable_Helper_Data::class, 'downloadable/data' => \Mage_Downloadable_Helper_Data::class, 'downloadable/download' => \Mage_Downloadable_Helper_Download::class, 'downloadable/file' => \Mage_Downloadable_Helper_File::class, - 'eav' => \Mage_Eav_Helper_Data::class, 'eav/data' => \Mage_Eav_Helper_Data::class, + 'eav' => \Mage_Eav_Helper_Data::class, 'giftmessage' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class, 'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class, 'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class, 'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class, - 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'importexport' => \Mage_ImportExport_Helper_Data::class, - 'index/data' => \Mage_Index_Helper_Data::class, + 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'index' => \Mage_Index_Helper_Data::class, + 'index/data' => \Mage_Index_Helper_Data::class, 'install' => \Mage_Install_Helper_Data::class, 'install/data' => \Mage_Install_Helper_Data::class, 'log/data' => \Mage_Log_Helper_Data::class, 'log' => \Mage_Log_Helper_Data::class, 'media/data' => \Mage_Media_Helper_Data::class, 'media' => \Mage_Media_Helper_Data::class, - 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'newsletter' => \Mage_Newsletter_Helper_Data::class, + 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, 'pagecache' => \Mage_PageCache_Helper_Data::class, 'pagecache/data' => \Mage_PageCache_Helper_Data::class, - 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, + 'page' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, 'page/layout' => \Mage_Page_Helper_Layout::class, - 'payment' => \Mage_Payment_Helper_Data::class, 'payment/data' => \Mage_Payment_Helper_Data::class, - 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, + 'payment' => \Mage_Payment_Helper_Data::class, 'paypaluk' => \Mage_PaypalUk_Helper_Data::class, + 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, 'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class, 'paypal/data' => \Mage_Paypal_Helper_Data::class, 'paypal' => \Mage_Paypal_Helper_Data::class, 'paypal/hss' => \Mage_Paypal_Helper_Hss::class, - 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent' => \Mage_Persistent_Helper_Data::class, + 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent/session' => \Mage_Persistent_Helper_Session::class, - 'poll/data' => \Mage_Poll_Helper_Data::class, 'poll' => \Mage_Poll_Helper_Data::class, - 'productalert' => \Mage_ProductAlert_Helper_Data::class, + 'poll/data' => \Mage_Poll_Helper_Data::class, 'productalert/data' => \Mage_ProductAlert_Helper_Data::class, + 'productalert' => \Mage_ProductAlert_Helper_Data::class, 'rating' => \Mage_Rating_Helper_Data::class, 'rating/data' => \Mage_Rating_Helper_Data::class, 'reports/data' => \Mage_Reports_Helper_Data::class, @@ -563,10 +560,10 @@ 'sendfriend' => \Mage_Sendfriend_Helper_Data::class, 'shipping' => \Mage_Shipping_Helper_Data::class, 'shipping/data' => \Mage_Shipping_Helper_Data::class, - 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'sitemap' => \Mage_Sitemap_Helper_Data::class, - 'tag/data' => \Mage_Tag_Helper_Data::class, + 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'tag' => \Mage_Tag_Helper_Data::class, + 'tag/data' => \Mage_Tag_Helper_Data::class, 'tax' => \Mage_Tax_Helper_Data::class, 'tax/data' => \Mage_Tax_Helper_Data::class, 'uploader/data' => \Mage_Uploader_Helper_Data::class, @@ -584,8 +581,8 @@ ); override( \Mage_Api_Model_User::_getHelper(0), map( [ - 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'adminnotification' => \Mage_AdminNotification_Helper_Data::class, + 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'admin/block' => \Mage_Admin_Helper_Block::class, 'admin' => \Mage_Admin_Helper_Data::class, 'admin/data' => \Mage_Admin_Helper_Data::class, @@ -605,32 +602,30 @@ 'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class, 'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class, 'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class, - 'api2' => \Mage_Api2_Helper_Data::class, 'api2/data' => \Mage_Api2_Helper_Data::class, - 'api' => \Mage_Api_Helper_Data::class, + 'api2' => \Mage_Api2_Helper_Data::class, 'api/data' => \Mage_Api_Helper_Data::class, + 'api' => \Mage_Api_Helper_Data::class, 'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class, 'authorizenet' => \Mage_Authorizenet_Helper_Data::class, 'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class, - 'backup' => \Mage_Backup_Helper_Data::class, - 'backup/data' => \Mage_Backup_Helper_Data::class, 'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class, - 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'bundle' => \Mage_Bundle_Helper_Data::class, - 'captcha/data' => \Mage_Captcha_Helper_Data::class, + 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'captcha' => \Mage_Captcha_Helper_Data::class, - 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, + 'captcha/data' => \Mage_Captcha_Helper_Data::class, 'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class, + 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, 'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class, - 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class, + 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class, 'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class, 'catalog/category' => \Mage_Catalog_Helper_Category::class, 'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class, 'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class, - 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/data' => \Mage_Catalog_Helper_Data::class, + 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class, 'catalog/image' => \Mage_Catalog_Helper_Image::class, 'catalog/map' => \Mage_Catalog_Helper_Map::class, @@ -654,8 +649,8 @@ 'cms/data' => \Mage_Cms_Helper_Data::class, 'cms/page' => \Mage_Cms_Helper_Page::class, 'cms/wysiwyg_images' => \Mage_Cms_Helper_Wysiwyg_Images::class, - 'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class, 'configurableswatches' => \Mage_ConfigurableSwatches_Helper_Data::class, + 'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class, 'configurableswatches/list_price' => \Mage_ConfigurableSwatches_Helper_List_Price::class, 'configurableswatches/mediafallback' => \Mage_ConfigurableSwatches_Helper_Mediafallback::class, 'configurableswatches/productimg' => \Mage_ConfigurableSwatches_Helper_Productimg::class, @@ -671,6 +666,7 @@ 'core/hint' => \Mage_Core_Helper_Hint::class, 'core/http' => \Mage_Core_Helper_Http::class, 'core/js' => \Mage_Core_Helper_Js::class, + 'core/security' => \Mage_Core_Helper_Security::class, 'core/string' => \Mage_Core_Helper_String::class, 'core/translate' => \Mage_Core_Helper_Translate::class, 'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class, @@ -683,57 +679,57 @@ 'customer' => \Mage_Customer_Helper_Data::class, 'dataflow' => \Mage_Dataflow_Helper_Data::class, 'dataflow/data' => \Mage_Dataflow_Helper_Data::class, - 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory' => \Mage_Directory_Helper_Data::class, + 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory/url' => \Mage_Directory_Helper_Url::class, 'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class, 'downloadable' => \Mage_Downloadable_Helper_Data::class, 'downloadable/data' => \Mage_Downloadable_Helper_Data::class, 'downloadable/download' => \Mage_Downloadable_Helper_Download::class, 'downloadable/file' => \Mage_Downloadable_Helper_File::class, - 'eav' => \Mage_Eav_Helper_Data::class, 'eav/data' => \Mage_Eav_Helper_Data::class, + 'eav' => \Mage_Eav_Helper_Data::class, 'giftmessage' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class, 'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class, 'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class, 'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class, - 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'importexport' => \Mage_ImportExport_Helper_Data::class, - 'index/data' => \Mage_Index_Helper_Data::class, + 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'index' => \Mage_Index_Helper_Data::class, + 'index/data' => \Mage_Index_Helper_Data::class, 'install' => \Mage_Install_Helper_Data::class, 'install/data' => \Mage_Install_Helper_Data::class, 'log/data' => \Mage_Log_Helper_Data::class, 'log' => \Mage_Log_Helper_Data::class, 'media/data' => \Mage_Media_Helper_Data::class, 'media' => \Mage_Media_Helper_Data::class, - 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'newsletter' => \Mage_Newsletter_Helper_Data::class, + 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, 'pagecache' => \Mage_PageCache_Helper_Data::class, 'pagecache/data' => \Mage_PageCache_Helper_Data::class, - 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, + 'page' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, 'page/layout' => \Mage_Page_Helper_Layout::class, - 'payment' => \Mage_Payment_Helper_Data::class, 'payment/data' => \Mage_Payment_Helper_Data::class, - 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, + 'payment' => \Mage_Payment_Helper_Data::class, 'paypaluk' => \Mage_PaypalUk_Helper_Data::class, + 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, 'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class, 'paypal/data' => \Mage_Paypal_Helper_Data::class, 'paypal' => \Mage_Paypal_Helper_Data::class, 'paypal/hss' => \Mage_Paypal_Helper_Hss::class, - 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent' => \Mage_Persistent_Helper_Data::class, + 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent/session' => \Mage_Persistent_Helper_Session::class, - 'poll/data' => \Mage_Poll_Helper_Data::class, 'poll' => \Mage_Poll_Helper_Data::class, - 'productalert' => \Mage_ProductAlert_Helper_Data::class, + 'poll/data' => \Mage_Poll_Helper_Data::class, 'productalert/data' => \Mage_ProductAlert_Helper_Data::class, + 'productalert' => \Mage_ProductAlert_Helper_Data::class, 'rating' => \Mage_Rating_Helper_Data::class, 'rating/data' => \Mage_Rating_Helper_Data::class, 'reports/data' => \Mage_Reports_Helper_Data::class, @@ -757,10 +753,10 @@ 'sendfriend' => \Mage_Sendfriend_Helper_Data::class, 'shipping' => \Mage_Shipping_Helper_Data::class, 'shipping/data' => \Mage_Shipping_Helper_Data::class, - 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'sitemap' => \Mage_Sitemap_Helper_Data::class, - 'tag/data' => \Mage_Tag_Helper_Data::class, + 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'tag' => \Mage_Tag_Helper_Data::class, + 'tag/data' => \Mage_Tag_Helper_Data::class, 'tax' => \Mage_Tax_Helper_Data::class, 'tax/data' => \Mage_Tax_Helper_Data::class, 'uploader/data' => \Mage_Uploader_Helper_Data::class, @@ -778,8 +774,8 @@ ); override( \Mage_Bundle_Model_Product_Price::_getHelperData(0), map( [ - 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'adminnotification' => \Mage_AdminNotification_Helper_Data::class, + 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'admin/block' => \Mage_Admin_Helper_Block::class, 'admin' => \Mage_Admin_Helper_Data::class, 'admin/data' => \Mage_Admin_Helper_Data::class, @@ -799,32 +795,30 @@ 'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class, 'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class, 'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class, - 'api2' => \Mage_Api2_Helper_Data::class, 'api2/data' => \Mage_Api2_Helper_Data::class, - 'api' => \Mage_Api_Helper_Data::class, + 'api2' => \Mage_Api2_Helper_Data::class, 'api/data' => \Mage_Api_Helper_Data::class, + 'api' => \Mage_Api_Helper_Data::class, 'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class, 'authorizenet' => \Mage_Authorizenet_Helper_Data::class, 'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class, - 'backup' => \Mage_Backup_Helper_Data::class, - 'backup/data' => \Mage_Backup_Helper_Data::class, 'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class, - 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'bundle' => \Mage_Bundle_Helper_Data::class, - 'captcha/data' => \Mage_Captcha_Helper_Data::class, + 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'captcha' => \Mage_Captcha_Helper_Data::class, - 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, + 'captcha/data' => \Mage_Captcha_Helper_Data::class, 'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class, + 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, 'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class, - 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class, + 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class, 'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class, 'catalog/category' => \Mage_Catalog_Helper_Category::class, 'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class, 'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class, - 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/data' => \Mage_Catalog_Helper_Data::class, + 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class, 'catalog/image' => \Mage_Catalog_Helper_Image::class, 'catalog/map' => \Mage_Catalog_Helper_Map::class, @@ -838,8 +832,8 @@ 'catalog/product_url' => \Mage_Catalog_Helper_Product_Url::class, 'catalog/product_url_rewrite' => \Mage_Catalog_Helper_Product_Url_Rewrite::class, 'catalog/product_view' => \Mage_Catalog_Helper_Product_View::class, - 'centinel/data' => \Mage_Centinel_Helper_Data::class, 'centinel' => \Mage_Centinel_Helper_Data::class, + 'centinel/data' => \Mage_Centinel_Helper_Data::class, 'checkout/cart' => \Mage_Checkout_Helper_Cart::class, 'checkout' => \Mage_Checkout_Helper_Data::class, 'checkout/data' => \Mage_Checkout_Helper_Data::class, @@ -865,6 +859,7 @@ 'core/hint' => \Mage_Core_Helper_Hint::class, 'core/http' => \Mage_Core_Helper_Http::class, 'core/js' => \Mage_Core_Helper_Js::class, + 'core/security' => \Mage_Core_Helper_Security::class, 'core/string' => \Mage_Core_Helper_String::class, 'core/translate' => \Mage_Core_Helper_Translate::class, 'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class, @@ -877,57 +872,57 @@ 'customer' => \Mage_Customer_Helper_Data::class, 'dataflow' => \Mage_Dataflow_Helper_Data::class, 'dataflow/data' => \Mage_Dataflow_Helper_Data::class, - 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory' => \Mage_Directory_Helper_Data::class, + 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory/url' => \Mage_Directory_Helper_Url::class, 'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class, 'downloadable' => \Mage_Downloadable_Helper_Data::class, 'downloadable/data' => \Mage_Downloadable_Helper_Data::class, 'downloadable/download' => \Mage_Downloadable_Helper_Download::class, 'downloadable/file' => \Mage_Downloadable_Helper_File::class, - 'eav' => \Mage_Eav_Helper_Data::class, 'eav/data' => \Mage_Eav_Helper_Data::class, + 'eav' => \Mage_Eav_Helper_Data::class, 'giftmessage' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class, 'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class, 'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class, 'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class, - 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'importexport' => \Mage_ImportExport_Helper_Data::class, - 'index/data' => \Mage_Index_Helper_Data::class, + 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'index' => \Mage_Index_Helper_Data::class, + 'index/data' => \Mage_Index_Helper_Data::class, 'install' => \Mage_Install_Helper_Data::class, 'install/data' => \Mage_Install_Helper_Data::class, 'log/data' => \Mage_Log_Helper_Data::class, 'log' => \Mage_Log_Helper_Data::class, 'media/data' => \Mage_Media_Helper_Data::class, 'media' => \Mage_Media_Helper_Data::class, - 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'newsletter' => \Mage_Newsletter_Helper_Data::class, + 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, 'pagecache' => \Mage_PageCache_Helper_Data::class, 'pagecache/data' => \Mage_PageCache_Helper_Data::class, - 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, + 'page' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, 'page/layout' => \Mage_Page_Helper_Layout::class, - 'payment' => \Mage_Payment_Helper_Data::class, 'payment/data' => \Mage_Payment_Helper_Data::class, - 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, + 'payment' => \Mage_Payment_Helper_Data::class, 'paypaluk' => \Mage_PaypalUk_Helper_Data::class, + 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, 'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class, 'paypal/data' => \Mage_Paypal_Helper_Data::class, 'paypal' => \Mage_Paypal_Helper_Data::class, 'paypal/hss' => \Mage_Paypal_Helper_Hss::class, - 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent' => \Mage_Persistent_Helper_Data::class, + 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent/session' => \Mage_Persistent_Helper_Session::class, - 'poll/data' => \Mage_Poll_Helper_Data::class, 'poll' => \Mage_Poll_Helper_Data::class, - 'productalert' => \Mage_ProductAlert_Helper_Data::class, + 'poll/data' => \Mage_Poll_Helper_Data::class, 'productalert/data' => \Mage_ProductAlert_Helper_Data::class, + 'productalert' => \Mage_ProductAlert_Helper_Data::class, 'rating' => \Mage_Rating_Helper_Data::class, 'rating/data' => \Mage_Rating_Helper_Data::class, 'reports/data' => \Mage_Reports_Helper_Data::class, @@ -951,10 +946,10 @@ 'sendfriend' => \Mage_Sendfriend_Helper_Data::class, 'shipping' => \Mage_Shipping_Helper_Data::class, 'shipping/data' => \Mage_Shipping_Helper_Data::class, - 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'sitemap' => \Mage_Sitemap_Helper_Data::class, - 'tag/data' => \Mage_Tag_Helper_Data::class, + 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'tag' => \Mage_Tag_Helper_Data::class, + 'tag/data' => \Mage_Tag_Helper_Data::class, 'tax' => \Mage_Tax_Helper_Data::class, 'tax/data' => \Mage_Tax_Helper_Data::class, 'uploader/data' => \Mage_Uploader_Helper_Data::class, @@ -972,8 +967,8 @@ ); override( \Mage_Core_Block_Abstract::helper(0), map( [ - 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'adminnotification' => \Mage_AdminNotification_Helper_Data::class, + 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'admin/block' => \Mage_Admin_Helper_Block::class, 'admin' => \Mage_Admin_Helper_Data::class, 'admin/data' => \Mage_Admin_Helper_Data::class, @@ -993,32 +988,30 @@ 'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class, 'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class, 'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class, - 'api2' => \Mage_Api2_Helper_Data::class, 'api2/data' => \Mage_Api2_Helper_Data::class, - 'api' => \Mage_Api_Helper_Data::class, + 'api2' => \Mage_Api2_Helper_Data::class, 'api/data' => \Mage_Api_Helper_Data::class, + 'api' => \Mage_Api_Helper_Data::class, 'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class, 'authorizenet' => \Mage_Authorizenet_Helper_Data::class, 'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class, - 'backup' => \Mage_Backup_Helper_Data::class, - 'backup/data' => \Mage_Backup_Helper_Data::class, 'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class, - 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'bundle' => \Mage_Bundle_Helper_Data::class, - 'captcha/data' => \Mage_Captcha_Helper_Data::class, + 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'captcha' => \Mage_Captcha_Helper_Data::class, - 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, + 'captcha/data' => \Mage_Captcha_Helper_Data::class, 'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class, + 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, 'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class, - 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class, + 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class, 'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class, 'catalog/category' => \Mage_Catalog_Helper_Category::class, 'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class, 'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class, - 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/data' => \Mage_Catalog_Helper_Data::class, + 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class, 'catalog/image' => \Mage_Catalog_Helper_Image::class, 'catalog/map' => \Mage_Catalog_Helper_Map::class, @@ -1042,8 +1035,8 @@ 'cms/data' => \Mage_Cms_Helper_Data::class, 'cms/page' => \Mage_Cms_Helper_Page::class, 'cms/wysiwyg_images' => \Mage_Cms_Helper_Wysiwyg_Images::class, - 'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class, 'configurableswatches' => \Mage_ConfigurableSwatches_Helper_Data::class, + 'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class, 'configurableswatches/list_price' => \Mage_ConfigurableSwatches_Helper_List_Price::class, 'configurableswatches/mediafallback' => \Mage_ConfigurableSwatches_Helper_Mediafallback::class, 'configurableswatches/productimg' => \Mage_ConfigurableSwatches_Helper_Productimg::class, @@ -1059,6 +1052,7 @@ 'core/hint' => \Mage_Core_Helper_Hint::class, 'core/http' => \Mage_Core_Helper_Http::class, 'core/js' => \Mage_Core_Helper_Js::class, + 'core/security' => \Mage_Core_Helper_Security::class, 'core/string' => \Mage_Core_Helper_String::class, 'core/translate' => \Mage_Core_Helper_Translate::class, 'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class, @@ -1071,57 +1065,57 @@ 'customer' => \Mage_Customer_Helper_Data::class, 'dataflow' => \Mage_Dataflow_Helper_Data::class, 'dataflow/data' => \Mage_Dataflow_Helper_Data::class, - 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory' => \Mage_Directory_Helper_Data::class, + 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory/url' => \Mage_Directory_Helper_Url::class, 'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class, 'downloadable' => \Mage_Downloadable_Helper_Data::class, 'downloadable/data' => \Mage_Downloadable_Helper_Data::class, 'downloadable/download' => \Mage_Downloadable_Helper_Download::class, 'downloadable/file' => \Mage_Downloadable_Helper_File::class, - 'eav' => \Mage_Eav_Helper_Data::class, 'eav/data' => \Mage_Eav_Helper_Data::class, + 'eav' => \Mage_Eav_Helper_Data::class, 'giftmessage' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class, 'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class, 'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class, 'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class, - 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'importexport' => \Mage_ImportExport_Helper_Data::class, - 'index/data' => \Mage_Index_Helper_Data::class, + 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'index' => \Mage_Index_Helper_Data::class, + 'index/data' => \Mage_Index_Helper_Data::class, 'install' => \Mage_Install_Helper_Data::class, 'install/data' => \Mage_Install_Helper_Data::class, 'log/data' => \Mage_Log_Helper_Data::class, 'log' => \Mage_Log_Helper_Data::class, 'media/data' => \Mage_Media_Helper_Data::class, 'media' => \Mage_Media_Helper_Data::class, - 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'newsletter' => \Mage_Newsletter_Helper_Data::class, + 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, 'pagecache' => \Mage_PageCache_Helper_Data::class, 'pagecache/data' => \Mage_PageCache_Helper_Data::class, - 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, + 'page' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, 'page/layout' => \Mage_Page_Helper_Layout::class, - 'payment' => \Mage_Payment_Helper_Data::class, 'payment/data' => \Mage_Payment_Helper_Data::class, - 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, + 'payment' => \Mage_Payment_Helper_Data::class, 'paypaluk' => \Mage_PaypalUk_Helper_Data::class, + 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, 'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class, 'paypal/data' => \Mage_Paypal_Helper_Data::class, 'paypal' => \Mage_Paypal_Helper_Data::class, 'paypal/hss' => \Mage_Paypal_Helper_Hss::class, - 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent' => \Mage_Persistent_Helper_Data::class, + 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent/session' => \Mage_Persistent_Helper_Session::class, - 'poll/data' => \Mage_Poll_Helper_Data::class, 'poll' => \Mage_Poll_Helper_Data::class, - 'productalert' => \Mage_ProductAlert_Helper_Data::class, + 'poll/data' => \Mage_Poll_Helper_Data::class, 'productalert/data' => \Mage_ProductAlert_Helper_Data::class, + 'productalert' => \Mage_ProductAlert_Helper_Data::class, 'rating' => \Mage_Rating_Helper_Data::class, 'rating/data' => \Mage_Rating_Helper_Data::class, 'reports/data' => \Mage_Reports_Helper_Data::class, @@ -1145,10 +1139,10 @@ 'sendfriend' => \Mage_Sendfriend_Helper_Data::class, 'shipping' => \Mage_Shipping_Helper_Data::class, 'shipping/data' => \Mage_Shipping_Helper_Data::class, - 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'sitemap' => \Mage_Sitemap_Helper_Data::class, - 'tag/data' => \Mage_Tag_Helper_Data::class, + 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'tag' => \Mage_Tag_Helper_Data::class, + 'tag/data' => \Mage_Tag_Helper_Data::class, 'tax' => \Mage_Tax_Helper_Data::class, 'tax/data' => \Mage_Tax_Helper_Data::class, 'uploader/data' => \Mage_Uploader_Helper_Data::class, @@ -1166,8 +1160,8 @@ ); override( \Mage_Core_Model_App::getHelper(0), map( [ - 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'adminnotification' => \Mage_AdminNotification_Helper_Data::class, + 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'admin/block' => \Mage_Admin_Helper_Block::class, 'admin' => \Mage_Admin_Helper_Data::class, 'admin/data' => \Mage_Admin_Helper_Data::class, @@ -1187,32 +1181,30 @@ 'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class, 'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class, 'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class, - 'api2' => \Mage_Api2_Helper_Data::class, 'api2/data' => \Mage_Api2_Helper_Data::class, - 'api' => \Mage_Api_Helper_Data::class, + 'api2' => \Mage_Api2_Helper_Data::class, 'api/data' => \Mage_Api_Helper_Data::class, + 'api' => \Mage_Api_Helper_Data::class, 'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class, 'authorizenet' => \Mage_Authorizenet_Helper_Data::class, 'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class, - 'backup' => \Mage_Backup_Helper_Data::class, - 'backup/data' => \Mage_Backup_Helper_Data::class, 'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class, - 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'bundle' => \Mage_Bundle_Helper_Data::class, - 'captcha/data' => \Mage_Captcha_Helper_Data::class, + 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'captcha' => \Mage_Captcha_Helper_Data::class, - 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, + 'captcha/data' => \Mage_Captcha_Helper_Data::class, 'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class, + 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, 'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class, - 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class, + 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class, 'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class, 'catalog/category' => \Mage_Catalog_Helper_Category::class, 'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class, 'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class, - 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/data' => \Mage_Catalog_Helper_Data::class, + 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class, 'catalog/image' => \Mage_Catalog_Helper_Image::class, 'catalog/map' => \Mage_Catalog_Helper_Map::class, @@ -1226,8 +1218,8 @@ 'catalog/product_url' => \Mage_Catalog_Helper_Product_Url::class, 'catalog/product_url_rewrite' => \Mage_Catalog_Helper_Product_Url_Rewrite::class, 'catalog/product_view' => \Mage_Catalog_Helper_Product_View::class, - 'centinel/data' => \Mage_Centinel_Helper_Data::class, 'centinel' => \Mage_Centinel_Helper_Data::class, + 'centinel/data' => \Mage_Centinel_Helper_Data::class, 'checkout/cart' => \Mage_Checkout_Helper_Cart::class, 'checkout' => \Mage_Checkout_Helper_Data::class, 'checkout/data' => \Mage_Checkout_Helper_Data::class, @@ -1253,6 +1245,7 @@ 'core/hint' => \Mage_Core_Helper_Hint::class, 'core/http' => \Mage_Core_Helper_Http::class, 'core/js' => \Mage_Core_Helper_Js::class, + 'core/security' => \Mage_Core_Helper_Security::class, 'core/string' => \Mage_Core_Helper_String::class, 'core/translate' => \Mage_Core_Helper_Translate::class, 'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class, @@ -1265,57 +1258,57 @@ 'customer' => \Mage_Customer_Helper_Data::class, 'dataflow' => \Mage_Dataflow_Helper_Data::class, 'dataflow/data' => \Mage_Dataflow_Helper_Data::class, - 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory' => \Mage_Directory_Helper_Data::class, + 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory/url' => \Mage_Directory_Helper_Url::class, 'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class, 'downloadable' => \Mage_Downloadable_Helper_Data::class, 'downloadable/data' => \Mage_Downloadable_Helper_Data::class, 'downloadable/download' => \Mage_Downloadable_Helper_Download::class, 'downloadable/file' => \Mage_Downloadable_Helper_File::class, - 'eav' => \Mage_Eav_Helper_Data::class, 'eav/data' => \Mage_Eav_Helper_Data::class, + 'eav' => \Mage_Eav_Helper_Data::class, 'giftmessage' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class, 'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class, 'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class, 'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class, - 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'importexport' => \Mage_ImportExport_Helper_Data::class, - 'index/data' => \Mage_Index_Helper_Data::class, + 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'index' => \Mage_Index_Helper_Data::class, + 'index/data' => \Mage_Index_Helper_Data::class, 'install' => \Mage_Install_Helper_Data::class, 'install/data' => \Mage_Install_Helper_Data::class, 'log/data' => \Mage_Log_Helper_Data::class, 'log' => \Mage_Log_Helper_Data::class, 'media/data' => \Mage_Media_Helper_Data::class, 'media' => \Mage_Media_Helper_Data::class, - 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'newsletter' => \Mage_Newsletter_Helper_Data::class, + 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, 'pagecache' => \Mage_PageCache_Helper_Data::class, 'pagecache/data' => \Mage_PageCache_Helper_Data::class, - 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, + 'page' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, 'page/layout' => \Mage_Page_Helper_Layout::class, - 'payment' => \Mage_Payment_Helper_Data::class, 'payment/data' => \Mage_Payment_Helper_Data::class, - 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, + 'payment' => \Mage_Payment_Helper_Data::class, 'paypaluk' => \Mage_PaypalUk_Helper_Data::class, + 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, 'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class, 'paypal/data' => \Mage_Paypal_Helper_Data::class, 'paypal' => \Mage_Paypal_Helper_Data::class, 'paypal/hss' => \Mage_Paypal_Helper_Hss::class, - 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent' => \Mage_Persistent_Helper_Data::class, + 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent/session' => \Mage_Persistent_Helper_Session::class, - 'poll/data' => \Mage_Poll_Helper_Data::class, 'poll' => \Mage_Poll_Helper_Data::class, - 'productalert' => \Mage_ProductAlert_Helper_Data::class, + 'poll/data' => \Mage_Poll_Helper_Data::class, 'productalert/data' => \Mage_ProductAlert_Helper_Data::class, + 'productalert' => \Mage_ProductAlert_Helper_Data::class, 'rating' => \Mage_Rating_Helper_Data::class, 'rating/data' => \Mage_Rating_Helper_Data::class, 'reports/data' => \Mage_Reports_Helper_Data::class, @@ -1339,10 +1332,10 @@ 'sendfriend' => \Mage_Sendfriend_Helper_Data::class, 'shipping' => \Mage_Shipping_Helper_Data::class, 'shipping/data' => \Mage_Shipping_Helper_Data::class, - 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'sitemap' => \Mage_Sitemap_Helper_Data::class, - 'tag/data' => \Mage_Tag_Helper_Data::class, + 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'tag' => \Mage_Tag_Helper_Data::class, + 'tag/data' => \Mage_Tag_Helper_Data::class, 'tax' => \Mage_Tax_Helper_Data::class, 'tax/data' => \Mage_Tax_Helper_Data::class, 'uploader/data' => \Mage_Uploader_Helper_Data::class, @@ -1360,8 +1353,8 @@ ); override( \Mage_Core_Model_Factory::getHelper(0), map( [ - 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'adminnotification' => \Mage_AdminNotification_Helper_Data::class, + 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'admin/block' => \Mage_Admin_Helper_Block::class, 'admin' => \Mage_Admin_Helper_Data::class, 'admin/data' => \Mage_Admin_Helper_Data::class, @@ -1381,32 +1374,30 @@ 'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class, 'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class, 'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class, - 'api2' => \Mage_Api2_Helper_Data::class, 'api2/data' => \Mage_Api2_Helper_Data::class, - 'api' => \Mage_Api_Helper_Data::class, + 'api2' => \Mage_Api2_Helper_Data::class, 'api/data' => \Mage_Api_Helper_Data::class, + 'api' => \Mage_Api_Helper_Data::class, 'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class, 'authorizenet' => \Mage_Authorizenet_Helper_Data::class, 'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class, - 'backup' => \Mage_Backup_Helper_Data::class, - 'backup/data' => \Mage_Backup_Helper_Data::class, 'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class, - 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'bundle' => \Mage_Bundle_Helper_Data::class, - 'captcha/data' => \Mage_Captcha_Helper_Data::class, + 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'captcha' => \Mage_Captcha_Helper_Data::class, - 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, + 'captcha/data' => \Mage_Captcha_Helper_Data::class, 'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class, + 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, 'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class, - 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class, + 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class, 'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class, 'catalog/category' => \Mage_Catalog_Helper_Category::class, 'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class, 'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class, - 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/data' => \Mage_Catalog_Helper_Data::class, + 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class, 'catalog/image' => \Mage_Catalog_Helper_Image::class, 'catalog/map' => \Mage_Catalog_Helper_Map::class, @@ -1430,8 +1421,8 @@ 'cms/data' => \Mage_Cms_Helper_Data::class, 'cms/page' => \Mage_Cms_Helper_Page::class, 'cms/wysiwyg_images' => \Mage_Cms_Helper_Wysiwyg_Images::class, - 'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class, 'configurableswatches' => \Mage_ConfigurableSwatches_Helper_Data::class, + 'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class, 'configurableswatches/list_price' => \Mage_ConfigurableSwatches_Helper_List_Price::class, 'configurableswatches/mediafallback' => \Mage_ConfigurableSwatches_Helper_Mediafallback::class, 'configurableswatches/productimg' => \Mage_ConfigurableSwatches_Helper_Productimg::class, @@ -1447,6 +1438,7 @@ 'core/hint' => \Mage_Core_Helper_Hint::class, 'core/http' => \Mage_Core_Helper_Http::class, 'core/js' => \Mage_Core_Helper_Js::class, + 'core/security' => \Mage_Core_Helper_Security::class, 'core/string' => \Mage_Core_Helper_String::class, 'core/translate' => \Mage_Core_Helper_Translate::class, 'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class, @@ -1459,57 +1451,57 @@ 'customer' => \Mage_Customer_Helper_Data::class, 'dataflow' => \Mage_Dataflow_Helper_Data::class, 'dataflow/data' => \Mage_Dataflow_Helper_Data::class, - 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory' => \Mage_Directory_Helper_Data::class, + 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory/url' => \Mage_Directory_Helper_Url::class, 'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class, 'downloadable' => \Mage_Downloadable_Helper_Data::class, 'downloadable/data' => \Mage_Downloadable_Helper_Data::class, 'downloadable/download' => \Mage_Downloadable_Helper_Download::class, 'downloadable/file' => \Mage_Downloadable_Helper_File::class, - 'eav' => \Mage_Eav_Helper_Data::class, 'eav/data' => \Mage_Eav_Helper_Data::class, + 'eav' => \Mage_Eav_Helper_Data::class, 'giftmessage' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class, 'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class, 'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class, 'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class, - 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'importexport' => \Mage_ImportExport_Helper_Data::class, - 'index/data' => \Mage_Index_Helper_Data::class, + 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'index' => \Mage_Index_Helper_Data::class, + 'index/data' => \Mage_Index_Helper_Data::class, 'install' => \Mage_Install_Helper_Data::class, 'install/data' => \Mage_Install_Helper_Data::class, 'log/data' => \Mage_Log_Helper_Data::class, 'log' => \Mage_Log_Helper_Data::class, 'media/data' => \Mage_Media_Helper_Data::class, 'media' => \Mage_Media_Helper_Data::class, - 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'newsletter' => \Mage_Newsletter_Helper_Data::class, + 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, 'pagecache' => \Mage_PageCache_Helper_Data::class, 'pagecache/data' => \Mage_PageCache_Helper_Data::class, - 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, + 'page' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, 'page/layout' => \Mage_Page_Helper_Layout::class, - 'payment' => \Mage_Payment_Helper_Data::class, 'payment/data' => \Mage_Payment_Helper_Data::class, - 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, + 'payment' => \Mage_Payment_Helper_Data::class, 'paypaluk' => \Mage_PaypalUk_Helper_Data::class, + 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, 'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class, 'paypal/data' => \Mage_Paypal_Helper_Data::class, 'paypal' => \Mage_Paypal_Helper_Data::class, 'paypal/hss' => \Mage_Paypal_Helper_Hss::class, - 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent' => \Mage_Persistent_Helper_Data::class, + 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent/session' => \Mage_Persistent_Helper_Session::class, - 'poll/data' => \Mage_Poll_Helper_Data::class, 'poll' => \Mage_Poll_Helper_Data::class, - 'productalert' => \Mage_ProductAlert_Helper_Data::class, + 'poll/data' => \Mage_Poll_Helper_Data::class, 'productalert/data' => \Mage_ProductAlert_Helper_Data::class, + 'productalert' => \Mage_ProductAlert_Helper_Data::class, 'rating' => \Mage_Rating_Helper_Data::class, 'rating/data' => \Mage_Rating_Helper_Data::class, 'reports/data' => \Mage_Reports_Helper_Data::class, @@ -1533,10 +1525,10 @@ 'sendfriend' => \Mage_Sendfriend_Helper_Data::class, 'shipping' => \Mage_Shipping_Helper_Data::class, 'shipping/data' => \Mage_Shipping_Helper_Data::class, - 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'sitemap' => \Mage_Sitemap_Helper_Data::class, - 'tag/data' => \Mage_Tag_Helper_Data::class, + 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'tag' => \Mage_Tag_Helper_Data::class, + 'tag/data' => \Mage_Tag_Helper_Data::class, 'tax' => \Mage_Tax_Helper_Data::class, 'tax/data' => \Mage_Tax_Helper_Data::class, 'uploader/data' => \Mage_Uploader_Helper_Data::class, @@ -1554,8 +1546,8 @@ ); override( \Mage_Core_Model_Layout::helper(0), map( [ - 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'adminnotification' => \Mage_AdminNotification_Helper_Data::class, + 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'admin/block' => \Mage_Admin_Helper_Block::class, 'admin' => \Mage_Admin_Helper_Data::class, 'admin/data' => \Mage_Admin_Helper_Data::class, @@ -1575,32 +1567,30 @@ 'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class, 'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class, 'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class, - 'api2' => \Mage_Api2_Helper_Data::class, 'api2/data' => \Mage_Api2_Helper_Data::class, - 'api' => \Mage_Api_Helper_Data::class, + 'api2' => \Mage_Api2_Helper_Data::class, 'api/data' => \Mage_Api_Helper_Data::class, + 'api' => \Mage_Api_Helper_Data::class, 'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class, 'authorizenet' => \Mage_Authorizenet_Helper_Data::class, 'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class, - 'backup' => \Mage_Backup_Helper_Data::class, - 'backup/data' => \Mage_Backup_Helper_Data::class, 'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class, - 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'bundle' => \Mage_Bundle_Helper_Data::class, - 'captcha/data' => \Mage_Captcha_Helper_Data::class, + 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'captcha' => \Mage_Captcha_Helper_Data::class, - 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, + 'captcha/data' => \Mage_Captcha_Helper_Data::class, 'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class, + 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, 'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class, - 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class, + 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class, 'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class, 'catalog/category' => \Mage_Catalog_Helper_Category::class, 'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class, 'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class, - 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/data' => \Mage_Catalog_Helper_Data::class, + 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class, 'catalog/image' => \Mage_Catalog_Helper_Image::class, 'catalog/map' => \Mage_Catalog_Helper_Map::class, @@ -1614,8 +1604,8 @@ 'catalog/product_url' => \Mage_Catalog_Helper_Product_Url::class, 'catalog/product_url_rewrite' => \Mage_Catalog_Helper_Product_Url_Rewrite::class, 'catalog/product_view' => \Mage_Catalog_Helper_Product_View::class, - 'centinel/data' => \Mage_Centinel_Helper_Data::class, 'centinel' => \Mage_Centinel_Helper_Data::class, + 'centinel/data' => \Mage_Centinel_Helper_Data::class, 'checkout/cart' => \Mage_Checkout_Helper_Cart::class, 'checkout' => \Mage_Checkout_Helper_Data::class, 'checkout/data' => \Mage_Checkout_Helper_Data::class, @@ -1641,6 +1631,7 @@ 'core/hint' => \Mage_Core_Helper_Hint::class, 'core/http' => \Mage_Core_Helper_Http::class, 'core/js' => \Mage_Core_Helper_Js::class, + 'core/security' => \Mage_Core_Helper_Security::class, 'core/string' => \Mage_Core_Helper_String::class, 'core/translate' => \Mage_Core_Helper_Translate::class, 'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class, @@ -1653,57 +1644,57 @@ 'customer' => \Mage_Customer_Helper_Data::class, 'dataflow' => \Mage_Dataflow_Helper_Data::class, 'dataflow/data' => \Mage_Dataflow_Helper_Data::class, - 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory' => \Mage_Directory_Helper_Data::class, + 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory/url' => \Mage_Directory_Helper_Url::class, 'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class, 'downloadable' => \Mage_Downloadable_Helper_Data::class, 'downloadable/data' => \Mage_Downloadable_Helper_Data::class, 'downloadable/download' => \Mage_Downloadable_Helper_Download::class, 'downloadable/file' => \Mage_Downloadable_Helper_File::class, - 'eav' => \Mage_Eav_Helper_Data::class, 'eav/data' => \Mage_Eav_Helper_Data::class, + 'eav' => \Mage_Eav_Helper_Data::class, 'giftmessage' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class, 'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class, 'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class, 'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class, - 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'importexport' => \Mage_ImportExport_Helper_Data::class, - 'index/data' => \Mage_Index_Helper_Data::class, + 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'index' => \Mage_Index_Helper_Data::class, + 'index/data' => \Mage_Index_Helper_Data::class, 'install' => \Mage_Install_Helper_Data::class, 'install/data' => \Mage_Install_Helper_Data::class, 'log/data' => \Mage_Log_Helper_Data::class, 'log' => \Mage_Log_Helper_Data::class, 'media/data' => \Mage_Media_Helper_Data::class, 'media' => \Mage_Media_Helper_Data::class, - 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'newsletter' => \Mage_Newsletter_Helper_Data::class, + 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, 'pagecache' => \Mage_PageCache_Helper_Data::class, 'pagecache/data' => \Mage_PageCache_Helper_Data::class, - 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, + 'page' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, 'page/layout' => \Mage_Page_Helper_Layout::class, - 'payment' => \Mage_Payment_Helper_Data::class, 'payment/data' => \Mage_Payment_Helper_Data::class, - 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, + 'payment' => \Mage_Payment_Helper_Data::class, 'paypaluk' => \Mage_PaypalUk_Helper_Data::class, + 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, 'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class, 'paypal/data' => \Mage_Paypal_Helper_Data::class, 'paypal' => \Mage_Paypal_Helper_Data::class, 'paypal/hss' => \Mage_Paypal_Helper_Hss::class, - 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent' => \Mage_Persistent_Helper_Data::class, + 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent/session' => \Mage_Persistent_Helper_Session::class, - 'poll/data' => \Mage_Poll_Helper_Data::class, 'poll' => \Mage_Poll_Helper_Data::class, - 'productalert' => \Mage_ProductAlert_Helper_Data::class, + 'poll/data' => \Mage_Poll_Helper_Data::class, 'productalert/data' => \Mage_ProductAlert_Helper_Data::class, + 'productalert' => \Mage_ProductAlert_Helper_Data::class, 'rating' => \Mage_Rating_Helper_Data::class, 'rating/data' => \Mage_Rating_Helper_Data::class, 'reports/data' => \Mage_Reports_Helper_Data::class, @@ -1727,10 +1718,10 @@ 'sendfriend' => \Mage_Sendfriend_Helper_Data::class, 'shipping' => \Mage_Shipping_Helper_Data::class, 'shipping/data' => \Mage_Shipping_Helper_Data::class, - 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'sitemap' => \Mage_Sitemap_Helper_Data::class, - 'tag/data' => \Mage_Tag_Helper_Data::class, + 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'tag' => \Mage_Tag_Helper_Data::class, + 'tag/data' => \Mage_Tag_Helper_Data::class, 'tax' => \Mage_Tax_Helper_Data::class, 'tax/data' => \Mage_Tax_Helper_Data::class, 'uploader/data' => \Mage_Uploader_Helper_Data::class, @@ -1748,8 +1739,8 @@ ); override( \Mage_Customer_AccountController::_getHelper(0), map( [ - 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'adminnotification' => \Mage_AdminNotification_Helper_Data::class, + 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'admin/block' => \Mage_Admin_Helper_Block::class, 'admin' => \Mage_Admin_Helper_Data::class, 'admin/data' => \Mage_Admin_Helper_Data::class, @@ -1769,32 +1760,30 @@ 'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class, 'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class, 'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class, - 'api2' => \Mage_Api2_Helper_Data::class, 'api2/data' => \Mage_Api2_Helper_Data::class, - 'api' => \Mage_Api_Helper_Data::class, + 'api2' => \Mage_Api2_Helper_Data::class, 'api/data' => \Mage_Api_Helper_Data::class, + 'api' => \Mage_Api_Helper_Data::class, 'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class, 'authorizenet' => \Mage_Authorizenet_Helper_Data::class, 'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class, - 'backup' => \Mage_Backup_Helper_Data::class, - 'backup/data' => \Mage_Backup_Helper_Data::class, 'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class, - 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'bundle' => \Mage_Bundle_Helper_Data::class, - 'captcha/data' => \Mage_Captcha_Helper_Data::class, + 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'captcha' => \Mage_Captcha_Helper_Data::class, - 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, + 'captcha/data' => \Mage_Captcha_Helper_Data::class, 'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class, + 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, 'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class, - 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class, + 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class, 'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class, 'catalog/category' => \Mage_Catalog_Helper_Category::class, 'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class, 'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class, - 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/data' => \Mage_Catalog_Helper_Data::class, + 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class, 'catalog/image' => \Mage_Catalog_Helper_Image::class, 'catalog/map' => \Mage_Catalog_Helper_Map::class, @@ -1818,8 +1807,8 @@ 'cms/data' => \Mage_Cms_Helper_Data::class, 'cms/page' => \Mage_Cms_Helper_Page::class, 'cms/wysiwyg_images' => \Mage_Cms_Helper_Wysiwyg_Images::class, - 'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class, 'configurableswatches' => \Mage_ConfigurableSwatches_Helper_Data::class, + 'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class, 'configurableswatches/list_price' => \Mage_ConfigurableSwatches_Helper_List_Price::class, 'configurableswatches/mediafallback' => \Mage_ConfigurableSwatches_Helper_Mediafallback::class, 'configurableswatches/productimg' => \Mage_ConfigurableSwatches_Helper_Productimg::class, @@ -1835,6 +1824,7 @@ 'core/hint' => \Mage_Core_Helper_Hint::class, 'core/http' => \Mage_Core_Helper_Http::class, 'core/js' => \Mage_Core_Helper_Js::class, + 'core/security' => \Mage_Core_Helper_Security::class, 'core/string' => \Mage_Core_Helper_String::class, 'core/translate' => \Mage_Core_Helper_Translate::class, 'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class, @@ -1847,57 +1837,57 @@ 'customer' => \Mage_Customer_Helper_Data::class, 'dataflow' => \Mage_Dataflow_Helper_Data::class, 'dataflow/data' => \Mage_Dataflow_Helper_Data::class, - 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory' => \Mage_Directory_Helper_Data::class, + 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory/url' => \Mage_Directory_Helper_Url::class, 'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class, 'downloadable' => \Mage_Downloadable_Helper_Data::class, 'downloadable/data' => \Mage_Downloadable_Helper_Data::class, 'downloadable/download' => \Mage_Downloadable_Helper_Download::class, 'downloadable/file' => \Mage_Downloadable_Helper_File::class, - 'eav' => \Mage_Eav_Helper_Data::class, 'eav/data' => \Mage_Eav_Helper_Data::class, + 'eav' => \Mage_Eav_Helper_Data::class, 'giftmessage' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class, 'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class, 'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class, 'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class, - 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'importexport' => \Mage_ImportExport_Helper_Data::class, - 'index/data' => \Mage_Index_Helper_Data::class, + 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'index' => \Mage_Index_Helper_Data::class, + 'index/data' => \Mage_Index_Helper_Data::class, 'install' => \Mage_Install_Helper_Data::class, 'install/data' => \Mage_Install_Helper_Data::class, 'log/data' => \Mage_Log_Helper_Data::class, 'log' => \Mage_Log_Helper_Data::class, 'media/data' => \Mage_Media_Helper_Data::class, 'media' => \Mage_Media_Helper_Data::class, - 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'newsletter' => \Mage_Newsletter_Helper_Data::class, + 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, 'pagecache' => \Mage_PageCache_Helper_Data::class, 'pagecache/data' => \Mage_PageCache_Helper_Data::class, - 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, + 'page' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, 'page/layout' => \Mage_Page_Helper_Layout::class, - 'payment' => \Mage_Payment_Helper_Data::class, 'payment/data' => \Mage_Payment_Helper_Data::class, - 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, + 'payment' => \Mage_Payment_Helper_Data::class, 'paypaluk' => \Mage_PaypalUk_Helper_Data::class, + 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, 'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class, 'paypal/data' => \Mage_Paypal_Helper_Data::class, 'paypal' => \Mage_Paypal_Helper_Data::class, 'paypal/hss' => \Mage_Paypal_Helper_Hss::class, - 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent' => \Mage_Persistent_Helper_Data::class, + 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent/session' => \Mage_Persistent_Helper_Session::class, - 'poll/data' => \Mage_Poll_Helper_Data::class, 'poll' => \Mage_Poll_Helper_Data::class, - 'productalert' => \Mage_ProductAlert_Helper_Data::class, + 'poll/data' => \Mage_Poll_Helper_Data::class, 'productalert/data' => \Mage_ProductAlert_Helper_Data::class, + 'productalert' => \Mage_ProductAlert_Helper_Data::class, 'rating' => \Mage_Rating_Helper_Data::class, 'rating/data' => \Mage_Rating_Helper_Data::class, 'reports/data' => \Mage_Reports_Helper_Data::class, @@ -1921,10 +1911,10 @@ 'sendfriend' => \Mage_Sendfriend_Helper_Data::class, 'shipping' => \Mage_Shipping_Helper_Data::class, 'shipping/data' => \Mage_Shipping_Helper_Data::class, - 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'sitemap' => \Mage_Sitemap_Helper_Data::class, - 'tag/data' => \Mage_Tag_Helper_Data::class, + 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'tag' => \Mage_Tag_Helper_Data::class, + 'tag/data' => \Mage_Tag_Helper_Data::class, 'tax' => \Mage_Tax_Helper_Data::class, 'tax/data' => \Mage_Tax_Helper_Data::class, 'uploader/data' => \Mage_Uploader_Helper_Data::class, @@ -1942,8 +1932,8 @@ ); override( \Mage_Customer_Model_Customer::_getHelper(0), map( [ - 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'adminnotification' => \Mage_AdminNotification_Helper_Data::class, + 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'admin/block' => \Mage_Admin_Helper_Block::class, 'admin' => \Mage_Admin_Helper_Data::class, 'admin/data' => \Mage_Admin_Helper_Data::class, @@ -1963,32 +1953,30 @@ 'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class, 'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class, 'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class, - 'api2' => \Mage_Api2_Helper_Data::class, 'api2/data' => \Mage_Api2_Helper_Data::class, - 'api' => \Mage_Api_Helper_Data::class, + 'api2' => \Mage_Api2_Helper_Data::class, 'api/data' => \Mage_Api_Helper_Data::class, + 'api' => \Mage_Api_Helper_Data::class, 'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class, 'authorizenet' => \Mage_Authorizenet_Helper_Data::class, 'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class, - 'backup' => \Mage_Backup_Helper_Data::class, - 'backup/data' => \Mage_Backup_Helper_Data::class, 'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class, - 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'bundle' => \Mage_Bundle_Helper_Data::class, - 'captcha/data' => \Mage_Captcha_Helper_Data::class, + 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'captcha' => \Mage_Captcha_Helper_Data::class, - 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, + 'captcha/data' => \Mage_Captcha_Helper_Data::class, 'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class, + 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, 'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class, - 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class, + 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class, 'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class, 'catalog/category' => \Mage_Catalog_Helper_Category::class, 'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class, 'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class, - 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/data' => \Mage_Catalog_Helper_Data::class, + 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class, 'catalog/image' => \Mage_Catalog_Helper_Image::class, 'catalog/map' => \Mage_Catalog_Helper_Map::class, @@ -2002,8 +1990,8 @@ 'catalog/product_url' => \Mage_Catalog_Helper_Product_Url::class, 'catalog/product_url_rewrite' => \Mage_Catalog_Helper_Product_Url_Rewrite::class, 'catalog/product_view' => \Mage_Catalog_Helper_Product_View::class, - 'centinel/data' => \Mage_Centinel_Helper_Data::class, 'centinel' => \Mage_Centinel_Helper_Data::class, + 'centinel/data' => \Mage_Centinel_Helper_Data::class, 'checkout/cart' => \Mage_Checkout_Helper_Cart::class, 'checkout' => \Mage_Checkout_Helper_Data::class, 'checkout/data' => \Mage_Checkout_Helper_Data::class, @@ -2029,6 +2017,7 @@ 'core/hint' => \Mage_Core_Helper_Hint::class, 'core/http' => \Mage_Core_Helper_Http::class, 'core/js' => \Mage_Core_Helper_Js::class, + 'core/security' => \Mage_Core_Helper_Security::class, 'core/string' => \Mage_Core_Helper_String::class, 'core/translate' => \Mage_Core_Helper_Translate::class, 'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class, @@ -2041,57 +2030,57 @@ 'customer' => \Mage_Customer_Helper_Data::class, 'dataflow' => \Mage_Dataflow_Helper_Data::class, 'dataflow/data' => \Mage_Dataflow_Helper_Data::class, - 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory' => \Mage_Directory_Helper_Data::class, + 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory/url' => \Mage_Directory_Helper_Url::class, 'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class, 'downloadable' => \Mage_Downloadable_Helper_Data::class, 'downloadable/data' => \Mage_Downloadable_Helper_Data::class, 'downloadable/download' => \Mage_Downloadable_Helper_Download::class, 'downloadable/file' => \Mage_Downloadable_Helper_File::class, - 'eav' => \Mage_Eav_Helper_Data::class, 'eav/data' => \Mage_Eav_Helper_Data::class, + 'eav' => \Mage_Eav_Helper_Data::class, 'giftmessage' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class, 'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class, 'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class, 'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class, - 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'importexport' => \Mage_ImportExport_Helper_Data::class, - 'index/data' => \Mage_Index_Helper_Data::class, + 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'index' => \Mage_Index_Helper_Data::class, + 'index/data' => \Mage_Index_Helper_Data::class, 'install' => \Mage_Install_Helper_Data::class, 'install/data' => \Mage_Install_Helper_Data::class, 'log/data' => \Mage_Log_Helper_Data::class, 'log' => \Mage_Log_Helper_Data::class, 'media/data' => \Mage_Media_Helper_Data::class, 'media' => \Mage_Media_Helper_Data::class, - 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'newsletter' => \Mage_Newsletter_Helper_Data::class, + 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, 'pagecache' => \Mage_PageCache_Helper_Data::class, 'pagecache/data' => \Mage_PageCache_Helper_Data::class, - 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, + 'page' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, 'page/layout' => \Mage_Page_Helper_Layout::class, - 'payment' => \Mage_Payment_Helper_Data::class, 'payment/data' => \Mage_Payment_Helper_Data::class, - 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, + 'payment' => \Mage_Payment_Helper_Data::class, 'paypaluk' => \Mage_PaypalUk_Helper_Data::class, + 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, 'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class, 'paypal/data' => \Mage_Paypal_Helper_Data::class, 'paypal' => \Mage_Paypal_Helper_Data::class, 'paypal/hss' => \Mage_Paypal_Helper_Hss::class, - 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent' => \Mage_Persistent_Helper_Data::class, + 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent/session' => \Mage_Persistent_Helper_Session::class, - 'poll/data' => \Mage_Poll_Helper_Data::class, 'poll' => \Mage_Poll_Helper_Data::class, - 'productalert' => \Mage_ProductAlert_Helper_Data::class, + 'poll/data' => \Mage_Poll_Helper_Data::class, 'productalert/data' => \Mage_ProductAlert_Helper_Data::class, + 'productalert' => \Mage_ProductAlert_Helper_Data::class, 'rating' => \Mage_Rating_Helper_Data::class, 'rating/data' => \Mage_Rating_Helper_Data::class, 'reports/data' => \Mage_Reports_Helper_Data::class, @@ -2115,10 +2104,10 @@ 'sendfriend' => \Mage_Sendfriend_Helper_Data::class, 'shipping' => \Mage_Shipping_Helper_Data::class, 'shipping/data' => \Mage_Shipping_Helper_Data::class, - 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'sitemap' => \Mage_Sitemap_Helper_Data::class, - 'tag/data' => \Mage_Tag_Helper_Data::class, + 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'tag' => \Mage_Tag_Helper_Data::class, + 'tag/data' => \Mage_Tag_Helper_Data::class, 'tax' => \Mage_Tax_Helper_Data::class, 'tax/data' => \Mage_Tax_Helper_Data::class, 'uploader/data' => \Mage_Uploader_Helper_Data::class, @@ -2136,8 +2125,8 @@ ); override( \Mage_ImportExport_Model_Import_Entity_Product::getHelper(0), map( [ - 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'adminnotification' => \Mage_AdminNotification_Helper_Data::class, + 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'admin/block' => \Mage_Admin_Helper_Block::class, 'admin' => \Mage_Admin_Helper_Data::class, 'admin/data' => \Mage_Admin_Helper_Data::class, @@ -2157,32 +2146,30 @@ 'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class, 'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class, 'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class, - 'api2' => \Mage_Api2_Helper_Data::class, 'api2/data' => \Mage_Api2_Helper_Data::class, - 'api' => \Mage_Api_Helper_Data::class, + 'api2' => \Mage_Api2_Helper_Data::class, 'api/data' => \Mage_Api_Helper_Data::class, + 'api' => \Mage_Api_Helper_Data::class, 'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class, 'authorizenet' => \Mage_Authorizenet_Helper_Data::class, 'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class, - 'backup' => \Mage_Backup_Helper_Data::class, - 'backup/data' => \Mage_Backup_Helper_Data::class, 'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class, - 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'bundle' => \Mage_Bundle_Helper_Data::class, - 'captcha/data' => \Mage_Captcha_Helper_Data::class, + 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'captcha' => \Mage_Captcha_Helper_Data::class, - 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, + 'captcha/data' => \Mage_Captcha_Helper_Data::class, 'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class, + 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, 'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class, - 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class, + 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class, 'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class, 'catalog/category' => \Mage_Catalog_Helper_Category::class, 'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class, 'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class, - 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/data' => \Mage_Catalog_Helper_Data::class, + 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class, 'catalog/image' => \Mage_Catalog_Helper_Image::class, 'catalog/map' => \Mage_Catalog_Helper_Map::class, @@ -2206,8 +2193,8 @@ 'cms/data' => \Mage_Cms_Helper_Data::class, 'cms/page' => \Mage_Cms_Helper_Page::class, 'cms/wysiwyg_images' => \Mage_Cms_Helper_Wysiwyg_Images::class, - 'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class, 'configurableswatches' => \Mage_ConfigurableSwatches_Helper_Data::class, + 'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class, 'configurableswatches/list_price' => \Mage_ConfigurableSwatches_Helper_List_Price::class, 'configurableswatches/mediafallback' => \Mage_ConfigurableSwatches_Helper_Mediafallback::class, 'configurableswatches/productimg' => \Mage_ConfigurableSwatches_Helper_Productimg::class, @@ -2223,6 +2210,7 @@ 'core/hint' => \Mage_Core_Helper_Hint::class, 'core/http' => \Mage_Core_Helper_Http::class, 'core/js' => \Mage_Core_Helper_Js::class, + 'core/security' => \Mage_Core_Helper_Security::class, 'core/string' => \Mage_Core_Helper_String::class, 'core/translate' => \Mage_Core_Helper_Translate::class, 'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class, @@ -2235,57 +2223,57 @@ 'customer' => \Mage_Customer_Helper_Data::class, 'dataflow' => \Mage_Dataflow_Helper_Data::class, 'dataflow/data' => \Mage_Dataflow_Helper_Data::class, - 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory' => \Mage_Directory_Helper_Data::class, + 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory/url' => \Mage_Directory_Helper_Url::class, 'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class, 'downloadable' => \Mage_Downloadable_Helper_Data::class, 'downloadable/data' => \Mage_Downloadable_Helper_Data::class, 'downloadable/download' => \Mage_Downloadable_Helper_Download::class, 'downloadable/file' => \Mage_Downloadable_Helper_File::class, - 'eav' => \Mage_Eav_Helper_Data::class, 'eav/data' => \Mage_Eav_Helper_Data::class, + 'eav' => \Mage_Eav_Helper_Data::class, 'giftmessage' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class, 'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class, 'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class, 'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class, - 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'importexport' => \Mage_ImportExport_Helper_Data::class, - 'index/data' => \Mage_Index_Helper_Data::class, + 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'index' => \Mage_Index_Helper_Data::class, + 'index/data' => \Mage_Index_Helper_Data::class, 'install' => \Mage_Install_Helper_Data::class, 'install/data' => \Mage_Install_Helper_Data::class, 'log/data' => \Mage_Log_Helper_Data::class, 'log' => \Mage_Log_Helper_Data::class, 'media/data' => \Mage_Media_Helper_Data::class, 'media' => \Mage_Media_Helper_Data::class, - 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'newsletter' => \Mage_Newsletter_Helper_Data::class, + 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, 'pagecache' => \Mage_PageCache_Helper_Data::class, 'pagecache/data' => \Mage_PageCache_Helper_Data::class, - 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, + 'page' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, 'page/layout' => \Mage_Page_Helper_Layout::class, - 'payment' => \Mage_Payment_Helper_Data::class, 'payment/data' => \Mage_Payment_Helper_Data::class, - 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, + 'payment' => \Mage_Payment_Helper_Data::class, 'paypaluk' => \Mage_PaypalUk_Helper_Data::class, + 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, 'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class, 'paypal/data' => \Mage_Paypal_Helper_Data::class, 'paypal' => \Mage_Paypal_Helper_Data::class, 'paypal/hss' => \Mage_Paypal_Helper_Hss::class, - 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent' => \Mage_Persistent_Helper_Data::class, + 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent/session' => \Mage_Persistent_Helper_Session::class, - 'poll/data' => \Mage_Poll_Helper_Data::class, 'poll' => \Mage_Poll_Helper_Data::class, - 'productalert' => \Mage_ProductAlert_Helper_Data::class, + 'poll/data' => \Mage_Poll_Helper_Data::class, 'productalert/data' => \Mage_ProductAlert_Helper_Data::class, + 'productalert' => \Mage_ProductAlert_Helper_Data::class, 'rating' => \Mage_Rating_Helper_Data::class, 'rating/data' => \Mage_Rating_Helper_Data::class, 'reports/data' => \Mage_Reports_Helper_Data::class, @@ -2309,10 +2297,10 @@ 'sendfriend' => \Mage_Sendfriend_Helper_Data::class, 'shipping' => \Mage_Shipping_Helper_Data::class, 'shipping/data' => \Mage_Shipping_Helper_Data::class, - 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'sitemap' => \Mage_Sitemap_Helper_Data::class, - 'tag/data' => \Mage_Tag_Helper_Data::class, + 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'tag' => \Mage_Tag_Helper_Data::class, + 'tag/data' => \Mage_Tag_Helper_Data::class, 'tax' => \Mage_Tax_Helper_Data::class, 'tax/data' => \Mage_Tax_Helper_Data::class, 'uploader/data' => \Mage_Uploader_Helper_Data::class, @@ -2330,8 +2318,8 @@ ); override( \Mage_Rss_Controller_Abstract::_getHelper(0), map( [ - 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'adminnotification' => \Mage_AdminNotification_Helper_Data::class, + 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'admin/block' => \Mage_Admin_Helper_Block::class, 'admin' => \Mage_Admin_Helper_Data::class, 'admin/data' => \Mage_Admin_Helper_Data::class, @@ -2351,32 +2339,30 @@ 'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class, 'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class, 'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class, - 'api2' => \Mage_Api2_Helper_Data::class, 'api2/data' => \Mage_Api2_Helper_Data::class, - 'api' => \Mage_Api_Helper_Data::class, + 'api2' => \Mage_Api2_Helper_Data::class, 'api/data' => \Mage_Api_Helper_Data::class, + 'api' => \Mage_Api_Helper_Data::class, 'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class, 'authorizenet' => \Mage_Authorizenet_Helper_Data::class, 'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class, - 'backup' => \Mage_Backup_Helper_Data::class, - 'backup/data' => \Mage_Backup_Helper_Data::class, 'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class, - 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'bundle' => \Mage_Bundle_Helper_Data::class, - 'captcha/data' => \Mage_Captcha_Helper_Data::class, + 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'captcha' => \Mage_Captcha_Helper_Data::class, - 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, + 'captcha/data' => \Mage_Captcha_Helper_Data::class, 'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class, + 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, 'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class, - 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class, + 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class, 'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class, 'catalog/category' => \Mage_Catalog_Helper_Category::class, 'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class, 'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class, - 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/data' => \Mage_Catalog_Helper_Data::class, + 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class, 'catalog/image' => \Mage_Catalog_Helper_Image::class, 'catalog/map' => \Mage_Catalog_Helper_Map::class, @@ -2390,8 +2376,8 @@ 'catalog/product_url' => \Mage_Catalog_Helper_Product_Url::class, 'catalog/product_url_rewrite' => \Mage_Catalog_Helper_Product_Url_Rewrite::class, 'catalog/product_view' => \Mage_Catalog_Helper_Product_View::class, - 'centinel/data' => \Mage_Centinel_Helper_Data::class, 'centinel' => \Mage_Centinel_Helper_Data::class, + 'centinel/data' => \Mage_Centinel_Helper_Data::class, 'checkout/cart' => \Mage_Checkout_Helper_Cart::class, 'checkout' => \Mage_Checkout_Helper_Data::class, 'checkout/data' => \Mage_Checkout_Helper_Data::class, @@ -2417,6 +2403,7 @@ 'core/hint' => \Mage_Core_Helper_Hint::class, 'core/http' => \Mage_Core_Helper_Http::class, 'core/js' => \Mage_Core_Helper_Js::class, + 'core/security' => \Mage_Core_Helper_Security::class, 'core/string' => \Mage_Core_Helper_String::class, 'core/translate' => \Mage_Core_Helper_Translate::class, 'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class, @@ -2429,57 +2416,57 @@ 'customer' => \Mage_Customer_Helper_Data::class, 'dataflow' => \Mage_Dataflow_Helper_Data::class, 'dataflow/data' => \Mage_Dataflow_Helper_Data::class, - 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory' => \Mage_Directory_Helper_Data::class, + 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory/url' => \Mage_Directory_Helper_Url::class, 'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class, 'downloadable' => \Mage_Downloadable_Helper_Data::class, 'downloadable/data' => \Mage_Downloadable_Helper_Data::class, 'downloadable/download' => \Mage_Downloadable_Helper_Download::class, 'downloadable/file' => \Mage_Downloadable_Helper_File::class, - 'eav' => \Mage_Eav_Helper_Data::class, 'eav/data' => \Mage_Eav_Helper_Data::class, + 'eav' => \Mage_Eav_Helper_Data::class, 'giftmessage' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class, 'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class, 'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class, 'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class, - 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'importexport' => \Mage_ImportExport_Helper_Data::class, - 'index/data' => \Mage_Index_Helper_Data::class, + 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'index' => \Mage_Index_Helper_Data::class, + 'index/data' => \Mage_Index_Helper_Data::class, 'install' => \Mage_Install_Helper_Data::class, 'install/data' => \Mage_Install_Helper_Data::class, 'log/data' => \Mage_Log_Helper_Data::class, 'log' => \Mage_Log_Helper_Data::class, 'media/data' => \Mage_Media_Helper_Data::class, 'media' => \Mage_Media_Helper_Data::class, - 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'newsletter' => \Mage_Newsletter_Helper_Data::class, + 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, 'pagecache' => \Mage_PageCache_Helper_Data::class, 'pagecache/data' => \Mage_PageCache_Helper_Data::class, - 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, + 'page' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, 'page/layout' => \Mage_Page_Helper_Layout::class, - 'payment' => \Mage_Payment_Helper_Data::class, 'payment/data' => \Mage_Payment_Helper_Data::class, - 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, + 'payment' => \Mage_Payment_Helper_Data::class, 'paypaluk' => \Mage_PaypalUk_Helper_Data::class, + 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, 'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class, 'paypal/data' => \Mage_Paypal_Helper_Data::class, 'paypal' => \Mage_Paypal_Helper_Data::class, 'paypal/hss' => \Mage_Paypal_Helper_Hss::class, - 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent' => \Mage_Persistent_Helper_Data::class, + 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent/session' => \Mage_Persistent_Helper_Session::class, - 'poll/data' => \Mage_Poll_Helper_Data::class, 'poll' => \Mage_Poll_Helper_Data::class, - 'productalert' => \Mage_ProductAlert_Helper_Data::class, + 'poll/data' => \Mage_Poll_Helper_Data::class, 'productalert/data' => \Mage_ProductAlert_Helper_Data::class, + 'productalert' => \Mage_ProductAlert_Helper_Data::class, 'rating' => \Mage_Rating_Helper_Data::class, 'rating/data' => \Mage_Rating_Helper_Data::class, 'reports/data' => \Mage_Reports_Helper_Data::class, @@ -2503,10 +2490,10 @@ 'sendfriend' => \Mage_Sendfriend_Helper_Data::class, 'shipping' => \Mage_Shipping_Helper_Data::class, 'shipping/data' => \Mage_Shipping_Helper_Data::class, - 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'sitemap' => \Mage_Sitemap_Helper_Data::class, - 'tag/data' => \Mage_Tag_Helper_Data::class, + 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'tag' => \Mage_Tag_Helper_Data::class, + 'tag/data' => \Mage_Tag_Helper_Data::class, 'tax' => \Mage_Tax_Helper_Data::class, 'tax/data' => \Mage_Tax_Helper_Data::class, 'uploader/data' => \Mage_Uploader_Helper_Data::class, @@ -2524,8 +2511,8 @@ ); override( \Mage_SalesRule_Model_Validator::_getHelper(0), map( [ - 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'adminnotification' => \Mage_AdminNotification_Helper_Data::class, + 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'admin/block' => \Mage_Admin_Helper_Block::class, 'admin' => \Mage_Admin_Helper_Data::class, 'admin/data' => \Mage_Admin_Helper_Data::class, @@ -2545,32 +2532,30 @@ 'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class, 'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class, 'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class, - 'api2' => \Mage_Api2_Helper_Data::class, 'api2/data' => \Mage_Api2_Helper_Data::class, - 'api' => \Mage_Api_Helper_Data::class, + 'api2' => \Mage_Api2_Helper_Data::class, 'api/data' => \Mage_Api_Helper_Data::class, + 'api' => \Mage_Api_Helper_Data::class, 'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class, 'authorizenet' => \Mage_Authorizenet_Helper_Data::class, 'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class, - 'backup' => \Mage_Backup_Helper_Data::class, - 'backup/data' => \Mage_Backup_Helper_Data::class, 'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class, - 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'bundle' => \Mage_Bundle_Helper_Data::class, - 'captcha/data' => \Mage_Captcha_Helper_Data::class, + 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'captcha' => \Mage_Captcha_Helper_Data::class, - 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, + 'captcha/data' => \Mage_Captcha_Helper_Data::class, 'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class, + 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, 'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class, - 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class, + 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class, 'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class, 'catalog/category' => \Mage_Catalog_Helper_Category::class, 'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class, 'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class, - 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/data' => \Mage_Catalog_Helper_Data::class, + 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class, 'catalog/image' => \Mage_Catalog_Helper_Image::class, 'catalog/map' => \Mage_Catalog_Helper_Map::class, @@ -2594,8 +2579,8 @@ 'cms/data' => \Mage_Cms_Helper_Data::class, 'cms/page' => \Mage_Cms_Helper_Page::class, 'cms/wysiwyg_images' => \Mage_Cms_Helper_Wysiwyg_Images::class, - 'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class, 'configurableswatches' => \Mage_ConfigurableSwatches_Helper_Data::class, + 'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class, 'configurableswatches/list_price' => \Mage_ConfigurableSwatches_Helper_List_Price::class, 'configurableswatches/mediafallback' => \Mage_ConfigurableSwatches_Helper_Mediafallback::class, 'configurableswatches/productimg' => \Mage_ConfigurableSwatches_Helper_Productimg::class, @@ -2611,6 +2596,7 @@ 'core/hint' => \Mage_Core_Helper_Hint::class, 'core/http' => \Mage_Core_Helper_Http::class, 'core/js' => \Mage_Core_Helper_Js::class, + 'core/security' => \Mage_Core_Helper_Security::class, 'core/string' => \Mage_Core_Helper_String::class, 'core/translate' => \Mage_Core_Helper_Translate::class, 'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class, @@ -2623,57 +2609,57 @@ 'customer' => \Mage_Customer_Helper_Data::class, 'dataflow' => \Mage_Dataflow_Helper_Data::class, 'dataflow/data' => \Mage_Dataflow_Helper_Data::class, - 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory' => \Mage_Directory_Helper_Data::class, + 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory/url' => \Mage_Directory_Helper_Url::class, 'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class, 'downloadable' => \Mage_Downloadable_Helper_Data::class, 'downloadable/data' => \Mage_Downloadable_Helper_Data::class, 'downloadable/download' => \Mage_Downloadable_Helper_Download::class, 'downloadable/file' => \Mage_Downloadable_Helper_File::class, - 'eav' => \Mage_Eav_Helper_Data::class, 'eav/data' => \Mage_Eav_Helper_Data::class, + 'eav' => \Mage_Eav_Helper_Data::class, 'giftmessage' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class, 'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class, 'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class, 'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class, - 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'importexport' => \Mage_ImportExport_Helper_Data::class, - 'index/data' => \Mage_Index_Helper_Data::class, + 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'index' => \Mage_Index_Helper_Data::class, + 'index/data' => \Mage_Index_Helper_Data::class, 'install' => \Mage_Install_Helper_Data::class, 'install/data' => \Mage_Install_Helper_Data::class, 'log/data' => \Mage_Log_Helper_Data::class, 'log' => \Mage_Log_Helper_Data::class, 'media/data' => \Mage_Media_Helper_Data::class, 'media' => \Mage_Media_Helper_Data::class, - 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'newsletter' => \Mage_Newsletter_Helper_Data::class, + 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, 'pagecache' => \Mage_PageCache_Helper_Data::class, 'pagecache/data' => \Mage_PageCache_Helper_Data::class, - 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, + 'page' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, 'page/layout' => \Mage_Page_Helper_Layout::class, - 'payment' => \Mage_Payment_Helper_Data::class, 'payment/data' => \Mage_Payment_Helper_Data::class, - 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, + 'payment' => \Mage_Payment_Helper_Data::class, 'paypaluk' => \Mage_PaypalUk_Helper_Data::class, + 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, 'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class, 'paypal/data' => \Mage_Paypal_Helper_Data::class, 'paypal' => \Mage_Paypal_Helper_Data::class, 'paypal/hss' => \Mage_Paypal_Helper_Hss::class, - 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent' => \Mage_Persistent_Helper_Data::class, + 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent/session' => \Mage_Persistent_Helper_Session::class, - 'poll/data' => \Mage_Poll_Helper_Data::class, 'poll' => \Mage_Poll_Helper_Data::class, - 'productalert' => \Mage_ProductAlert_Helper_Data::class, + 'poll/data' => \Mage_Poll_Helper_Data::class, 'productalert/data' => \Mage_ProductAlert_Helper_Data::class, + 'productalert' => \Mage_ProductAlert_Helper_Data::class, 'rating' => \Mage_Rating_Helper_Data::class, 'rating/data' => \Mage_Rating_Helper_Data::class, 'reports/data' => \Mage_Reports_Helper_Data::class, @@ -2697,10 +2683,10 @@ 'sendfriend' => \Mage_Sendfriend_Helper_Data::class, 'shipping' => \Mage_Shipping_Helper_Data::class, 'shipping/data' => \Mage_Shipping_Helper_Data::class, - 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'sitemap' => \Mage_Sitemap_Helper_Data::class, - 'tag/data' => \Mage_Tag_Helper_Data::class, + 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'tag' => \Mage_Tag_Helper_Data::class, + 'tag/data' => \Mage_Tag_Helper_Data::class, 'tax' => \Mage_Tax_Helper_Data::class, 'tax/data' => \Mage_Tax_Helper_Data::class, 'uploader/data' => \Mage_Uploader_Helper_Data::class, @@ -2718,8 +2704,8 @@ ); override( \Mage_Weee_Helper_Data::_getHelper(0), map( [ - 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'adminnotification' => \Mage_AdminNotification_Helper_Data::class, + 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'admin/block' => \Mage_Admin_Helper_Block::class, 'admin' => \Mage_Admin_Helper_Data::class, 'admin/data' => \Mage_Admin_Helper_Data::class, @@ -2739,32 +2725,30 @@ 'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class, 'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class, 'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class, - 'api2' => \Mage_Api2_Helper_Data::class, 'api2/data' => \Mage_Api2_Helper_Data::class, - 'api' => \Mage_Api_Helper_Data::class, + 'api2' => \Mage_Api2_Helper_Data::class, 'api/data' => \Mage_Api_Helper_Data::class, + 'api' => \Mage_Api_Helper_Data::class, 'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class, 'authorizenet' => \Mage_Authorizenet_Helper_Data::class, 'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class, - 'backup' => \Mage_Backup_Helper_Data::class, - 'backup/data' => \Mage_Backup_Helper_Data::class, 'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class, - 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'bundle' => \Mage_Bundle_Helper_Data::class, - 'captcha/data' => \Mage_Captcha_Helper_Data::class, + 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'captcha' => \Mage_Captcha_Helper_Data::class, - 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, + 'captcha/data' => \Mage_Captcha_Helper_Data::class, 'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class, + 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, 'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class, - 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class, + 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class, 'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class, 'catalog/category' => \Mage_Catalog_Helper_Category::class, 'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class, 'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class, - 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/data' => \Mage_Catalog_Helper_Data::class, + 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class, 'catalog/image' => \Mage_Catalog_Helper_Image::class, 'catalog/map' => \Mage_Catalog_Helper_Map::class, @@ -2778,8 +2762,8 @@ 'catalog/product_url' => \Mage_Catalog_Helper_Product_Url::class, 'catalog/product_url_rewrite' => \Mage_Catalog_Helper_Product_Url_Rewrite::class, 'catalog/product_view' => \Mage_Catalog_Helper_Product_View::class, - 'centinel/data' => \Mage_Centinel_Helper_Data::class, 'centinel' => \Mage_Centinel_Helper_Data::class, + 'centinel/data' => \Mage_Centinel_Helper_Data::class, 'checkout/cart' => \Mage_Checkout_Helper_Cart::class, 'checkout' => \Mage_Checkout_Helper_Data::class, 'checkout/data' => \Mage_Checkout_Helper_Data::class, @@ -2805,6 +2789,7 @@ 'core/hint' => \Mage_Core_Helper_Hint::class, 'core/http' => \Mage_Core_Helper_Http::class, 'core/js' => \Mage_Core_Helper_Js::class, + 'core/security' => \Mage_Core_Helper_Security::class, 'core/string' => \Mage_Core_Helper_String::class, 'core/translate' => \Mage_Core_Helper_Translate::class, 'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class, @@ -2817,57 +2802,57 @@ 'customer' => \Mage_Customer_Helper_Data::class, 'dataflow' => \Mage_Dataflow_Helper_Data::class, 'dataflow/data' => \Mage_Dataflow_Helper_Data::class, - 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory' => \Mage_Directory_Helper_Data::class, + 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory/url' => \Mage_Directory_Helper_Url::class, 'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class, 'downloadable' => \Mage_Downloadable_Helper_Data::class, 'downloadable/data' => \Mage_Downloadable_Helper_Data::class, 'downloadable/download' => \Mage_Downloadable_Helper_Download::class, 'downloadable/file' => \Mage_Downloadable_Helper_File::class, - 'eav' => \Mage_Eav_Helper_Data::class, 'eav/data' => \Mage_Eav_Helper_Data::class, + 'eav' => \Mage_Eav_Helper_Data::class, 'giftmessage' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class, 'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class, 'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class, 'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class, - 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'importexport' => \Mage_ImportExport_Helper_Data::class, - 'index/data' => \Mage_Index_Helper_Data::class, + 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'index' => \Mage_Index_Helper_Data::class, + 'index/data' => \Mage_Index_Helper_Data::class, 'install' => \Mage_Install_Helper_Data::class, 'install/data' => \Mage_Install_Helper_Data::class, 'log/data' => \Mage_Log_Helper_Data::class, 'log' => \Mage_Log_Helper_Data::class, 'media/data' => \Mage_Media_Helper_Data::class, 'media' => \Mage_Media_Helper_Data::class, - 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'newsletter' => \Mage_Newsletter_Helper_Data::class, + 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, 'pagecache' => \Mage_PageCache_Helper_Data::class, 'pagecache/data' => \Mage_PageCache_Helper_Data::class, - 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, + 'page' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, 'page/layout' => \Mage_Page_Helper_Layout::class, - 'payment' => \Mage_Payment_Helper_Data::class, 'payment/data' => \Mage_Payment_Helper_Data::class, - 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, + 'payment' => \Mage_Payment_Helper_Data::class, 'paypaluk' => \Mage_PaypalUk_Helper_Data::class, + 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, 'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class, 'paypal/data' => \Mage_Paypal_Helper_Data::class, 'paypal' => \Mage_Paypal_Helper_Data::class, 'paypal/hss' => \Mage_Paypal_Helper_Hss::class, - 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent' => \Mage_Persistent_Helper_Data::class, + 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent/session' => \Mage_Persistent_Helper_Session::class, - 'poll/data' => \Mage_Poll_Helper_Data::class, 'poll' => \Mage_Poll_Helper_Data::class, - 'productalert' => \Mage_ProductAlert_Helper_Data::class, + 'poll/data' => \Mage_Poll_Helper_Data::class, 'productalert/data' => \Mage_ProductAlert_Helper_Data::class, + 'productalert' => \Mage_ProductAlert_Helper_Data::class, 'rating' => \Mage_Rating_Helper_Data::class, 'rating/data' => \Mage_Rating_Helper_Data::class, 'reports/data' => \Mage_Reports_Helper_Data::class, @@ -2891,10 +2876,10 @@ 'sendfriend' => \Mage_Sendfriend_Helper_Data::class, 'shipping' => \Mage_Shipping_Helper_Data::class, 'shipping/data' => \Mage_Shipping_Helper_Data::class, - 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'sitemap' => \Mage_Sitemap_Helper_Data::class, - 'tag/data' => \Mage_Tag_Helper_Data::class, + 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'tag' => \Mage_Tag_Helper_Data::class, + 'tag/data' => \Mage_Tag_Helper_Data::class, 'tax' => \Mage_Tax_Helper_Data::class, 'tax/data' => \Mage_Tax_Helper_Data::class, 'uploader/data' => \Mage_Uploader_Helper_Data::class, @@ -2912,8 +2897,8 @@ ); override( \Mage_Weee_Model_Config_Source_Fpt_Tax::_getHelper(0), map( [ - 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'adminnotification' => \Mage_AdminNotification_Helper_Data::class, + 'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class, 'admin/block' => \Mage_Admin_Helper_Block::class, 'admin' => \Mage_Admin_Helper_Data::class, 'admin/data' => \Mage_Admin_Helper_Data::class, @@ -2933,32 +2918,30 @@ 'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class, 'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class, 'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class, - 'api2' => \Mage_Api2_Helper_Data::class, 'api2/data' => \Mage_Api2_Helper_Data::class, - 'api' => \Mage_Api_Helper_Data::class, + 'api2' => \Mage_Api2_Helper_Data::class, 'api/data' => \Mage_Api_Helper_Data::class, + 'api' => \Mage_Api_Helper_Data::class, 'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class, 'authorizenet' => \Mage_Authorizenet_Helper_Data::class, 'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class, - 'backup' => \Mage_Backup_Helper_Data::class, - 'backup/data' => \Mage_Backup_Helper_Data::class, 'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class, - 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'bundle' => \Mage_Bundle_Helper_Data::class, - 'captcha/data' => \Mage_Captcha_Helper_Data::class, + 'bundle/data' => \Mage_Bundle_Helper_Data::class, 'captcha' => \Mage_Captcha_Helper_Data::class, - 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, + 'captcha/data' => \Mage_Captcha_Helper_Data::class, 'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class, + 'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class, 'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class, - 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class, + 'catalogrule' => \Mage_CatalogRule_Helper_Data::class, 'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class, 'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class, 'catalog/category' => \Mage_Catalog_Helper_Category::class, 'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class, 'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class, - 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/data' => \Mage_Catalog_Helper_Data::class, + 'catalog' => \Mage_Catalog_Helper_Data::class, 'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class, 'catalog/image' => \Mage_Catalog_Helper_Image::class, 'catalog/map' => \Mage_Catalog_Helper_Map::class, @@ -2982,8 +2965,8 @@ 'cms/data' => \Mage_Cms_Helper_Data::class, 'cms/page' => \Mage_Cms_Helper_Page::class, 'cms/wysiwyg_images' => \Mage_Cms_Helper_Wysiwyg_Images::class, - 'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class, 'configurableswatches' => \Mage_ConfigurableSwatches_Helper_Data::class, + 'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class, 'configurableswatches/list_price' => \Mage_ConfigurableSwatches_Helper_List_Price::class, 'configurableswatches/mediafallback' => \Mage_ConfigurableSwatches_Helper_Mediafallback::class, 'configurableswatches/productimg' => \Mage_ConfigurableSwatches_Helper_Productimg::class, @@ -2999,6 +2982,7 @@ 'core/hint' => \Mage_Core_Helper_Hint::class, 'core/http' => \Mage_Core_Helper_Http::class, 'core/js' => \Mage_Core_Helper_Js::class, + 'core/security' => \Mage_Core_Helper_Security::class, 'core/string' => \Mage_Core_Helper_String::class, 'core/translate' => \Mage_Core_Helper_Translate::class, 'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class, @@ -3011,57 +2995,57 @@ 'customer' => \Mage_Customer_Helper_Data::class, 'dataflow' => \Mage_Dataflow_Helper_Data::class, 'dataflow/data' => \Mage_Dataflow_Helper_Data::class, - 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory' => \Mage_Directory_Helper_Data::class, + 'directory/data' => \Mage_Directory_Helper_Data::class, 'directory/url' => \Mage_Directory_Helper_Url::class, 'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class, 'downloadable' => \Mage_Downloadable_Helper_Data::class, 'downloadable/data' => \Mage_Downloadable_Helper_Data::class, 'downloadable/download' => \Mage_Downloadable_Helper_Download::class, 'downloadable/file' => \Mage_Downloadable_Helper_File::class, - 'eav' => \Mage_Eav_Helper_Data::class, 'eav/data' => \Mage_Eav_Helper_Data::class, + 'eav' => \Mage_Eav_Helper_Data::class, 'giftmessage' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class, 'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class, 'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class, 'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class, 'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class, - 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'importexport' => \Mage_ImportExport_Helper_Data::class, - 'index/data' => \Mage_Index_Helper_Data::class, + 'importexport/data' => \Mage_ImportExport_Helper_Data::class, 'index' => \Mage_Index_Helper_Data::class, + 'index/data' => \Mage_Index_Helper_Data::class, 'install' => \Mage_Install_Helper_Data::class, 'install/data' => \Mage_Install_Helper_Data::class, 'log/data' => \Mage_Log_Helper_Data::class, 'log' => \Mage_Log_Helper_Data::class, 'media/data' => \Mage_Media_Helper_Data::class, 'media' => \Mage_Media_Helper_Data::class, - 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'newsletter' => \Mage_Newsletter_Helper_Data::class, + 'newsletter/data' => \Mage_Newsletter_Helper_Data::class, 'oauth' => \Mage_Oauth_Helper_Data::class, 'oauth/data' => \Mage_Oauth_Helper_Data::class, 'pagecache' => \Mage_PageCache_Helper_Data::class, 'pagecache/data' => \Mage_PageCache_Helper_Data::class, - 'page' => \Mage_Page_Helper_Data::class, 'page/data' => \Mage_Page_Helper_Data::class, + 'page' => \Mage_Page_Helper_Data::class, 'page/html' => \Mage_Page_Helper_Html::class, 'page/layout' => \Mage_Page_Helper_Layout::class, - 'payment' => \Mage_Payment_Helper_Data::class, 'payment/data' => \Mage_Payment_Helper_Data::class, - 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, + 'payment' => \Mage_Payment_Helper_Data::class, 'paypaluk' => \Mage_PaypalUk_Helper_Data::class, + 'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class, 'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class, 'paypal/data' => \Mage_Paypal_Helper_Data::class, 'paypal' => \Mage_Paypal_Helper_Data::class, 'paypal/hss' => \Mage_Paypal_Helper_Hss::class, - 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent' => \Mage_Persistent_Helper_Data::class, + 'persistent/data' => \Mage_Persistent_Helper_Data::class, 'persistent/session' => \Mage_Persistent_Helper_Session::class, - 'poll/data' => \Mage_Poll_Helper_Data::class, 'poll' => \Mage_Poll_Helper_Data::class, - 'productalert' => \Mage_ProductAlert_Helper_Data::class, + 'poll/data' => \Mage_Poll_Helper_Data::class, 'productalert/data' => \Mage_ProductAlert_Helper_Data::class, + 'productalert' => \Mage_ProductAlert_Helper_Data::class, 'rating' => \Mage_Rating_Helper_Data::class, 'rating/data' => \Mage_Rating_Helper_Data::class, 'reports/data' => \Mage_Reports_Helper_Data::class, @@ -3085,10 +3069,10 @@ 'sendfriend' => \Mage_Sendfriend_Helper_Data::class, 'shipping' => \Mage_Shipping_Helper_Data::class, 'shipping/data' => \Mage_Shipping_Helper_Data::class, - 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'sitemap' => \Mage_Sitemap_Helper_Data::class, - 'tag/data' => \Mage_Tag_Helper_Data::class, + 'sitemap/data' => \Mage_Sitemap_Helper_Data::class, 'tag' => \Mage_Tag_Helper_Data::class, + 'tag/data' => \Mage_Tag_Helper_Data::class, 'tax' => \Mage_Tax_Helper_Data::class, 'tax/data' => \Mage_Tax_Helper_Data::class, 'uploader/data' => \Mage_Uploader_Helper_Data::class, diff --git a/.phpstorm.meta.php/magento_models.meta.php b/.phpstorm.meta.php/magento_models.meta.php index 5e62b2dcfce..afb980536e8 100644 --- a/.phpstorm.meta.php/magento_models.meta.php +++ b/.phpstorm.meta.php/magento_models.meta.php @@ -7,11 +7,10 @@ 'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class, 'adminnotification/mysql4_inbox_collection' => \Mage_AdminNotification_Model_Mysql4_Inbox_Collection::class, 'adminnotification/observer' => \Mage_AdminNotification_Model_Observer::class, - 'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, 'adminnotification/resource_inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, - 'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, + 'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, 'adminnotification/resource_inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, - 'adminnotification/survey' => \Mage_AdminNotification_Model_Survey::class, + 'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, 'admin/acl' => \Mage_Admin_Model_Acl::class, 'admin/acl_assert_ip' => \Mage_Admin_Model_Acl_Assert_Ip::class, 'admin/acl_assert_time' => \Mage_Admin_Model_Acl_Assert_Time::class, @@ -40,38 +39,38 @@ 'admin/redirectpolicy' => \Mage_Admin_Model_Redirectpolicy::class, 'admin/resource_acl' => \Mage_Admin_Model_Resource_Acl::class, 'admin_resource/acl' => \Mage_Admin_Model_Resource_Acl::class, - 'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, 'admin/resource_acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, + 'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, 'admin/resource_acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class, 'admin_resource/acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class, - 'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class, 'admin/resource_block' => \Mage_Admin_Model_Resource_Block::class, - 'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, + 'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class, 'admin/resource_block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, + 'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, 'admin_resource/permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class, 'admin/resource_permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class, - 'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class, 'admin/resource_role' => \Mage_Admin_Model_Resource_Role::class, + 'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class, 'admin/resource_role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class, 'admin_resource/role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class, - 'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class, 'admin_resource/roles' => \Mage_Admin_Model_Resource_Roles::class, - 'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, + 'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class, 'admin_resource/roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, - 'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, + 'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, 'admin/resource_roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, + 'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, 'admin/resource_rules' => \Mage_Admin_Model_Resource_Rules::class, 'admin_resource/rules' => \Mage_Admin_Model_Resource_Rules::class, 'admin_resource/rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, 'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, - 'admin_resource/user' => \Mage_Admin_Model_Resource_User::class, 'admin/resource_user' => \Mage_Admin_Model_Resource_User::class, + 'admin_resource/user' => \Mage_Admin_Model_Resource_User::class, 'admin/resource_user_collection' => \Mage_Admin_Model_Resource_User_Collection::class, 'admin_resource/user_collection' => \Mage_Admin_Model_Resource_User_Collection::class, - 'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class, 'admin_resource/variable' => \Mage_Admin_Model_Resource_Variable::class, - 'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, + 'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class, 'admin/resource_variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, + 'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, 'admin/role' => \Mage_Admin_Model_Role::class, 'admin/roles' => \Mage_Admin_Model_Roles::class, 'admin/rules' => \Mage_Admin_Model_Rules::class, @@ -106,6 +105,7 @@ 'adminhtml/system_config_backend_baseurl' => \Mage_Adminhtml_Model_System_Config_Backend_Baseurl::class, 'adminhtml/system_config_backend_cache' => \Mage_Adminhtml_Model_System_Config_Backend_Cache::class, 'adminhtml/system_config_backend_catalog_inventory_managestock' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock::class, + 'adminhtml/system_config_backend_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Separator::class, 'adminhtml/system_config_backend_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Type::class, 'adminhtml/system_config_backend_category' => \Mage_Adminhtml_Model_System_Config_Backend_Category::class, 'adminhtml/system_config_backend_cookie' => \Mage_Adminhtml_Model_System_Config_Backend_Cookie::class, @@ -158,12 +158,14 @@ 'adminhtml/system_config_source_catalog_listMode' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListMode::class, 'adminhtml/system_config_source_catalog_listPerPage' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListPerPage::class, 'adminhtml/system_config_source_catalog_listSort' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort::class, + 'adminhtml/system_config_source_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Separator::class, 'adminhtml/system_config_source_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Type::class, 'adminhtml/system_config_source_catalog_timeFormat' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_TimeFormat::class, 'adminhtml/system_config_source_category' => \Mage_Adminhtml_Model_System_Config_Source_Category::class, 'adminhtml/system_config_source_checktype' => \Mage_Adminhtml_Model_System_Config_Source_Checktype::class, 'adminhtml/system_config_source_cms_page' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Page::class, 'adminhtml/system_config_source_cms_wysiwyg_enabled' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Wysiwyg_Enabled::class, + 'adminhtml/system_config_source_cookie_samesite' => \Mage_Adminhtml_Model_System_Config_Source_Cookie_Samesite::class, 'adminhtml/system_config_source_country' => \Mage_Adminhtml_Model_System_Config_Source_Country::class, 'adminhtml/system_config_source_country_full' => \Mage_Adminhtml_Model_System_Config_Source_Country_Full::class, 'adminhtml/system_config_source_cron_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency::class, @@ -190,6 +192,7 @@ 'adminhtml/system_config_source_locale_timezone' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Timezone::class, 'adminhtml/system_config_source_locale_weekdaycodes' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdaycodes::class, 'adminhtml/system_config_source_locale_weekdays' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdays::class, + 'adminhtml/system_config_source_log_level' => \Mage_Adminhtml_Model_System_Config_Source_Log_Level::class, 'adminhtml/system_config_source_nooptreq' => \Mage_Adminhtml_Model_System_Config_Source_Nooptreq::class, 'adminhtml/system_config_source_notification_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Notification_Frequency::class, 'adminhtml/system_config_source_order_status' => \Mage_Adminhtml_Model_System_Config_Source_Order_Status::class, @@ -213,7 +216,6 @@ 'adminhtml/system_config_source_shipping_flatrate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Flatrate::class, 'adminhtml/system_config_source_shipping_tablerate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Tablerate::class, 'adminhtml/system_config_source_shipping_taxclass' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Taxclass::class, - 'adminhtml/system_config_source_startdateenddate' => \Mage_Adminhtml_Model_System_Config_Source_Startdateenddate::class, 'adminhtml/system_config_source_storage_media_database' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Database::class, 'adminhtml/system_config_source_storage_media_storage' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Storage::class, 'adminhtml/system_config_source_store' => \Mage_Adminhtml_Model_System_Config_Source_Store::class, @@ -269,22 +271,22 @@ 'api2_resource/acl_filter_attribute' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute::class, 'api2/resource_acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class, 'api2_resource/acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class, - 'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, 'api2_resource/acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, + 'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, 'api2/resource_acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class, 'api2_resource/acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class, 'api2_resource/acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class, 'api2/resource_acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class, 'api2/resource_acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class, 'api2_resource/acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class, - 'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class, 'api2/resource_setup' => \Mage_Api2_Model_Resource_Setup::class, + 'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class, 'api2/resource_validator' => \Mage_Api2_Model_Resource_Validator::class, 'api2_resource/validator' => \Mage_Api2_Model_Resource_Validator::class, 'api2/resource_validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class, 'api2_resource/validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class, - 'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, 'api2/resource_validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, + 'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, 'api2/response' => \Mage_Api2_Model_Response::class, 'api2/route_abstract' => \Mage_Api2_Model_Route_Abstract::class, 'api2/route_apiType' => \Mage_Api2_Model_Route_ApiType::class, @@ -316,8 +318,8 @@ 'api/mysql4_user_collection' => \Mage_Api_Model_Mysql4_User_Collection::class, 'api/resource_abstract' => \Mage_Api_Model_Resource_Abstract::class, 'api_resource/abstract' => \Mage_Api_Model_Resource_Abstract::class, - 'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class, 'api_resource/acl' => \Mage_Api_Model_Resource_Acl::class, + 'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class, 'api_resource/acl_role' => \Mage_Api_Model_Resource_Acl_Role::class, 'api/resource_acl_role' => \Mage_Api_Model_Resource_Acl_Role::class, 'api/resource_acl_role_collection' => \Mage_Api_Model_Resource_Acl_Role_Collection::class, @@ -326,18 +328,18 @@ 'api_resource/permissions_collection' => \Mage_Api_Model_Resource_Permissions_Collection::class, 'api_resource/role' => \Mage_Api_Model_Resource_Role::class, 'api/resource_role' => \Mage_Api_Model_Resource_Role::class, - 'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, 'api_resource/role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, + 'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, 'api/resource_roles' => \Mage_Api_Model_Resource_Roles::class, 'api_resource/roles' => \Mage_Api_Model_Resource_Roles::class, - 'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, 'api_resource/roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, - 'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, + 'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, 'api_resource/roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, - 'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class, + 'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, 'api_resource/rules' => \Mage_Api_Model_Resource_Rules::class, - 'api/resource_rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class, + 'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class, 'api_resource/rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class, + 'api/resource_rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class, 'api/resource_user' => \Mage_Api_Model_Resource_User::class, 'api_resource/user' => \Mage_Api_Model_Resource_User::class, 'api/resource_user_collection' => \Mage_Api_Model_Resource_User_Collection::class, @@ -364,15 +366,6 @@ 'authorizenet/directpost_request' => \Mage_Authorizenet_Model_Directpost_Request::class, 'authorizenet/directpost_response' => \Mage_Authorizenet_Model_Directpost_Response::class, 'authorizenet/directpost_session' => \Mage_Authorizenet_Model_Directpost_Session::class, - 'backup/backup' => \Mage_Backup_Model_Backup::class, - 'backup/config_backend_cron' => \Mage_Backup_Model_Config_Backend_Cron::class, - 'backup/config_source_type' => \Mage_Backup_Model_Config_Source_Type::class, - 'backup/db' => \Mage_Backup_Model_Db::class, - 'backup/fs_collection' => \Mage_Backup_Model_Fs_Collection::class, - 'backup/mysql4_db' => \Mage_Backup_Model_Mysql4_Db::class, - 'backup/observer' => \Mage_Backup_Model_Observer::class, - 'backup/resource_db' => \Mage_Backup_Model_Resource_Db::class, - 'backup/resource_helper_mysql4' => \Mage_Backup_Model_Resource_Helper_Mysql4::class, 'bundle/catalogIndex_data_bundle' => \Mage_Bundle_Model_CatalogIndex_Data_Bundle::class, 'bundle/mysql4_bundle' => \Mage_Bundle_Model_Mysql4_Bundle::class, 'bundle/mysql4_indexer_price' => \Mage_Bundle_Model_Mysql4_Indexer_Price::class, @@ -398,10 +391,10 @@ 'bundle_resource/option' => \Mage_Bundle_Model_Resource_Option::class, 'bundle/resource_option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class, 'bundle_resource/option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class, - 'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, 'bundle_resource/price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, - 'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class, + 'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, 'bundle_resource/selection' => \Mage_Bundle_Model_Resource_Selection::class, + 'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class, 'bundle_resource/selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class, 'bundle/resource_selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class, 'bundle/sales_order_pdf_items_abstract' => \Mage_Bundle_Model_Sales_Order_Pdf_Items_Abstract::class, @@ -417,8 +410,8 @@ 'captcha/config_form_frontend' => \Mage_Captcha_Model_Config_Form_Frontend::class, 'captcha/config_mode' => \Mage_Captcha_Model_Config_Mode::class, 'captcha/observer' => \Mage_Captcha_Model_Observer::class, - 'captcha_resource/log' => \Mage_Captcha_Model_Resource_Log::class, 'captcha/resource_log' => \Mage_Captcha_Model_Resource_Log::class, + 'captcha_resource/log' => \Mage_Captcha_Model_Resource_Log::class, 'captcha/zend' => \Mage_Captcha_Model_Zend::class, 'catalogindex/aggregation' => \Mage_CatalogIndex_Model_Aggregation::class, 'catalogindex/attribute' => \Mage_CatalogIndex_Model_Attribute::class, @@ -461,8 +454,8 @@ 'catalogindex/resource_data_abstract' => \Mage_CatalogIndex_Model_Resource_Data_Abstract::class, 'catalogindex_resource/data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class, 'catalogindex/resource_data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class, - 'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, 'catalogindex_resource/data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, + 'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, 'catalogindex_resource/indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class, 'catalogindex/resource_indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class, 'catalogindex/resource_indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class, @@ -494,20 +487,20 @@ 'cataloginventory/mysql4_stock_item_collection' => \Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection::class, 'cataloginventory/mysql4_stock_status' => \Mage_CatalogInventory_Model_Mysql4_Stock_Status::class, 'cataloginventory/observer' => \Mage_CatalogInventory_Model_Observer::class, - 'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, 'cataloginventory_resource/indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, + 'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, 'cataloginventory/resource_indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class, 'cataloginventory_resource/indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class, - 'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, 'cataloginventory/resource_indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, + 'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, 'cataloginventory/resource_indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class, 'cataloginventory_resource/indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class, 'cataloginventory_resource/stock' => \Mage_CatalogInventory_Model_Resource_Stock::class, 'cataloginventory/resource_stock' => \Mage_CatalogInventory_Model_Resource_Stock::class, - 'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, 'cataloginventory/resource_stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, - 'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, + 'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, 'cataloginventory/resource_stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, + 'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, 'cataloginventory/resource_stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class, 'cataloginventory_resource/stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class, 'cataloginventory/source_backorders' => \Mage_CatalogInventory_Model_Source_Backorders::class, @@ -530,8 +523,8 @@ 'catalogrule/observer' => \Mage_CatalogRule_Model_Observer::class, 'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class, 'catalogrule/resource_rule' => \Mage_CatalogRule_Model_Resource_Rule::class, - 'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, 'catalogrule_resource/rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, + 'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, 'catalogrule_resource/rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class, 'catalogrule/resource_rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class, 'catalogrule_resource/rule_product_price_collection' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price_Collection::class, @@ -560,24 +553,24 @@ 'catalogsearch/query' => \Mage_CatalogSearch_Model_Query::class, 'catalogsearch_resource/advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class, 'catalogsearch/resource_advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class, - 'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, 'catalogsearch_resource/advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, + 'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, 'catalogsearch_resource/fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class, 'catalogsearch/resource_fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class, 'catalogsearch_resource/fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class, 'catalogsearch/resource_fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class, - 'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, 'catalogsearch_resource/fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, - 'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, + 'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, 'catalogsearch/resource_helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, - 'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, + 'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, 'catalogsearch_resource/indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, - 'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class, + 'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, 'catalogsearch_resource/query' => \Mage_CatalogSearch_Model_Resource_Query::class, - 'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, + 'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class, 'catalogsearch_resource/query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, - 'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, + 'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, 'catalogsearch/resource_search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, + 'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, 'catalogsearch/session' => \Mage_CatalogSearch_Model_Session::class, 'catalogsearch/system_config_backend_sitemap' => \Mage_CatalogSearch_Model_System_Config_Backend_Sitemap::class, 'catalog/abstract' => \Mage_Catalog_Model_Abstract::class, @@ -720,144 +713,144 @@ 'catalog/product_website' => \Mage_Catalog_Model_Product_Website::class, 'catalog/resource_abstract' => \Mage_Catalog_Model_Resource_Abstract::class, 'catalog_resource/abstract' => \Mage_Catalog_Model_Resource_Abstract::class, - 'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class, 'catalog/resource_attribute' => \Mage_Catalog_Model_Resource_Attribute::class, - 'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class, + 'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class, 'catalog_resource/category' => \Mage_Catalog_Model_Resource_Category::class, + 'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class, 'catalog_resource/category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class, 'catalog/resource_category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class, - 'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, 'catalog/resource_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, - 'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, + 'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, 'catalog/resource_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, + 'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, 'catalog_resource/category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class, 'catalog/resource_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class, 'catalog_resource/category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class, 'catalog/resource_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class, 'catalog/resource_category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class, 'catalog_resource/category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class, - 'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, 'catalog_resource/category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, - 'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, + 'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, 'catalog/resource_category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, + 'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, 'catalog_resource/category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class, 'catalog/resource_category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class, 'catalog/resource_category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class, 'catalog_resource/category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class, - 'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, 'catalog_resource/collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, + 'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, 'catalog_resource/config' => \Mage_Catalog_Model_Resource_Config::class, 'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class, - 'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, 'catalog/resource_eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, + 'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, 'catalog_resource/eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class, 'catalog/resource_eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class, 'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, 'catalog_resource/eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, - 'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, 'catalog/resource_eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, - 'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, + 'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, 'catalog_resource/eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, + 'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, 'catalog_resource/eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, - 'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, + 'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, 'catalog_resource/eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, + 'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, 'catalog/resource_eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class, 'catalog_resource/eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class, 'catalog/resource_eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class, 'catalog_resource/eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class, 'catalog/resource_eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class, 'catalog_resource/eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class, - 'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, 'catalog/resource_eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, + 'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, 'catalog/resource_eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, 'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, 'catalog/resource_eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class, 'catalog_resource/eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class, - 'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, 'catalog_resource/eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, - 'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, + 'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, 'catalog_resource/eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, + 'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, 'catalog_resource/eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class, 'catalog/resource_eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class, - 'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, 'catalog_resource/eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, + 'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, 'catalog/resource_eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, 'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, - 'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, 'catalog/resource_eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, - 'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, + 'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, 'catalog/resource_eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, - 'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, + 'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, 'catalog_resource/eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, + 'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, 'catalog_resource/eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, 'catalog_resource/eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, 'catalog/resource_eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class, 'catalog/resource_eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, + 'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, 'catalog/resource_eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class, 'catalog/resource_eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class, 'catalog_resource/eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class, 'catalog_resource/eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class, 'catalog/resource_eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class, - 'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, 'catalog_resource/eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, - 'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, + 'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, 'catalog_resource/eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, - 'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, + 'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, 'catalog_resource/eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, + 'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, 'catalog/resource_eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class, 'catalog/resource_eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class, 'catalog/resource_eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class, - 'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, 'catalog/resource_eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, - 'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, + 'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, 'catalog_resource/eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, + 'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, 'catalog_resource/eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class, 'catalog/resource_eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class, - 'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, 'catalog/resource_eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, - 'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, + 'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, 'catalog/resource_eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, + 'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, 'catalog/resource_eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class, 'catalog_resource/eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class, - 'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, 'catalog/resource_eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, + 'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, 'catalog_resource/eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class, 'catalog/resource_eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class, 'catalog_resource/eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class, 'catalog/resource_eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class, - 'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, 'catalog/resource_eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, - 'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, + 'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, 'catalog_resource/eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, - 'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, + 'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, 'catalog/resource_eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, + 'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, 'catalog/resource_eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, 'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, - 'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, 'catalog/resource_eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, + 'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, 'catalog/resource_eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class, 'catalog_resource/eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class, - 'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, 'catalog_resource/eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, - 'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, + 'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, 'catalog/resource_eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, - 'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, + 'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, 'catalog/resource_eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, + 'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, 'catalog_resource/eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, + 'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, 'catalog/resource_eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class, 'catalog_resource/eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class, 'catalog/resource_eav_mysql4_sendfriend' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend::class, @@ -866,16 +859,16 @@ 'catalog/resource_eav_mysql4_sendfriend_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection::class, 'catalog_resource/eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class, 'catalog/resource_eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class, - 'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, 'catalog/resource_eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, - 'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, + 'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, 'catalog/resource_helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, + 'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, 'catalog_resource/layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class, 'catalog/resource_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class, 'catalog/resource_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class, 'catalog_resource/layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class, - 'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, 'catalog/resource_layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, + 'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, 'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class, 'catalog_resource/product' => \Mage_Catalog_Model_Resource_Product::class, 'catalog/resource_product_action' => \Mage_Catalog_Model_Resource_Product_Action::class, @@ -886,42 +879,42 @@ 'catalog_resource/product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class, 'catalog/resource_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class, 'catalog_resource/product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class, - 'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, 'catalog/resource_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, - 'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, + 'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, 'catalog_resource/product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, + 'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, 'catalog/resource_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class, - 'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, 'catalog_resource/product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, - 'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, + 'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, 'catalog/resource_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, - 'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, + 'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, 'catalog_resource/product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, - 'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, + 'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, + 'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, 'catalog_resource/product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class, 'catalog/resource_product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class, - 'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, 'catalog/resource_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, + 'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, 'catalog/resource_product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class, 'catalog_resource/product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class, - 'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, 'catalog/resource_product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, + 'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, 'catalog/resource_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class, 'catalog_resource/product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class, - 'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, 'catalog_resource/product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, - 'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, + 'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, 'catalog/resource_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, + 'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, 'catalog/resource_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class, 'catalog_resource/product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class, - 'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, 'catalog_resource/product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, + 'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, 'catalog_resource/product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, 'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, - 'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, 'catalog_resource/product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, + 'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, 'catalog/resource_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class, 'catalog_resource/product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class, 'catalog_resource/product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class, @@ -932,12 +925,12 @@ 'catalog_resource/product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class, 'catalog/resource_product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, 'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, - 'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, 'catalog_resource/product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, - 'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, + 'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, 'catalog/resource_product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, - 'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, + 'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, 'catalog_resource/product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, + 'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, 'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, 'catalog_resource/product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, 'catalog_resource/product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class, @@ -946,14 +939,14 @@ 'catalog/resource_product_status' => \Mage_Catalog_Model_Resource_Product_Status::class, 'catalog_resource/product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class, 'catalog/resource_product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class, - 'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, 'catalog/resource_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, - 'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, + 'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, 'catalog_resource/product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, + 'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, 'catalog_resource/product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class, 'catalog/resource_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class, - 'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, 'catalog_resource/product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, + 'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, 'catalog/resource_setup' => \Mage_Catalog_Model_Resource_Setup::class, 'catalog_resource/setup' => \Mage_Catalog_Model_Resource_Setup::class, 'catalog_resource/url' => \Mage_Catalog_Model_Resource_Url::class, @@ -999,12 +992,12 @@ 'checkout/observer' => \Mage_Checkout_Model_Observer::class, 'checkout_resource/agreement' => \Mage_Checkout_Model_Resource_Agreement::class, 'checkout/resource_agreement' => \Mage_Checkout_Model_Resource_Agreement::class, - 'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, 'checkout/resource_agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, - 'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class, + 'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, 'checkout_resource/cart' => \Mage_Checkout_Model_Resource_Cart::class, - 'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class, + 'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class, 'checkout/resource_setup' => \Mage_Checkout_Model_Resource_Setup::class, + 'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class, 'checkout/session' => \Mage_Checkout_Model_Session::class, 'checkout/type_abstract' => \Mage_Checkout_Model_Type_Abstract::class, 'checkout/type_multishipping' => \Mage_Checkout_Model_Type_Multishipping::class, @@ -1019,25 +1012,25 @@ 'cms/mysql4_page_service' => \Mage_Cms_Model_Mysql4_Page_Service::class, 'cms/observer' => \Mage_Cms_Model_Observer::class, 'cms/page' => \Mage_Cms_Model_Page::class, - 'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class, 'cms/resource_block' => \Mage_Cms_Model_Resource_Block::class, + 'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class, 'cms_resource/block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class, 'cms/resource_block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class, 'cms/resource_page' => \Mage_Cms_Model_Resource_Page::class, 'cms_resource/page' => \Mage_Cms_Model_Resource_Page::class, - 'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, 'cms_resource/page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, - 'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class, + 'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, 'cms/resource_page_service' => \Mage_Cms_Model_Resource_Page_Service::class, + 'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class, 'cms/template_filter' => \Mage_Cms_Model_Template_Filter::class, 'cms/wysiwyg_config' => \Mage_Cms_Model_Wysiwyg_Config::class, 'cms/wysiwyg_images_storage' => \Mage_Cms_Model_Wysiwyg_Images_Storage::class, 'cms/wysiwyg_images_storage_collection' => \Mage_Cms_Model_Wysiwyg_Images_Storage_Collection::class, 'configurableswatches/observer' => \Mage_ConfigurableSwatches_Model_Observer::class, - 'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, 'configurableswatches_resource/catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, - 'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, + 'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, 'configurableswatches_resource/catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, + 'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, 'configurableswatches_resource/catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class, 'configurableswatches/resource_catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class, 'configurableswatches/system_config_source_catalog_product_configattribute' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute::class, @@ -1144,152 +1137,152 @@ 'core/mysql4_website_collection' => \Mage_Core_Model_Mysql4_Website_Collection::class, 'core/observer' => \Mage_Core_Model_Observer::class, 'core/resource' => \Mage_Core_Model_Resource::class, + 'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, 'core_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, 'core/resource_abstract' => \Mage_Core_Model_Resource_Abstract::class, - 'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, + 'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class, 'core/resource_cache' => \Mage_Core_Model_Resource_Cache::class, 'core_resource/cache' => \Mage_Core_Model_Resource_Cache::class, - 'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class, 'core_resource/config' => \Mage_Core_Model_Resource_Config::class, 'payment_resource/config' => \Mage_Core_Model_Resource_Config::class, 'core/resource_config' => \Mage_Core_Model_Resource_Config::class, - 'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, 'core/resource_config_data' => \Mage_Core_Model_Resource_Config_Data::class, + 'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, 'payment_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, - 'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'core_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, - 'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, - 'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, + 'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'payment_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, - 'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, + 'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, + 'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, 'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, 'core/resource_db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, - 'core/resource_design' => \Mage_Core_Model_Resource_Design::class, + 'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, 'core_resource/design' => \Mage_Core_Model_Resource_Design::class, + 'core/resource_design' => \Mage_Core_Model_Resource_Design::class, 'payment_resource/design' => \Mage_Core_Model_Resource_Design::class, - 'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, - 'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, 'payment_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, - 'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, + 'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, + 'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, 'payment_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, 'core/resource_design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, + 'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, 'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, 'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, 'core/resource_email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, - 'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, - 'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, 'payment_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, - 'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, + 'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, + 'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, 'core/resource_email_template' => \Mage_Core_Model_Resource_Email_Template::class, 'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, - 'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, + 'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, 'core/resource_email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, + 'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, 'core_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, - 'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, - 'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, 'core_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, - 'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, - 'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, + 'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, 'core_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, 'payment_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, 'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, - 'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, + 'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, 'payment_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, 'core/resource_file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, - 'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, + 'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, 'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, 'core/resource_file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, - 'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, - 'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, 'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, + 'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, 'core/resource_file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, 'payment_resource/flag' => \Mage_Core_Model_Resource_Flag::class, - 'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class, 'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class, + 'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class, 'payment_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, - 'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, 'core_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, - 'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, + 'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, 'core/resource_helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, + 'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, 'core_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, 'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, 'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, 'core/resource_iterator' => \Mage_Core_Model_Resource_Iterator::class, - 'core/resource_language' => \Mage_Core_Model_Resource_Language::class, - 'core_resource/language' => \Mage_Core_Model_Resource_Language::class, 'payment_resource/language' => \Mage_Core_Model_Resource_Language::class, + 'core_resource/language' => \Mage_Core_Model_Resource_Language::class, + 'core/resource_language' => \Mage_Core_Model_Resource_Language::class, 'payment_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, - 'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, 'core/resource_language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, - 'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class, + 'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, 'core_resource/layout' => \Mage_Core_Model_Resource_Layout::class, 'core/resource_layout' => \Mage_Core_Model_Resource_Layout::class, + 'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class, 'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class, - 'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class, 'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class, + 'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class, 'core/resource_session' => \Mage_Core_Model_Resource_Session::class, - 'core_resource/session' => \Mage_Core_Model_Resource_Session::class, 'payment_resource/session' => \Mage_Core_Model_Resource_Session::class, + 'core_resource/session' => \Mage_Core_Model_Resource_Session::class, 'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class, 'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class, 'payment_resource/setup' => \Mage_Core_Model_Resource_Setup::class, - 'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core/resource_setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, + 'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'payment_resource/store' => \Mage_Core_Model_Resource_Store::class, 'core_resource/store' => \Mage_Core_Model_Resource_Store::class, 'core/resource_store' => \Mage_Core_Model_Resource_Store::class, - 'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, 'core/resource_store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, + 'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, 'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, - 'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'core/resource_store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'payment_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, - 'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, - 'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, + 'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'payment_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, - 'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, + 'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, + 'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, 'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class, + 'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, 'core_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, 'core_resource/translate' => \Mage_Core_Model_Resource_Translate::class, - 'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class, 'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class, - 'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, - 'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class, + 'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class, 'payment_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, - 'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class, + 'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, 'core/resource_type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, 'payment_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'core/resource_type_db' => \Mage_Core_Model_Resource_Type_Db::class, - 'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'core_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, 'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, 'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, - 'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, - 'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, 'payment_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, 'payment_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, - 'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, 'core_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, - 'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, - 'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, + 'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, 'payment_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, + 'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, + 'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, 'core_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'core_resource/variable' => \Mage_Core_Model_Resource_Variable::class, - 'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class, 'core/resource_variable' => \Mage_Core_Model_Resource_Variable::class, + 'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class, 'core/resource_variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, - 'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, 'core_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, + 'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, + 'core/resource_website' => \Mage_Core_Model_Resource_Website::class, 'core_resource/website' => \Mage_Core_Model_Resource_Website::class, 'payment_resource/website' => \Mage_Core_Model_Resource_Website::class, - 'core/resource_website' => \Mage_Core_Model_Resource_Website::class, - 'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core/resource_website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, + 'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core/session' => \Mage_Core_Model_Session::class, 'core/session_abstract' => \Mage_Core_Model_Session_Abstract::class, @@ -1319,10 +1312,10 @@ 'cron/mysql4_schedule' => \Mage_Cron_Model_Mysql4_Schedule::class, 'cron/mysql4_schedule_collection' => \Mage_Cron_Model_Mysql4_Schedule_Collection::class, 'cron/observer' => \Mage_Cron_Model_Observer::class, - 'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class, 'cron/resource_schedule' => \Mage_Cron_Model_Resource_Schedule::class, - 'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, + 'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class, 'cron/resource_schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, + 'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, 'cron/schedule' => \Mage_Cron_Model_Schedule::class, 'currencysymbol/observer' => \Mage_CurrencySymbol_Model_Observer::class, 'currencysymbol/system_currencysymbol' => \Mage_CurrencySymbol_Model_System_Currencysymbol::class, @@ -1397,16 +1390,16 @@ 'customer_resource/address' => \Mage_Customer_Model_Resource_Address::class, 'customer/resource_address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class, 'customer_resource/address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class, - 'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, 'customer_resource/address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, - 'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, + 'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, 'customer/resource_address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, - 'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, + 'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, 'customer/resource_address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, - 'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, + 'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, 'customer_resource/address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, - 'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, + 'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, 'customer_resource/address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, + 'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, 'customer/resource_attribute' => \Mage_Customer_Model_Resource_Attribute::class, 'customer_resource/attribute' => \Mage_Customer_Model_Resource_Attribute::class, 'customer_resource/attribute_collection' => \Mage_Customer_Model_Resource_Attribute_Collection::class, @@ -1415,22 +1408,22 @@ 'customer_resource/customer' => \Mage_Customer_Model_Resource_Customer::class, 'customer_resource/customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class, 'customer/resource_customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class, - 'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, 'customer/resource_flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, - 'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, + 'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, 'customer/resource_flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, - 'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, + 'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, 'customer/resource_form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, - 'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, + 'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, 'customer/resource_form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, + 'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, 'customer/resource_group' => \Mage_Customer_Model_Resource_Group::class, 'customer_resource/group' => \Mage_Customer_Model_Resource_Group::class, 'customer_resource/group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class, 'customer/resource_group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class, - 'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class, 'customer_resource/setup' => \Mage_Customer_Model_Resource_Setup::class, - 'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, + 'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class, 'customer_resource/wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, + 'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, 'customer/session' => \Mage_Customer_Model_Session::class, 'dataflow/batch' => \Mage_Dataflow_Model_Batch::class, 'dataflow/batch_abstract' => \Mage_Dataflow_Model_Batch_Abstract::class, @@ -1482,10 +1475,10 @@ 'dataflow/mysql4_session' => \Mage_Dataflow_Model_Mysql4_Session::class, 'dataflow/profile' => \Mage_Dataflow_Model_Profile::class, 'dataflow/profile_history' => \Mage_Dataflow_Model_Profile_History::class, - 'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class, 'dataflow/resource_batch' => \Mage_Dataflow_Model_Resource_Batch::class, - 'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, + 'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class, 'dataflow/resource_batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, + 'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, 'dataflow/resource_batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class, 'dataflow_resource/batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class, 'dataflow_resource/batch_export' => \Mage_Dataflow_Model_Resource_Batch_Export::class, @@ -1496,12 +1489,12 @@ 'dataflow/resource_import' => \Mage_Dataflow_Model_Resource_Import::class, 'dataflow_resource/import_collection' => \Mage_Dataflow_Model_Resource_Import_Collection::class, 'dataflow/resource_import_collection' => \Mage_Dataflow_Model_Resource_Import_Collection::class, - 'dataflow_resource/profile' => \Mage_Dataflow_Model_Resource_Profile::class, 'dataflow/resource_profile' => \Mage_Dataflow_Model_Resource_Profile::class, + 'dataflow_resource/profile' => \Mage_Dataflow_Model_Resource_Profile::class, 'dataflow/resource_profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class, 'dataflow_resource/profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class, - 'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, 'dataflow_resource/profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, + 'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, 'dataflow_resource/profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class, 'dataflow/resource_profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class, 'dataflow_resource/session' => \Mage_Dataflow_Model_Resource_Session::class, @@ -1535,8 +1528,8 @@ 'directory/resource_country' => \Mage_Directory_Model_Resource_Country::class, 'directory_resource/country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class, 'directory/resource_country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class, - 'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class, 'directory/resource_country_format' => \Mage_Directory_Model_Resource_Country_Format::class, + 'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class, 'directory_resource/country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class, 'directory/resource_country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class, 'directory_resource/currency' => \Mage_Directory_Model_Resource_Currency::class, @@ -1567,8 +1560,8 @@ 'downloadable/observer' => \Mage_Downloadable_Model_Observer::class, 'downloadable/product_price' => \Mage_Downloadable_Model_Product_Price::class, 'downloadable/product_type' => \Mage_Downloadable_Model_Product_Type::class, - 'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, 'downloadable_resource/indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, + 'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, 'downloadable/resource_link' => \Mage_Downloadable_Model_Resource_Link::class, 'downloadable_resource/link' => \Mage_Downloadable_Model_Resource_Link::class, 'downloadable/resource_link_collection' => \Mage_Downloadable_Model_Resource_Link_Collection::class, @@ -1577,12 +1570,12 @@ 'downloadable_resource/link_purchased' => \Mage_Downloadable_Model_Resource_Link_Purchased::class, 'downloadable/resource_link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class, 'downloadable_resource/link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class, - 'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, 'downloadable/resource_link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, + 'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, 'downloadable/resource_link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, 'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, - 'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class, 'downloadable/resource_sample' => \Mage_Downloadable_Model_Resource_Sample::class, + 'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class, 'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, 'downloadable/resource_sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, 'downloadable/sales_order_pdf_items_abstract' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Abstract::class, @@ -1670,46 +1663,46 @@ 'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class, 'eav_resource/attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class, 'eav/resource_attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class, - 'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class, 'eav_resource/config' => \Mage_Eav_Model_Resource_Config::class, + 'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class, 'eav/resource_entity_attribute' => \Mage_Eav_Model_Resource_Entity_Attribute::class, 'eav_resource/entity_attribute' => \Mage_Eav_Model_Resource_Entity_Attribute::class, 'eav_resource/entity_attribute_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Collection::class, 'eav/resource_entity_attribute_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Collection::class, 'eav_resource/entity_attribute_group' => \Mage_Eav_Model_Resource_Entity_Attribute_Group::class, 'eav/resource_entity_attribute_group' => \Mage_Eav_Model_Resource_Entity_Attribute_Group::class, - 'eav/resource_entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class, 'eav_resource/entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class, + 'eav/resource_entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class, 'eav/resource_entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class, 'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class, - 'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, 'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, - 'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, + 'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, 'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, - 'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, + 'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, 'eav_resource/entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, + 'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, 'eav_resource/entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class, 'eav/resource_entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class, 'eav_resource/entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class, 'eav/resource_entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class, - 'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, 'eav_resource/entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, + 'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, 'eav/resource_form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class, 'eav_resource/form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class, - 'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, 'eav/resource_form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, + 'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, 'eav/resource_form_element' => \Mage_Eav_Model_Resource_Form_Element::class, 'eav_resource/form_element' => \Mage_Eav_Model_Resource_Form_Element::class, - 'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, 'eav_resource/form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, - 'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, + 'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, 'eav/resource_form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, + 'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, 'eav_resource/form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, 'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, 'eav/resource_form_type' => \Mage_Eav_Model_Resource_Form_Type::class, 'eav_resource/form_type' => \Mage_Eav_Model_Resource_Form_Type::class, - 'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class, 'eav_resource/form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class, + 'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class, 'eav_resource/helper_mysql4' => \Mage_Eav_Model_Resource_Helper_Mysql4::class, 'eav/resource_helper_mysql4' => \Mage_Eav_Model_Resource_Helper_Mysql4::class, 'giftmessage/api' => \Mage_GiftMessage_Model_Api::class, @@ -1721,12 +1714,12 @@ 'giftmessage/mysql4_message_collection' => \Mage_GiftMessage_Model_Mysql4_Message_Collection::class, 'giftmessage/mysql4_setup' => \Mage_GiftMessage_Model_Mysql4_Setup::class, 'giftmessage/observer' => \Mage_GiftMessage_Model_Observer::class, - 'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class, 'giftmessage/resource_message' => \Mage_GiftMessage_Model_Resource_Message::class, - 'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, + 'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class, 'giftmessage_resource/message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, - 'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class, + 'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, 'giftmessage_resource/setup' => \Mage_GiftMessage_Model_Resource_Setup::class, + 'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class, 'googleanalytics/observer' => \Mage_GoogleAnalytics_Model_Observer::class, 'googleanalytics/system_config_source_type' => \Mage_GoogleAnalytics_Model_System_Config_Source_Type::class, 'googlecheckout/payment' => \Mage_GoogleCheckout_Model_Payment::class, @@ -1762,8 +1755,8 @@ 'importexport/product_attribute_backend_urlkey' => \Mage_ImportExport_Model_Product_Attribute_Backend_Urlkey::class, 'importexport_resource/helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class, 'importexport/resource_helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class, - 'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, 'importexport_resource/import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, + 'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, 'importexport_resource/setup' => \Mage_ImportExport_Model_Resource_Setup::class, 'importexport/resource_setup' => \Mage_ImportExport_Model_Resource_Setup::class, 'importexport/source_export_entity' => \Mage_ImportExport_Model_Source_Export_Entity::class, @@ -1785,16 +1778,16 @@ 'index/process' => \Mage_Index_Model_Process::class, 'index_resource/abstract' => \Mage_Index_Model_Resource_Abstract::class, 'index/resource_abstract' => \Mage_Index_Model_Resource_Abstract::class, - 'index/resource_event' => \Mage_Index_Model_Resource_Event::class, 'index_resource/event' => \Mage_Index_Model_Resource_Event::class, + 'index/resource_event' => \Mage_Index_Model_Resource_Event::class, 'index/resource_event_collection' => \Mage_Index_Model_Resource_Event_Collection::class, 'index_resource/event_collection' => \Mage_Index_Model_Resource_Event_Collection::class, 'index/resource_helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class, 'index_resource/helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class, - 'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, 'index/resource_lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, - 'index_resource/process' => \Mage_Index_Model_Resource_Process::class, + 'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, 'index/resource_process' => \Mage_Index_Model_Resource_Process::class, + 'index_resource/process' => \Mage_Index_Model_Resource_Process::class, 'index/resource_process_collection' => \Mage_Index_Model_Resource_Process_Collection::class, 'index_resource/process_collection' => \Mage_Index_Model_Resource_Process_Collection::class, 'index/resource_setup' => \Mage_Index_Model_Resource_Setup::class, @@ -1827,22 +1820,22 @@ 'log/mysql4_visitor_online_collection' => \Mage_Log_Model_Mysql4_Visitor_Online_Collection::class, 'log_resource/aggregation' => \Mage_Log_Model_Resource_Aggregation::class, 'log/resource_aggregation' => \Mage_Log_Model_Resource_Aggregation::class, - 'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class, 'log/resource_customer' => \Mage_Log_Model_Resource_Customer::class, + 'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class, 'log/resource_log' => \Mage_Log_Model_Resource_Log::class, 'log_resource/log' => \Mage_Log_Model_Resource_Log::class, 'log_resource/visitor' => \Mage_Log_Model_Resource_Visitor::class, 'log/resource_visitor' => \Mage_Log_Model_Resource_Visitor::class, 'log_resource/visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class, 'log/resource_visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class, - 'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, 'log_resource/visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, - 'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, + 'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, 'log_resource/visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, + 'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, 'log/visitor' => \Mage_Log_Model_Visitor::class, 'log/visitor_online' => \Mage_Log_Model_Visitor_Online::class, - 'media_resource/image' => \Mage_Media_Model_File_Image::class, 'media/file_image' => \Mage_Media_Model_File_Image::class, + 'media_resource/image' => \Mage_Media_Model_File_Image::class, 'media/image' => \Mage_Media_Model_Image::class, 'newsletter/message' => \Mage_Newsletter_Model_Message::class, 'newsletter/mysql4_problem' => \Mage_Newsletter_Model_Mysql4_Problem::class, @@ -1860,14 +1853,14 @@ 'newsletter_resource/problem' => \Mage_Newsletter_Model_Resource_Problem::class, 'newsletter/resource_problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class, 'newsletter_resource/problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class, - 'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class, 'newsletter/resource_queue' => \Mage_Newsletter_Model_Resource_Queue::class, - 'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, + 'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class, 'newsletter/resource_queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, - 'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, + 'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, 'newsletter/resource_subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, - 'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, + 'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, 'newsletter/resource_subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, + 'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, 'newsletter_resource/template' => \Mage_Newsletter_Model_Resource_Template::class, 'newsletter/resource_template' => \Mage_Newsletter_Model_Resource_Template::class, 'newsletter_resource/template_collection' => \Mage_Newsletter_Model_Resource_Template_Collection::class, @@ -1880,20 +1873,20 @@ 'oauth/consumer_validator_keyLength' => \Mage_Oauth_Model_Consumer_Validator_KeyLength::class, 'oauth/nonce' => \Mage_Oauth_Model_Nonce::class, 'oauth/observer' => \Mage_Oauth_Model_Observer::class, - 'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class, 'oauth/resource_consumer' => \Mage_Oauth_Model_Resource_Consumer::class, + 'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class, 'oauth/resource_consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class, 'oauth_resource/consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class, 'oauth_resource/nonce' => \Mage_Oauth_Model_Resource_Nonce::class, 'oauth/resource_nonce' => \Mage_Oauth_Model_Resource_Nonce::class, 'oauth_resource/nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class, 'oauth/resource_nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class, - 'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class, 'oauth/resource_setup' => \Mage_Oauth_Model_Resource_Setup::class, - 'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class, + 'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class, 'oauth_resource/token' => \Mage_Oauth_Model_Resource_Token::class, - 'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, + 'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class, 'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, + 'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth/server' => \Mage_Oauth_Model_Server::class, 'oauth/token' => \Mage_Oauth_Model_Token::class, 'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class, @@ -1910,8 +1903,8 @@ 'paygate/authorizenet_source_paymentAction' => \Mage_Paygate_Model_Authorizenet_Source_PaymentAction::class, 'paygate/mysql4_authorizenet_debug' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug::class, 'paygate/mysql4_authorizenet_debug_collection' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection::class, - 'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, 'paygate/resource_authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, + 'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, 'paygate_resource/authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class, 'paygate/resource_authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class, 'payment/billing_agreementAbstract' => \Mage_Payment_Model_Billing_AgreementAbstract::class, @@ -1974,12 +1967,12 @@ 'paypal/resource_cert' => \Mage_Paypal_Model_Resource_Cert::class, 'paypal_resource/payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class, 'paypal/resource_payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class, - 'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, 'paypal/resource_payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, + 'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, 'paypal/resource_report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class, 'paypal_resource/report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class, - 'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, 'paypal/resource_report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, + 'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, 'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, 'paypal/resource_report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, 'paypal/resource_setup' => \Mage_Paypal_Model_Resource_Setup::class, @@ -2004,8 +1997,8 @@ 'persistent/observer' => \Mage_Persistent_Model_Observer::class, 'persistent/observer_session' => \Mage_Persistent_Model_Observer_Session::class, 'persistent/persistent_config' => \Mage_Persistent_Model_Persistent_Config::class, - 'persistent/resource_session' => \Mage_Persistent_Model_Resource_Session::class, 'persistent_resource/session' => \Mage_Persistent_Model_Resource_Session::class, + 'persistent/resource_session' => \Mage_Persistent_Model_Resource_Session::class, 'persistent/session' => \Mage_Persistent_Model_Session::class, 'poll/mysql4_poll' => \Mage_Poll_Model_Mysql4_Poll::class, 'poll/mysql4_poll_answer' => \Mage_Poll_Model_Mysql4_Poll_Answer::class, @@ -2015,16 +2008,16 @@ 'poll/poll' => \Mage_Poll_Model_Poll::class, 'poll/poll_answer' => \Mage_Poll_Model_Poll_Answer::class, 'poll/poll_vote' => \Mage_Poll_Model_Poll_Vote::class, - 'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class, 'poll_resource/poll' => \Mage_Poll_Model_Resource_Poll::class, + 'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class, 'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, 'poll/resource_poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, - 'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, 'poll_resource/poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, - 'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, + 'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, 'poll_resource/poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, - 'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, + 'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, 'poll/resource_poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, + 'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, 'productalert/email' => \Mage_ProductAlert_Model_Email::class, 'productalert/mysql4_price' => \Mage_ProductAlert_Model_Mysql4_Price::class, 'productalert/mysql4_price_collection' => \Mage_ProductAlert_Model_Mysql4_Price_Collection::class, @@ -2034,20 +2027,20 @@ 'productalert/mysql4_stock_customer_collection' => \Mage_ProductAlert_Model_Mysql4_Stock_Customer_Collection::class, 'productalert/observer' => \Mage_ProductAlert_Model_Observer::class, 'productalert/price' => \Mage_ProductAlert_Model_Price::class, - 'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, 'productalert_resource/abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, - 'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class, + 'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, 'productalert_resource/price' => \Mage_ProductAlert_Model_Resource_Price::class, - 'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, + 'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class, 'productalert/resource_price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, - 'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, + 'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, 'productalert/resource_price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, + 'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, 'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class, 'productalert/resource_stock' => \Mage_ProductAlert_Model_Resource_Stock::class, - 'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, 'productalert/resource_stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, - 'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, + 'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, 'productalert/resource_stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, + 'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, 'productalert/stock' => \Mage_ProductAlert_Model_Stock::class, 'rating/mysql4_rating' => \Mage_Rating_Model_Mysql4_Rating::class, 'rating/mysql4_rating_collection' => \Mage_Rating_Model_Mysql4_Rating_Collection::class, @@ -2061,20 +2054,20 @@ 'rating/rating_entity' => \Mage_Rating_Model_Rating_Entity::class, 'rating/rating_option' => \Mage_Rating_Model_Rating_Option::class, 'rating/rating_option_vote' => \Mage_Rating_Model_Rating_Option_Vote::class, - 'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class, 'rating/resource_rating' => \Mage_Rating_Model_Resource_Rating::class, + 'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class, 'rating_resource/rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class, 'rating/resource_rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class, 'rating/resource_rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class, 'rating_resource/rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class, - 'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, 'rating/resource_rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, - 'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, + 'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, 'rating_resource/rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, + 'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, 'rating_resource/rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class, 'rating/resource_rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class, - 'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, 'rating/resource_rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, + 'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, 'reports/config' => \Mage_Reports_Model_Config::class, 'reports/event' => \Mage_Reports_Model_Event::class, 'reports/event_observer' => \Mage_Reports_Model_Event_Observer::class, @@ -2120,6 +2113,7 @@ 'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class, 'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class, 'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class, + 'reports/observer' => \Mage_Reports_Model_Observer::class, 'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class, 'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class, 'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class, @@ -2128,88 +2122,88 @@ 'reports_resource/accounts_collection' => \Mage_Reports_Model_Resource_Accounts_Collection::class, 'reports/resource_coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class, 'reports_resource/coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class, - 'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, 'reports/resource_customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, - 'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, + 'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, 'reports/resource_customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, - 'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, + 'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, 'reports_resource/customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, - 'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, + 'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, 'reports/resource_entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, + 'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, 'reports_resource/event' => \Mage_Reports_Model_Resource_Event::class, 'reports/resource_event' => \Mage_Reports_Model_Resource_Event::class, 'reports_resource/event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, 'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, 'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class, 'reports/resource_event_type' => \Mage_Reports_Model_Resource_Event_Type::class, - 'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, 'reports/resource_event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, - 'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, + 'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, 'reports_resource/helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, - 'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, + 'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, 'reports/resource_invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, - 'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, + 'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, 'reports_resource/order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, - 'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, + 'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, 'reports_resource/product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, + 'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, 'reports/resource_product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class, 'reports_resource/product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class, 'reports_resource/product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class, 'reports/resource_product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class, - 'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, 'reports/resource_product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, + 'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, 'reports_resource/product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class, 'reports/resource_product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class, - 'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, 'reports_resource/product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, - 'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, + 'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, 'reports/resource_product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, - 'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, + 'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, 'reports_resource/product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, - 'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, + 'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, 'reports/resource_product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, + 'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, 'reports_resource/product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class, 'reports/resource_product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class, - 'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, 'reports_resource/product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, - 'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, + 'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, 'reports_resource/product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, - 'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, + 'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, 'reports/resource_quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, - 'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class, + 'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, 'reports_resource/refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class, + 'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class, 'reports/resource_report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class, 'reports_resource/report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class, 'reports/resource_report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class, 'reports_resource/report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class, - 'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, 'reports_resource/report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, + 'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, 'reports/resource_report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class, 'reports_resource/report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class, - 'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, 'reports/resource_report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, + 'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, 'reports_resource/review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, 'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, - 'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, 'reports_resource/review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, + 'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, 'reports_resource/review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class, 'reports/resource_review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class, 'reports_resource/shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class, 'reports/resource_shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class, - 'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, 'reports_resource/shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, + 'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, 'reports_resource/tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class, 'reports/resource_tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class, - 'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, 'reports/resource_tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, - 'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, + 'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, 'reports/resource_tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, - 'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, + 'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, 'reports/resource_tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, + 'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, 'reports_resource/wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class, 'reports/resource_wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class, - 'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, 'reports_resource/wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, + 'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, 'reports/session' => \Mage_Reports_Model_Session::class, 'reports/test' => \Mage_Reports_Model_Test::class, 'reports/totals' => \Mage_Reports_Model_Totals::class, @@ -2226,14 +2220,14 @@ 'review/resource_review_collection' => \Mage_Review_Model_Resource_Review_Collection::class, 'review_resource/review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class, 'review/resource_review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class, - 'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class, 'review_resource/review_status' => \Mage_Review_Model_Resource_Review_Status::class, - 'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, + 'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class, 'review_resource/review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, + 'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, 'review/resource_review_summary' => \Mage_Review_Model_Resource_Review_Summary::class, 'review_resource/review_summary' => \Mage_Review_Model_Resource_Review_Summary::class, - 'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, 'review/resource_review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, + 'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, 'review/review' => \Mage_Review_Model_Review::class, 'review/review_status' => \Mage_Review_Model_Review_Status::class, 'review/review_summary' => \Mage_Review_Model_Review_Summary::class, @@ -2256,14 +2250,14 @@ 'rule/mysql4_rule_collection' => \Mage_Rule_Model_Mysql4_Rule_Collection::class, 'rule/renderer_actions' => \Mage_Rule_Model_Renderer_Actions::class, 'rule/renderer_conditions' => \Mage_Rule_Model_Renderer_Conditions::class, - 'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class, 'rule/resource_abstract' => \Mage_Rule_Model_Resource_Abstract::class, - 'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class, + 'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class, 'rule/resource_rule' => \Mage_Rule_Model_Resource_Rule::class, - 'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, + 'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class, 'rule_resource/rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, - 'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, + 'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, 'rule_resource/rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, + 'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, 'rule/resource_rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class, 'rule_resource/rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class, 'rule/rule' => \Mage_Rule_Model_Rule::class, @@ -2292,24 +2286,24 @@ 'salesrule/resource_coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class, 'salesrule/resource_coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class, 'salesrule_resource/coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class, - 'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, 'salesrule_resource/report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, - 'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, + 'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, 'salesrule_resource/report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, + 'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, 'salesrule_resource/report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class, 'salesrule/resource_report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class, 'salesrule_resource/report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class, 'salesrule/resource_report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class, 'salesrule_resource/report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class, 'salesrule/resource_report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class, - 'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class, 'salesrule_resource/rule' => \Mage_SalesRule_Model_Resource_Rule::class, - 'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, + 'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class, 'salesrule_resource/rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, - 'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, + 'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, 'salesrule_resource/rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, - 'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, + 'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, 'salesrule/resource_rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, + 'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, 'salesrule_resource/rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class, 'salesrule/resource_rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class, 'salesrule_resource/rule_product_collection' => \Mage_SalesRule_Model_Resource_Rule_Product_Collection::class, @@ -2354,14 +2348,14 @@ 'sales/email_template' => \Mage_Sales_Model_Email_Template::class, 'sales/entity_order' => \Mage_Sales_Model_Entity_Order::class, 'sales_entity/order' => \Mage_Sales_Model_Entity_Order::class, - 'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class, 'sales_entity/order_address' => \Mage_Sales_Model_Entity_Order_Address::class, - 'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, + 'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class, 'sales/entity_order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, - 'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, + 'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, 'sales_entity/order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, - 'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, + 'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, 'sales_entity/order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, + 'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, 'sales/entity_order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class, 'sales_entity/order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class, 'sales/entity_order_attribute_backend_shipping' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Shipping::class, @@ -2370,22 +2364,22 @@ 'sales/entity_order_collection' => \Mage_Sales_Model_Entity_Order_Collection::class, 'sales_entity/order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class, 'sales/entity_order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class, - 'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, 'sales_entity/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, - 'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, + 'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, 'sales/entity_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, - 'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, + 'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, 'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, + 'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, 'sales/entity_order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class, 'sales_entity/order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class, 'sales/entity_order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class, 'sales_entity/order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class, 'sales_entity/order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class, 'sales/entity_order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class, - 'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, 'sales/entity_order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, - 'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, + 'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, 'sales_entity/order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, + 'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, 'sales/entity_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class, 'sales_entity/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class, 'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class, @@ -2396,28 +2390,28 @@ 'sales/entity_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class, 'sales/entity_order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class, 'sales_entity/order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class, - 'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, 'sales/entity_order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, + 'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, 'sales_entity/order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class, 'sales/entity_order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class, 'sales_entity/order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class, 'sales/entity_order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class, - 'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, 'sales/entity_order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, + 'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, 'sales/entity_order_item' => \Mage_Sales_Model_Entity_Order_Item::class, 'sales_entity/order_item' => \Mage_Sales_Model_Entity_Order_Item::class, 'sales/entity_order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class, 'sales_entity/order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class, - 'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, 'sales/entity_order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, + 'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, 'sales_entity/order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class, 'sales/entity_order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class, 'sales_entity/order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class, 'sales/entity_order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class, - 'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, 'sales_entity/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, - 'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, + 'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, 'sales/entity_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, + 'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, 'sales/entity_order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class, 'sales_entity/order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class, 'sales/entity_order_shipment_comment' => \Mage_Sales_Model_Entity_Order_Shipment_Comment::class, @@ -2426,66 +2420,66 @@ 'sales_entity/order_shipment_comment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Comment_Collection::class, 'sales/entity_order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class, 'sales_entity/order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class, - 'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, 'sales/entity_order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, - 'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, + 'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, 'sales_entity/order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, - 'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, + 'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, 'sales_entity/order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, - 'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, + 'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, 'sales_entity/order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, - 'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, + 'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, 'sales_entity/order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, + 'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, 'sales_entity/quote' => \Mage_Sales_Model_Entity_Quote::class, 'sales/entity_quote' => \Mage_Sales_Model_Entity_Quote::class, - 'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, 'sales_entity/quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, + 'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, 'sales_entity/quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class, 'sales/entity_quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class, - 'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, 'sales/entity_quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, - 'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, + 'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, 'sales/entity_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, - 'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, + 'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, 'sales_entity/quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, - 'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, + 'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, 'sales/entity_quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, + 'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, 'sales_entity/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales/entity_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales_entity/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class, 'sales/entity_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class, - 'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, 'sales_entity/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, - 'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, 'sales/entity_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/entity_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales_entity/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales/entity_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class, 'sales_entity/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class, 'sales/entity_quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class, 'sales_entity/quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class, - 'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, 'sales_entity/quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, - 'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, + 'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, 'sales/entity_quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, - 'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, + 'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, 'sales_entity/quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, + 'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, 'sales/entity_quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class, 'sales_entity/quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class, 'sales/entity_quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class, 'sales_entity/quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class, - 'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, 'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, - 'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, + 'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, 'sales/entity_quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, - 'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, + 'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, 'sales/entity_quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, + 'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, 'sales_entity/quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class, 'sales/entity_quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class, - 'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, 'sales_entity/sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, - 'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class, + 'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, 'sales_entity/setup' => \Mage_Sales_Model_Entity_Setup::class, + 'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class, 'sales/mysql4_abstract' => \Mage_Sales_Model_Mysql4_Abstract::class, 'sales/mysql4_billing_agreement' => \Mage_Sales_Model_Mysql4_Billing_Agreement::class, 'sales/mysql4_billing_agreement_collection' => \Mage_Sales_Model_Mysql4_Billing_Agreement_Collection::class, @@ -2680,48 +2674,48 @@ 'sales/recurring_profile' => \Mage_Sales_Model_Recurring_Profile::class, 'sales_resource/abstract' => \Mage_Sales_Model_Resource_Abstract::class, 'sales/resource_abstract' => \Mage_Sales_Model_Resource_Abstract::class, - 'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, 'sales_resource/billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, - 'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, + 'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, 'sales_resource/billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, - 'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, + 'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, 'sales/resource_collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, - 'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, + 'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, 'sales_resource/helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, - 'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class, + 'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, 'sales_resource/order' => \Mage_Sales_Model_Resource_Order::class, + 'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class, 'sales_resource/order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class, 'sales/resource_order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class, - 'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class, 'sales_resource/order_address' => \Mage_Sales_Model_Resource_Order_Address::class, + 'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class, 'sales/resource_order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class, 'sales_resource/order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class, 'sales/resource_order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class, 'sales_resource/order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class, 'sales/resource_order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class, 'sales_resource/order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class, - 'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, 'sales/resource_order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, + 'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, 'sales_resource/order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class, 'sales/resource_order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class, 'sales/resource_order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class, 'sales_resource/order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class, - 'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, 'sales/resource_order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, + 'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, 'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, 'sales/resource_order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, 'sales/resource_order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, 'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, - 'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, 'sales_resource/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, + 'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, 'sales/resource_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class, 'sales_resource/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class, - 'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, 'sales/resource_order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, - 'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, + 'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, 'sales_resource/order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, - 'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, + 'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, 'sales/resource_order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, + 'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, 'sales/resource_order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, 'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, 'sales_resource/order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class, @@ -2732,84 +2726,84 @@ 'sales/resource_order_grid_collection' => \Mage_Sales_Model_Resource_Order_Grid_Collection::class, 'sales/resource_order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class, 'sales_resource/order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class, - 'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, 'sales/resource_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, - 'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, + 'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, 'sales_resource/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, + 'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, 'sales_resource/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class, 'sales/resource_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class, 'sales/resource_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class, 'sales_resource/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class, 'sales/resource_order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class, 'sales_resource/order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class, - 'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, 'sales/resource_order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, + 'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, 'sales/resource_order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class, 'sales_resource/order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class, - 'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, 'sales/resource_order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, - 'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, + 'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, 'sales_resource/order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, + 'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, 'sales/resource_order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class, 'sales_resource/order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class, - 'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class, 'sales_resource/order_item' => \Mage_Sales_Model_Resource_Order_Item::class, + 'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class, 'sales/resource_order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class, 'sales_resource/order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class, - 'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, 'sales_resource/order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, + 'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, 'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, 'sales/resource_order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, - 'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, 'sales_resource/order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, - 'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, + 'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, 'sales_resource/order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, - 'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, + 'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, 'sales_resource/order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, - 'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, + 'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, 'sales/resource_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, + 'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, 'sales_resource/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class, 'sales/resource_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class, - 'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, 'sales/resource_order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, + 'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, 'sales/resource_order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, 'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, - 'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, 'sales/resource_order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, + 'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, 'sales_resource/order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class, 'sales/resource_order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class, - 'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, 'sales_resource/order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, - 'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, + 'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, 'sales_resource/order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, - 'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, + 'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, 'sales_resource/order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, + 'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, 'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, 'sales_resource/order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, 'sales_resource/order_status' => \Mage_Sales_Model_Resource_Order_Status::class, 'sales/resource_order_status' => \Mage_Sales_Model_Resource_Order_Status::class, 'sales_resource/order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class, 'sales/resource_order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class, - 'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, 'sales_resource/order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, - 'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, + 'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, 'sales_resource/order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, - 'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, + 'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, 'sales/resource_order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, - 'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, + 'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, 'sales_resource/order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, - 'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class, + 'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, 'sales/resource_quote' => \Mage_Sales_Model_Resource_Quote::class, + 'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class, 'sales_resource/quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class, 'sales/resource_quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class, 'sales/resource_quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class, 'sales_resource/quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class, 'sales/resource_quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class, 'sales_resource/quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class, - 'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, 'sales/resource_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, - 'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, + 'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, 'sales/resource_quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, + 'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, 'sales_resource/quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, 'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, 'sales_resource/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class, @@ -2818,82 +2812,82 @@ 'sales_resource/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class, 'sales/resource_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class, 'sales_resource/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class, - 'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/resource_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, - 'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, + 'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/resource_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, + 'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales_resource/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, 'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, - 'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, 'sales/resource_quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, + 'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, 'sales_resource/quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class, 'sales/resource_quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class, - 'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, 'sales/resource_quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, - 'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, + 'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, 'sales_resource/quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, - 'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, + 'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, 'sales_resource/quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, + 'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, 'sales_resource/quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class, 'sales/resource_quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class, - 'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, 'sales/resource_quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, + 'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, 'sales/resource_quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class, 'sales_resource/quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class, - 'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, 'sales/resource_quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, - 'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, + 'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, 'sales/resource_quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, - 'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, + 'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, 'sales_resource/quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, - 'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, + 'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, 'sales/resource_quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, - 'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, + 'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, 'sales/resource_recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, + 'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, 'sales/resource_recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class, 'sales_resource/recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class, - 'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class, 'sales/resource_report' => \Mage_Sales_Model_Resource_Report::class, + 'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class, 'sales/resource_report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class, 'sales_resource/report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class, - 'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, 'sales/resource_report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, - 'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, + 'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, 'sales/resource_report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, + 'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, 'sales_resource/report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, 'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, - 'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, 'sales_resource/report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, + 'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, 'sales/resource_report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class, 'sales_resource/report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class, 'sales_resource/report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class, 'sales/resource_report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class, 'sales/resource_report_order' => \Mage_Sales_Model_Resource_Report_Order::class, 'sales_resource/report_order' => \Mage_Sales_Model_Resource_Report_Order::class, - 'sales/resource_report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class, 'sales_resource/report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class, - 'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class, + 'sales/resource_report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class, 'sales/resource_report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class, + 'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class, 'sales_resource/report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class, 'sales/resource_report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class, - 'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, 'sales/resource_report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, - 'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, + 'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, 'sales_resource/report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, + 'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, 'sales_resource/report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class, 'sales/resource_report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class, 'sales_resource/report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class, 'sales/resource_report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class, - 'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, 'sales_resource/report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, + 'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, 'sales_resource/report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class, 'sales/resource_report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class, 'sales_resource/report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class, 'sales/resource_report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class, - 'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, 'sales/resource_sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, - 'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class, + 'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, 'sales/resource_setup' => \Mage_Sales_Model_Resource_Setup::class, + 'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class, 'sales/service_order' => \Mage_Sales_Model_Service_Order::class, 'sales/service_quote' => \Mage_Sales_Model_Service_Quote::class, 'sales/status_list' => \Mage_Sales_Model_Status_List::class, @@ -2903,8 +2897,8 @@ 'sendfriend/observer' => \Mage_Sendfriend_Model_Observer::class, 'sendfriend_resource/sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class, 'sendfriend/resource_sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class, - 'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, 'sendfriend/resource_sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, + 'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, 'sendfriend/resource_setup' => \Mage_Sendfriend_Model_Resource_Setup::class, 'sendfriend_resource/setup' => \Mage_Sendfriend_Model_Resource_Setup::class, 'sendfriend/sendfriend' => \Mage_Sendfriend_Model_Sendfriend::class, @@ -2944,16 +2938,16 @@ 'sitemap/observer' => \Mage_Sitemap_Model_Observer::class, 'sitemap_resource/catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class, 'sitemap/resource_catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class, - 'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, 'sitemap/resource_catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, + 'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, 'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, 'sitemap_resource/catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, 'sitemap_resource/cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, 'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, 'sitemap_resource/sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class, 'sitemap/resource_sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class, - 'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, 'sitemap_resource/sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, + 'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, 'sitemap/sitemap' => \Mage_Sitemap_Model_Sitemap::class, 'tag/api' => \Mage_Tag_Model_Api::class, 'tag/api_v2' => \Mage_Tag_Model_Api_V2::class, @@ -2966,21 +2960,21 @@ 'tag/mysql4_tag' => \Mage_Tag_Model_Mysql4_Tag::class, 'tag/mysql4_tag_collection' => \Mage_Tag_Model_Mysql4_Tag_Collection::class, 'tag/mysql4_tag_relation' => \Mage_Tag_Model_Mysql4_Tag_Relation::class, - 'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag/resource_customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag_resource/customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, - 'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, + 'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag_resource/indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, - 'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, + 'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, 'tag_resource/popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, + 'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, 'tag_resource/product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class, 'tag/resource_product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class, 'tag_resource/tag' => \Mage_Tag_Model_Resource_Tag::class, 'tag/resource_tag' => \Mage_Tag_Model_Resource_Tag::class, - 'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, 'tag_resource/tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, - 'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, + 'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, 'tag_resource/tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, + 'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, 'tag/session' => \Mage_Tag_Model_Session::class, 'tag/tag' => \Mage_Tag_Model_Tag::class, 'tag/tag_relation' => \Mage_Tag_Model_Tag_Relation::class, @@ -3019,16 +3013,16 @@ 'tax/resource_calculation_rate' => \Mage_Tax_Model_Resource_Calculation_Rate::class, 'tax/resource_calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class, 'tax_resource/calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class, - 'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, 'tax/resource_calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, - 'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, + 'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, 'tax/resource_calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, - 'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, + 'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, 'tax/resource_calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, - 'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, + 'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, 'tax_resource/calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, - 'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class, + 'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, 'tax/resource_class' => \Mage_Tax_Model_Resource_Class::class, + 'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class, 'tax/resource_class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class, 'tax_resource/class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class, 'tax_resource/report_collection' => \Mage_Tax_Model_Resource_Report_Collection::class, @@ -3039,10 +3033,10 @@ 'tax/resource_report_tax_createdat' => \Mage_Tax_Model_Resource_Report_Tax_Createdat::class, 'tax_resource/report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class, 'tax/resource_report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class, - 'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, 'tax/resource_report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, - 'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, + 'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, 'tax_resource/sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, + 'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, 'tax_resource/sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class, 'tax/resource_sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class, 'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class, @@ -3131,8 +3125,8 @@ 'weee/observer' => \Mage_Weee_Model_Observer::class, 'weee/resource_attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class, 'weee_resource/attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class, - 'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class, 'weee/resource_setup' => \Mage_Weee_Model_Resource_Setup::class, + 'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class, 'weee/resource_tax' => \Mage_Weee_Model_Resource_Tax::class, 'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class, 'weee/tax' => \Mage_Weee_Model_Tax::class, @@ -3144,12 +3138,12 @@ 'widget/mysql4_widget_instance' => \Mage_Widget_Model_Mysql4_Widget_Instance::class, 'widget/mysql4_widget_instance_collection' => \Mage_Widget_Model_Mysql4_Widget_Instance_Collection::class, 'widget/observer' => \Mage_Widget_Model_Observer::class, - 'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class, 'widget/resource_widget' => \Mage_Widget_Model_Resource_Widget::class, + 'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class, 'widget_resource/widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class, 'widget/resource_widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class, - 'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, 'widget_resource/widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, + 'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, 'widget/template_filter' => \Mage_Widget_Model_Template_Filter::class, 'widget/widget' => \Mage_Widget_Model_Widget::class, 'widget/widget_config' => \Mage_Widget_Model_Widget_Config::class, @@ -3166,14 +3160,14 @@ 'wishlist/mysql4_wishlist' => \Mage_Wishlist_Model_Mysql4_Wishlist::class, 'wishlist/mysql4_wishlist_collection' => \Mage_Wishlist_Model_Mysql4_Wishlist_Collection::class, 'wishlist/observer' => \Mage_Wishlist_Model_Observer::class, - 'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class, 'wishlist_resource/item' => \Mage_Wishlist_Model_Resource_Item::class, + 'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class, 'wishlist_resource/item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class, 'wishlist/resource_item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class, - 'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, 'wishlist/resource_item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, - 'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, + 'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, 'wishlist_resource/item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, + 'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, 'wishlist_resource/product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class, 'wishlist/resource_product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class, 'wishlist/resource_wishlist' => \Mage_Wishlist_Model_Resource_Wishlist::class, @@ -3182,7 +3176,6 @@ 'wishlist/resource_wishlist_collection' => \Mage_Wishlist_Model_Resource_Wishlist_Collection::class, 'wishlist/session' => \Mage_Wishlist_Model_Session::class, 'wishlist/wishlist' => \Mage_Wishlist_Model_Wishlist::class, - 'varien/autoload' => \Varien_Autoload::class, ]) ); override( \Mage::getSingleton(0), @@ -3192,11 +3185,10 @@ 'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class, 'adminnotification/mysql4_inbox_collection' => \Mage_AdminNotification_Model_Mysql4_Inbox_Collection::class, 'adminnotification/observer' => \Mage_AdminNotification_Model_Observer::class, - 'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, 'adminnotification/resource_inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, - 'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, + 'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, 'adminnotification/resource_inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, - 'adminnotification/survey' => \Mage_AdminNotification_Model_Survey::class, + 'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, 'admin/acl' => \Mage_Admin_Model_Acl::class, 'admin/acl_assert_ip' => \Mage_Admin_Model_Acl_Assert_Ip::class, 'admin/acl_assert_time' => \Mage_Admin_Model_Acl_Assert_Time::class, @@ -3225,38 +3217,38 @@ 'admin/redirectpolicy' => \Mage_Admin_Model_Redirectpolicy::class, 'admin/resource_acl' => \Mage_Admin_Model_Resource_Acl::class, 'admin_resource/acl' => \Mage_Admin_Model_Resource_Acl::class, - 'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, 'admin/resource_acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, + 'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, 'admin/resource_acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class, 'admin_resource/acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class, - 'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class, 'admin/resource_block' => \Mage_Admin_Model_Resource_Block::class, - 'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, + 'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class, 'admin/resource_block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, + 'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, 'admin_resource/permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class, 'admin/resource_permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class, 'admin/resource_role' => \Mage_Admin_Model_Resource_Role::class, 'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class, 'admin/resource_role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class, 'admin_resource/role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class, - 'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class, 'admin_resource/roles' => \Mage_Admin_Model_Resource_Roles::class, - 'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, + 'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class, 'admin_resource/roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, - 'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, + 'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, 'admin/resource_roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, + 'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, 'admin/resource_rules' => \Mage_Admin_Model_Resource_Rules::class, 'admin_resource/rules' => \Mage_Admin_Model_Resource_Rules::class, - 'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, 'admin_resource/rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, + 'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, 'admin_resource/user' => \Mage_Admin_Model_Resource_User::class, 'admin/resource_user' => \Mage_Admin_Model_Resource_User::class, 'admin/resource_user_collection' => \Mage_Admin_Model_Resource_User_Collection::class, 'admin_resource/user_collection' => \Mage_Admin_Model_Resource_User_Collection::class, - 'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class, 'admin_resource/variable' => \Mage_Admin_Model_Resource_Variable::class, - 'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, + 'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class, 'admin/resource_variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, + 'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, 'admin/role' => \Mage_Admin_Model_Role::class, 'admin/roles' => \Mage_Admin_Model_Roles::class, 'admin/rules' => \Mage_Admin_Model_Rules::class, @@ -3291,6 +3283,7 @@ 'adminhtml/system_config_backend_baseurl' => \Mage_Adminhtml_Model_System_Config_Backend_Baseurl::class, 'adminhtml/system_config_backend_cache' => \Mage_Adminhtml_Model_System_Config_Backend_Cache::class, 'adminhtml/system_config_backend_catalog_inventory_managestock' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock::class, + 'adminhtml/system_config_backend_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Separator::class, 'adminhtml/system_config_backend_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Type::class, 'adminhtml/system_config_backend_category' => \Mage_Adminhtml_Model_System_Config_Backend_Category::class, 'adminhtml/system_config_backend_cookie' => \Mage_Adminhtml_Model_System_Config_Backend_Cookie::class, @@ -3343,12 +3336,14 @@ 'adminhtml/system_config_source_catalog_listMode' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListMode::class, 'adminhtml/system_config_source_catalog_listPerPage' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListPerPage::class, 'adminhtml/system_config_source_catalog_listSort' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort::class, + 'adminhtml/system_config_source_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Separator::class, 'adminhtml/system_config_source_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Type::class, 'adminhtml/system_config_source_catalog_timeFormat' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_TimeFormat::class, 'adminhtml/system_config_source_category' => \Mage_Adminhtml_Model_System_Config_Source_Category::class, 'adminhtml/system_config_source_checktype' => \Mage_Adminhtml_Model_System_Config_Source_Checktype::class, 'adminhtml/system_config_source_cms_page' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Page::class, 'adminhtml/system_config_source_cms_wysiwyg_enabled' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Wysiwyg_Enabled::class, + 'adminhtml/system_config_source_cookie_samesite' => \Mage_Adminhtml_Model_System_Config_Source_Cookie_Samesite::class, 'adminhtml/system_config_source_country' => \Mage_Adminhtml_Model_System_Config_Source_Country::class, 'adminhtml/system_config_source_country_full' => \Mage_Adminhtml_Model_System_Config_Source_Country_Full::class, 'adminhtml/system_config_source_cron_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency::class, @@ -3375,6 +3370,7 @@ 'adminhtml/system_config_source_locale_timezone' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Timezone::class, 'adminhtml/system_config_source_locale_weekdaycodes' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdaycodes::class, 'adminhtml/system_config_source_locale_weekdays' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdays::class, + 'adminhtml/system_config_source_log_level' => \Mage_Adminhtml_Model_System_Config_Source_Log_Level::class, 'adminhtml/system_config_source_nooptreq' => \Mage_Adminhtml_Model_System_Config_Source_Nooptreq::class, 'adminhtml/system_config_source_notification_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Notification_Frequency::class, 'adminhtml/system_config_source_order_status' => \Mage_Adminhtml_Model_System_Config_Source_Order_Status::class, @@ -3398,7 +3394,6 @@ 'adminhtml/system_config_source_shipping_flatrate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Flatrate::class, 'adminhtml/system_config_source_shipping_tablerate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Tablerate::class, 'adminhtml/system_config_source_shipping_taxclass' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Taxclass::class, - 'adminhtml/system_config_source_startdateenddate' => \Mage_Adminhtml_Model_System_Config_Source_Startdateenddate::class, 'adminhtml/system_config_source_storage_media_database' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Database::class, 'adminhtml/system_config_source_storage_media_storage' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Storage::class, 'adminhtml/system_config_source_store' => \Mage_Adminhtml_Model_System_Config_Source_Store::class, @@ -3454,22 +3449,22 @@ 'api2_resource/acl_filter_attribute' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute::class, 'api2/resource_acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class, 'api2_resource/acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class, - 'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, 'api2_resource/acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, + 'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, 'api2/resource_acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class, 'api2_resource/acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class, 'api2_resource/acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class, 'api2/resource_acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class, 'api2/resource_acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class, 'api2_resource/acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class, - 'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class, 'api2/resource_setup' => \Mage_Api2_Model_Resource_Setup::class, + 'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class, 'api2/resource_validator' => \Mage_Api2_Model_Resource_Validator::class, 'api2_resource/validator' => \Mage_Api2_Model_Resource_Validator::class, 'api2/resource_validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class, 'api2_resource/validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class, - 'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, 'api2/resource_validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, + 'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, 'api2/response' => \Mage_Api2_Model_Response::class, 'api2/route_abstract' => \Mage_Api2_Model_Route_Abstract::class, 'api2/route_apiType' => \Mage_Api2_Model_Route_ApiType::class, @@ -3501,8 +3496,8 @@ 'api/mysql4_user_collection' => \Mage_Api_Model_Mysql4_User_Collection::class, 'api/resource_abstract' => \Mage_Api_Model_Resource_Abstract::class, 'api_resource/abstract' => \Mage_Api_Model_Resource_Abstract::class, - 'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class, 'api_resource/acl' => \Mage_Api_Model_Resource_Acl::class, + 'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class, 'api_resource/acl_role' => \Mage_Api_Model_Resource_Acl_Role::class, 'api/resource_acl_role' => \Mage_Api_Model_Resource_Acl_Role::class, 'api/resource_acl_role_collection' => \Mage_Api_Model_Resource_Acl_Role_Collection::class, @@ -3511,14 +3506,14 @@ 'api_resource/permissions_collection' => \Mage_Api_Model_Resource_Permissions_Collection::class, 'api_resource/role' => \Mage_Api_Model_Resource_Role::class, 'api/resource_role' => \Mage_Api_Model_Resource_Role::class, - 'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, 'api_resource/role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, + 'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, 'api/resource_roles' => \Mage_Api_Model_Resource_Roles::class, 'api_resource/roles' => \Mage_Api_Model_Resource_Roles::class, - 'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, 'api_resource/roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, - 'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, + 'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, 'api_resource/roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, + 'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, 'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class, 'api_resource/rules' => \Mage_Api_Model_Resource_Rules::class, 'api_resource/rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class, @@ -3549,15 +3544,6 @@ 'authorizenet/directpost_request' => \Mage_Authorizenet_Model_Directpost_Request::class, 'authorizenet/directpost_response' => \Mage_Authorizenet_Model_Directpost_Response::class, 'authorizenet/directpost_session' => \Mage_Authorizenet_Model_Directpost_Session::class, - 'backup/backup' => \Mage_Backup_Model_Backup::class, - 'backup/config_backend_cron' => \Mage_Backup_Model_Config_Backend_Cron::class, - 'backup/config_source_type' => \Mage_Backup_Model_Config_Source_Type::class, - 'backup/db' => \Mage_Backup_Model_Db::class, - 'backup/fs_collection' => \Mage_Backup_Model_Fs_Collection::class, - 'backup/mysql4_db' => \Mage_Backup_Model_Mysql4_Db::class, - 'backup/observer' => \Mage_Backup_Model_Observer::class, - 'backup/resource_db' => \Mage_Backup_Model_Resource_Db::class, - 'backup/resource_helper_mysql4' => \Mage_Backup_Model_Resource_Helper_Mysql4::class, 'bundle/catalogIndex_data_bundle' => \Mage_Bundle_Model_CatalogIndex_Data_Bundle::class, 'bundle/mysql4_bundle' => \Mage_Bundle_Model_Mysql4_Bundle::class, 'bundle/mysql4_indexer_price' => \Mage_Bundle_Model_Mysql4_Indexer_Price::class, @@ -3577,16 +3563,16 @@ 'bundle/resource_bundle' => \Mage_Bundle_Model_Resource_Bundle::class, 'bundle/resource_indexer_price' => \Mage_Bundle_Model_Resource_Indexer_Price::class, 'bundle_resource/indexer_price' => \Mage_Bundle_Model_Resource_Indexer_Price::class, - 'bundle/resource_indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class, 'bundle_resource/indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class, + 'bundle/resource_indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class, 'bundle/resource_option' => \Mage_Bundle_Model_Resource_Option::class, 'bundle_resource/option' => \Mage_Bundle_Model_Resource_Option::class, 'bundle/resource_option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class, 'bundle_resource/option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class, 'bundle_resource/price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, 'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, - 'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class, 'bundle_resource/selection' => \Mage_Bundle_Model_Resource_Selection::class, + 'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class, 'bundle_resource/selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class, 'bundle/resource_selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class, 'bundle/sales_order_pdf_items_abstract' => \Mage_Bundle_Model_Sales_Order_Pdf_Items_Abstract::class, @@ -3646,14 +3632,14 @@ 'catalogindex/resource_data_abstract' => \Mage_CatalogIndex_Model_Resource_Data_Abstract::class, 'catalogindex_resource/data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class, 'catalogindex/resource_data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class, - 'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, 'catalogindex_resource/data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, + 'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, 'catalogindex_resource/indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class, 'catalogindex/resource_indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class, 'catalogindex/resource_indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class, 'catalogindex_resource/indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class, - 'catalogindex_resource/indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class, 'catalogindex/resource_indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class, + 'catalogindex_resource/indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class, 'catalogindex_resource/indexer_minimalprice' => \Mage_CatalogIndex_Model_Resource_Indexer_Minimalprice::class, 'catalogindex/resource_indexer_minimalprice' => \Mage_CatalogIndex_Model_Resource_Indexer_Minimalprice::class, 'catalogindex/resource_indexer_price' => \Mage_CatalogIndex_Model_Resource_Indexer_Price::class, @@ -3679,20 +3665,20 @@ 'cataloginventory/mysql4_stock_item_collection' => \Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection::class, 'cataloginventory/mysql4_stock_status' => \Mage_CatalogInventory_Model_Mysql4_Stock_Status::class, 'cataloginventory/observer' => \Mage_CatalogInventory_Model_Observer::class, - 'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, 'cataloginventory_resource/indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, + 'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, 'cataloginventory/resource_indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class, 'cataloginventory_resource/indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class, - 'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, 'cataloginventory/resource_indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, + 'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, 'cataloginventory/resource_indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class, 'cataloginventory_resource/indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class, 'cataloginventory_resource/stock' => \Mage_CatalogInventory_Model_Resource_Stock::class, 'cataloginventory/resource_stock' => \Mage_CatalogInventory_Model_Resource_Stock::class, 'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, 'cataloginventory/resource_stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, - 'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, 'cataloginventory/resource_stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, + 'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, 'cataloginventory/resource_stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class, 'cataloginventory_resource/stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class, 'cataloginventory/source_backorders' => \Mage_CatalogInventory_Model_Source_Backorders::class, @@ -3713,10 +3699,10 @@ 'catalogrule/mysql4_rule_product_price' => \Mage_CatalogRule_Model_Mysql4_Rule_Product_Price::class, 'catalogrule/mysql4_rule_product_price_collection' => \Mage_CatalogRule_Model_Mysql4_Rule_Product_Price_Collection::class, 'catalogrule/observer' => \Mage_CatalogRule_Model_Observer::class, - 'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class, 'catalogrule/resource_rule' => \Mage_CatalogRule_Model_Resource_Rule::class, - 'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, + 'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class, 'catalogrule_resource/rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, + 'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, 'catalogrule_resource/rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class, 'catalogrule/resource_rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class, 'catalogrule_resource/rule_product_price_collection' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price_Collection::class, @@ -3745,24 +3731,24 @@ 'catalogsearch/query' => \Mage_CatalogSearch_Model_Query::class, 'catalogsearch_resource/advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class, 'catalogsearch/resource_advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class, - 'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, 'catalogsearch_resource/advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, + 'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, 'catalogsearch_resource/fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class, 'catalogsearch/resource_fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class, 'catalogsearch_resource/fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class, 'catalogsearch/resource_fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class, 'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, 'catalogsearch_resource/fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, - 'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, 'catalogsearch/resource_helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, - 'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, + 'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, 'catalogsearch_resource/indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, + 'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, 'catalogsearch_resource/query' => \Mage_CatalogSearch_Model_Resource_Query::class, 'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class, - 'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, 'catalogsearch_resource/query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, - 'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, + 'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, 'catalogsearch/resource_search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, + 'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, 'catalogsearch/session' => \Mage_CatalogSearch_Model_Session::class, 'catalogsearch/system_config_backend_sitemap' => \Mage_CatalogSearch_Model_System_Config_Backend_Sitemap::class, 'catalog/abstract' => \Mage_Catalog_Model_Abstract::class, @@ -3905,144 +3891,144 @@ 'catalog/product_website' => \Mage_Catalog_Model_Product_Website::class, 'catalog/resource_abstract' => \Mage_Catalog_Model_Resource_Abstract::class, 'catalog_resource/abstract' => \Mage_Catalog_Model_Resource_Abstract::class, - 'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class, 'catalog/resource_attribute' => \Mage_Catalog_Model_Resource_Attribute::class, - 'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class, + 'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class, 'catalog_resource/category' => \Mage_Catalog_Model_Resource_Category::class, + 'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class, 'catalog_resource/category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class, 'catalog/resource_category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class, - 'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, 'catalog/resource_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, - 'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, + 'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, 'catalog/resource_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, + 'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, 'catalog_resource/category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class, 'catalog/resource_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class, 'catalog_resource/category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class, 'catalog/resource_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class, 'catalog/resource_category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class, 'catalog_resource/category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class, - 'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, 'catalog_resource/category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, - 'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, + 'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, 'catalog/resource_category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, + 'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, 'catalog_resource/category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class, 'catalog/resource_category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class, 'catalog/resource_category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class, 'catalog_resource/category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class, - 'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, 'catalog_resource/collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, - 'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class, + 'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, 'catalog_resource/config' => \Mage_Catalog_Model_Resource_Config::class, - 'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, + 'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class, 'catalog/resource_eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, + 'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, 'catalog_resource/eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class, 'catalog/resource_eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class, - 'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, 'catalog_resource/eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, - 'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, + 'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, 'catalog/resource_eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, - 'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, + 'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, 'catalog_resource/eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, + 'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, 'catalog_resource/eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, - 'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, + 'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, 'catalog_resource/eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, + 'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, 'catalog/resource_eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class, 'catalog_resource/eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class, 'catalog/resource_eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class, 'catalog_resource/eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class, 'catalog/resource_eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class, 'catalog_resource/eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class, - 'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, 'catalog/resource_eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, - 'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, + 'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, 'catalog/resource_eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, + 'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, 'catalog/resource_eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class, 'catalog_resource/eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class, - 'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, 'catalog_resource/eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, + 'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, 'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, 'catalog_resource/eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, 'catalog_resource/eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class, 'catalog/resource_eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class, - 'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, 'catalog_resource/eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, - 'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, + 'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, 'catalog/resource_eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, - 'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, + 'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, 'catalog/resource_eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, - 'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, + 'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, 'catalog/resource_eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, + 'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, 'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, 'catalog_resource/eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, 'catalog_resource/eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, - 'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, 'catalog/resource_eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, + 'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class, 'catalog/resource_eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, + 'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, 'catalog/resource_eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class, 'catalog/resource_eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class, 'catalog_resource/eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class, 'catalog_resource/eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class, 'catalog/resource_eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class, - 'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, 'catalog_resource/eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, - 'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, + 'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, 'catalog_resource/eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, - 'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, + 'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, 'catalog_resource/eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, + 'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, 'catalog/resource_eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class, 'catalog/resource_eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class, 'catalog/resource_eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class, - 'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, 'catalog/resource_eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, - 'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, + 'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, 'catalog_resource/eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, + 'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, 'catalog_resource/eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class, 'catalog/resource_eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class, 'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, 'catalog/resource_eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, - 'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, 'catalog/resource_eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, + 'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, 'catalog/resource_eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class, 'catalog_resource/eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class, - 'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, 'catalog/resource_eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, + 'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, 'catalog_resource/eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class, 'catalog/resource_eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class, 'catalog_resource/eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class, 'catalog/resource_eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class, 'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, 'catalog/resource_eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, - 'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, 'catalog_resource/eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, - 'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, + 'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, 'catalog/resource_eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, - 'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, + 'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, 'catalog/resource_eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, - 'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, + 'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, 'catalog/resource_eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, + 'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, 'catalog/resource_eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class, 'catalog_resource/eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class, - 'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, 'catalog_resource/eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, - 'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, + 'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, 'catalog/resource_eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, - 'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, + 'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, 'catalog/resource_eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, + 'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, 'catalog_resource/eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, + 'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, 'catalog/resource_eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class, 'catalog_resource/eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class, 'catalog/resource_eav_mysql4_sendfriend' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend::class, @@ -4051,98 +4037,98 @@ 'catalog/resource_eav_mysql4_sendfriend_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection::class, 'catalog_resource/eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class, 'catalog/resource_eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class, - 'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, 'catalog/resource_eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, + 'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, 'catalog/resource_helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, 'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, 'catalog_resource/layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class, 'catalog/resource_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class, 'catalog/resource_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class, 'catalog_resource/layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class, - 'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, 'catalog/resource_layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, - 'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class, + 'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, 'catalog_resource/product' => \Mage_Catalog_Model_Resource_Product::class, + 'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class, 'catalog/resource_product_action' => \Mage_Catalog_Model_Resource_Product_Action::class, 'catalog_resource/product_action' => \Mage_Catalog_Model_Resource_Product_Action::class, - 'catalog_resource/product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class, 'catalog/resource_product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class, + 'catalog_resource/product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class, 'catalog/resource_product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class, 'catalog_resource/product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class, 'catalog/resource_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class, 'catalog_resource/product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class, - 'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, 'catalog/resource_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, + 'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, 'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, 'catalog_resource/product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, 'catalog/resource_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class, - 'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, 'catalog_resource/product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, + 'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, 'catalog/resource_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, 'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, - 'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, - 'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, + 'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, + 'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, 'catalog_resource/product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class, 'catalog/resource_product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class, - 'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, 'catalog/resource_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, + 'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, 'catalog/resource_product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class, 'catalog_resource/product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class, - 'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, 'catalog/resource_product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, + 'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, 'catalog/resource_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class, 'catalog_resource/product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class, - 'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, 'catalog_resource/product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, - 'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, + 'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, 'catalog/resource_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, + 'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, 'catalog/resource_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class, 'catalog_resource/product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class, - 'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, 'catalog_resource/product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, - 'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, + 'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, 'catalog_resource/product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, - 'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, + 'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, 'catalog_resource/product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, + 'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, 'catalog/resource_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class, 'catalog_resource/product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class, 'catalog_resource/product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class, 'catalog/resource_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class, - 'catalog/resource_product_link' => \Mage_Catalog_Model_Resource_Product_Link::class, 'catalog_resource/product_link' => \Mage_Catalog_Model_Resource_Product_Link::class, + 'catalog/resource_product_link' => \Mage_Catalog_Model_Resource_Product_Link::class, 'catalog/resource_product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class, 'catalog_resource/product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class, - 'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, 'catalog/resource_product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, - 'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, + 'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, 'catalog_resource/product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, - 'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, + 'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, 'catalog/resource_product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, - 'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, + 'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, 'catalog_resource/product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, - 'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, + 'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, 'catalog_resource/product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, + 'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, 'catalog_resource/product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class, 'catalog/resource_product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class, 'catalog_resource/product_status' => \Mage_Catalog_Model_Resource_Product_Status::class, 'catalog/resource_product_status' => \Mage_Catalog_Model_Resource_Product_Status::class, 'catalog_resource/product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class, 'catalog/resource_product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class, - 'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, 'catalog/resource_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, - 'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, + 'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, 'catalog_resource/product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, + 'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, 'catalog_resource/product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class, 'catalog/resource_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class, - 'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, 'catalog_resource/product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, + 'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, 'catalog/resource_setup' => \Mage_Catalog_Model_Resource_Setup::class, 'catalog_resource/setup' => \Mage_Catalog_Model_Resource_Setup::class, - 'catalog/resource_url' => \Mage_Catalog_Model_Resource_Url::class, 'catalog_resource/url' => \Mage_Catalog_Model_Resource_Url::class, + 'catalog/resource_url' => \Mage_Catalog_Model_Resource_Url::class, 'catalog/session' => \Mage_Catalog_Model_Session::class, 'catalog/system_config_backend_catalog_category_flat' => \Mage_Catalog_Model_System_Config_Backend_Catalog_Category_Flat::class, 'catalog/system_config_backend_catalog_product_flat' => \Mage_Catalog_Model_System_Config_Backend_Catalog_Product_Flat::class, @@ -4184,12 +4170,12 @@ 'checkout/observer' => \Mage_Checkout_Model_Observer::class, 'checkout_resource/agreement' => \Mage_Checkout_Model_Resource_Agreement::class, 'checkout/resource_agreement' => \Mage_Checkout_Model_Resource_Agreement::class, - 'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, 'checkout/resource_agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, - 'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class, + 'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, 'checkout_resource/cart' => \Mage_Checkout_Model_Resource_Cart::class, - 'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class, + 'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class, 'checkout/resource_setup' => \Mage_Checkout_Model_Resource_Setup::class, + 'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class, 'checkout/session' => \Mage_Checkout_Model_Session::class, 'checkout/type_abstract' => \Mage_Checkout_Model_Type_Abstract::class, 'checkout/type_multishipping' => \Mage_Checkout_Model_Type_Multishipping::class, @@ -4204,25 +4190,25 @@ 'cms/mysql4_page_service' => \Mage_Cms_Model_Mysql4_Page_Service::class, 'cms/observer' => \Mage_Cms_Model_Observer::class, 'cms/page' => \Mage_Cms_Model_Page::class, - 'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class, 'cms/resource_block' => \Mage_Cms_Model_Resource_Block::class, + 'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class, 'cms_resource/block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class, 'cms/resource_block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class, 'cms/resource_page' => \Mage_Cms_Model_Resource_Page::class, 'cms_resource/page' => \Mage_Cms_Model_Resource_Page::class, 'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, 'cms_resource/page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, - 'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class, 'cms/resource_page_service' => \Mage_Cms_Model_Resource_Page_Service::class, + 'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class, 'cms/template_filter' => \Mage_Cms_Model_Template_Filter::class, 'cms/wysiwyg_config' => \Mage_Cms_Model_Wysiwyg_Config::class, 'cms/wysiwyg_images_storage' => \Mage_Cms_Model_Wysiwyg_Images_Storage::class, 'cms/wysiwyg_images_storage_collection' => \Mage_Cms_Model_Wysiwyg_Images_Storage_Collection::class, 'configurableswatches/observer' => \Mage_ConfigurableSwatches_Model_Observer::class, - 'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, 'configurableswatches_resource/catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, - 'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, + 'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, 'configurableswatches_resource/catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, + 'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, 'configurableswatches_resource/catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class, 'configurableswatches/resource_catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class, 'configurableswatches/system_config_source_catalog_product_configattribute' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute::class, @@ -4329,152 +4315,152 @@ 'core/mysql4_website_collection' => \Mage_Core_Model_Mysql4_Website_Collection::class, 'core/observer' => \Mage_Core_Model_Observer::class, 'core/resource' => \Mage_Core_Model_Resource::class, + 'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, 'core_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, 'core/resource_abstract' => \Mage_Core_Model_Resource_Abstract::class, - 'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, + 'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class, 'core/resource_cache' => \Mage_Core_Model_Resource_Cache::class, 'core_resource/cache' => \Mage_Core_Model_Resource_Cache::class, - 'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class, + 'core/resource_config' => \Mage_Core_Model_Resource_Config::class, 'core_resource/config' => \Mage_Core_Model_Resource_Config::class, 'payment_resource/config' => \Mage_Core_Model_Resource_Config::class, - 'core/resource_config' => \Mage_Core_Model_Resource_Config::class, - 'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, 'core/resource_config_data' => \Mage_Core_Model_Resource_Config_Data::class, + 'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, 'payment_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, - 'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'core_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, + 'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, - 'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, - 'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, 'payment_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, + 'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, + 'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, 'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, - 'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, 'core/resource_db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, - 'core/resource_design' => \Mage_Core_Model_Resource_Design::class, + 'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, 'core_resource/design' => \Mage_Core_Model_Resource_Design::class, + 'core/resource_design' => \Mage_Core_Model_Resource_Design::class, 'payment_resource/design' => \Mage_Core_Model_Resource_Design::class, 'payment_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, - 'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, 'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, - 'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, + 'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, 'payment_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, 'core/resource_design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, - 'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, - 'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, + 'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, 'core/resource_email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, - 'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, - 'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, + 'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, + 'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, 'payment_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, - 'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, + 'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, + 'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, 'core/resource_email_template' => \Mage_Core_Model_Resource_Email_Template::class, + 'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, 'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, - 'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, 'core/resource_email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, + 'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, 'core_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, 'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, 'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, 'core_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, - 'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, - 'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, 'core_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, 'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, - 'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, 'payment_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, + 'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, + 'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, 'payment_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, 'core/resource_file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, - 'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, - 'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, 'core/resource_file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, + 'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, 'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, - 'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, - 'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, 'core/resource_file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, - 'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class, + 'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, + 'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, 'payment_resource/flag' => \Mage_Core_Model_Resource_Flag::class, + 'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class, 'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class, 'payment_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, - 'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, 'core_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, - 'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, + 'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, 'core/resource_helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, + 'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, 'core_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, - 'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, - 'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, 'core/resource_iterator' => \Mage_Core_Model_Resource_Iterator::class, + 'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, + 'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, 'payment_resource/language' => \Mage_Core_Model_Resource_Language::class, - 'core/resource_language' => \Mage_Core_Model_Resource_Language::class, 'core_resource/language' => \Mage_Core_Model_Resource_Language::class, + 'core/resource_language' => \Mage_Core_Model_Resource_Language::class, 'payment_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, - 'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, 'core/resource_language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, - 'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class, + 'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, 'core_resource/layout' => \Mage_Core_Model_Resource_Layout::class, 'core/resource_layout' => \Mage_Core_Model_Resource_Layout::class, - 'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class, + 'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class, 'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class, 'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class, + 'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class, + 'core/resource_session' => \Mage_Core_Model_Resource_Session::class, 'payment_resource/session' => \Mage_Core_Model_Resource_Session::class, 'core_resource/session' => \Mage_Core_Model_Resource_Session::class, - 'core/resource_session' => \Mage_Core_Model_Resource_Session::class, 'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class, 'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class, 'payment_resource/setup' => \Mage_Core_Model_Resource_Setup::class, - 'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core/resource_setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, - 'payment_resource/store' => \Mage_Core_Model_Resource_Store::class, - 'core_resource/store' => \Mage_Core_Model_Resource_Store::class, + 'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core/resource_store' => \Mage_Core_Model_Resource_Store::class, - 'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, + 'core_resource/store' => \Mage_Core_Model_Resource_Store::class, + 'payment_resource/store' => \Mage_Core_Model_Resource_Store::class, 'core/resource_store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, 'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, - 'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, + 'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, 'core/resource_store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'payment_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, - 'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, - 'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, + 'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'payment_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, - 'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, - 'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class, + 'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, + 'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, 'core_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, - 'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class, + 'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class, + 'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, 'core_resource/translate' => \Mage_Core_Model_Resource_Translate::class, + 'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class, 'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class, - 'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, - 'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class, 'payment_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, - 'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class, + 'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, 'core/resource_type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, 'payment_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, - 'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'core/resource_type_db' => \Mage_Core_Model_Resource_Type_Db::class, + 'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, - 'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, - 'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, 'core_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, - 'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, - 'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, + 'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, 'payment_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, 'payment_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, - 'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, 'core_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, + 'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, 'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, 'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, 'payment_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, - 'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, - 'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'core_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, + 'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, + 'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'core_resource/variable' => \Mage_Core_Model_Resource_Variable::class, - 'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class, 'core/resource_variable' => \Mage_Core_Model_Resource_Variable::class, + 'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class, 'core/resource_variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, - 'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, 'core_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, - 'core_resource/website' => \Mage_Core_Model_Resource_Website::class, + 'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, 'payment_resource/website' => \Mage_Core_Model_Resource_Website::class, + 'core_resource/website' => \Mage_Core_Model_Resource_Website::class, 'core/resource_website' => \Mage_Core_Model_Resource_Website::class, - 'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core/resource_website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, + 'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core/session' => \Mage_Core_Model_Session::class, 'core/session_abstract' => \Mage_Core_Model_Session_Abstract::class, @@ -4504,10 +4490,10 @@ 'cron/mysql4_schedule' => \Mage_Cron_Model_Mysql4_Schedule::class, 'cron/mysql4_schedule_collection' => \Mage_Cron_Model_Mysql4_Schedule_Collection::class, 'cron/observer' => \Mage_Cron_Model_Observer::class, - 'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class, 'cron/resource_schedule' => \Mage_Cron_Model_Resource_Schedule::class, - 'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, + 'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class, 'cron/resource_schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, + 'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, 'cron/schedule' => \Mage_Cron_Model_Schedule::class, 'currencysymbol/observer' => \Mage_CurrencySymbol_Model_Observer::class, 'currencysymbol/system_currencysymbol' => \Mage_CurrencySymbol_Model_System_Currencysymbol::class, @@ -4584,14 +4570,14 @@ 'customer_resource/address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class, 'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, 'customer_resource/address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, - 'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, 'customer/resource_address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, - 'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, + 'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, 'customer/resource_address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, - 'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, + 'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, 'customer_resource/address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, - 'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, + 'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, 'customer_resource/address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, + 'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, 'customer/resource_attribute' => \Mage_Customer_Model_Resource_Attribute::class, 'customer_resource/attribute' => \Mage_Customer_Model_Resource_Attribute::class, 'customer_resource/attribute_collection' => \Mage_Customer_Model_Resource_Attribute_Collection::class, @@ -4600,20 +4586,20 @@ 'customer_resource/customer' => \Mage_Customer_Model_Resource_Customer::class, 'customer_resource/customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class, 'customer/resource_customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class, - 'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, 'customer/resource_flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, - 'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, + 'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, 'customer/resource_flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, - 'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, + 'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, 'customer/resource_form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, + 'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, 'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, 'customer/resource_form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, 'customer/resource_group' => \Mage_Customer_Model_Resource_Group::class, 'customer_resource/group' => \Mage_Customer_Model_Resource_Group::class, 'customer_resource/group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class, 'customer/resource_group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class, - 'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class, 'customer_resource/setup' => \Mage_Customer_Model_Resource_Setup::class, + 'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class, 'customer_resource/wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, 'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, 'customer/session' => \Mage_Customer_Model_Session::class, @@ -4667,10 +4653,10 @@ 'dataflow/mysql4_session' => \Mage_Dataflow_Model_Mysql4_Session::class, 'dataflow/profile' => \Mage_Dataflow_Model_Profile::class, 'dataflow/profile_history' => \Mage_Dataflow_Model_Profile_History::class, - 'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class, 'dataflow/resource_batch' => \Mage_Dataflow_Model_Resource_Batch::class, - 'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, + 'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class, 'dataflow/resource_batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, + 'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, 'dataflow/resource_batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class, 'dataflow_resource/batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class, 'dataflow_resource/batch_export' => \Mage_Dataflow_Model_Resource_Batch_Export::class, @@ -4685,12 +4671,12 @@ 'dataflow/resource_profile' => \Mage_Dataflow_Model_Resource_Profile::class, 'dataflow/resource_profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class, 'dataflow_resource/profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class, - 'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, 'dataflow_resource/profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, + 'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, 'dataflow_resource/profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class, 'dataflow/resource_profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class, - 'dataflow/resource_session' => \Mage_Dataflow_Model_Resource_Session::class, 'dataflow_resource/session' => \Mage_Dataflow_Model_Resource_Session::class, + 'dataflow/resource_session' => \Mage_Dataflow_Model_Resource_Session::class, 'dataflow/session' => \Mage_Dataflow_Model_Session::class, 'dataflow/session_adapter_http' => \Mage_Dataflow_Model_Session_Adapter_Http::class, 'dataflow/session_parser_csv' => \Mage_Dataflow_Model_Session_Parser_Csv::class, @@ -4720,18 +4706,18 @@ 'directory/resource_country' => \Mage_Directory_Model_Resource_Country::class, 'directory_resource/country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class, 'directory/resource_country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class, - 'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class, 'directory/resource_country_format' => \Mage_Directory_Model_Resource_Country_Format::class, + 'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class, 'directory_resource/country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class, 'directory/resource_country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class, 'directory_resource/currency' => \Mage_Directory_Model_Resource_Currency::class, 'directory/resource_currency' => \Mage_Directory_Model_Resource_Currency::class, - 'directory/resource_currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class, 'directory_resource/currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class, + 'directory/resource_currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class, 'directory/resource_region' => \Mage_Directory_Model_Resource_Region::class, 'directory_resource/region' => \Mage_Directory_Model_Resource_Region::class, - 'directory/resource_region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class, 'directory_resource/region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class, + 'directory/resource_region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class, 'downloadable/catalogIndex_data_downloadable' => \Mage_Downloadable_Model_CatalogIndex_Data_Downloadable::class, 'downloadable/link' => \Mage_Downloadable_Model_Link::class, 'downloadable/link_api' => \Mage_Downloadable_Model_Link_Api::class, @@ -4752,8 +4738,8 @@ 'downloadable/observer' => \Mage_Downloadable_Model_Observer::class, 'downloadable/product_price' => \Mage_Downloadable_Model_Product_Price::class, 'downloadable/product_type' => \Mage_Downloadable_Model_Product_Type::class, - 'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, 'downloadable_resource/indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, + 'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, 'downloadable/resource_link' => \Mage_Downloadable_Model_Resource_Link::class, 'downloadable_resource/link' => \Mage_Downloadable_Model_Resource_Link::class, 'downloadable/resource_link_collection' => \Mage_Downloadable_Model_Resource_Link_Collection::class, @@ -4762,14 +4748,14 @@ 'downloadable_resource/link_purchased' => \Mage_Downloadable_Model_Resource_Link_Purchased::class, 'downloadable/resource_link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class, 'downloadable_resource/link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class, - 'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, 'downloadable/resource_link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, - 'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, + 'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, 'downloadable/resource_link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, - 'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class, + 'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, 'downloadable/resource_sample' => \Mage_Downloadable_Model_Resource_Sample::class, - 'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, + 'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class, 'downloadable/resource_sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, + 'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, 'downloadable/sales_order_pdf_items_abstract' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Abstract::class, 'downloadable/sales_order_pdf_items_creditmemo' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Creditmemo::class, 'downloadable/sales_order_pdf_items_invoice' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Invoice::class, @@ -4851,8 +4837,8 @@ 'eav/mysql4_form_fieldset_collection' => \Mage_Eav_Model_Mysql4_Form_Fieldset_Collection::class, 'eav/mysql4_form_type' => \Mage_Eav_Model_Mysql4_Form_Type::class, 'eav/mysql4_form_type_collection' => \Mage_Eav_Model_Mysql4_Form_Type_Collection::class, - 'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class, 'eav_resource/attribute' => \Mage_Eav_Model_Resource_Attribute::class, + 'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class, 'eav_resource/attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class, 'eav/resource_attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class, 'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class, @@ -4869,28 +4855,28 @@ 'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class, 'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, 'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, - 'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, 'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, - 'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, + 'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, 'eav_resource/entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, + 'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, 'eav_resource/entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class, 'eav/resource_entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class, 'eav_resource/entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class, 'eav/resource_entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class, - 'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, 'eav_resource/entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, + 'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, 'eav/resource_form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class, 'eav_resource/form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class, - 'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, 'eav/resource_form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, + 'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, 'eav/resource_form_element' => \Mage_Eav_Model_Resource_Form_Element::class, 'eav_resource/form_element' => \Mage_Eav_Model_Resource_Form_Element::class, - 'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, 'eav_resource/form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, - 'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, + 'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, 'eav/resource_form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, - 'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, + 'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, 'eav_resource/form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, + 'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, 'eav/resource_form_type' => \Mage_Eav_Model_Resource_Form_Type::class, 'eav_resource/form_type' => \Mage_Eav_Model_Resource_Form_Type::class, 'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class, @@ -4906,12 +4892,12 @@ 'giftmessage/mysql4_message_collection' => \Mage_GiftMessage_Model_Mysql4_Message_Collection::class, 'giftmessage/mysql4_setup' => \Mage_GiftMessage_Model_Mysql4_Setup::class, 'giftmessage/observer' => \Mage_GiftMessage_Model_Observer::class, - 'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class, 'giftmessage/resource_message' => \Mage_GiftMessage_Model_Resource_Message::class, - 'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, + 'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class, 'giftmessage_resource/message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, - 'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class, + 'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, 'giftmessage_resource/setup' => \Mage_GiftMessage_Model_Resource_Setup::class, + 'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class, 'googleanalytics/observer' => \Mage_GoogleAnalytics_Model_Observer::class, 'googleanalytics/system_config_source_type' => \Mage_GoogleAnalytics_Model_System_Config_Source_Type::class, 'googlecheckout/payment' => \Mage_GoogleCheckout_Model_Payment::class, @@ -4947,8 +4933,8 @@ 'importexport/product_attribute_backend_urlkey' => \Mage_ImportExport_Model_Product_Attribute_Backend_Urlkey::class, 'importexport_resource/helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class, 'importexport/resource_helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class, - 'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, 'importexport_resource/import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, + 'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, 'importexport_resource/setup' => \Mage_ImportExport_Model_Resource_Setup::class, 'importexport/resource_setup' => \Mage_ImportExport_Model_Resource_Setup::class, 'importexport/source_export_entity' => \Mage_ImportExport_Model_Source_Export_Entity::class, @@ -4970,16 +4956,16 @@ 'index/process' => \Mage_Index_Model_Process::class, 'index_resource/abstract' => \Mage_Index_Model_Resource_Abstract::class, 'index/resource_abstract' => \Mage_Index_Model_Resource_Abstract::class, - 'index/resource_event' => \Mage_Index_Model_Resource_Event::class, 'index_resource/event' => \Mage_Index_Model_Resource_Event::class, + 'index/resource_event' => \Mage_Index_Model_Resource_Event::class, 'index/resource_event_collection' => \Mage_Index_Model_Resource_Event_Collection::class, 'index_resource/event_collection' => \Mage_Index_Model_Resource_Event_Collection::class, 'index/resource_helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class, 'index_resource/helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class, - 'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, 'index/resource_lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, - 'index_resource/process' => \Mage_Index_Model_Resource_Process::class, + 'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, 'index/resource_process' => \Mage_Index_Model_Resource_Process::class, + 'index_resource/process' => \Mage_Index_Model_Resource_Process::class, 'index/resource_process_collection' => \Mage_Index_Model_Resource_Process_Collection::class, 'index_resource/process_collection' => \Mage_Index_Model_Resource_Process_Collection::class, 'index/resource_setup' => \Mage_Index_Model_Resource_Setup::class, @@ -5012,22 +4998,22 @@ 'log/mysql4_visitor_online_collection' => \Mage_Log_Model_Mysql4_Visitor_Online_Collection::class, 'log_resource/aggregation' => \Mage_Log_Model_Resource_Aggregation::class, 'log/resource_aggregation' => \Mage_Log_Model_Resource_Aggregation::class, - 'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class, 'log/resource_customer' => \Mage_Log_Model_Resource_Customer::class, + 'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class, 'log/resource_log' => \Mage_Log_Model_Resource_Log::class, 'log_resource/log' => \Mage_Log_Model_Resource_Log::class, 'log_resource/visitor' => \Mage_Log_Model_Resource_Visitor::class, 'log/resource_visitor' => \Mage_Log_Model_Resource_Visitor::class, 'log_resource/visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class, 'log/resource_visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class, - 'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, 'log_resource/visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, - 'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, + 'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, 'log_resource/visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, + 'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, 'log/visitor' => \Mage_Log_Model_Visitor::class, 'log/visitor_online' => \Mage_Log_Model_Visitor_Online::class, - 'media_resource/image' => \Mage_Media_Model_File_Image::class, 'media/file_image' => \Mage_Media_Model_File_Image::class, + 'media_resource/image' => \Mage_Media_Model_File_Image::class, 'media/image' => \Mage_Media_Model_Image::class, 'newsletter/message' => \Mage_Newsletter_Model_Message::class, 'newsletter/mysql4_problem' => \Mage_Newsletter_Model_Mysql4_Problem::class, @@ -5045,14 +5031,14 @@ 'newsletter_resource/problem' => \Mage_Newsletter_Model_Resource_Problem::class, 'newsletter/resource_problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class, 'newsletter_resource/problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class, - 'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class, 'newsletter/resource_queue' => \Mage_Newsletter_Model_Resource_Queue::class, - 'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, + 'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class, 'newsletter/resource_queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, - 'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, + 'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, 'newsletter/resource_subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, - 'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, + 'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, 'newsletter/resource_subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, + 'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, 'newsletter_resource/template' => \Mage_Newsletter_Model_Resource_Template::class, 'newsletter/resource_template' => \Mage_Newsletter_Model_Resource_Template::class, 'newsletter_resource/template_collection' => \Mage_Newsletter_Model_Resource_Template_Collection::class, @@ -5065,20 +5051,20 @@ 'oauth/consumer_validator_keyLength' => \Mage_Oauth_Model_Consumer_Validator_KeyLength::class, 'oauth/nonce' => \Mage_Oauth_Model_Nonce::class, 'oauth/observer' => \Mage_Oauth_Model_Observer::class, - 'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class, 'oauth/resource_consumer' => \Mage_Oauth_Model_Resource_Consumer::class, + 'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class, 'oauth/resource_consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class, 'oauth_resource/consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class, 'oauth_resource/nonce' => \Mage_Oauth_Model_Resource_Nonce::class, 'oauth/resource_nonce' => \Mage_Oauth_Model_Resource_Nonce::class, 'oauth_resource/nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class, 'oauth/resource_nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class, - 'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class, 'oauth/resource_setup' => \Mage_Oauth_Model_Resource_Setup::class, + 'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class, 'oauth_resource/token' => \Mage_Oauth_Model_Resource_Token::class, 'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class, - 'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, + 'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth/server' => \Mage_Oauth_Model_Server::class, 'oauth/token' => \Mage_Oauth_Model_Token::class, 'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class, @@ -5095,8 +5081,8 @@ 'paygate/authorizenet_source_paymentAction' => \Mage_Paygate_Model_Authorizenet_Source_PaymentAction::class, 'paygate/mysql4_authorizenet_debug' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug::class, 'paygate/mysql4_authorizenet_debug_collection' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection::class, - 'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, 'paygate/resource_authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, + 'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, 'paygate_resource/authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class, 'paygate/resource_authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class, 'payment/billing_agreementAbstract' => \Mage_Payment_Model_Billing_AgreementAbstract::class, @@ -5159,14 +5145,14 @@ 'paypal/resource_cert' => \Mage_Paypal_Model_Resource_Cert::class, 'paypal_resource/payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class, 'paypal/resource_payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class, - 'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, 'paypal/resource_payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, + 'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, 'paypal/resource_report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class, 'paypal_resource/report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class, - 'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, 'paypal/resource_report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, - 'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, + 'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, 'paypal/resource_report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, + 'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, 'paypal/resource_setup' => \Mage_Paypal_Model_Resource_Setup::class, 'paypal_resource/setup' => \Mage_Paypal_Model_Resource_Setup::class, 'paypal/session' => \Mage_Paypal_Model_Session::class, @@ -5200,16 +5186,16 @@ 'poll/poll' => \Mage_Poll_Model_Poll::class, 'poll/poll_answer' => \Mage_Poll_Model_Poll_Answer::class, 'poll/poll_vote' => \Mage_Poll_Model_Poll_Vote::class, - 'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class, 'poll_resource/poll' => \Mage_Poll_Model_Resource_Poll::class, - 'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, + 'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class, 'poll/resource_poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, - 'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, + 'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, 'poll_resource/poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, - 'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, + 'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, 'poll_resource/poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, - 'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, + 'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, 'poll/resource_poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, + 'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, 'productalert/email' => \Mage_ProductAlert_Model_Email::class, 'productalert/mysql4_price' => \Mage_ProductAlert_Model_Mysql4_Price::class, 'productalert/mysql4_price_collection' => \Mage_ProductAlert_Model_Mysql4_Price_Collection::class, @@ -5219,20 +5205,20 @@ 'productalert/mysql4_stock_customer_collection' => \Mage_ProductAlert_Model_Mysql4_Stock_Customer_Collection::class, 'productalert/observer' => \Mage_ProductAlert_Model_Observer::class, 'productalert/price' => \Mage_ProductAlert_Model_Price::class, - 'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, 'productalert_resource/abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, - 'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class, + 'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, 'productalert_resource/price' => \Mage_ProductAlert_Model_Resource_Price::class, - 'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, + 'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class, 'productalert/resource_price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, - 'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, + 'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, 'productalert/resource_price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, - 'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class, + 'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, 'productalert/resource_stock' => \Mage_ProductAlert_Model_Resource_Stock::class, - 'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, + 'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class, 'productalert/resource_stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, - 'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, + 'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, 'productalert/resource_stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, + 'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, 'productalert/stock' => \Mage_ProductAlert_Model_Stock::class, 'rating/mysql4_rating' => \Mage_Rating_Model_Mysql4_Rating::class, 'rating/mysql4_rating_collection' => \Mage_Rating_Model_Mysql4_Rating_Collection::class, @@ -5246,20 +5232,20 @@ 'rating/rating_entity' => \Mage_Rating_Model_Rating_Entity::class, 'rating/rating_option' => \Mage_Rating_Model_Rating_Option::class, 'rating/rating_option_vote' => \Mage_Rating_Model_Rating_Option_Vote::class, - 'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class, 'rating/resource_rating' => \Mage_Rating_Model_Resource_Rating::class, + 'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class, 'rating_resource/rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class, 'rating/resource_rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class, 'rating/resource_rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class, 'rating_resource/rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class, - 'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, 'rating/resource_rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, - 'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, + 'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, 'rating_resource/rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, + 'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, 'rating_resource/rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class, 'rating/resource_rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class, - 'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, 'rating/resource_rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, + 'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, 'reports/config' => \Mage_Reports_Model_Config::class, 'reports/event' => \Mage_Reports_Model_Event::class, 'reports/event_observer' => \Mage_Reports_Model_Event_Observer::class, @@ -5305,6 +5291,7 @@ 'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class, 'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class, 'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class, + 'reports/observer' => \Mage_Reports_Model_Observer::class, 'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class, 'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class, 'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class, @@ -5313,52 +5300,52 @@ 'reports_resource/accounts_collection' => \Mage_Reports_Model_Resource_Accounts_Collection::class, 'reports/resource_coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class, 'reports_resource/coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class, - 'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, 'reports/resource_customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, - 'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, + 'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, 'reports/resource_customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, - 'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, + 'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, 'reports_resource/customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, - 'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, + 'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, 'reports/resource_entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, + 'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, 'reports_resource/event' => \Mage_Reports_Model_Resource_Event::class, 'reports/resource_event' => \Mage_Reports_Model_Resource_Event::class, - 'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, 'reports_resource/event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, - 'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class, + 'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, 'reports/resource_event_type' => \Mage_Reports_Model_Resource_Event_Type::class, - 'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, + 'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class, 'reports/resource_event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, - 'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, + 'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, 'reports_resource/helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, - 'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, + 'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, 'reports/resource_invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, - 'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, + 'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, 'reports_resource/order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, - 'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, + 'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, 'reports_resource/product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, + 'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, 'reports/resource_product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class, 'reports_resource/product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class, 'reports_resource/product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class, 'reports/resource_product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class, - 'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, 'reports/resource_product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, + 'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, 'reports_resource/product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class, 'reports/resource_product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class, - 'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, 'reports_resource/product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, + 'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, 'reports/resource_product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, 'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, 'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, 'reports_resource/product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, - 'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, 'reports/resource_product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, + 'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, 'reports_resource/product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class, 'reports/resource_product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class, - 'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, 'reports_resource/product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, - 'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, + 'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, 'reports_resource/product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, + 'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, 'reports/resource_quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, 'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, 'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class, @@ -5367,34 +5354,34 @@ 'reports_resource/report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class, 'reports/resource_report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class, 'reports_resource/report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class, - 'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, 'reports_resource/report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, + 'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, 'reports/resource_report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class, 'reports_resource/report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class, - 'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, 'reports/resource_report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, - 'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, + 'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, 'reports_resource/review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, - 'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, + 'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, 'reports_resource/review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, + 'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, 'reports_resource/review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class, 'reports/resource_review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class, 'reports_resource/shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class, 'reports/resource_shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class, - 'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, 'reports_resource/shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, + 'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, 'reports_resource/tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class, 'reports/resource_tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class, 'reports/resource_tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, 'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, 'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, 'reports/resource_tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, - 'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, 'reports/resource_tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, + 'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, 'reports_resource/wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class, 'reports/resource_wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class, - 'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, 'reports_resource/wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, + 'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, 'reports/session' => \Mage_Reports_Model_Session::class, 'reports/test' => \Mage_Reports_Model_Test::class, 'reports/totals' => \Mage_Reports_Model_Totals::class, @@ -5413,12 +5400,12 @@ 'review/resource_review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class, 'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class, 'review_resource/review_status' => \Mage_Review_Model_Resource_Review_Status::class, - 'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, 'review_resource/review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, + 'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, 'review/resource_review_summary' => \Mage_Review_Model_Resource_Review_Summary::class, 'review_resource/review_summary' => \Mage_Review_Model_Resource_Review_Summary::class, - 'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, 'review/resource_review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, + 'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, 'review/review' => \Mage_Review_Model_Review::class, 'review/review_status' => \Mage_Review_Model_Review_Status::class, 'review/review_summary' => \Mage_Review_Model_Review_Summary::class, @@ -5441,12 +5428,12 @@ 'rule/mysql4_rule_collection' => \Mage_Rule_Model_Mysql4_Rule_Collection::class, 'rule/renderer_actions' => \Mage_Rule_Model_Renderer_Actions::class, 'rule/renderer_conditions' => \Mage_Rule_Model_Renderer_Conditions::class, - 'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class, 'rule/resource_abstract' => \Mage_Rule_Model_Resource_Abstract::class, - 'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class, + 'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class, 'rule/resource_rule' => \Mage_Rule_Model_Resource_Rule::class, - 'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, + 'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class, 'rule_resource/rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, + 'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, 'rule_resource/rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, 'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, 'rule/resource_rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class, @@ -5473,28 +5460,28 @@ 'salesrule/quote_nominal_discount' => \Mage_SalesRule_Model_Quote_Nominal_Discount::class, 'salesrule_resource/coupon' => \Mage_SalesRule_Model_Resource_Coupon::class, 'salesrule/resource_coupon' => \Mage_SalesRule_Model_Resource_Coupon::class, - 'salesrule_resource/coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class, 'salesrule/resource_coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class, + 'salesrule_resource/coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class, 'salesrule/resource_coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class, 'salesrule_resource/coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class, - 'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, 'salesrule_resource/report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, - 'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, + 'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, 'salesrule_resource/report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, + 'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, 'salesrule_resource/report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class, 'salesrule/resource_report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class, 'salesrule_resource/report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class, 'salesrule/resource_report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class, 'salesrule_resource/report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class, 'salesrule/resource_report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class, - 'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class, 'salesrule_resource/rule' => \Mage_SalesRule_Model_Resource_Rule::class, - 'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, + 'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class, 'salesrule_resource/rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, - 'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, + 'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, 'salesrule_resource/rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, - 'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, + 'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, 'salesrule/resource_rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, + 'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, 'salesrule_resource/rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class, 'salesrule/resource_rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class, 'salesrule/resource_rule_product_collection' => \Mage_SalesRule_Model_Resource_Rule_Product_Collection::class, @@ -5539,14 +5526,14 @@ 'sales/email_template' => \Mage_Sales_Model_Email_Template::class, 'sales/entity_order' => \Mage_Sales_Model_Entity_Order::class, 'sales_entity/order' => \Mage_Sales_Model_Entity_Order::class, - 'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class, 'sales_entity/order_address' => \Mage_Sales_Model_Entity_Order_Address::class, - 'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, + 'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class, 'sales/entity_order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, - 'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, + 'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, 'sales_entity/order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, - 'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, + 'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, 'sales_entity/order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, + 'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, 'sales_entity/order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class, 'sales/entity_order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class, 'sales/entity_order_attribute_backend_shipping' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Shipping::class, @@ -5555,54 +5542,54 @@ 'sales/entity_order_collection' => \Mage_Sales_Model_Entity_Order_Collection::class, 'sales_entity/order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class, 'sales/entity_order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class, - 'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, 'sales_entity/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, - 'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, + 'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, 'sales/entity_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, - 'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, + 'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, 'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, + 'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, 'sales/entity_order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class, 'sales_entity/order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class, 'sales/entity_order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class, 'sales_entity/order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class, 'sales_entity/order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class, 'sales/entity_order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class, - 'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, 'sales/entity_order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, - 'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, + 'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, 'sales_entity/order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, + 'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, 'sales/entity_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class, 'sales_entity/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class, - 'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class, 'sales/entity_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class, + 'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class, 'sales/entity_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Order::class, 'sales_entity/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Order::class, 'sales_entity/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class, 'sales/entity_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class, 'sales/entity_order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class, 'sales_entity/order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class, - 'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, 'sales/entity_order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, + 'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, 'sales_entity/order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class, 'sales/entity_order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class, 'sales_entity/order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class, 'sales/entity_order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class, - 'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, 'sales/entity_order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, + 'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, 'sales/entity_order_item' => \Mage_Sales_Model_Entity_Order_Item::class, 'sales_entity/order_item' => \Mage_Sales_Model_Entity_Order_Item::class, 'sales/entity_order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class, 'sales_entity/order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class, - 'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, 'sales/entity_order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, + 'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, 'sales_entity/order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class, 'sales/entity_order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class, 'sales/entity_order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class, 'sales_entity/order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class, - 'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, 'sales_entity/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, - 'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, + 'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, 'sales/entity_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, + 'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, 'sales/entity_order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class, 'sales_entity/order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class, 'sales/entity_order_shipment_comment' => \Mage_Sales_Model_Entity_Order_Shipment_Comment::class, @@ -5611,66 +5598,66 @@ 'sales_entity/order_shipment_comment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Comment_Collection::class, 'sales_entity/order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class, 'sales/entity_order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class, - 'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, 'sales/entity_order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, - 'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, + 'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, 'sales_entity/order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, - 'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, + 'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, 'sales_entity/order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, - 'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, + 'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, 'sales_entity/order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, - 'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, + 'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, 'sales_entity/order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, + 'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, 'sales_entity/quote' => \Mage_Sales_Model_Entity_Quote::class, 'sales/entity_quote' => \Mage_Sales_Model_Entity_Quote::class, - 'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, 'sales_entity/quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, + 'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, 'sales_entity/quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class, 'sales/entity_quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class, - 'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, 'sales/entity_quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, - 'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, + 'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, 'sales/entity_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, - 'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, + 'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, 'sales_entity/quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, - 'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, + 'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, 'sales/entity_quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, + 'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, 'sales_entity/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales/entity_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales_entity/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class, 'sales/entity_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class, - 'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, 'sales_entity/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, - 'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, 'sales/entity_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/entity_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales_entity/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales/entity_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class, 'sales_entity/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class, 'sales_entity/quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class, 'sales/entity_quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class, - 'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, 'sales_entity/quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, - 'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, + 'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, 'sales/entity_quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, - 'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, + 'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, 'sales_entity/quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, + 'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, 'sales/entity_quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class, 'sales_entity/quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class, 'sales/entity_quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class, 'sales_entity/quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class, - 'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, 'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, - 'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, + 'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, 'sales/entity_quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, - 'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, + 'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, 'sales/entity_quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, + 'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, 'sales_entity/quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class, 'sales/entity_quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class, - 'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, 'sales_entity/sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, - 'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class, + 'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, 'sales_entity/setup' => \Mage_Sales_Model_Entity_Setup::class, + 'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class, 'sales/mysql4_abstract' => \Mage_Sales_Model_Mysql4_Abstract::class, 'sales/mysql4_billing_agreement' => \Mage_Sales_Model_Mysql4_Billing_Agreement::class, 'sales/mysql4_billing_agreement_collection' => \Mage_Sales_Model_Mysql4_Billing_Agreement_Collection::class, @@ -5865,50 +5852,50 @@ 'sales/recurring_profile' => \Mage_Sales_Model_Recurring_Profile::class, 'sales_resource/abstract' => \Mage_Sales_Model_Resource_Abstract::class, 'sales/resource_abstract' => \Mage_Sales_Model_Resource_Abstract::class, - 'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, 'sales_resource/billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, - 'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, + 'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, 'sales_resource/billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, + 'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, 'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, 'sales/resource_collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, 'sales_resource/helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, 'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, - 'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class, 'sales_resource/order' => \Mage_Sales_Model_Resource_Order::class, + 'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class, 'sales_resource/order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class, 'sales/resource_order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class, - 'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class, 'sales_resource/order_address' => \Mage_Sales_Model_Resource_Order_Address::class, + 'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class, 'sales/resource_order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class, 'sales_resource/order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class, 'sales/resource_order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class, 'sales_resource/order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class, 'sales/resource_order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class, 'sales_resource/order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class, - 'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, 'sales/resource_order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, + 'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, 'sales_resource/order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class, 'sales/resource_order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class, 'sales/resource_order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class, 'sales_resource/order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class, - 'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, 'sales/resource_order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, - 'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, + 'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, 'sales/resource_order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, - 'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, + 'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, 'sales/resource_order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, - 'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, + 'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, 'sales_resource/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, + 'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, 'sales/resource_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class, 'sales_resource/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class, - 'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, 'sales/resource_order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, - 'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, + 'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, 'sales_resource/order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, + 'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, 'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, 'sales/resource_order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, - 'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, 'sales/resource_order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, + 'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, 'sales_resource/order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class, 'sales/resource_order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class, 'sales_resource/order_creditmemo_item_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item_Collection::class, @@ -5917,138 +5904,138 @@ 'sales/resource_order_grid_collection' => \Mage_Sales_Model_Resource_Order_Grid_Collection::class, 'sales/resource_order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class, 'sales_resource/order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class, - 'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, 'sales/resource_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, - 'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, + 'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, 'sales_resource/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, + 'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, 'sales_resource/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class, 'sales/resource_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class, 'sales/resource_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class, 'sales_resource/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class, 'sales/resource_order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class, 'sales_resource/order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class, - 'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, 'sales/resource_order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, + 'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, 'sales/resource_order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class, 'sales_resource/order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class, - 'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, 'sales/resource_order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, - 'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, + 'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, 'sales_resource/order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, + 'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, 'sales/resource_order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class, 'sales_resource/order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class, - 'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class, 'sales_resource/order_item' => \Mage_Sales_Model_Resource_Order_Item::class, + 'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class, 'sales/resource_order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class, 'sales_resource/order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class, - 'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, 'sales_resource/order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, - 'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, + 'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, 'sales/resource_order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, + 'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, 'sales_resource/order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, 'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, - 'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, 'sales_resource/order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, - 'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, + 'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, 'sales_resource/order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, - 'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, + 'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, 'sales/resource_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, + 'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, 'sales_resource/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class, 'sales/resource_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class, 'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, 'sales/resource_order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, - 'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, 'sales/resource_order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, - 'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, + 'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, 'sales/resource_order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, + 'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, 'sales_resource/order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class, 'sales/resource_order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class, - 'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, 'sales_resource/order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, - 'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, + 'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, 'sales_resource/order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, - 'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, + 'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, 'sales_resource/order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, - 'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, + 'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, 'sales_resource/order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, + 'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, 'sales_resource/order_status' => \Mage_Sales_Model_Resource_Order_Status::class, 'sales/resource_order_status' => \Mage_Sales_Model_Resource_Order_Status::class, 'sales_resource/order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class, 'sales/resource_order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class, - 'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, 'sales_resource/order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, - 'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, + 'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, 'sales_resource/order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, - 'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, + 'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, 'sales/resource_order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, - 'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, + 'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, 'sales_resource/order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, - 'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class, + 'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, 'sales/resource_quote' => \Mage_Sales_Model_Resource_Quote::class, + 'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class, 'sales_resource/quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class, 'sales/resource_quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class, 'sales/resource_quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class, 'sales_resource/quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class, 'sales/resource_quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class, 'sales_resource/quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class, - 'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, 'sales/resource_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, + 'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, 'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, 'sales/resource_quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, - 'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, 'sales_resource/quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, + 'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, 'sales_resource/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales/resource_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales/resource_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class, 'sales_resource/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class, 'sales/resource_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class, 'sales_resource/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class, - 'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/resource_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, 'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales/resource_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, - 'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, 'sales_resource/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, - 'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, + 'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, 'sales/resource_quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, + 'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, 'sales_resource/quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class, 'sales/resource_quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class, - 'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, 'sales/resource_quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, - 'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, + 'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, 'sales_resource/quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, - 'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, + 'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, 'sales_resource/quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, + 'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, 'sales_resource/quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class, 'sales/resource_quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class, - 'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, 'sales/resource_quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, + 'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, 'sales/resource_quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class, 'sales_resource/quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class, - 'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, 'sales/resource_quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, - 'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, + 'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, 'sales/resource_quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, - 'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, + 'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, 'sales_resource/quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, - 'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, + 'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, 'sales/resource_quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, - 'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, + 'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, 'sales/resource_recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, + 'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, 'sales/resource_recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class, 'sales_resource/recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class, - 'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class, 'sales/resource_report' => \Mage_Sales_Model_Resource_Report::class, + 'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class, 'sales/resource_report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class, 'sales_resource/report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class, - 'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, 'sales/resource_report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, + 'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, 'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, 'sales/resource_report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, - 'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, 'sales_resource/report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, - 'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, + 'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, 'sales_resource/report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, + 'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, 'sales/resource_report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class, 'sales_resource/report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class, 'sales_resource/report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class, @@ -6061,24 +6048,24 @@ 'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class, 'sales_resource/report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class, 'sales/resource_report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class, - 'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, 'sales/resource_report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, - 'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, + 'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, 'sales_resource/report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, + 'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, 'sales_resource/report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class, 'sales/resource_report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class, 'sales_resource/report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class, 'sales/resource_report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class, - 'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, 'sales_resource/report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, + 'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, 'sales_resource/report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class, 'sales/resource_report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class, 'sales_resource/report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class, 'sales/resource_report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class, - 'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, 'sales/resource_sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, - 'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class, + 'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, 'sales/resource_setup' => \Mage_Sales_Model_Resource_Setup::class, + 'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class, 'sales/service_order' => \Mage_Sales_Model_Service_Order::class, 'sales/service_quote' => \Mage_Sales_Model_Service_Quote::class, 'sales/status_list' => \Mage_Sales_Model_Status_List::class, @@ -6088,8 +6075,8 @@ 'sendfriend/observer' => \Mage_Sendfriend_Model_Observer::class, 'sendfriend_resource/sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class, 'sendfriend/resource_sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class, - 'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, 'sendfriend/resource_sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, + 'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, 'sendfriend/resource_setup' => \Mage_Sendfriend_Model_Resource_Setup::class, 'sendfriend_resource/setup' => \Mage_Sendfriend_Model_Resource_Setup::class, 'sendfriend/sendfriend' => \Mage_Sendfriend_Model_Sendfriend::class, @@ -6108,8 +6095,8 @@ 'shipping/rate_result_abstract' => \Mage_Shipping_Model_Rate_Result_Abstract::class, 'shipping/rate_result_error' => \Mage_Shipping_Model_Rate_Result_Error::class, 'shipping/rate_result_method' => \Mage_Shipping_Model_Rate_Result_Method::class, - 'shipping/resource_carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class, 'shipping_resource/carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class, + 'shipping/resource_carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class, 'shipping/resource_carrier_tablerate_collection' => \Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection::class, 'shipping_resource/carrier_tablerate_collection' => \Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection::class, 'shipping/shipment_request' => \Mage_Shipping_Model_Shipment_Request::class, @@ -6129,16 +6116,16 @@ 'sitemap/observer' => \Mage_Sitemap_Model_Observer::class, 'sitemap_resource/catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class, 'sitemap/resource_catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class, - 'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, 'sitemap/resource_catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, - 'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, + 'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, 'sitemap_resource/catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, - 'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, + 'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, 'sitemap_resource/cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, + 'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, 'sitemap_resource/sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class, 'sitemap/resource_sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class, - 'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, 'sitemap_resource/sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, + 'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, 'sitemap/sitemap' => \Mage_Sitemap_Model_Sitemap::class, 'tag/api' => \Mage_Tag_Model_Api::class, 'tag/api_v2' => \Mage_Tag_Model_Api_V2::class, @@ -6151,21 +6138,21 @@ 'tag/mysql4_tag' => \Mage_Tag_Model_Mysql4_Tag::class, 'tag/mysql4_tag_collection' => \Mage_Tag_Model_Mysql4_Tag_Collection::class, 'tag/mysql4_tag_relation' => \Mage_Tag_Model_Mysql4_Tag_Relation::class, - 'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag/resource_customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag_resource/customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, - 'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, + 'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag_resource/indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, - 'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, + 'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, 'tag_resource/popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, + 'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, 'tag_resource/product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class, 'tag/resource_product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class, 'tag_resource/tag' => \Mage_Tag_Model_Resource_Tag::class, 'tag/resource_tag' => \Mage_Tag_Model_Resource_Tag::class, - 'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, 'tag_resource/tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, - 'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, + 'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, 'tag_resource/tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, + 'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, 'tag/session' => \Mage_Tag_Model_Session::class, 'tag/tag' => \Mage_Tag_Model_Tag::class, 'tag/tag_relation' => \Mage_Tag_Model_Tag_Relation::class, @@ -6204,16 +6191,16 @@ 'tax/resource_calculation_rate' => \Mage_Tax_Model_Resource_Calculation_Rate::class, 'tax/resource_calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class, 'tax_resource/calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class, - 'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, 'tax/resource_calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, - 'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, + 'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, 'tax/resource_calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, - 'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, + 'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, 'tax/resource_calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, - 'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, + 'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, 'tax_resource/calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, - 'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class, + 'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, 'tax/resource_class' => \Mage_Tax_Model_Resource_Class::class, + 'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class, 'tax/resource_class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class, 'tax_resource/class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class, 'tax_resource/report_collection' => \Mage_Tax_Model_Resource_Report_Collection::class, @@ -6224,16 +6211,16 @@ 'tax/resource_report_tax_createdat' => \Mage_Tax_Model_Resource_Report_Tax_Createdat::class, 'tax_resource/report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class, 'tax/resource_report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class, - 'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, 'tax/resource_report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, - 'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, + 'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, 'tax_resource/sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, + 'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, 'tax_resource/sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class, 'tax/resource_sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class, - 'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class, 'tax/resource_sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class, - 'tax_resource/sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class, + 'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class, 'tax/resource_sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class, + 'tax_resource/sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class, 'tax/resource_setup' => \Mage_Tax_Model_Resource_Setup::class, 'tax_resource/setup' => \Mage_Tax_Model_Resource_Setup::class, 'tax/sales_order_tax' => \Mage_Tax_Model_Sales_Order_Tax::class, @@ -6316,10 +6303,10 @@ 'weee/observer' => \Mage_Weee_Model_Observer::class, 'weee/resource_attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class, 'weee_resource/attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class, - 'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class, 'weee/resource_setup' => \Mage_Weee_Model_Resource_Setup::class, - 'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class, + 'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class, 'weee/resource_tax' => \Mage_Weee_Model_Resource_Tax::class, + 'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class, 'weee/tax' => \Mage_Weee_Model_Tax::class, 'weee/total_creditmemo_weee' => \Mage_Weee_Model_Total_Creditmemo_Weee::class, 'weee/total_invoice_weee' => \Mage_Weee_Model_Total_Invoice_Weee::class, @@ -6329,12 +6316,12 @@ 'widget/mysql4_widget_instance' => \Mage_Widget_Model_Mysql4_Widget_Instance::class, 'widget/mysql4_widget_instance_collection' => \Mage_Widget_Model_Mysql4_Widget_Instance_Collection::class, 'widget/observer' => \Mage_Widget_Model_Observer::class, - 'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class, 'widget/resource_widget' => \Mage_Widget_Model_Resource_Widget::class, + 'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class, 'widget_resource/widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class, 'widget/resource_widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class, - 'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, 'widget_resource/widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, + 'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, 'widget/template_filter' => \Mage_Widget_Model_Template_Filter::class, 'widget/widget' => \Mage_Widget_Model_Widget::class, 'widget/widget_config' => \Mage_Widget_Model_Widget_Config::class, @@ -6351,14 +6338,14 @@ 'wishlist/mysql4_wishlist' => \Mage_Wishlist_Model_Mysql4_Wishlist::class, 'wishlist/mysql4_wishlist_collection' => \Mage_Wishlist_Model_Mysql4_Wishlist_Collection::class, 'wishlist/observer' => \Mage_Wishlist_Model_Observer::class, - 'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class, 'wishlist_resource/item' => \Mage_Wishlist_Model_Resource_Item::class, + 'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class, 'wishlist_resource/item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class, 'wishlist/resource_item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class, 'wishlist/resource_item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, 'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, - 'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, 'wishlist_resource/item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, + 'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, 'wishlist_resource/product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class, 'wishlist/resource_product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class, 'wishlist/resource_wishlist' => \Mage_Wishlist_Model_Resource_Wishlist::class, @@ -6367,7 +6354,6 @@ 'wishlist/resource_wishlist_collection' => \Mage_Wishlist_Model_Resource_Wishlist_Collection::class, 'wishlist/session' => \Mage_Wishlist_Model_Session::class, 'wishlist/wishlist' => \Mage_Wishlist_Model_Wishlist::class, - 'varien/autoload' => \Varien_Autoload::class, ]) ); } \ No newline at end of file diff --git a/.phpstorm.meta.php/magento_models_methods.meta.php b/.phpstorm.meta.php/magento_models_methods.meta.php index 79e27cc575a..8801d08ce0c 100644 --- a/.phpstorm.meta.php/magento_models_methods.meta.php +++ b/.phpstorm.meta.php/magento_models_methods.meta.php @@ -7,11 +7,10 @@ 'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class, 'adminnotification/mysql4_inbox_collection' => \Mage_AdminNotification_Model_Mysql4_Inbox_Collection::class, 'adminnotification/observer' => \Mage_AdminNotification_Model_Observer::class, - 'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, 'adminnotification/resource_inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, - 'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, + 'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, 'adminnotification/resource_inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, - 'adminnotification/survey' => \Mage_AdminNotification_Model_Survey::class, + 'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, 'admin/acl' => \Mage_Admin_Model_Acl::class, 'admin/acl_assert_ip' => \Mage_Admin_Model_Acl_Assert_Ip::class, 'admin/acl_assert_time' => \Mage_Admin_Model_Acl_Assert_Time::class, @@ -40,38 +39,38 @@ 'admin/redirectpolicy' => \Mage_Admin_Model_Redirectpolicy::class, 'admin/resource_acl' => \Mage_Admin_Model_Resource_Acl::class, 'admin_resource/acl' => \Mage_Admin_Model_Resource_Acl::class, - 'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, 'admin/resource_acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, + 'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, 'admin/resource_acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class, 'admin_resource/acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class, - 'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class, 'admin/resource_block' => \Mage_Admin_Model_Resource_Block::class, - 'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, + 'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class, 'admin/resource_block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, + 'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, 'admin_resource/permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class, 'admin/resource_permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class, - 'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class, 'admin/resource_role' => \Mage_Admin_Model_Resource_Role::class, + 'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class, 'admin/resource_role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class, 'admin_resource/role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class, - 'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class, 'admin_resource/roles' => \Mage_Admin_Model_Resource_Roles::class, - 'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, + 'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class, 'admin_resource/roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, - 'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, + 'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, 'admin/resource_roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, + 'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, 'admin/resource_rules' => \Mage_Admin_Model_Resource_Rules::class, 'admin_resource/rules' => \Mage_Admin_Model_Resource_Rules::class, 'admin_resource/rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, 'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, - 'admin_resource/user' => \Mage_Admin_Model_Resource_User::class, 'admin/resource_user' => \Mage_Admin_Model_Resource_User::class, + 'admin_resource/user' => \Mage_Admin_Model_Resource_User::class, 'admin/resource_user_collection' => \Mage_Admin_Model_Resource_User_Collection::class, 'admin_resource/user_collection' => \Mage_Admin_Model_Resource_User_Collection::class, - 'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class, 'admin_resource/variable' => \Mage_Admin_Model_Resource_Variable::class, - 'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, + 'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class, 'admin/resource_variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, + 'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, 'admin/role' => \Mage_Admin_Model_Role::class, 'admin/roles' => \Mage_Admin_Model_Roles::class, 'admin/rules' => \Mage_Admin_Model_Rules::class, @@ -106,6 +105,7 @@ 'adminhtml/system_config_backend_baseurl' => \Mage_Adminhtml_Model_System_Config_Backend_Baseurl::class, 'adminhtml/system_config_backend_cache' => \Mage_Adminhtml_Model_System_Config_Backend_Cache::class, 'adminhtml/system_config_backend_catalog_inventory_managestock' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock::class, + 'adminhtml/system_config_backend_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Separator::class, 'adminhtml/system_config_backend_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Type::class, 'adminhtml/system_config_backend_category' => \Mage_Adminhtml_Model_System_Config_Backend_Category::class, 'adminhtml/system_config_backend_cookie' => \Mage_Adminhtml_Model_System_Config_Backend_Cookie::class, @@ -158,12 +158,14 @@ 'adminhtml/system_config_source_catalog_listMode' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListMode::class, 'adminhtml/system_config_source_catalog_listPerPage' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListPerPage::class, 'adminhtml/system_config_source_catalog_listSort' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort::class, + 'adminhtml/system_config_source_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Separator::class, 'adminhtml/system_config_source_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Type::class, 'adminhtml/system_config_source_catalog_timeFormat' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_TimeFormat::class, 'adminhtml/system_config_source_category' => \Mage_Adminhtml_Model_System_Config_Source_Category::class, 'adminhtml/system_config_source_checktype' => \Mage_Adminhtml_Model_System_Config_Source_Checktype::class, 'adminhtml/system_config_source_cms_page' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Page::class, 'adminhtml/system_config_source_cms_wysiwyg_enabled' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Wysiwyg_Enabled::class, + 'adminhtml/system_config_source_cookie_samesite' => \Mage_Adminhtml_Model_System_Config_Source_Cookie_Samesite::class, 'adminhtml/system_config_source_country' => \Mage_Adminhtml_Model_System_Config_Source_Country::class, 'adminhtml/system_config_source_country_full' => \Mage_Adminhtml_Model_System_Config_Source_Country_Full::class, 'adminhtml/system_config_source_cron_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency::class, @@ -190,6 +192,7 @@ 'adminhtml/system_config_source_locale_timezone' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Timezone::class, 'adminhtml/system_config_source_locale_weekdaycodes' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdaycodes::class, 'adminhtml/system_config_source_locale_weekdays' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdays::class, + 'adminhtml/system_config_source_log_level' => \Mage_Adminhtml_Model_System_Config_Source_Log_Level::class, 'adminhtml/system_config_source_nooptreq' => \Mage_Adminhtml_Model_System_Config_Source_Nooptreq::class, 'adminhtml/system_config_source_notification_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Notification_Frequency::class, 'adminhtml/system_config_source_order_status' => \Mage_Adminhtml_Model_System_Config_Source_Order_Status::class, @@ -213,7 +216,6 @@ 'adminhtml/system_config_source_shipping_flatrate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Flatrate::class, 'adminhtml/system_config_source_shipping_tablerate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Tablerate::class, 'adminhtml/system_config_source_shipping_taxclass' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Taxclass::class, - 'adminhtml/system_config_source_startdateenddate' => \Mage_Adminhtml_Model_System_Config_Source_Startdateenddate::class, 'adminhtml/system_config_source_storage_media_database' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Database::class, 'adminhtml/system_config_source_storage_media_storage' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Storage::class, 'adminhtml/system_config_source_store' => \Mage_Adminhtml_Model_System_Config_Source_Store::class, @@ -269,22 +271,22 @@ 'api2_resource/acl_filter_attribute' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute::class, 'api2/resource_acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class, 'api2_resource/acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class, - 'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, 'api2_resource/acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, + 'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, 'api2/resource_acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class, 'api2_resource/acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class, 'api2_resource/acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class, 'api2/resource_acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class, 'api2/resource_acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class, 'api2_resource/acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class, - 'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class, 'api2/resource_setup' => \Mage_Api2_Model_Resource_Setup::class, + 'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class, 'api2/resource_validator' => \Mage_Api2_Model_Resource_Validator::class, 'api2_resource/validator' => \Mage_Api2_Model_Resource_Validator::class, 'api2/resource_validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class, 'api2_resource/validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class, - 'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, 'api2/resource_validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, + 'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, 'api2/response' => \Mage_Api2_Model_Response::class, 'api2/route_abstract' => \Mage_Api2_Model_Route_Abstract::class, 'api2/route_apiType' => \Mage_Api2_Model_Route_ApiType::class, @@ -316,8 +318,8 @@ 'api/mysql4_user_collection' => \Mage_Api_Model_Mysql4_User_Collection::class, 'api/resource_abstract' => \Mage_Api_Model_Resource_Abstract::class, 'api_resource/abstract' => \Mage_Api_Model_Resource_Abstract::class, - 'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class, 'api_resource/acl' => \Mage_Api_Model_Resource_Acl::class, + 'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class, 'api_resource/acl_role' => \Mage_Api_Model_Resource_Acl_Role::class, 'api/resource_acl_role' => \Mage_Api_Model_Resource_Acl_Role::class, 'api/resource_acl_role_collection' => \Mage_Api_Model_Resource_Acl_Role_Collection::class, @@ -326,18 +328,18 @@ 'api_resource/permissions_collection' => \Mage_Api_Model_Resource_Permissions_Collection::class, 'api_resource/role' => \Mage_Api_Model_Resource_Role::class, 'api/resource_role' => \Mage_Api_Model_Resource_Role::class, - 'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, 'api_resource/role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, + 'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, 'api/resource_roles' => \Mage_Api_Model_Resource_Roles::class, 'api_resource/roles' => \Mage_Api_Model_Resource_Roles::class, - 'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, 'api_resource/roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, - 'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, + 'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, 'api_resource/roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, - 'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class, + 'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, 'api_resource/rules' => \Mage_Api_Model_Resource_Rules::class, - 'api/resource_rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class, + 'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class, 'api_resource/rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class, + 'api/resource_rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class, 'api/resource_user' => \Mage_Api_Model_Resource_User::class, 'api_resource/user' => \Mage_Api_Model_Resource_User::class, 'api/resource_user_collection' => \Mage_Api_Model_Resource_User_Collection::class, @@ -364,15 +366,6 @@ 'authorizenet/directpost_request' => \Mage_Authorizenet_Model_Directpost_Request::class, 'authorizenet/directpost_response' => \Mage_Authorizenet_Model_Directpost_Response::class, 'authorizenet/directpost_session' => \Mage_Authorizenet_Model_Directpost_Session::class, - 'backup/backup' => \Mage_Backup_Model_Backup::class, - 'backup/config_backend_cron' => \Mage_Backup_Model_Config_Backend_Cron::class, - 'backup/config_source_type' => \Mage_Backup_Model_Config_Source_Type::class, - 'backup/db' => \Mage_Backup_Model_Db::class, - 'backup/fs_collection' => \Mage_Backup_Model_Fs_Collection::class, - 'backup/mysql4_db' => \Mage_Backup_Model_Mysql4_Db::class, - 'backup/observer' => \Mage_Backup_Model_Observer::class, - 'backup/resource_db' => \Mage_Backup_Model_Resource_Db::class, - 'backup/resource_helper_mysql4' => \Mage_Backup_Model_Resource_Helper_Mysql4::class, 'bundle/catalogIndex_data_bundle' => \Mage_Bundle_Model_CatalogIndex_Data_Bundle::class, 'bundle/mysql4_bundle' => \Mage_Bundle_Model_Mysql4_Bundle::class, 'bundle/mysql4_indexer_price' => \Mage_Bundle_Model_Mysql4_Indexer_Price::class, @@ -398,10 +391,10 @@ 'bundle_resource/option' => \Mage_Bundle_Model_Resource_Option::class, 'bundle/resource_option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class, 'bundle_resource/option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class, - 'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, 'bundle_resource/price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, - 'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class, + 'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, 'bundle_resource/selection' => \Mage_Bundle_Model_Resource_Selection::class, + 'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class, 'bundle_resource/selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class, 'bundle/resource_selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class, 'bundle/sales_order_pdf_items_abstract' => \Mage_Bundle_Model_Sales_Order_Pdf_Items_Abstract::class, @@ -417,8 +410,8 @@ 'captcha/config_form_frontend' => \Mage_Captcha_Model_Config_Form_Frontend::class, 'captcha/config_mode' => \Mage_Captcha_Model_Config_Mode::class, 'captcha/observer' => \Mage_Captcha_Model_Observer::class, - 'captcha_resource/log' => \Mage_Captcha_Model_Resource_Log::class, 'captcha/resource_log' => \Mage_Captcha_Model_Resource_Log::class, + 'captcha_resource/log' => \Mage_Captcha_Model_Resource_Log::class, 'captcha/zend' => \Mage_Captcha_Model_Zend::class, 'catalogindex/aggregation' => \Mage_CatalogIndex_Model_Aggregation::class, 'catalogindex/attribute' => \Mage_CatalogIndex_Model_Attribute::class, @@ -461,8 +454,8 @@ 'catalogindex/resource_data_abstract' => \Mage_CatalogIndex_Model_Resource_Data_Abstract::class, 'catalogindex_resource/data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class, 'catalogindex/resource_data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class, - 'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, 'catalogindex_resource/data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, + 'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, 'catalogindex_resource/indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class, 'catalogindex/resource_indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class, 'catalogindex/resource_indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class, @@ -494,20 +487,20 @@ 'cataloginventory/mysql4_stock_item_collection' => \Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection::class, 'cataloginventory/mysql4_stock_status' => \Mage_CatalogInventory_Model_Mysql4_Stock_Status::class, 'cataloginventory/observer' => \Mage_CatalogInventory_Model_Observer::class, - 'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, 'cataloginventory_resource/indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, + 'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, 'cataloginventory/resource_indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class, 'cataloginventory_resource/indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class, - 'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, 'cataloginventory/resource_indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, + 'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, 'cataloginventory/resource_indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class, 'cataloginventory_resource/indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class, 'cataloginventory_resource/stock' => \Mage_CatalogInventory_Model_Resource_Stock::class, 'cataloginventory/resource_stock' => \Mage_CatalogInventory_Model_Resource_Stock::class, - 'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, 'cataloginventory/resource_stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, - 'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, + 'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, 'cataloginventory/resource_stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, + 'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, 'cataloginventory/resource_stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class, 'cataloginventory_resource/stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class, 'cataloginventory/source_backorders' => \Mage_CatalogInventory_Model_Source_Backorders::class, @@ -530,8 +523,8 @@ 'catalogrule/observer' => \Mage_CatalogRule_Model_Observer::class, 'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class, 'catalogrule/resource_rule' => \Mage_CatalogRule_Model_Resource_Rule::class, - 'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, 'catalogrule_resource/rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, + 'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, 'catalogrule_resource/rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class, 'catalogrule/resource_rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class, 'catalogrule_resource/rule_product_price_collection' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price_Collection::class, @@ -560,24 +553,24 @@ 'catalogsearch/query' => \Mage_CatalogSearch_Model_Query::class, 'catalogsearch_resource/advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class, 'catalogsearch/resource_advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class, - 'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, 'catalogsearch_resource/advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, + 'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, 'catalogsearch_resource/fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class, 'catalogsearch/resource_fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class, 'catalogsearch_resource/fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class, 'catalogsearch/resource_fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class, - 'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, 'catalogsearch_resource/fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, - 'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, + 'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, 'catalogsearch/resource_helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, - 'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, + 'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, 'catalogsearch_resource/indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, - 'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class, + 'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, 'catalogsearch_resource/query' => \Mage_CatalogSearch_Model_Resource_Query::class, - 'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, + 'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class, 'catalogsearch_resource/query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, - 'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, + 'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, 'catalogsearch/resource_search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, + 'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, 'catalogsearch/session' => \Mage_CatalogSearch_Model_Session::class, 'catalogsearch/system_config_backend_sitemap' => \Mage_CatalogSearch_Model_System_Config_Backend_Sitemap::class, 'catalog/abstract' => \Mage_Catalog_Model_Abstract::class, @@ -720,144 +713,144 @@ 'catalog/product_website' => \Mage_Catalog_Model_Product_Website::class, 'catalog/resource_abstract' => \Mage_Catalog_Model_Resource_Abstract::class, 'catalog_resource/abstract' => \Mage_Catalog_Model_Resource_Abstract::class, - 'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class, 'catalog/resource_attribute' => \Mage_Catalog_Model_Resource_Attribute::class, - 'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class, + 'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class, 'catalog_resource/category' => \Mage_Catalog_Model_Resource_Category::class, + 'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class, 'catalog_resource/category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class, 'catalog/resource_category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class, - 'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, 'catalog/resource_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, - 'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, + 'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, 'catalog/resource_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, + 'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, 'catalog_resource/category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class, 'catalog/resource_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class, 'catalog_resource/category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class, 'catalog/resource_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class, 'catalog/resource_category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class, 'catalog_resource/category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class, - 'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, 'catalog_resource/category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, - 'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, + 'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, 'catalog/resource_category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, + 'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, 'catalog_resource/category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class, 'catalog/resource_category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class, 'catalog/resource_category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class, 'catalog_resource/category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class, - 'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, 'catalog_resource/collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, + 'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, 'catalog_resource/config' => \Mage_Catalog_Model_Resource_Config::class, 'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class, - 'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, 'catalog/resource_eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, + 'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, 'catalog_resource/eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class, 'catalog/resource_eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class, 'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, 'catalog_resource/eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, - 'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, 'catalog/resource_eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, - 'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, + 'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, 'catalog_resource/eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, + 'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, 'catalog_resource/eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, - 'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, + 'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, 'catalog_resource/eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, + 'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, 'catalog/resource_eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class, 'catalog_resource/eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class, 'catalog/resource_eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class, 'catalog_resource/eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class, 'catalog/resource_eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class, 'catalog_resource/eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class, - 'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, 'catalog/resource_eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, + 'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, 'catalog/resource_eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, 'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, 'catalog/resource_eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class, 'catalog_resource/eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class, - 'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, 'catalog_resource/eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, - 'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, + 'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, 'catalog_resource/eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, + 'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, 'catalog_resource/eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class, 'catalog/resource_eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class, - 'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, 'catalog_resource/eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, + 'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, 'catalog/resource_eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, 'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, - 'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, 'catalog/resource_eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, - 'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, + 'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, 'catalog/resource_eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, - 'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, + 'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, 'catalog_resource/eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, + 'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, 'catalog_resource/eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, 'catalog_resource/eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, 'catalog/resource_eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class, 'catalog/resource_eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, + 'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, 'catalog/resource_eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class, 'catalog/resource_eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class, 'catalog_resource/eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class, 'catalog_resource/eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class, 'catalog/resource_eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class, - 'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, 'catalog_resource/eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, - 'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, + 'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, 'catalog_resource/eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, - 'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, + 'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, 'catalog_resource/eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, + 'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, 'catalog/resource_eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class, 'catalog/resource_eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class, 'catalog/resource_eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class, - 'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, 'catalog/resource_eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, - 'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, + 'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, 'catalog_resource/eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, + 'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, 'catalog_resource/eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class, 'catalog/resource_eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class, - 'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, 'catalog/resource_eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, - 'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, + 'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, 'catalog/resource_eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, + 'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, 'catalog/resource_eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class, 'catalog_resource/eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class, - 'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, 'catalog/resource_eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, + 'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, 'catalog_resource/eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class, 'catalog/resource_eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class, 'catalog_resource/eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class, 'catalog/resource_eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class, - 'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, 'catalog/resource_eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, - 'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, + 'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, 'catalog_resource/eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, - 'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, + 'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, 'catalog/resource_eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, + 'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, 'catalog/resource_eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, 'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, - 'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, 'catalog/resource_eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, + 'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, 'catalog/resource_eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class, 'catalog_resource/eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class, - 'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, 'catalog_resource/eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, - 'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, + 'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, 'catalog/resource_eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, - 'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, + 'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, 'catalog/resource_eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, + 'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, 'catalog_resource/eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, + 'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, 'catalog/resource_eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class, 'catalog_resource/eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class, 'catalog/resource_eav_mysql4_sendfriend' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend::class, @@ -866,16 +859,16 @@ 'catalog/resource_eav_mysql4_sendfriend_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection::class, 'catalog_resource/eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class, 'catalog/resource_eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class, - 'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, 'catalog/resource_eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, - 'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, + 'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, 'catalog/resource_helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, + 'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, 'catalog_resource/layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class, 'catalog/resource_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class, 'catalog/resource_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class, 'catalog_resource/layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class, - 'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, 'catalog/resource_layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, + 'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, 'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class, 'catalog_resource/product' => \Mage_Catalog_Model_Resource_Product::class, 'catalog/resource_product_action' => \Mage_Catalog_Model_Resource_Product_Action::class, @@ -886,42 +879,42 @@ 'catalog_resource/product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class, 'catalog/resource_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class, 'catalog_resource/product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class, - 'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, 'catalog/resource_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, - 'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, + 'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, 'catalog_resource/product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, + 'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, 'catalog/resource_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class, - 'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, 'catalog_resource/product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, - 'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, + 'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, 'catalog/resource_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, - 'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, + 'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, 'catalog_resource/product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, - 'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, + 'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, + 'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, 'catalog_resource/product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class, 'catalog/resource_product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class, - 'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, 'catalog/resource_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, + 'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, 'catalog/resource_product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class, 'catalog_resource/product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class, - 'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, 'catalog/resource_product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, + 'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, 'catalog/resource_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class, 'catalog_resource/product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class, - 'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, 'catalog_resource/product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, - 'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, + 'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, 'catalog/resource_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, + 'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, 'catalog/resource_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class, 'catalog_resource/product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class, - 'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, 'catalog_resource/product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, + 'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, 'catalog_resource/product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, 'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, - 'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, 'catalog_resource/product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, + 'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, 'catalog/resource_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class, 'catalog_resource/product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class, 'catalog_resource/product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class, @@ -932,12 +925,12 @@ 'catalog_resource/product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class, 'catalog/resource_product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, 'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, - 'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, 'catalog_resource/product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, - 'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, + 'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, 'catalog/resource_product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, - 'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, + 'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, 'catalog_resource/product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, + 'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, 'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, 'catalog_resource/product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, 'catalog_resource/product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class, @@ -946,14 +939,14 @@ 'catalog/resource_product_status' => \Mage_Catalog_Model_Resource_Product_Status::class, 'catalog_resource/product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class, 'catalog/resource_product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class, - 'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, 'catalog/resource_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, - 'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, + 'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, 'catalog_resource/product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, + 'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, 'catalog_resource/product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class, 'catalog/resource_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class, - 'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, 'catalog_resource/product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, + 'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, 'catalog/resource_setup' => \Mage_Catalog_Model_Resource_Setup::class, 'catalog_resource/setup' => \Mage_Catalog_Model_Resource_Setup::class, 'catalog_resource/url' => \Mage_Catalog_Model_Resource_Url::class, @@ -999,12 +992,12 @@ 'checkout/observer' => \Mage_Checkout_Model_Observer::class, 'checkout_resource/agreement' => \Mage_Checkout_Model_Resource_Agreement::class, 'checkout/resource_agreement' => \Mage_Checkout_Model_Resource_Agreement::class, - 'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, 'checkout/resource_agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, - 'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class, + 'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, 'checkout_resource/cart' => \Mage_Checkout_Model_Resource_Cart::class, - 'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class, + 'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class, 'checkout/resource_setup' => \Mage_Checkout_Model_Resource_Setup::class, + 'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class, 'checkout/session' => \Mage_Checkout_Model_Session::class, 'checkout/type_abstract' => \Mage_Checkout_Model_Type_Abstract::class, 'checkout/type_multishipping' => \Mage_Checkout_Model_Type_Multishipping::class, @@ -1019,25 +1012,25 @@ 'cms/mysql4_page_service' => \Mage_Cms_Model_Mysql4_Page_Service::class, 'cms/observer' => \Mage_Cms_Model_Observer::class, 'cms/page' => \Mage_Cms_Model_Page::class, - 'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class, 'cms/resource_block' => \Mage_Cms_Model_Resource_Block::class, + 'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class, 'cms_resource/block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class, 'cms/resource_block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class, 'cms/resource_page' => \Mage_Cms_Model_Resource_Page::class, 'cms_resource/page' => \Mage_Cms_Model_Resource_Page::class, - 'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, 'cms_resource/page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, - 'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class, + 'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, 'cms/resource_page_service' => \Mage_Cms_Model_Resource_Page_Service::class, + 'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class, 'cms/template_filter' => \Mage_Cms_Model_Template_Filter::class, 'cms/wysiwyg_config' => \Mage_Cms_Model_Wysiwyg_Config::class, 'cms/wysiwyg_images_storage' => \Mage_Cms_Model_Wysiwyg_Images_Storage::class, 'cms/wysiwyg_images_storage_collection' => \Mage_Cms_Model_Wysiwyg_Images_Storage_Collection::class, 'configurableswatches/observer' => \Mage_ConfigurableSwatches_Model_Observer::class, - 'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, 'configurableswatches_resource/catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, - 'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, + 'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, 'configurableswatches_resource/catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, + 'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, 'configurableswatches_resource/catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class, 'configurableswatches/resource_catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class, 'configurableswatches/system_config_source_catalog_product_configattribute' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute::class, @@ -1144,152 +1137,152 @@ 'core/mysql4_website_collection' => \Mage_Core_Model_Mysql4_Website_Collection::class, 'core/observer' => \Mage_Core_Model_Observer::class, 'core/resource' => \Mage_Core_Model_Resource::class, + 'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, 'core_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, 'core/resource_abstract' => \Mage_Core_Model_Resource_Abstract::class, - 'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, + 'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class, 'core/resource_cache' => \Mage_Core_Model_Resource_Cache::class, 'core_resource/cache' => \Mage_Core_Model_Resource_Cache::class, - 'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class, - 'core_resource/config' => \Mage_Core_Model_Resource_Config::class, 'payment_resource/config' => \Mage_Core_Model_Resource_Config::class, 'core/resource_config' => \Mage_Core_Model_Resource_Config::class, - 'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, + 'core_resource/config' => \Mage_Core_Model_Resource_Config::class, 'core/resource_config_data' => \Mage_Core_Model_Resource_Config_Data::class, + 'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, 'payment_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, - 'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'core_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, - 'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, - 'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, + 'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'payment_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, - 'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, + 'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, + 'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, 'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, 'core/resource_db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, - 'core/resource_design' => \Mage_Core_Model_Resource_Design::class, + 'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, 'core_resource/design' => \Mage_Core_Model_Resource_Design::class, + 'core/resource_design' => \Mage_Core_Model_Resource_Design::class, 'payment_resource/design' => \Mage_Core_Model_Resource_Design::class, - 'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, 'payment_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, + 'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, 'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, - 'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, 'payment_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, 'core/resource_design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, + 'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, 'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, 'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, 'core/resource_email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, - 'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, - 'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, 'payment_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, - 'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, + 'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, + 'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, 'core/resource_email_template' => \Mage_Core_Model_Resource_Email_Template::class, 'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, - 'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, + 'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, 'core/resource_email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, + 'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, 'core_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, - 'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, - 'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, 'core_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, - 'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, - 'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, + 'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, 'core_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, 'payment_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, 'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, - 'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, + 'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, 'payment_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, 'core/resource_file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, - 'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, + 'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, 'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, 'core/resource_file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, - 'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, 'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, - 'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, 'core/resource_file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, - 'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class, - 'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class, + 'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, 'payment_resource/flag' => \Mage_Core_Model_Resource_Flag::class, + 'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class, + 'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class, 'payment_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, - 'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, 'core_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, - 'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, + 'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, 'core/resource_helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, + 'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, 'core_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, 'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, 'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, 'core/resource_iterator' => \Mage_Core_Model_Resource_Iterator::class, - 'core_resource/language' => \Mage_Core_Model_Resource_Language::class, 'payment_resource/language' => \Mage_Core_Model_Resource_Language::class, + 'core_resource/language' => \Mage_Core_Model_Resource_Language::class, 'core/resource_language' => \Mage_Core_Model_Resource_Language::class, 'payment_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, - 'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, 'core/resource_language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, - 'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class, + 'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, 'core_resource/layout' => \Mage_Core_Model_Resource_Layout::class, 'core/resource_layout' => \Mage_Core_Model_Resource_Layout::class, + 'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class, 'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class, - 'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class, 'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class, + 'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class, 'core/resource_session' => \Mage_Core_Model_Resource_Session::class, - 'core_resource/session' => \Mage_Core_Model_Resource_Session::class, 'payment_resource/session' => \Mage_Core_Model_Resource_Session::class, + 'core_resource/session' => \Mage_Core_Model_Resource_Session::class, 'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class, 'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class, 'payment_resource/setup' => \Mage_Core_Model_Resource_Setup::class, - 'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core/resource_setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, + 'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'payment_resource/store' => \Mage_Core_Model_Resource_Store::class, 'core_resource/store' => \Mage_Core_Model_Resource_Store::class, 'core/resource_store' => \Mage_Core_Model_Resource_Store::class, - 'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, 'core/resource_store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, + 'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, 'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, - 'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'core/resource_store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'payment_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, - 'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, - 'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, + 'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'payment_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, + 'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, + 'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, 'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, - 'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class, 'core_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, - 'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class, - 'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class, + 'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class, 'core_resource/translate' => \Mage_Core_Model_Resource_Translate::class, - 'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, - 'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class, + 'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class, + 'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class, 'payment_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, - 'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class, + 'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, 'core/resource_type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, 'payment_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'core/resource_type_db' => \Mage_Core_Model_Resource_Type_Db::class, - 'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'core_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, 'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, 'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, - 'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, - 'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, 'payment_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, 'payment_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, - 'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, 'core_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, - 'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, - 'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, + 'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, 'payment_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, + 'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, + 'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, 'core_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'core_resource/variable' => \Mage_Core_Model_Resource_Variable::class, - 'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class, 'core/resource_variable' => \Mage_Core_Model_Resource_Variable::class, + 'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class, 'core/resource_variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, - 'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, 'core_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, + 'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, + 'core/resource_website' => \Mage_Core_Model_Resource_Website::class, 'core_resource/website' => \Mage_Core_Model_Resource_Website::class, 'payment_resource/website' => \Mage_Core_Model_Resource_Website::class, - 'core/resource_website' => \Mage_Core_Model_Resource_Website::class, - 'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core/resource_website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, + 'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core/session' => \Mage_Core_Model_Session::class, 'core/session_abstract' => \Mage_Core_Model_Session_Abstract::class, @@ -1319,10 +1312,10 @@ 'cron/mysql4_schedule' => \Mage_Cron_Model_Mysql4_Schedule::class, 'cron/mysql4_schedule_collection' => \Mage_Cron_Model_Mysql4_Schedule_Collection::class, 'cron/observer' => \Mage_Cron_Model_Observer::class, - 'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class, 'cron/resource_schedule' => \Mage_Cron_Model_Resource_Schedule::class, - 'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, + 'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class, 'cron/resource_schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, + 'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, 'cron/schedule' => \Mage_Cron_Model_Schedule::class, 'currencysymbol/observer' => \Mage_CurrencySymbol_Model_Observer::class, 'currencysymbol/system_currencysymbol' => \Mage_CurrencySymbol_Model_System_Currencysymbol::class, @@ -1397,16 +1390,16 @@ 'customer_resource/address' => \Mage_Customer_Model_Resource_Address::class, 'customer/resource_address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class, 'customer_resource/address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class, - 'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, 'customer_resource/address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, - 'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, + 'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, 'customer/resource_address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, - 'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, + 'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, 'customer/resource_address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, - 'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, + 'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, 'customer_resource/address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, - 'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, + 'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, 'customer_resource/address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, + 'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, 'customer/resource_attribute' => \Mage_Customer_Model_Resource_Attribute::class, 'customer_resource/attribute' => \Mage_Customer_Model_Resource_Attribute::class, 'customer_resource/attribute_collection' => \Mage_Customer_Model_Resource_Attribute_Collection::class, @@ -1415,22 +1408,22 @@ 'customer_resource/customer' => \Mage_Customer_Model_Resource_Customer::class, 'customer_resource/customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class, 'customer/resource_customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class, - 'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, 'customer/resource_flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, - 'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, + 'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, 'customer/resource_flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, - 'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, + 'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, 'customer/resource_form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, - 'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, + 'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, 'customer/resource_form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, + 'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, 'customer/resource_group' => \Mage_Customer_Model_Resource_Group::class, 'customer_resource/group' => \Mage_Customer_Model_Resource_Group::class, 'customer_resource/group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class, 'customer/resource_group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class, - 'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class, 'customer_resource/setup' => \Mage_Customer_Model_Resource_Setup::class, - 'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, + 'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class, 'customer_resource/wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, + 'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, 'customer/session' => \Mage_Customer_Model_Session::class, 'dataflow/batch' => \Mage_Dataflow_Model_Batch::class, 'dataflow/batch_abstract' => \Mage_Dataflow_Model_Batch_Abstract::class, @@ -1482,10 +1475,10 @@ 'dataflow/mysql4_session' => \Mage_Dataflow_Model_Mysql4_Session::class, 'dataflow/profile' => \Mage_Dataflow_Model_Profile::class, 'dataflow/profile_history' => \Mage_Dataflow_Model_Profile_History::class, - 'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class, 'dataflow/resource_batch' => \Mage_Dataflow_Model_Resource_Batch::class, - 'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, + 'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class, 'dataflow/resource_batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, + 'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, 'dataflow/resource_batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class, 'dataflow_resource/batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class, 'dataflow_resource/batch_export' => \Mage_Dataflow_Model_Resource_Batch_Export::class, @@ -1496,12 +1489,12 @@ 'dataflow/resource_import' => \Mage_Dataflow_Model_Resource_Import::class, 'dataflow_resource/import_collection' => \Mage_Dataflow_Model_Resource_Import_Collection::class, 'dataflow/resource_import_collection' => \Mage_Dataflow_Model_Resource_Import_Collection::class, - 'dataflow_resource/profile' => \Mage_Dataflow_Model_Resource_Profile::class, 'dataflow/resource_profile' => \Mage_Dataflow_Model_Resource_Profile::class, + 'dataflow_resource/profile' => \Mage_Dataflow_Model_Resource_Profile::class, 'dataflow/resource_profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class, 'dataflow_resource/profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class, - 'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, 'dataflow_resource/profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, + 'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, 'dataflow_resource/profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class, 'dataflow/resource_profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class, 'dataflow_resource/session' => \Mage_Dataflow_Model_Resource_Session::class, @@ -1535,8 +1528,8 @@ 'directory/resource_country' => \Mage_Directory_Model_Resource_Country::class, 'directory_resource/country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class, 'directory/resource_country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class, - 'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class, 'directory/resource_country_format' => \Mage_Directory_Model_Resource_Country_Format::class, + 'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class, 'directory_resource/country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class, 'directory/resource_country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class, 'directory_resource/currency' => \Mage_Directory_Model_Resource_Currency::class, @@ -1567,8 +1560,8 @@ 'downloadable/observer' => \Mage_Downloadable_Model_Observer::class, 'downloadable/product_price' => \Mage_Downloadable_Model_Product_Price::class, 'downloadable/product_type' => \Mage_Downloadable_Model_Product_Type::class, - 'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, 'downloadable_resource/indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, + 'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, 'downloadable/resource_link' => \Mage_Downloadable_Model_Resource_Link::class, 'downloadable_resource/link' => \Mage_Downloadable_Model_Resource_Link::class, 'downloadable/resource_link_collection' => \Mage_Downloadable_Model_Resource_Link_Collection::class, @@ -1577,12 +1570,12 @@ 'downloadable_resource/link_purchased' => \Mage_Downloadable_Model_Resource_Link_Purchased::class, 'downloadable/resource_link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class, 'downloadable_resource/link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class, - 'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, 'downloadable/resource_link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, + 'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, 'downloadable/resource_link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, 'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, - 'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class, 'downloadable/resource_sample' => \Mage_Downloadable_Model_Resource_Sample::class, + 'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class, 'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, 'downloadable/resource_sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, 'downloadable/sales_order_pdf_items_abstract' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Abstract::class, @@ -1670,46 +1663,46 @@ 'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class, 'eav_resource/attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class, 'eav/resource_attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class, - 'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class, 'eav_resource/config' => \Mage_Eav_Model_Resource_Config::class, + 'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class, 'eav/resource_entity_attribute' => \Mage_Eav_Model_Resource_Entity_Attribute::class, 'eav_resource/entity_attribute' => \Mage_Eav_Model_Resource_Entity_Attribute::class, 'eav_resource/entity_attribute_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Collection::class, 'eav/resource_entity_attribute_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Collection::class, 'eav_resource/entity_attribute_group' => \Mage_Eav_Model_Resource_Entity_Attribute_Group::class, 'eav/resource_entity_attribute_group' => \Mage_Eav_Model_Resource_Entity_Attribute_Group::class, - 'eav/resource_entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class, 'eav_resource/entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class, + 'eav/resource_entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class, 'eav/resource_entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class, 'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class, - 'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, 'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, - 'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, + 'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, 'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, - 'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, + 'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, 'eav_resource/entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, + 'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, 'eav_resource/entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class, 'eav/resource_entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class, 'eav_resource/entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class, 'eav/resource_entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class, - 'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, 'eav_resource/entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, + 'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, 'eav/resource_form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class, 'eav_resource/form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class, - 'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, 'eav/resource_form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, + 'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, 'eav/resource_form_element' => \Mage_Eav_Model_Resource_Form_Element::class, 'eav_resource/form_element' => \Mage_Eav_Model_Resource_Form_Element::class, - 'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, 'eav_resource/form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, - 'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, + 'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, 'eav/resource_form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, + 'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, 'eav_resource/form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, 'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, 'eav/resource_form_type' => \Mage_Eav_Model_Resource_Form_Type::class, 'eav_resource/form_type' => \Mage_Eav_Model_Resource_Form_Type::class, - 'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class, 'eav_resource/form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class, + 'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class, 'eav_resource/helper_mysql4' => \Mage_Eav_Model_Resource_Helper_Mysql4::class, 'eav/resource_helper_mysql4' => \Mage_Eav_Model_Resource_Helper_Mysql4::class, 'giftmessage/api' => \Mage_GiftMessage_Model_Api::class, @@ -1721,12 +1714,12 @@ 'giftmessage/mysql4_message_collection' => \Mage_GiftMessage_Model_Mysql4_Message_Collection::class, 'giftmessage/mysql4_setup' => \Mage_GiftMessage_Model_Mysql4_Setup::class, 'giftmessage/observer' => \Mage_GiftMessage_Model_Observer::class, - 'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class, 'giftmessage/resource_message' => \Mage_GiftMessage_Model_Resource_Message::class, - 'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, + 'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class, 'giftmessage_resource/message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, - 'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class, + 'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, 'giftmessage_resource/setup' => \Mage_GiftMessage_Model_Resource_Setup::class, + 'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class, 'googleanalytics/observer' => \Mage_GoogleAnalytics_Model_Observer::class, 'googleanalytics/system_config_source_type' => \Mage_GoogleAnalytics_Model_System_Config_Source_Type::class, 'googlecheckout/payment' => \Mage_GoogleCheckout_Model_Payment::class, @@ -1762,8 +1755,8 @@ 'importexport/product_attribute_backend_urlkey' => \Mage_ImportExport_Model_Product_Attribute_Backend_Urlkey::class, 'importexport_resource/helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class, 'importexport/resource_helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class, - 'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, 'importexport_resource/import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, + 'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, 'importexport_resource/setup' => \Mage_ImportExport_Model_Resource_Setup::class, 'importexport/resource_setup' => \Mage_ImportExport_Model_Resource_Setup::class, 'importexport/source_export_entity' => \Mage_ImportExport_Model_Source_Export_Entity::class, @@ -1785,16 +1778,16 @@ 'index/process' => \Mage_Index_Model_Process::class, 'index_resource/abstract' => \Mage_Index_Model_Resource_Abstract::class, 'index/resource_abstract' => \Mage_Index_Model_Resource_Abstract::class, - 'index/resource_event' => \Mage_Index_Model_Resource_Event::class, 'index_resource/event' => \Mage_Index_Model_Resource_Event::class, + 'index/resource_event' => \Mage_Index_Model_Resource_Event::class, 'index/resource_event_collection' => \Mage_Index_Model_Resource_Event_Collection::class, 'index_resource/event_collection' => \Mage_Index_Model_Resource_Event_Collection::class, 'index/resource_helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class, 'index_resource/helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class, - 'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, 'index/resource_lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, - 'index_resource/process' => \Mage_Index_Model_Resource_Process::class, + 'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, 'index/resource_process' => \Mage_Index_Model_Resource_Process::class, + 'index_resource/process' => \Mage_Index_Model_Resource_Process::class, 'index/resource_process_collection' => \Mage_Index_Model_Resource_Process_Collection::class, 'index_resource/process_collection' => \Mage_Index_Model_Resource_Process_Collection::class, 'index/resource_setup' => \Mage_Index_Model_Resource_Setup::class, @@ -1827,22 +1820,22 @@ 'log/mysql4_visitor_online_collection' => \Mage_Log_Model_Mysql4_Visitor_Online_Collection::class, 'log_resource/aggregation' => \Mage_Log_Model_Resource_Aggregation::class, 'log/resource_aggregation' => \Mage_Log_Model_Resource_Aggregation::class, - 'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class, 'log/resource_customer' => \Mage_Log_Model_Resource_Customer::class, + 'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class, 'log/resource_log' => \Mage_Log_Model_Resource_Log::class, 'log_resource/log' => \Mage_Log_Model_Resource_Log::class, 'log_resource/visitor' => \Mage_Log_Model_Resource_Visitor::class, 'log/resource_visitor' => \Mage_Log_Model_Resource_Visitor::class, 'log_resource/visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class, 'log/resource_visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class, - 'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, 'log_resource/visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, - 'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, + 'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, 'log_resource/visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, + 'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, 'log/visitor' => \Mage_Log_Model_Visitor::class, 'log/visitor_online' => \Mage_Log_Model_Visitor_Online::class, - 'media_resource/image' => \Mage_Media_Model_File_Image::class, 'media/file_image' => \Mage_Media_Model_File_Image::class, + 'media_resource/image' => \Mage_Media_Model_File_Image::class, 'media/image' => \Mage_Media_Model_Image::class, 'newsletter/message' => \Mage_Newsletter_Model_Message::class, 'newsletter/mysql4_problem' => \Mage_Newsletter_Model_Mysql4_Problem::class, @@ -1860,14 +1853,14 @@ 'newsletter_resource/problem' => \Mage_Newsletter_Model_Resource_Problem::class, 'newsletter/resource_problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class, 'newsletter_resource/problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class, - 'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class, 'newsletter/resource_queue' => \Mage_Newsletter_Model_Resource_Queue::class, - 'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, + 'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class, 'newsletter/resource_queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, - 'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, + 'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, 'newsletter/resource_subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, - 'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, + 'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, 'newsletter/resource_subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, + 'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, 'newsletter_resource/template' => \Mage_Newsletter_Model_Resource_Template::class, 'newsletter/resource_template' => \Mage_Newsletter_Model_Resource_Template::class, 'newsletter_resource/template_collection' => \Mage_Newsletter_Model_Resource_Template_Collection::class, @@ -1880,20 +1873,20 @@ 'oauth/consumer_validator_keyLength' => \Mage_Oauth_Model_Consumer_Validator_KeyLength::class, 'oauth/nonce' => \Mage_Oauth_Model_Nonce::class, 'oauth/observer' => \Mage_Oauth_Model_Observer::class, - 'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class, 'oauth/resource_consumer' => \Mage_Oauth_Model_Resource_Consumer::class, + 'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class, 'oauth/resource_consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class, 'oauth_resource/consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class, 'oauth_resource/nonce' => \Mage_Oauth_Model_Resource_Nonce::class, 'oauth/resource_nonce' => \Mage_Oauth_Model_Resource_Nonce::class, 'oauth_resource/nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class, 'oauth/resource_nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class, - 'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class, 'oauth/resource_setup' => \Mage_Oauth_Model_Resource_Setup::class, - 'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class, + 'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class, 'oauth_resource/token' => \Mage_Oauth_Model_Resource_Token::class, - 'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, + 'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class, 'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, + 'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth/server' => \Mage_Oauth_Model_Server::class, 'oauth/token' => \Mage_Oauth_Model_Token::class, 'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class, @@ -1910,8 +1903,8 @@ 'paygate/authorizenet_source_paymentAction' => \Mage_Paygate_Model_Authorizenet_Source_PaymentAction::class, 'paygate/mysql4_authorizenet_debug' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug::class, 'paygate/mysql4_authorizenet_debug_collection' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection::class, - 'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, 'paygate/resource_authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, + 'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, 'paygate_resource/authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class, 'paygate/resource_authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class, 'payment/billing_agreementAbstract' => \Mage_Payment_Model_Billing_AgreementAbstract::class, @@ -1974,12 +1967,12 @@ 'paypal/resource_cert' => \Mage_Paypal_Model_Resource_Cert::class, 'paypal_resource/payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class, 'paypal/resource_payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class, - 'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, 'paypal/resource_payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, + 'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, 'paypal/resource_report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class, 'paypal_resource/report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class, - 'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, 'paypal/resource_report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, + 'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, 'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, 'paypal/resource_report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, 'paypal/resource_setup' => \Mage_Paypal_Model_Resource_Setup::class, @@ -2004,8 +1997,8 @@ 'persistent/observer' => \Mage_Persistent_Model_Observer::class, 'persistent/observer_session' => \Mage_Persistent_Model_Observer_Session::class, 'persistent/persistent_config' => \Mage_Persistent_Model_Persistent_Config::class, - 'persistent/resource_session' => \Mage_Persistent_Model_Resource_Session::class, 'persistent_resource/session' => \Mage_Persistent_Model_Resource_Session::class, + 'persistent/resource_session' => \Mage_Persistent_Model_Resource_Session::class, 'persistent/session' => \Mage_Persistent_Model_Session::class, 'poll/mysql4_poll' => \Mage_Poll_Model_Mysql4_Poll::class, 'poll/mysql4_poll_answer' => \Mage_Poll_Model_Mysql4_Poll_Answer::class, @@ -2015,16 +2008,16 @@ 'poll/poll' => \Mage_Poll_Model_Poll::class, 'poll/poll_answer' => \Mage_Poll_Model_Poll_Answer::class, 'poll/poll_vote' => \Mage_Poll_Model_Poll_Vote::class, - 'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class, 'poll_resource/poll' => \Mage_Poll_Model_Resource_Poll::class, + 'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class, 'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, 'poll/resource_poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, - 'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, 'poll_resource/poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, - 'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, + 'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, 'poll_resource/poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, - 'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, + 'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, 'poll/resource_poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, + 'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, 'productalert/email' => \Mage_ProductAlert_Model_Email::class, 'productalert/mysql4_price' => \Mage_ProductAlert_Model_Mysql4_Price::class, 'productalert/mysql4_price_collection' => \Mage_ProductAlert_Model_Mysql4_Price_Collection::class, @@ -2034,20 +2027,20 @@ 'productalert/mysql4_stock_customer_collection' => \Mage_ProductAlert_Model_Mysql4_Stock_Customer_Collection::class, 'productalert/observer' => \Mage_ProductAlert_Model_Observer::class, 'productalert/price' => \Mage_ProductAlert_Model_Price::class, - 'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, 'productalert_resource/abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, - 'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class, + 'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, 'productalert_resource/price' => \Mage_ProductAlert_Model_Resource_Price::class, - 'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, + 'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class, 'productalert/resource_price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, - 'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, + 'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, 'productalert/resource_price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, + 'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, 'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class, 'productalert/resource_stock' => \Mage_ProductAlert_Model_Resource_Stock::class, - 'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, 'productalert/resource_stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, - 'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, + 'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, 'productalert/resource_stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, + 'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, 'productalert/stock' => \Mage_ProductAlert_Model_Stock::class, 'rating/mysql4_rating' => \Mage_Rating_Model_Mysql4_Rating::class, 'rating/mysql4_rating_collection' => \Mage_Rating_Model_Mysql4_Rating_Collection::class, @@ -2061,20 +2054,20 @@ 'rating/rating_entity' => \Mage_Rating_Model_Rating_Entity::class, 'rating/rating_option' => \Mage_Rating_Model_Rating_Option::class, 'rating/rating_option_vote' => \Mage_Rating_Model_Rating_Option_Vote::class, - 'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class, 'rating/resource_rating' => \Mage_Rating_Model_Resource_Rating::class, + 'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class, 'rating_resource/rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class, 'rating/resource_rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class, 'rating/resource_rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class, 'rating_resource/rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class, - 'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, 'rating/resource_rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, - 'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, + 'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, 'rating_resource/rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, + 'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, 'rating_resource/rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class, 'rating/resource_rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class, - 'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, 'rating/resource_rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, + 'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, 'reports/config' => \Mage_Reports_Model_Config::class, 'reports/event' => \Mage_Reports_Model_Event::class, 'reports/event_observer' => \Mage_Reports_Model_Event_Observer::class, @@ -2120,6 +2113,7 @@ 'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class, 'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class, 'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class, + 'reports/observer' => \Mage_Reports_Model_Observer::class, 'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class, 'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class, 'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class, @@ -2128,88 +2122,88 @@ 'reports_resource/accounts_collection' => \Mage_Reports_Model_Resource_Accounts_Collection::class, 'reports/resource_coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class, 'reports_resource/coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class, - 'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, 'reports/resource_customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, - 'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, + 'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, 'reports/resource_customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, - 'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, + 'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, 'reports_resource/customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, - 'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, + 'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, 'reports/resource_entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, + 'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, 'reports_resource/event' => \Mage_Reports_Model_Resource_Event::class, 'reports/resource_event' => \Mage_Reports_Model_Resource_Event::class, 'reports_resource/event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, 'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, 'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class, 'reports/resource_event_type' => \Mage_Reports_Model_Resource_Event_Type::class, - 'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, 'reports/resource_event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, - 'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, + 'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, 'reports_resource/helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, - 'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, + 'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, 'reports/resource_invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, - 'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, + 'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, 'reports_resource/order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, - 'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, + 'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, 'reports_resource/product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, + 'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, 'reports/resource_product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class, 'reports_resource/product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class, 'reports_resource/product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class, 'reports/resource_product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class, - 'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, 'reports/resource_product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, + 'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, 'reports_resource/product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class, 'reports/resource_product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class, - 'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, 'reports_resource/product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, - 'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, + 'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, 'reports/resource_product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, - 'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, + 'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, 'reports_resource/product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, - 'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, + 'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, 'reports/resource_product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, + 'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, 'reports_resource/product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class, 'reports/resource_product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class, - 'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, 'reports_resource/product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, - 'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, + 'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, 'reports_resource/product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, - 'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, + 'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, 'reports/resource_quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, - 'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class, + 'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, 'reports_resource/refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class, + 'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class, 'reports/resource_report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class, 'reports_resource/report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class, 'reports/resource_report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class, 'reports_resource/report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class, - 'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, 'reports_resource/report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, + 'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, 'reports/resource_report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class, 'reports_resource/report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class, - 'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, 'reports/resource_report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, + 'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, 'reports_resource/review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, 'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, - 'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, 'reports_resource/review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, + 'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, 'reports_resource/review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class, 'reports/resource_review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class, 'reports_resource/shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class, 'reports/resource_shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class, - 'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, 'reports_resource/shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, + 'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, 'reports_resource/tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class, 'reports/resource_tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class, - 'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, 'reports/resource_tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, - 'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, + 'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, 'reports/resource_tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, - 'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, + 'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, 'reports/resource_tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, + 'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, 'reports_resource/wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class, 'reports/resource_wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class, - 'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, 'reports_resource/wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, + 'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, 'reports/session' => \Mage_Reports_Model_Session::class, 'reports/test' => \Mage_Reports_Model_Test::class, 'reports/totals' => \Mage_Reports_Model_Totals::class, @@ -2226,14 +2220,14 @@ 'review/resource_review_collection' => \Mage_Review_Model_Resource_Review_Collection::class, 'review_resource/review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class, 'review/resource_review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class, - 'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class, 'review_resource/review_status' => \Mage_Review_Model_Resource_Review_Status::class, - 'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, + 'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class, 'review_resource/review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, + 'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, 'review/resource_review_summary' => \Mage_Review_Model_Resource_Review_Summary::class, 'review_resource/review_summary' => \Mage_Review_Model_Resource_Review_Summary::class, - 'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, 'review/resource_review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, + 'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, 'review/review' => \Mage_Review_Model_Review::class, 'review/review_status' => \Mage_Review_Model_Review_Status::class, 'review/review_summary' => \Mage_Review_Model_Review_Summary::class, @@ -2256,14 +2250,14 @@ 'rule/mysql4_rule_collection' => \Mage_Rule_Model_Mysql4_Rule_Collection::class, 'rule/renderer_actions' => \Mage_Rule_Model_Renderer_Actions::class, 'rule/renderer_conditions' => \Mage_Rule_Model_Renderer_Conditions::class, - 'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class, 'rule/resource_abstract' => \Mage_Rule_Model_Resource_Abstract::class, - 'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class, + 'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class, 'rule/resource_rule' => \Mage_Rule_Model_Resource_Rule::class, - 'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, + 'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class, 'rule_resource/rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, - 'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, + 'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, 'rule_resource/rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, + 'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, 'rule/resource_rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class, 'rule_resource/rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class, 'rule/rule' => \Mage_Rule_Model_Rule::class, @@ -2292,24 +2286,24 @@ 'salesrule/resource_coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class, 'salesrule/resource_coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class, 'salesrule_resource/coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class, - 'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, 'salesrule_resource/report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, - 'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, + 'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, 'salesrule_resource/report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, + 'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, 'salesrule_resource/report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class, 'salesrule/resource_report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class, 'salesrule_resource/report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class, 'salesrule/resource_report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class, 'salesrule_resource/report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class, 'salesrule/resource_report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class, - 'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class, 'salesrule_resource/rule' => \Mage_SalesRule_Model_Resource_Rule::class, - 'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, + 'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class, 'salesrule_resource/rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, - 'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, + 'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, 'salesrule_resource/rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, - 'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, + 'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, 'salesrule/resource_rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, + 'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, 'salesrule_resource/rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class, 'salesrule/resource_rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class, 'salesrule_resource/rule_product_collection' => \Mage_SalesRule_Model_Resource_Rule_Product_Collection::class, @@ -2354,14 +2348,14 @@ 'sales/email_template' => \Mage_Sales_Model_Email_Template::class, 'sales/entity_order' => \Mage_Sales_Model_Entity_Order::class, 'sales_entity/order' => \Mage_Sales_Model_Entity_Order::class, - 'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class, 'sales_entity/order_address' => \Mage_Sales_Model_Entity_Order_Address::class, - 'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, + 'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class, 'sales/entity_order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, - 'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, + 'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, 'sales_entity/order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, - 'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, + 'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, 'sales_entity/order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, + 'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, 'sales/entity_order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class, 'sales_entity/order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class, 'sales/entity_order_attribute_backend_shipping' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Shipping::class, @@ -2370,22 +2364,22 @@ 'sales/entity_order_collection' => \Mage_Sales_Model_Entity_Order_Collection::class, 'sales_entity/order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class, 'sales/entity_order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class, - 'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, 'sales_entity/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, - 'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, + 'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, 'sales/entity_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, - 'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, + 'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, 'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, + 'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, 'sales/entity_order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class, 'sales_entity/order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class, 'sales/entity_order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class, 'sales_entity/order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class, 'sales_entity/order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class, 'sales/entity_order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class, - 'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, 'sales/entity_order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, - 'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, + 'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, 'sales_entity/order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, + 'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, 'sales/entity_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class, 'sales_entity/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class, 'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class, @@ -2396,28 +2390,28 @@ 'sales/entity_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class, 'sales/entity_order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class, 'sales_entity/order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class, - 'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, 'sales/entity_order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, + 'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, 'sales_entity/order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class, 'sales/entity_order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class, 'sales_entity/order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class, 'sales/entity_order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class, - 'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, 'sales/entity_order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, + 'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, 'sales/entity_order_item' => \Mage_Sales_Model_Entity_Order_Item::class, 'sales_entity/order_item' => \Mage_Sales_Model_Entity_Order_Item::class, 'sales/entity_order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class, 'sales_entity/order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class, - 'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, 'sales/entity_order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, + 'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, 'sales_entity/order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class, 'sales/entity_order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class, 'sales_entity/order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class, 'sales/entity_order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class, - 'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, 'sales_entity/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, - 'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, + 'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, 'sales/entity_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, + 'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, 'sales/entity_order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class, 'sales_entity/order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class, 'sales/entity_order_shipment_comment' => \Mage_Sales_Model_Entity_Order_Shipment_Comment::class, @@ -2426,66 +2420,66 @@ 'sales_entity/order_shipment_comment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Comment_Collection::class, 'sales/entity_order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class, 'sales_entity/order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class, - 'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, 'sales/entity_order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, - 'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, + 'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, 'sales_entity/order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, - 'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, + 'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, 'sales_entity/order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, - 'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, + 'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, 'sales_entity/order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, - 'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, + 'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, 'sales_entity/order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, + 'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, 'sales_entity/quote' => \Mage_Sales_Model_Entity_Quote::class, 'sales/entity_quote' => \Mage_Sales_Model_Entity_Quote::class, - 'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, 'sales_entity/quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, + 'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, 'sales_entity/quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class, 'sales/entity_quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class, - 'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, 'sales/entity_quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, - 'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, + 'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, 'sales/entity_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, - 'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, + 'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, 'sales_entity/quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, - 'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, + 'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, 'sales/entity_quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, + 'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, 'sales_entity/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales/entity_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales_entity/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class, 'sales/entity_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class, - 'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, 'sales_entity/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, - 'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, 'sales/entity_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/entity_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales_entity/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales/entity_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class, 'sales_entity/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class, 'sales/entity_quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class, 'sales_entity/quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class, - 'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, 'sales_entity/quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, - 'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, + 'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, 'sales/entity_quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, - 'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, + 'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, 'sales_entity/quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, + 'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, 'sales/entity_quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class, 'sales_entity/quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class, 'sales/entity_quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class, 'sales_entity/quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class, - 'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, 'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, - 'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, + 'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, 'sales/entity_quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, - 'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, + 'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, 'sales/entity_quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, + 'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, 'sales_entity/quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class, 'sales/entity_quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class, - 'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, 'sales_entity/sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, - 'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class, + 'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, 'sales_entity/setup' => \Mage_Sales_Model_Entity_Setup::class, + 'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class, 'sales/mysql4_abstract' => \Mage_Sales_Model_Mysql4_Abstract::class, 'sales/mysql4_billing_agreement' => \Mage_Sales_Model_Mysql4_Billing_Agreement::class, 'sales/mysql4_billing_agreement_collection' => \Mage_Sales_Model_Mysql4_Billing_Agreement_Collection::class, @@ -2680,48 +2674,48 @@ 'sales/recurring_profile' => \Mage_Sales_Model_Recurring_Profile::class, 'sales_resource/abstract' => \Mage_Sales_Model_Resource_Abstract::class, 'sales/resource_abstract' => \Mage_Sales_Model_Resource_Abstract::class, - 'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, 'sales_resource/billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, - 'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, + 'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, 'sales_resource/billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, - 'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, + 'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, 'sales/resource_collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, - 'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, + 'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, 'sales_resource/helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, - 'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class, + 'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, 'sales_resource/order' => \Mage_Sales_Model_Resource_Order::class, + 'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class, 'sales_resource/order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class, 'sales/resource_order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class, - 'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class, 'sales_resource/order_address' => \Mage_Sales_Model_Resource_Order_Address::class, + 'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class, 'sales/resource_order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class, 'sales_resource/order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class, 'sales/resource_order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class, 'sales_resource/order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class, 'sales/resource_order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class, 'sales_resource/order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class, - 'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, 'sales/resource_order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, + 'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, 'sales_resource/order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class, 'sales/resource_order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class, 'sales/resource_order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class, 'sales_resource/order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class, - 'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, 'sales/resource_order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, + 'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, 'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, 'sales/resource_order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, 'sales/resource_order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, 'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, - 'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, 'sales_resource/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, + 'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, 'sales/resource_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class, 'sales_resource/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class, - 'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, 'sales/resource_order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, - 'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, + 'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, 'sales_resource/order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, - 'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, + 'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, 'sales/resource_order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, + 'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, 'sales/resource_order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, 'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, 'sales_resource/order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class, @@ -2732,84 +2726,84 @@ 'sales/resource_order_grid_collection' => \Mage_Sales_Model_Resource_Order_Grid_Collection::class, 'sales/resource_order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class, 'sales_resource/order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class, - 'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, 'sales/resource_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, - 'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, + 'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, 'sales_resource/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, + 'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, 'sales_resource/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class, 'sales/resource_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class, 'sales/resource_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class, 'sales_resource/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class, 'sales/resource_order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class, 'sales_resource/order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class, - 'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, 'sales/resource_order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, + 'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, 'sales/resource_order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class, 'sales_resource/order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class, - 'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, 'sales/resource_order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, - 'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, + 'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, 'sales_resource/order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, + 'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, 'sales/resource_order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class, 'sales_resource/order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class, - 'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class, 'sales_resource/order_item' => \Mage_Sales_Model_Resource_Order_Item::class, + 'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class, 'sales/resource_order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class, 'sales_resource/order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class, - 'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, 'sales_resource/order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, + 'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, 'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, 'sales/resource_order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, - 'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, 'sales_resource/order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, - 'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, + 'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, 'sales_resource/order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, - 'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, + 'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, 'sales_resource/order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, - 'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, + 'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, 'sales/resource_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, + 'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, 'sales_resource/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class, 'sales/resource_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class, - 'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, 'sales/resource_order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, + 'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, 'sales/resource_order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, 'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, - 'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, 'sales/resource_order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, + 'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, 'sales_resource/order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class, 'sales/resource_order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class, - 'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, 'sales_resource/order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, - 'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, + 'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, 'sales_resource/order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, - 'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, + 'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, 'sales_resource/order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, + 'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, 'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, 'sales_resource/order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, 'sales_resource/order_status' => \Mage_Sales_Model_Resource_Order_Status::class, 'sales/resource_order_status' => \Mage_Sales_Model_Resource_Order_Status::class, 'sales_resource/order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class, 'sales/resource_order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class, - 'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, 'sales_resource/order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, - 'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, + 'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, 'sales_resource/order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, - 'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, + 'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, 'sales/resource_order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, - 'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, + 'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, 'sales_resource/order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, - 'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class, + 'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, 'sales/resource_quote' => \Mage_Sales_Model_Resource_Quote::class, + 'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class, 'sales_resource/quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class, 'sales/resource_quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class, 'sales/resource_quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class, 'sales_resource/quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class, 'sales/resource_quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class, 'sales_resource/quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class, - 'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, 'sales/resource_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, - 'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, + 'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, 'sales/resource_quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, + 'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, 'sales_resource/quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, 'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, 'sales_resource/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class, @@ -2818,82 +2812,82 @@ 'sales_resource/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class, 'sales/resource_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class, 'sales_resource/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class, - 'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/resource_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, - 'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, + 'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/resource_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, + 'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales_resource/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, 'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, - 'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, 'sales/resource_quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, + 'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, 'sales_resource/quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class, 'sales/resource_quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class, - 'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, 'sales/resource_quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, - 'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, + 'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, 'sales_resource/quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, - 'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, + 'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, 'sales_resource/quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, + 'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, 'sales_resource/quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class, 'sales/resource_quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class, - 'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, 'sales/resource_quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, + 'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, 'sales/resource_quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class, 'sales_resource/quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class, - 'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, 'sales/resource_quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, - 'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, + 'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, 'sales/resource_quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, - 'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, + 'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, 'sales_resource/quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, - 'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, + 'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, 'sales/resource_quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, - 'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, + 'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, 'sales/resource_recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, + 'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, 'sales/resource_recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class, 'sales_resource/recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class, - 'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class, 'sales/resource_report' => \Mage_Sales_Model_Resource_Report::class, + 'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class, 'sales/resource_report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class, 'sales_resource/report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class, - 'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, 'sales/resource_report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, - 'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, + 'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, 'sales/resource_report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, + 'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, 'sales_resource/report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, 'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, - 'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, 'sales_resource/report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, + 'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, 'sales/resource_report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class, 'sales_resource/report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class, 'sales_resource/report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class, 'sales/resource_report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class, 'sales/resource_report_order' => \Mage_Sales_Model_Resource_Report_Order::class, 'sales_resource/report_order' => \Mage_Sales_Model_Resource_Report_Order::class, - 'sales/resource_report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class, 'sales_resource/report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class, - 'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class, + 'sales/resource_report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class, 'sales/resource_report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class, + 'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class, 'sales_resource/report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class, 'sales/resource_report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class, - 'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, 'sales/resource_report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, - 'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, + 'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, 'sales_resource/report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, + 'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, 'sales_resource/report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class, 'sales/resource_report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class, 'sales_resource/report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class, 'sales/resource_report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class, - 'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, 'sales_resource/report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, + 'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, 'sales_resource/report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class, 'sales/resource_report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class, 'sales_resource/report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class, 'sales/resource_report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class, - 'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, 'sales/resource_sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, - 'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class, + 'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, 'sales/resource_setup' => \Mage_Sales_Model_Resource_Setup::class, + 'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class, 'sales/service_order' => \Mage_Sales_Model_Service_Order::class, 'sales/service_quote' => \Mage_Sales_Model_Service_Quote::class, 'sales/status_list' => \Mage_Sales_Model_Status_List::class, @@ -2903,8 +2897,8 @@ 'sendfriend/observer' => \Mage_Sendfriend_Model_Observer::class, 'sendfriend_resource/sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class, 'sendfriend/resource_sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class, - 'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, 'sendfriend/resource_sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, + 'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, 'sendfriend/resource_setup' => \Mage_Sendfriend_Model_Resource_Setup::class, 'sendfriend_resource/setup' => \Mage_Sendfriend_Model_Resource_Setup::class, 'sendfriend/sendfriend' => \Mage_Sendfriend_Model_Sendfriend::class, @@ -2944,16 +2938,16 @@ 'sitemap/observer' => \Mage_Sitemap_Model_Observer::class, 'sitemap_resource/catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class, 'sitemap/resource_catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class, - 'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, 'sitemap/resource_catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, + 'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, 'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, 'sitemap_resource/catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, 'sitemap_resource/cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, 'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, 'sitemap_resource/sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class, 'sitemap/resource_sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class, - 'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, 'sitemap_resource/sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, + 'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, 'sitemap/sitemap' => \Mage_Sitemap_Model_Sitemap::class, 'tag/api' => \Mage_Tag_Model_Api::class, 'tag/api_v2' => \Mage_Tag_Model_Api_V2::class, @@ -2966,21 +2960,21 @@ 'tag/mysql4_tag' => \Mage_Tag_Model_Mysql4_Tag::class, 'tag/mysql4_tag_collection' => \Mage_Tag_Model_Mysql4_Tag_Collection::class, 'tag/mysql4_tag_relation' => \Mage_Tag_Model_Mysql4_Tag_Relation::class, - 'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag/resource_customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag_resource/customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, - 'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, + 'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag_resource/indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, - 'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, + 'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, 'tag_resource/popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, + 'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, 'tag_resource/product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class, 'tag/resource_product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class, 'tag_resource/tag' => \Mage_Tag_Model_Resource_Tag::class, 'tag/resource_tag' => \Mage_Tag_Model_Resource_Tag::class, - 'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, 'tag_resource/tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, - 'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, + 'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, 'tag_resource/tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, + 'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, 'tag/session' => \Mage_Tag_Model_Session::class, 'tag/tag' => \Mage_Tag_Model_Tag::class, 'tag/tag_relation' => \Mage_Tag_Model_Tag_Relation::class, @@ -3019,16 +3013,16 @@ 'tax/resource_calculation_rate' => \Mage_Tax_Model_Resource_Calculation_Rate::class, 'tax/resource_calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class, 'tax_resource/calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class, - 'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, 'tax/resource_calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, - 'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, + 'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, 'tax/resource_calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, - 'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, + 'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, 'tax/resource_calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, - 'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, + 'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, 'tax_resource/calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, - 'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class, + 'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, 'tax/resource_class' => \Mage_Tax_Model_Resource_Class::class, + 'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class, 'tax/resource_class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class, 'tax_resource/class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class, 'tax_resource/report_collection' => \Mage_Tax_Model_Resource_Report_Collection::class, @@ -3039,10 +3033,10 @@ 'tax/resource_report_tax_createdat' => \Mage_Tax_Model_Resource_Report_Tax_Createdat::class, 'tax_resource/report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class, 'tax/resource_report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class, - 'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, 'tax/resource_report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, - 'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, + 'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, 'tax_resource/sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, + 'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, 'tax_resource/sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class, 'tax/resource_sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class, 'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class, @@ -3131,8 +3125,8 @@ 'weee/observer' => \Mage_Weee_Model_Observer::class, 'weee/resource_attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class, 'weee_resource/attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class, - 'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class, 'weee/resource_setup' => \Mage_Weee_Model_Resource_Setup::class, + 'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class, 'weee/resource_tax' => \Mage_Weee_Model_Resource_Tax::class, 'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class, 'weee/tax' => \Mage_Weee_Model_Tax::class, @@ -3144,12 +3138,12 @@ 'widget/mysql4_widget_instance' => \Mage_Widget_Model_Mysql4_Widget_Instance::class, 'widget/mysql4_widget_instance_collection' => \Mage_Widget_Model_Mysql4_Widget_Instance_Collection::class, 'widget/observer' => \Mage_Widget_Model_Observer::class, - 'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class, 'widget/resource_widget' => \Mage_Widget_Model_Resource_Widget::class, + 'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class, 'widget_resource/widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class, 'widget/resource_widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class, - 'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, 'widget_resource/widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, + 'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, 'widget/template_filter' => \Mage_Widget_Model_Template_Filter::class, 'widget/widget' => \Mage_Widget_Model_Widget::class, 'widget/widget_config' => \Mage_Widget_Model_Widget_Config::class, @@ -3166,14 +3160,14 @@ 'wishlist/mysql4_wishlist' => \Mage_Wishlist_Model_Mysql4_Wishlist::class, 'wishlist/mysql4_wishlist_collection' => \Mage_Wishlist_Model_Mysql4_Wishlist_Collection::class, 'wishlist/observer' => \Mage_Wishlist_Model_Observer::class, - 'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class, 'wishlist_resource/item' => \Mage_Wishlist_Model_Resource_Item::class, + 'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class, 'wishlist_resource/item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class, 'wishlist/resource_item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class, - 'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, 'wishlist/resource_item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, - 'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, + 'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, 'wishlist_resource/item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, + 'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, 'wishlist_resource/product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class, 'wishlist/resource_product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class, 'wishlist/resource_wishlist' => \Mage_Wishlist_Model_Resource_Wishlist::class, @@ -3182,7 +3176,6 @@ 'wishlist/resource_wishlist_collection' => \Mage_Wishlist_Model_Resource_Wishlist_Collection::class, 'wishlist/session' => \Mage_Wishlist_Model_Session::class, 'wishlist/wishlist' => \Mage_Wishlist_Model_Wishlist::class, - 'varien/autoload' => \Varien_Autoload::class, ]) ); override( \Mage_Catalog_Block_Product_Abstract::_getSingletonModel(0), @@ -3192,11 +3185,10 @@ 'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class, 'adminnotification/mysql4_inbox_collection' => \Mage_AdminNotification_Model_Mysql4_Inbox_Collection::class, 'adminnotification/observer' => \Mage_AdminNotification_Model_Observer::class, - 'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, 'adminnotification/resource_inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, - 'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, + 'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, 'adminnotification/resource_inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, - 'adminnotification/survey' => \Mage_AdminNotification_Model_Survey::class, + 'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, 'admin/acl' => \Mage_Admin_Model_Acl::class, 'admin/acl_assert_ip' => \Mage_Admin_Model_Acl_Assert_Ip::class, 'admin/acl_assert_time' => \Mage_Admin_Model_Acl_Assert_Time::class, @@ -3225,38 +3217,38 @@ 'admin/redirectpolicy' => \Mage_Admin_Model_Redirectpolicy::class, 'admin/resource_acl' => \Mage_Admin_Model_Resource_Acl::class, 'admin_resource/acl' => \Mage_Admin_Model_Resource_Acl::class, - 'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, 'admin/resource_acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, + 'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, 'admin/resource_acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class, 'admin_resource/acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class, - 'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class, 'admin/resource_block' => \Mage_Admin_Model_Resource_Block::class, - 'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, + 'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class, 'admin/resource_block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, + 'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, 'admin_resource/permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class, 'admin/resource_permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class, 'admin/resource_role' => \Mage_Admin_Model_Resource_Role::class, 'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class, 'admin/resource_role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class, 'admin_resource/role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class, - 'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class, 'admin_resource/roles' => \Mage_Admin_Model_Resource_Roles::class, - 'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, + 'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class, 'admin_resource/roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, - 'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, + 'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, 'admin/resource_roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, + 'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, 'admin/resource_rules' => \Mage_Admin_Model_Resource_Rules::class, 'admin_resource/rules' => \Mage_Admin_Model_Resource_Rules::class, - 'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, 'admin_resource/rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, + 'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, 'admin_resource/user' => \Mage_Admin_Model_Resource_User::class, 'admin/resource_user' => \Mage_Admin_Model_Resource_User::class, 'admin/resource_user_collection' => \Mage_Admin_Model_Resource_User_Collection::class, 'admin_resource/user_collection' => \Mage_Admin_Model_Resource_User_Collection::class, - 'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class, 'admin_resource/variable' => \Mage_Admin_Model_Resource_Variable::class, - 'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, + 'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class, 'admin/resource_variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, + 'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, 'admin/role' => \Mage_Admin_Model_Role::class, 'admin/roles' => \Mage_Admin_Model_Roles::class, 'admin/rules' => \Mage_Admin_Model_Rules::class, @@ -3291,6 +3283,7 @@ 'adminhtml/system_config_backend_baseurl' => \Mage_Adminhtml_Model_System_Config_Backend_Baseurl::class, 'adminhtml/system_config_backend_cache' => \Mage_Adminhtml_Model_System_Config_Backend_Cache::class, 'adminhtml/system_config_backend_catalog_inventory_managestock' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock::class, + 'adminhtml/system_config_backend_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Separator::class, 'adminhtml/system_config_backend_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Type::class, 'adminhtml/system_config_backend_category' => \Mage_Adminhtml_Model_System_Config_Backend_Category::class, 'adminhtml/system_config_backend_cookie' => \Mage_Adminhtml_Model_System_Config_Backend_Cookie::class, @@ -3343,12 +3336,14 @@ 'adminhtml/system_config_source_catalog_listMode' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListMode::class, 'adminhtml/system_config_source_catalog_listPerPage' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListPerPage::class, 'adminhtml/system_config_source_catalog_listSort' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort::class, + 'adminhtml/system_config_source_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Separator::class, 'adminhtml/system_config_source_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Type::class, 'adminhtml/system_config_source_catalog_timeFormat' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_TimeFormat::class, 'adminhtml/system_config_source_category' => \Mage_Adminhtml_Model_System_Config_Source_Category::class, 'adminhtml/system_config_source_checktype' => \Mage_Adminhtml_Model_System_Config_Source_Checktype::class, 'adminhtml/system_config_source_cms_page' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Page::class, 'adminhtml/system_config_source_cms_wysiwyg_enabled' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Wysiwyg_Enabled::class, + 'adminhtml/system_config_source_cookie_samesite' => \Mage_Adminhtml_Model_System_Config_Source_Cookie_Samesite::class, 'adminhtml/system_config_source_country' => \Mage_Adminhtml_Model_System_Config_Source_Country::class, 'adminhtml/system_config_source_country_full' => \Mage_Adminhtml_Model_System_Config_Source_Country_Full::class, 'adminhtml/system_config_source_cron_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency::class, @@ -3375,6 +3370,7 @@ 'adminhtml/system_config_source_locale_timezone' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Timezone::class, 'adminhtml/system_config_source_locale_weekdaycodes' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdaycodes::class, 'adminhtml/system_config_source_locale_weekdays' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdays::class, + 'adminhtml/system_config_source_log_level' => \Mage_Adminhtml_Model_System_Config_Source_Log_Level::class, 'adminhtml/system_config_source_nooptreq' => \Mage_Adminhtml_Model_System_Config_Source_Nooptreq::class, 'adminhtml/system_config_source_notification_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Notification_Frequency::class, 'adminhtml/system_config_source_order_status' => \Mage_Adminhtml_Model_System_Config_Source_Order_Status::class, @@ -3398,7 +3394,6 @@ 'adminhtml/system_config_source_shipping_flatrate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Flatrate::class, 'adminhtml/system_config_source_shipping_tablerate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Tablerate::class, 'adminhtml/system_config_source_shipping_taxclass' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Taxclass::class, - 'adminhtml/system_config_source_startdateenddate' => \Mage_Adminhtml_Model_System_Config_Source_Startdateenddate::class, 'adminhtml/system_config_source_storage_media_database' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Database::class, 'adminhtml/system_config_source_storage_media_storage' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Storage::class, 'adminhtml/system_config_source_store' => \Mage_Adminhtml_Model_System_Config_Source_Store::class, @@ -3454,22 +3449,22 @@ 'api2_resource/acl_filter_attribute' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute::class, 'api2/resource_acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class, 'api2_resource/acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class, - 'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, 'api2_resource/acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, + 'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, 'api2/resource_acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class, 'api2_resource/acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class, 'api2_resource/acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class, 'api2/resource_acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class, 'api2/resource_acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class, 'api2_resource/acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class, - 'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class, 'api2/resource_setup' => \Mage_Api2_Model_Resource_Setup::class, + 'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class, 'api2/resource_validator' => \Mage_Api2_Model_Resource_Validator::class, 'api2_resource/validator' => \Mage_Api2_Model_Resource_Validator::class, 'api2/resource_validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class, 'api2_resource/validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class, - 'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, 'api2/resource_validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, + 'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, 'api2/response' => \Mage_Api2_Model_Response::class, 'api2/route_abstract' => \Mage_Api2_Model_Route_Abstract::class, 'api2/route_apiType' => \Mage_Api2_Model_Route_ApiType::class, @@ -3501,8 +3496,8 @@ 'api/mysql4_user_collection' => \Mage_Api_Model_Mysql4_User_Collection::class, 'api/resource_abstract' => \Mage_Api_Model_Resource_Abstract::class, 'api_resource/abstract' => \Mage_Api_Model_Resource_Abstract::class, - 'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class, 'api_resource/acl' => \Mage_Api_Model_Resource_Acl::class, + 'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class, 'api_resource/acl_role' => \Mage_Api_Model_Resource_Acl_Role::class, 'api/resource_acl_role' => \Mage_Api_Model_Resource_Acl_Role::class, 'api/resource_acl_role_collection' => \Mage_Api_Model_Resource_Acl_Role_Collection::class, @@ -3511,14 +3506,14 @@ 'api_resource/permissions_collection' => \Mage_Api_Model_Resource_Permissions_Collection::class, 'api_resource/role' => \Mage_Api_Model_Resource_Role::class, 'api/resource_role' => \Mage_Api_Model_Resource_Role::class, - 'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, 'api_resource/role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, + 'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, 'api/resource_roles' => \Mage_Api_Model_Resource_Roles::class, 'api_resource/roles' => \Mage_Api_Model_Resource_Roles::class, - 'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, 'api_resource/roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, - 'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, + 'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, 'api_resource/roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, + 'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, 'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class, 'api_resource/rules' => \Mage_Api_Model_Resource_Rules::class, 'api_resource/rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class, @@ -3549,15 +3544,6 @@ 'authorizenet/directpost_request' => \Mage_Authorizenet_Model_Directpost_Request::class, 'authorizenet/directpost_response' => \Mage_Authorizenet_Model_Directpost_Response::class, 'authorizenet/directpost_session' => \Mage_Authorizenet_Model_Directpost_Session::class, - 'backup/backup' => \Mage_Backup_Model_Backup::class, - 'backup/config_backend_cron' => \Mage_Backup_Model_Config_Backend_Cron::class, - 'backup/config_source_type' => \Mage_Backup_Model_Config_Source_Type::class, - 'backup/db' => \Mage_Backup_Model_Db::class, - 'backup/fs_collection' => \Mage_Backup_Model_Fs_Collection::class, - 'backup/mysql4_db' => \Mage_Backup_Model_Mysql4_Db::class, - 'backup/observer' => \Mage_Backup_Model_Observer::class, - 'backup/resource_db' => \Mage_Backup_Model_Resource_Db::class, - 'backup/resource_helper_mysql4' => \Mage_Backup_Model_Resource_Helper_Mysql4::class, 'bundle/catalogIndex_data_bundle' => \Mage_Bundle_Model_CatalogIndex_Data_Bundle::class, 'bundle/mysql4_bundle' => \Mage_Bundle_Model_Mysql4_Bundle::class, 'bundle/mysql4_indexer_price' => \Mage_Bundle_Model_Mysql4_Indexer_Price::class, @@ -3577,16 +3563,16 @@ 'bundle/resource_bundle' => \Mage_Bundle_Model_Resource_Bundle::class, 'bundle/resource_indexer_price' => \Mage_Bundle_Model_Resource_Indexer_Price::class, 'bundle_resource/indexer_price' => \Mage_Bundle_Model_Resource_Indexer_Price::class, - 'bundle/resource_indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class, 'bundle_resource/indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class, + 'bundle/resource_indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class, 'bundle/resource_option' => \Mage_Bundle_Model_Resource_Option::class, 'bundle_resource/option' => \Mage_Bundle_Model_Resource_Option::class, 'bundle/resource_option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class, 'bundle_resource/option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class, 'bundle_resource/price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, 'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, - 'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class, 'bundle_resource/selection' => \Mage_Bundle_Model_Resource_Selection::class, + 'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class, 'bundle_resource/selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class, 'bundle/resource_selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class, 'bundle/sales_order_pdf_items_abstract' => \Mage_Bundle_Model_Sales_Order_Pdf_Items_Abstract::class, @@ -3646,14 +3632,14 @@ 'catalogindex/resource_data_abstract' => \Mage_CatalogIndex_Model_Resource_Data_Abstract::class, 'catalogindex_resource/data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class, 'catalogindex/resource_data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class, - 'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, 'catalogindex_resource/data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, + 'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, 'catalogindex_resource/indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class, 'catalogindex/resource_indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class, 'catalogindex/resource_indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class, 'catalogindex_resource/indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class, - 'catalogindex_resource/indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class, 'catalogindex/resource_indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class, + 'catalogindex_resource/indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class, 'catalogindex_resource/indexer_minimalprice' => \Mage_CatalogIndex_Model_Resource_Indexer_Minimalprice::class, 'catalogindex/resource_indexer_minimalprice' => \Mage_CatalogIndex_Model_Resource_Indexer_Minimalprice::class, 'catalogindex/resource_indexer_price' => \Mage_CatalogIndex_Model_Resource_Indexer_Price::class, @@ -3679,20 +3665,20 @@ 'cataloginventory/mysql4_stock_item_collection' => \Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection::class, 'cataloginventory/mysql4_stock_status' => \Mage_CatalogInventory_Model_Mysql4_Stock_Status::class, 'cataloginventory/observer' => \Mage_CatalogInventory_Model_Observer::class, - 'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, 'cataloginventory_resource/indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, + 'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, 'cataloginventory/resource_indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class, 'cataloginventory_resource/indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class, - 'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, 'cataloginventory/resource_indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, + 'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, 'cataloginventory/resource_indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class, 'cataloginventory_resource/indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class, 'cataloginventory_resource/stock' => \Mage_CatalogInventory_Model_Resource_Stock::class, 'cataloginventory/resource_stock' => \Mage_CatalogInventory_Model_Resource_Stock::class, 'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, 'cataloginventory/resource_stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, - 'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, 'cataloginventory/resource_stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, + 'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, 'cataloginventory/resource_stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class, 'cataloginventory_resource/stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class, 'cataloginventory/source_backorders' => \Mage_CatalogInventory_Model_Source_Backorders::class, @@ -3713,10 +3699,10 @@ 'catalogrule/mysql4_rule_product_price' => \Mage_CatalogRule_Model_Mysql4_Rule_Product_Price::class, 'catalogrule/mysql4_rule_product_price_collection' => \Mage_CatalogRule_Model_Mysql4_Rule_Product_Price_Collection::class, 'catalogrule/observer' => \Mage_CatalogRule_Model_Observer::class, - 'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class, 'catalogrule/resource_rule' => \Mage_CatalogRule_Model_Resource_Rule::class, - 'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, + 'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class, 'catalogrule_resource/rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, + 'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, 'catalogrule_resource/rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class, 'catalogrule/resource_rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class, 'catalogrule_resource/rule_product_price_collection' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price_Collection::class, @@ -3745,24 +3731,24 @@ 'catalogsearch/query' => \Mage_CatalogSearch_Model_Query::class, 'catalogsearch_resource/advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class, 'catalogsearch/resource_advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class, - 'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, 'catalogsearch_resource/advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, + 'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, 'catalogsearch_resource/fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class, 'catalogsearch/resource_fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class, 'catalogsearch_resource/fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class, 'catalogsearch/resource_fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class, 'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, 'catalogsearch_resource/fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, - 'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, 'catalogsearch/resource_helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, - 'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, + 'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, 'catalogsearch_resource/indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, + 'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, 'catalogsearch_resource/query' => \Mage_CatalogSearch_Model_Resource_Query::class, 'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class, - 'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, 'catalogsearch_resource/query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, - 'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, + 'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, 'catalogsearch/resource_search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, + 'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, 'catalogsearch/session' => \Mage_CatalogSearch_Model_Session::class, 'catalogsearch/system_config_backend_sitemap' => \Mage_CatalogSearch_Model_System_Config_Backend_Sitemap::class, 'catalog/abstract' => \Mage_Catalog_Model_Abstract::class, @@ -3905,144 +3891,144 @@ 'catalog/product_website' => \Mage_Catalog_Model_Product_Website::class, 'catalog/resource_abstract' => \Mage_Catalog_Model_Resource_Abstract::class, 'catalog_resource/abstract' => \Mage_Catalog_Model_Resource_Abstract::class, - 'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class, 'catalog/resource_attribute' => \Mage_Catalog_Model_Resource_Attribute::class, - 'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class, + 'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class, 'catalog_resource/category' => \Mage_Catalog_Model_Resource_Category::class, + 'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class, 'catalog_resource/category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class, 'catalog/resource_category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class, - 'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, 'catalog/resource_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, - 'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, + 'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, 'catalog/resource_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, + 'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, 'catalog_resource/category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class, 'catalog/resource_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class, 'catalog_resource/category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class, 'catalog/resource_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class, 'catalog/resource_category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class, 'catalog_resource/category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class, - 'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, 'catalog_resource/category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, - 'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, + 'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, 'catalog/resource_category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, + 'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, 'catalog_resource/category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class, 'catalog/resource_category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class, 'catalog/resource_category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class, 'catalog_resource/category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class, - 'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, 'catalog_resource/collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, - 'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class, + 'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, 'catalog_resource/config' => \Mage_Catalog_Model_Resource_Config::class, - 'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, + 'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class, 'catalog/resource_eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, + 'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, 'catalog_resource/eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class, 'catalog/resource_eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class, - 'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, 'catalog_resource/eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, - 'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, + 'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, 'catalog/resource_eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, - 'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, + 'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, 'catalog_resource/eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, + 'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, 'catalog_resource/eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, - 'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, + 'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, 'catalog_resource/eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, + 'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, 'catalog/resource_eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class, 'catalog_resource/eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class, 'catalog/resource_eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class, 'catalog_resource/eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class, 'catalog/resource_eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class, 'catalog_resource/eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class, - 'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, 'catalog/resource_eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, - 'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, + 'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, 'catalog/resource_eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, + 'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, 'catalog/resource_eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class, 'catalog_resource/eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class, - 'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, 'catalog_resource/eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, + 'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, 'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, 'catalog_resource/eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, 'catalog_resource/eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class, 'catalog/resource_eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class, - 'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, 'catalog_resource/eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, - 'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, + 'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, 'catalog/resource_eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, - 'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, + 'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, 'catalog/resource_eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, - 'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, + 'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, 'catalog/resource_eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, + 'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, 'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, 'catalog_resource/eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, 'catalog_resource/eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, - 'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, 'catalog/resource_eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, + 'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class, 'catalog/resource_eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, + 'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, 'catalog/resource_eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class, 'catalog/resource_eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class, 'catalog_resource/eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class, 'catalog_resource/eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class, 'catalog/resource_eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class, - 'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, 'catalog_resource/eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, - 'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, + 'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, 'catalog_resource/eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, - 'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, + 'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, 'catalog_resource/eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, + 'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, 'catalog/resource_eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class, 'catalog/resource_eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class, 'catalog/resource_eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class, - 'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, 'catalog/resource_eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, - 'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, + 'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, 'catalog_resource/eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, + 'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, 'catalog_resource/eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class, 'catalog/resource_eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class, 'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, 'catalog/resource_eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, - 'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, 'catalog/resource_eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, + 'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, 'catalog/resource_eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class, 'catalog_resource/eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class, - 'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, 'catalog/resource_eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, + 'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, 'catalog_resource/eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class, 'catalog/resource_eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class, 'catalog_resource/eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class, 'catalog/resource_eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class, 'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, 'catalog/resource_eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, - 'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, 'catalog_resource/eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, - 'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, + 'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, 'catalog/resource_eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, - 'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, + 'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, 'catalog/resource_eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, - 'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, + 'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, 'catalog/resource_eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, + 'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, 'catalog/resource_eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class, 'catalog_resource/eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class, - 'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, 'catalog_resource/eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, - 'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, + 'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, 'catalog/resource_eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, - 'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, + 'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, 'catalog/resource_eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, + 'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, 'catalog_resource/eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, + 'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, 'catalog/resource_eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class, 'catalog_resource/eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class, 'catalog/resource_eav_mysql4_sendfriend' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend::class, @@ -4051,98 +4037,98 @@ 'catalog/resource_eav_mysql4_sendfriend_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection::class, 'catalog_resource/eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class, 'catalog/resource_eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class, - 'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, 'catalog/resource_eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, + 'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, 'catalog/resource_helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, 'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, 'catalog_resource/layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class, 'catalog/resource_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class, 'catalog/resource_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class, 'catalog_resource/layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class, - 'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, 'catalog/resource_layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, - 'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class, + 'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, 'catalog_resource/product' => \Mage_Catalog_Model_Resource_Product::class, + 'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class, 'catalog/resource_product_action' => \Mage_Catalog_Model_Resource_Product_Action::class, 'catalog_resource/product_action' => \Mage_Catalog_Model_Resource_Product_Action::class, - 'catalog_resource/product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class, 'catalog/resource_product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class, + 'catalog_resource/product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class, 'catalog/resource_product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class, 'catalog_resource/product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class, 'catalog/resource_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class, 'catalog_resource/product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class, - 'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, 'catalog/resource_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, + 'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, 'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, 'catalog_resource/product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, 'catalog/resource_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class, - 'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, 'catalog_resource/product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, + 'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, 'catalog/resource_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, 'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, - 'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, - 'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, + 'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, + 'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, 'catalog_resource/product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class, 'catalog/resource_product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class, - 'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, 'catalog/resource_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, + 'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, 'catalog/resource_product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class, 'catalog_resource/product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class, - 'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, 'catalog/resource_product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, + 'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, 'catalog/resource_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class, 'catalog_resource/product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class, - 'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, 'catalog_resource/product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, - 'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, + 'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, 'catalog/resource_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, + 'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, 'catalog/resource_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class, 'catalog_resource/product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class, - 'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, 'catalog_resource/product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, - 'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, + 'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, 'catalog_resource/product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, - 'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, + 'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, 'catalog_resource/product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, + 'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, 'catalog/resource_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class, 'catalog_resource/product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class, 'catalog_resource/product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class, 'catalog/resource_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class, - 'catalog/resource_product_link' => \Mage_Catalog_Model_Resource_Product_Link::class, 'catalog_resource/product_link' => \Mage_Catalog_Model_Resource_Product_Link::class, + 'catalog/resource_product_link' => \Mage_Catalog_Model_Resource_Product_Link::class, 'catalog/resource_product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class, 'catalog_resource/product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class, - 'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, 'catalog/resource_product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, - 'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, + 'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, 'catalog_resource/product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, - 'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, + 'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, 'catalog/resource_product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, - 'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, + 'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, 'catalog_resource/product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, - 'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, + 'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, 'catalog_resource/product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, + 'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, 'catalog_resource/product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class, 'catalog/resource_product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class, 'catalog_resource/product_status' => \Mage_Catalog_Model_Resource_Product_Status::class, 'catalog/resource_product_status' => \Mage_Catalog_Model_Resource_Product_Status::class, 'catalog_resource/product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class, 'catalog/resource_product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class, - 'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, 'catalog/resource_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, - 'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, + 'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, 'catalog_resource/product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, + 'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, 'catalog_resource/product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class, 'catalog/resource_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class, - 'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, 'catalog_resource/product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, + 'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, 'catalog/resource_setup' => \Mage_Catalog_Model_Resource_Setup::class, 'catalog_resource/setup' => \Mage_Catalog_Model_Resource_Setup::class, - 'catalog/resource_url' => \Mage_Catalog_Model_Resource_Url::class, 'catalog_resource/url' => \Mage_Catalog_Model_Resource_Url::class, + 'catalog/resource_url' => \Mage_Catalog_Model_Resource_Url::class, 'catalog/session' => \Mage_Catalog_Model_Session::class, 'catalog/system_config_backend_catalog_category_flat' => \Mage_Catalog_Model_System_Config_Backend_Catalog_Category_Flat::class, 'catalog/system_config_backend_catalog_product_flat' => \Mage_Catalog_Model_System_Config_Backend_Catalog_Product_Flat::class, @@ -4184,12 +4170,12 @@ 'checkout/observer' => \Mage_Checkout_Model_Observer::class, 'checkout_resource/agreement' => \Mage_Checkout_Model_Resource_Agreement::class, 'checkout/resource_agreement' => \Mage_Checkout_Model_Resource_Agreement::class, - 'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, 'checkout/resource_agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, - 'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class, + 'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, 'checkout_resource/cart' => \Mage_Checkout_Model_Resource_Cart::class, - 'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class, + 'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class, 'checkout/resource_setup' => \Mage_Checkout_Model_Resource_Setup::class, + 'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class, 'checkout/session' => \Mage_Checkout_Model_Session::class, 'checkout/type_abstract' => \Mage_Checkout_Model_Type_Abstract::class, 'checkout/type_multishipping' => \Mage_Checkout_Model_Type_Multishipping::class, @@ -4204,25 +4190,25 @@ 'cms/mysql4_page_service' => \Mage_Cms_Model_Mysql4_Page_Service::class, 'cms/observer' => \Mage_Cms_Model_Observer::class, 'cms/page' => \Mage_Cms_Model_Page::class, - 'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class, 'cms/resource_block' => \Mage_Cms_Model_Resource_Block::class, + 'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class, 'cms_resource/block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class, 'cms/resource_block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class, 'cms/resource_page' => \Mage_Cms_Model_Resource_Page::class, 'cms_resource/page' => \Mage_Cms_Model_Resource_Page::class, 'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, 'cms_resource/page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, - 'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class, 'cms/resource_page_service' => \Mage_Cms_Model_Resource_Page_Service::class, + 'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class, 'cms/template_filter' => \Mage_Cms_Model_Template_Filter::class, 'cms/wysiwyg_config' => \Mage_Cms_Model_Wysiwyg_Config::class, 'cms/wysiwyg_images_storage' => \Mage_Cms_Model_Wysiwyg_Images_Storage::class, 'cms/wysiwyg_images_storage_collection' => \Mage_Cms_Model_Wysiwyg_Images_Storage_Collection::class, 'configurableswatches/observer' => \Mage_ConfigurableSwatches_Model_Observer::class, - 'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, 'configurableswatches_resource/catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, - 'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, + 'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, 'configurableswatches_resource/catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, + 'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, 'configurableswatches_resource/catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class, 'configurableswatches/resource_catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class, 'configurableswatches/system_config_source_catalog_product_configattribute' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute::class, @@ -4329,152 +4315,152 @@ 'core/mysql4_website_collection' => \Mage_Core_Model_Mysql4_Website_Collection::class, 'core/observer' => \Mage_Core_Model_Observer::class, 'core/resource' => \Mage_Core_Model_Resource::class, + 'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, 'core_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, 'core/resource_abstract' => \Mage_Core_Model_Resource_Abstract::class, - 'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, + 'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class, 'core/resource_cache' => \Mage_Core_Model_Resource_Cache::class, 'core_resource/cache' => \Mage_Core_Model_Resource_Cache::class, - 'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class, 'core_resource/config' => \Mage_Core_Model_Resource_Config::class, 'payment_resource/config' => \Mage_Core_Model_Resource_Config::class, 'core/resource_config' => \Mage_Core_Model_Resource_Config::class, - 'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, 'core/resource_config_data' => \Mage_Core_Model_Resource_Config_Data::class, + 'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, 'payment_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, - 'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'core_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, + 'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, - 'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, - 'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, 'payment_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, + 'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, + 'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, 'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, - 'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, 'core/resource_db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, - 'core/resource_design' => \Mage_Core_Model_Resource_Design::class, + 'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, 'core_resource/design' => \Mage_Core_Model_Resource_Design::class, + 'core/resource_design' => \Mage_Core_Model_Resource_Design::class, 'payment_resource/design' => \Mage_Core_Model_Resource_Design::class, - 'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, - 'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, 'payment_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, - 'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, + 'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, + 'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, 'payment_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, 'core/resource_design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, - 'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, - 'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, + 'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, 'core/resource_email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, - 'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, - 'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, + 'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, + 'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, 'payment_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, - 'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, + 'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, + 'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, 'core/resource_email_template' => \Mage_Core_Model_Resource_Email_Template::class, + 'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, 'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, - 'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, 'core/resource_email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, + 'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, 'core_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, 'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, 'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, 'core_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, - 'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, - 'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, 'core_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, 'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, - 'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, 'payment_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, + 'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, + 'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, 'payment_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, 'core/resource_file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, - 'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, - 'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, 'core/resource_file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, + 'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, 'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, - 'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, 'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, + 'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, 'core/resource_file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, 'payment_resource/flag' => \Mage_Core_Model_Resource_Flag::class, - 'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class, 'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class, + 'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class, 'payment_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, - 'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, 'core_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, - 'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, + 'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, 'core/resource_helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, + 'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, 'core_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, - 'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, - 'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, 'core/resource_iterator' => \Mage_Core_Model_Resource_Iterator::class, - 'core/resource_language' => \Mage_Core_Model_Resource_Language::class, - 'core_resource/language' => \Mage_Core_Model_Resource_Language::class, + 'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, + 'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, 'payment_resource/language' => \Mage_Core_Model_Resource_Language::class, + 'core_resource/language' => \Mage_Core_Model_Resource_Language::class, + 'core/resource_language' => \Mage_Core_Model_Resource_Language::class, 'payment_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, - 'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, 'core/resource_language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, - 'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class, + 'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, 'core_resource/layout' => \Mage_Core_Model_Resource_Layout::class, 'core/resource_layout' => \Mage_Core_Model_Resource_Layout::class, - 'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class, + 'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class, 'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class, 'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class, + 'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class, + 'core/resource_session' => \Mage_Core_Model_Resource_Session::class, 'payment_resource/session' => \Mage_Core_Model_Resource_Session::class, 'core_resource/session' => \Mage_Core_Model_Resource_Session::class, - 'core/resource_session' => \Mage_Core_Model_Resource_Session::class, 'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class, 'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class, 'payment_resource/setup' => \Mage_Core_Model_Resource_Setup::class, - 'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core/resource_setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, - 'payment_resource/store' => \Mage_Core_Model_Resource_Store::class, - 'core_resource/store' => \Mage_Core_Model_Resource_Store::class, + 'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core/resource_store' => \Mage_Core_Model_Resource_Store::class, - 'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, + 'core_resource/store' => \Mage_Core_Model_Resource_Store::class, + 'payment_resource/store' => \Mage_Core_Model_Resource_Store::class, 'core/resource_store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, 'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, - 'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, + 'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, 'core/resource_store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'payment_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, - 'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, - 'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, + 'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'payment_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, - 'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, + 'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, + 'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, 'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class, + 'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, 'core_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, 'core_resource/translate' => \Mage_Core_Model_Resource_Translate::class, - 'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class, 'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class, - 'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, - 'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class, + 'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class, 'payment_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, - 'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class, + 'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, 'core/resource_type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, 'payment_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, - 'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'core/resource_type_db' => \Mage_Core_Model_Resource_Type_Db::class, + 'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, - 'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, - 'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, 'core_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, - 'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, - 'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, + 'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, 'payment_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, 'payment_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, - 'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, 'core_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, + 'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, 'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, 'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, 'payment_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, - 'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, - 'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'core_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, + 'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, + 'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'core_resource/variable' => \Mage_Core_Model_Resource_Variable::class, - 'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class, 'core/resource_variable' => \Mage_Core_Model_Resource_Variable::class, + 'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class, 'core/resource_variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, - 'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, 'core_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, - 'core_resource/website' => \Mage_Core_Model_Resource_Website::class, + 'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, 'payment_resource/website' => \Mage_Core_Model_Resource_Website::class, + 'core_resource/website' => \Mage_Core_Model_Resource_Website::class, 'core/resource_website' => \Mage_Core_Model_Resource_Website::class, - 'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core/resource_website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, + 'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core/session' => \Mage_Core_Model_Session::class, 'core/session_abstract' => \Mage_Core_Model_Session_Abstract::class, @@ -4504,10 +4490,10 @@ 'cron/mysql4_schedule' => \Mage_Cron_Model_Mysql4_Schedule::class, 'cron/mysql4_schedule_collection' => \Mage_Cron_Model_Mysql4_Schedule_Collection::class, 'cron/observer' => \Mage_Cron_Model_Observer::class, - 'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class, 'cron/resource_schedule' => \Mage_Cron_Model_Resource_Schedule::class, - 'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, + 'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class, 'cron/resource_schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, + 'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, 'cron/schedule' => \Mage_Cron_Model_Schedule::class, 'currencysymbol/observer' => \Mage_CurrencySymbol_Model_Observer::class, 'currencysymbol/system_currencysymbol' => \Mage_CurrencySymbol_Model_System_Currencysymbol::class, @@ -4584,14 +4570,14 @@ 'customer_resource/address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class, 'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, 'customer_resource/address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, - 'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, 'customer/resource_address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, - 'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, + 'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, 'customer/resource_address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, - 'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, + 'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, 'customer_resource/address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, - 'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, + 'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, 'customer_resource/address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, + 'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, 'customer/resource_attribute' => \Mage_Customer_Model_Resource_Attribute::class, 'customer_resource/attribute' => \Mage_Customer_Model_Resource_Attribute::class, 'customer_resource/attribute_collection' => \Mage_Customer_Model_Resource_Attribute_Collection::class, @@ -4600,20 +4586,20 @@ 'customer_resource/customer' => \Mage_Customer_Model_Resource_Customer::class, 'customer_resource/customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class, 'customer/resource_customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class, - 'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, 'customer/resource_flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, - 'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, + 'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, 'customer/resource_flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, - 'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, + 'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, 'customer/resource_form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, + 'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, 'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, 'customer/resource_form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, 'customer/resource_group' => \Mage_Customer_Model_Resource_Group::class, 'customer_resource/group' => \Mage_Customer_Model_Resource_Group::class, 'customer_resource/group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class, 'customer/resource_group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class, - 'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class, 'customer_resource/setup' => \Mage_Customer_Model_Resource_Setup::class, + 'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class, 'customer_resource/wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, 'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, 'customer/session' => \Mage_Customer_Model_Session::class, @@ -4667,10 +4653,10 @@ 'dataflow/mysql4_session' => \Mage_Dataflow_Model_Mysql4_Session::class, 'dataflow/profile' => \Mage_Dataflow_Model_Profile::class, 'dataflow/profile_history' => \Mage_Dataflow_Model_Profile_History::class, - 'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class, 'dataflow/resource_batch' => \Mage_Dataflow_Model_Resource_Batch::class, - 'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, + 'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class, 'dataflow/resource_batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, + 'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, 'dataflow/resource_batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class, 'dataflow_resource/batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class, 'dataflow_resource/batch_export' => \Mage_Dataflow_Model_Resource_Batch_Export::class, @@ -4685,12 +4671,12 @@ 'dataflow/resource_profile' => \Mage_Dataflow_Model_Resource_Profile::class, 'dataflow/resource_profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class, 'dataflow_resource/profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class, - 'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, 'dataflow_resource/profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, + 'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, 'dataflow_resource/profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class, 'dataflow/resource_profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class, - 'dataflow/resource_session' => \Mage_Dataflow_Model_Resource_Session::class, 'dataflow_resource/session' => \Mage_Dataflow_Model_Resource_Session::class, + 'dataflow/resource_session' => \Mage_Dataflow_Model_Resource_Session::class, 'dataflow/session' => \Mage_Dataflow_Model_Session::class, 'dataflow/session_adapter_http' => \Mage_Dataflow_Model_Session_Adapter_Http::class, 'dataflow/session_parser_csv' => \Mage_Dataflow_Model_Session_Parser_Csv::class, @@ -4720,18 +4706,18 @@ 'directory/resource_country' => \Mage_Directory_Model_Resource_Country::class, 'directory_resource/country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class, 'directory/resource_country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class, - 'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class, 'directory/resource_country_format' => \Mage_Directory_Model_Resource_Country_Format::class, + 'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class, 'directory_resource/country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class, 'directory/resource_country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class, 'directory_resource/currency' => \Mage_Directory_Model_Resource_Currency::class, 'directory/resource_currency' => \Mage_Directory_Model_Resource_Currency::class, - 'directory/resource_currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class, 'directory_resource/currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class, + 'directory/resource_currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class, 'directory/resource_region' => \Mage_Directory_Model_Resource_Region::class, 'directory_resource/region' => \Mage_Directory_Model_Resource_Region::class, - 'directory/resource_region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class, 'directory_resource/region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class, + 'directory/resource_region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class, 'downloadable/catalogIndex_data_downloadable' => \Mage_Downloadable_Model_CatalogIndex_Data_Downloadable::class, 'downloadable/link' => \Mage_Downloadable_Model_Link::class, 'downloadable/link_api' => \Mage_Downloadable_Model_Link_Api::class, @@ -4752,8 +4738,8 @@ 'downloadable/observer' => \Mage_Downloadable_Model_Observer::class, 'downloadable/product_price' => \Mage_Downloadable_Model_Product_Price::class, 'downloadable/product_type' => \Mage_Downloadable_Model_Product_Type::class, - 'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, 'downloadable_resource/indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, + 'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, 'downloadable/resource_link' => \Mage_Downloadable_Model_Resource_Link::class, 'downloadable_resource/link' => \Mage_Downloadable_Model_Resource_Link::class, 'downloadable/resource_link_collection' => \Mage_Downloadable_Model_Resource_Link_Collection::class, @@ -4762,14 +4748,14 @@ 'downloadable_resource/link_purchased' => \Mage_Downloadable_Model_Resource_Link_Purchased::class, 'downloadable/resource_link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class, 'downloadable_resource/link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class, - 'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, 'downloadable/resource_link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, - 'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, + 'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, 'downloadable/resource_link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, - 'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class, + 'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, 'downloadable/resource_sample' => \Mage_Downloadable_Model_Resource_Sample::class, - 'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, + 'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class, 'downloadable/resource_sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, + 'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, 'downloadable/sales_order_pdf_items_abstract' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Abstract::class, 'downloadable/sales_order_pdf_items_creditmemo' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Creditmemo::class, 'downloadable/sales_order_pdf_items_invoice' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Invoice::class, @@ -4851,8 +4837,8 @@ 'eav/mysql4_form_fieldset_collection' => \Mage_Eav_Model_Mysql4_Form_Fieldset_Collection::class, 'eav/mysql4_form_type' => \Mage_Eav_Model_Mysql4_Form_Type::class, 'eav/mysql4_form_type_collection' => \Mage_Eav_Model_Mysql4_Form_Type_Collection::class, - 'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class, 'eav_resource/attribute' => \Mage_Eav_Model_Resource_Attribute::class, + 'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class, 'eav_resource/attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class, 'eav/resource_attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class, 'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class, @@ -4869,28 +4855,28 @@ 'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class, 'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, 'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, - 'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, 'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, - 'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, + 'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, 'eav_resource/entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, + 'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, 'eav_resource/entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class, 'eav/resource_entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class, 'eav_resource/entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class, 'eav/resource_entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class, - 'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, 'eav_resource/entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, + 'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, 'eav/resource_form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class, 'eav_resource/form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class, - 'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, 'eav/resource_form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, + 'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, 'eav/resource_form_element' => \Mage_Eav_Model_Resource_Form_Element::class, 'eav_resource/form_element' => \Mage_Eav_Model_Resource_Form_Element::class, - 'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, 'eav_resource/form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, - 'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, + 'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, 'eav/resource_form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, - 'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, + 'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, 'eav_resource/form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, + 'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, 'eav/resource_form_type' => \Mage_Eav_Model_Resource_Form_Type::class, 'eav_resource/form_type' => \Mage_Eav_Model_Resource_Form_Type::class, 'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class, @@ -4906,12 +4892,12 @@ 'giftmessage/mysql4_message_collection' => \Mage_GiftMessage_Model_Mysql4_Message_Collection::class, 'giftmessage/mysql4_setup' => \Mage_GiftMessage_Model_Mysql4_Setup::class, 'giftmessage/observer' => \Mage_GiftMessage_Model_Observer::class, - 'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class, 'giftmessage/resource_message' => \Mage_GiftMessage_Model_Resource_Message::class, - 'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, + 'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class, 'giftmessage_resource/message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, - 'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class, + 'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, 'giftmessage_resource/setup' => \Mage_GiftMessage_Model_Resource_Setup::class, + 'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class, 'googleanalytics/observer' => \Mage_GoogleAnalytics_Model_Observer::class, 'googleanalytics/system_config_source_type' => \Mage_GoogleAnalytics_Model_System_Config_Source_Type::class, 'googlecheckout/payment' => \Mage_GoogleCheckout_Model_Payment::class, @@ -4947,8 +4933,8 @@ 'importexport/product_attribute_backend_urlkey' => \Mage_ImportExport_Model_Product_Attribute_Backend_Urlkey::class, 'importexport_resource/helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class, 'importexport/resource_helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class, - 'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, 'importexport_resource/import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, + 'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, 'importexport_resource/setup' => \Mage_ImportExport_Model_Resource_Setup::class, 'importexport/resource_setup' => \Mage_ImportExport_Model_Resource_Setup::class, 'importexport/source_export_entity' => \Mage_ImportExport_Model_Source_Export_Entity::class, @@ -4970,16 +4956,16 @@ 'index/process' => \Mage_Index_Model_Process::class, 'index_resource/abstract' => \Mage_Index_Model_Resource_Abstract::class, 'index/resource_abstract' => \Mage_Index_Model_Resource_Abstract::class, - 'index/resource_event' => \Mage_Index_Model_Resource_Event::class, 'index_resource/event' => \Mage_Index_Model_Resource_Event::class, + 'index/resource_event' => \Mage_Index_Model_Resource_Event::class, 'index/resource_event_collection' => \Mage_Index_Model_Resource_Event_Collection::class, 'index_resource/event_collection' => \Mage_Index_Model_Resource_Event_Collection::class, 'index/resource_helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class, 'index_resource/helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class, - 'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, 'index/resource_lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, - 'index_resource/process' => \Mage_Index_Model_Resource_Process::class, + 'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, 'index/resource_process' => \Mage_Index_Model_Resource_Process::class, + 'index_resource/process' => \Mage_Index_Model_Resource_Process::class, 'index/resource_process_collection' => \Mage_Index_Model_Resource_Process_Collection::class, 'index_resource/process_collection' => \Mage_Index_Model_Resource_Process_Collection::class, 'index/resource_setup' => \Mage_Index_Model_Resource_Setup::class, @@ -5012,22 +4998,22 @@ 'log/mysql4_visitor_online_collection' => \Mage_Log_Model_Mysql4_Visitor_Online_Collection::class, 'log_resource/aggregation' => \Mage_Log_Model_Resource_Aggregation::class, 'log/resource_aggregation' => \Mage_Log_Model_Resource_Aggregation::class, - 'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class, 'log/resource_customer' => \Mage_Log_Model_Resource_Customer::class, + 'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class, 'log/resource_log' => \Mage_Log_Model_Resource_Log::class, 'log_resource/log' => \Mage_Log_Model_Resource_Log::class, 'log_resource/visitor' => \Mage_Log_Model_Resource_Visitor::class, 'log/resource_visitor' => \Mage_Log_Model_Resource_Visitor::class, 'log_resource/visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class, 'log/resource_visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class, - 'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, 'log_resource/visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, - 'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, + 'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, 'log_resource/visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, + 'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, 'log/visitor' => \Mage_Log_Model_Visitor::class, 'log/visitor_online' => \Mage_Log_Model_Visitor_Online::class, - 'media_resource/image' => \Mage_Media_Model_File_Image::class, 'media/file_image' => \Mage_Media_Model_File_Image::class, + 'media_resource/image' => \Mage_Media_Model_File_Image::class, 'media/image' => \Mage_Media_Model_Image::class, 'newsletter/message' => \Mage_Newsletter_Model_Message::class, 'newsletter/mysql4_problem' => \Mage_Newsletter_Model_Mysql4_Problem::class, @@ -5045,14 +5031,14 @@ 'newsletter_resource/problem' => \Mage_Newsletter_Model_Resource_Problem::class, 'newsletter/resource_problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class, 'newsletter_resource/problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class, - 'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class, 'newsletter/resource_queue' => \Mage_Newsletter_Model_Resource_Queue::class, - 'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, + 'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class, 'newsletter/resource_queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, - 'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, + 'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, 'newsletter/resource_subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, - 'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, + 'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, 'newsletter/resource_subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, + 'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, 'newsletter_resource/template' => \Mage_Newsletter_Model_Resource_Template::class, 'newsletter/resource_template' => \Mage_Newsletter_Model_Resource_Template::class, 'newsletter_resource/template_collection' => \Mage_Newsletter_Model_Resource_Template_Collection::class, @@ -5065,20 +5051,20 @@ 'oauth/consumer_validator_keyLength' => \Mage_Oauth_Model_Consumer_Validator_KeyLength::class, 'oauth/nonce' => \Mage_Oauth_Model_Nonce::class, 'oauth/observer' => \Mage_Oauth_Model_Observer::class, - 'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class, 'oauth/resource_consumer' => \Mage_Oauth_Model_Resource_Consumer::class, + 'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class, 'oauth/resource_consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class, 'oauth_resource/consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class, 'oauth_resource/nonce' => \Mage_Oauth_Model_Resource_Nonce::class, 'oauth/resource_nonce' => \Mage_Oauth_Model_Resource_Nonce::class, 'oauth_resource/nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class, 'oauth/resource_nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class, - 'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class, 'oauth/resource_setup' => \Mage_Oauth_Model_Resource_Setup::class, + 'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class, 'oauth_resource/token' => \Mage_Oauth_Model_Resource_Token::class, 'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class, - 'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, + 'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth/server' => \Mage_Oauth_Model_Server::class, 'oauth/token' => \Mage_Oauth_Model_Token::class, 'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class, @@ -5095,8 +5081,8 @@ 'paygate/authorizenet_source_paymentAction' => \Mage_Paygate_Model_Authorizenet_Source_PaymentAction::class, 'paygate/mysql4_authorizenet_debug' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug::class, 'paygate/mysql4_authorizenet_debug_collection' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection::class, - 'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, 'paygate/resource_authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, + 'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, 'paygate_resource/authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class, 'paygate/resource_authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class, 'payment/billing_agreementAbstract' => \Mage_Payment_Model_Billing_AgreementAbstract::class, @@ -5159,14 +5145,14 @@ 'paypal/resource_cert' => \Mage_Paypal_Model_Resource_Cert::class, 'paypal_resource/payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class, 'paypal/resource_payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class, - 'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, 'paypal/resource_payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, + 'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, 'paypal/resource_report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class, 'paypal_resource/report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class, - 'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, 'paypal/resource_report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, - 'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, + 'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, 'paypal/resource_report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, + 'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, 'paypal/resource_setup' => \Mage_Paypal_Model_Resource_Setup::class, 'paypal_resource/setup' => \Mage_Paypal_Model_Resource_Setup::class, 'paypal/session' => \Mage_Paypal_Model_Session::class, @@ -5200,16 +5186,16 @@ 'poll/poll' => \Mage_Poll_Model_Poll::class, 'poll/poll_answer' => \Mage_Poll_Model_Poll_Answer::class, 'poll/poll_vote' => \Mage_Poll_Model_Poll_Vote::class, - 'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class, 'poll_resource/poll' => \Mage_Poll_Model_Resource_Poll::class, - 'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, + 'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class, 'poll/resource_poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, - 'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, + 'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, 'poll_resource/poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, - 'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, + 'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, 'poll_resource/poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, - 'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, + 'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, 'poll/resource_poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, + 'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, 'productalert/email' => \Mage_ProductAlert_Model_Email::class, 'productalert/mysql4_price' => \Mage_ProductAlert_Model_Mysql4_Price::class, 'productalert/mysql4_price_collection' => \Mage_ProductAlert_Model_Mysql4_Price_Collection::class, @@ -5219,20 +5205,20 @@ 'productalert/mysql4_stock_customer_collection' => \Mage_ProductAlert_Model_Mysql4_Stock_Customer_Collection::class, 'productalert/observer' => \Mage_ProductAlert_Model_Observer::class, 'productalert/price' => \Mage_ProductAlert_Model_Price::class, - 'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, 'productalert_resource/abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, - 'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class, + 'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, 'productalert_resource/price' => \Mage_ProductAlert_Model_Resource_Price::class, - 'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, + 'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class, 'productalert/resource_price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, - 'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, + 'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, 'productalert/resource_price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, - 'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class, + 'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, 'productalert/resource_stock' => \Mage_ProductAlert_Model_Resource_Stock::class, - 'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, + 'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class, 'productalert/resource_stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, - 'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, + 'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, 'productalert/resource_stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, + 'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, 'productalert/stock' => \Mage_ProductAlert_Model_Stock::class, 'rating/mysql4_rating' => \Mage_Rating_Model_Mysql4_Rating::class, 'rating/mysql4_rating_collection' => \Mage_Rating_Model_Mysql4_Rating_Collection::class, @@ -5246,20 +5232,20 @@ 'rating/rating_entity' => \Mage_Rating_Model_Rating_Entity::class, 'rating/rating_option' => \Mage_Rating_Model_Rating_Option::class, 'rating/rating_option_vote' => \Mage_Rating_Model_Rating_Option_Vote::class, - 'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class, 'rating/resource_rating' => \Mage_Rating_Model_Resource_Rating::class, + 'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class, 'rating_resource/rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class, 'rating/resource_rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class, 'rating/resource_rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class, 'rating_resource/rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class, - 'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, 'rating/resource_rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, - 'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, + 'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, 'rating_resource/rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, + 'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, 'rating_resource/rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class, 'rating/resource_rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class, - 'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, 'rating/resource_rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, + 'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, 'reports/config' => \Mage_Reports_Model_Config::class, 'reports/event' => \Mage_Reports_Model_Event::class, 'reports/event_observer' => \Mage_Reports_Model_Event_Observer::class, @@ -5305,6 +5291,7 @@ 'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class, 'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class, 'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class, + 'reports/observer' => \Mage_Reports_Model_Observer::class, 'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class, 'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class, 'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class, @@ -5313,52 +5300,52 @@ 'reports_resource/accounts_collection' => \Mage_Reports_Model_Resource_Accounts_Collection::class, 'reports/resource_coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class, 'reports_resource/coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class, - 'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, 'reports/resource_customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, - 'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, + 'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, 'reports/resource_customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, - 'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, + 'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, 'reports_resource/customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, - 'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, + 'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, 'reports/resource_entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, + 'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, 'reports_resource/event' => \Mage_Reports_Model_Resource_Event::class, 'reports/resource_event' => \Mage_Reports_Model_Resource_Event::class, - 'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, 'reports_resource/event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, - 'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class, + 'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, 'reports/resource_event_type' => \Mage_Reports_Model_Resource_Event_Type::class, - 'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, + 'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class, 'reports/resource_event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, - 'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, + 'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, 'reports_resource/helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, - 'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, + 'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, 'reports/resource_invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, - 'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, + 'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, 'reports_resource/order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, - 'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, + 'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, 'reports_resource/product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, + 'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, 'reports/resource_product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class, 'reports_resource/product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class, 'reports_resource/product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class, 'reports/resource_product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class, - 'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, 'reports/resource_product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, + 'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, 'reports_resource/product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class, 'reports/resource_product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class, - 'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, 'reports_resource/product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, + 'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, 'reports/resource_product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, 'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, 'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, 'reports_resource/product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, - 'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, 'reports/resource_product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, + 'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, 'reports_resource/product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class, 'reports/resource_product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class, - 'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, 'reports_resource/product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, - 'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, + 'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, 'reports_resource/product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, + 'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, 'reports/resource_quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, 'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, 'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class, @@ -5367,34 +5354,34 @@ 'reports_resource/report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class, 'reports/resource_report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class, 'reports_resource/report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class, - 'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, 'reports_resource/report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, + 'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, 'reports/resource_report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class, 'reports_resource/report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class, - 'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, 'reports/resource_report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, - 'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, + 'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, 'reports_resource/review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, - 'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, + 'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, 'reports_resource/review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, + 'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, 'reports_resource/review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class, 'reports/resource_review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class, 'reports_resource/shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class, 'reports/resource_shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class, - 'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, 'reports_resource/shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, + 'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, 'reports_resource/tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class, 'reports/resource_tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class, 'reports/resource_tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, 'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, 'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, 'reports/resource_tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, - 'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, 'reports/resource_tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, + 'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, 'reports_resource/wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class, 'reports/resource_wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class, - 'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, 'reports_resource/wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, + 'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, 'reports/session' => \Mage_Reports_Model_Session::class, 'reports/test' => \Mage_Reports_Model_Test::class, 'reports/totals' => \Mage_Reports_Model_Totals::class, @@ -5413,12 +5400,12 @@ 'review/resource_review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class, 'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class, 'review_resource/review_status' => \Mage_Review_Model_Resource_Review_Status::class, - 'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, 'review_resource/review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, + 'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, 'review/resource_review_summary' => \Mage_Review_Model_Resource_Review_Summary::class, 'review_resource/review_summary' => \Mage_Review_Model_Resource_Review_Summary::class, - 'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, 'review/resource_review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, + 'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, 'review/review' => \Mage_Review_Model_Review::class, 'review/review_status' => \Mage_Review_Model_Review_Status::class, 'review/review_summary' => \Mage_Review_Model_Review_Summary::class, @@ -5441,12 +5428,12 @@ 'rule/mysql4_rule_collection' => \Mage_Rule_Model_Mysql4_Rule_Collection::class, 'rule/renderer_actions' => \Mage_Rule_Model_Renderer_Actions::class, 'rule/renderer_conditions' => \Mage_Rule_Model_Renderer_Conditions::class, - 'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class, 'rule/resource_abstract' => \Mage_Rule_Model_Resource_Abstract::class, - 'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class, + 'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class, 'rule/resource_rule' => \Mage_Rule_Model_Resource_Rule::class, - 'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, + 'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class, 'rule_resource/rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, + 'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, 'rule_resource/rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, 'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, 'rule/resource_rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class, @@ -5473,28 +5460,28 @@ 'salesrule/quote_nominal_discount' => \Mage_SalesRule_Model_Quote_Nominal_Discount::class, 'salesrule_resource/coupon' => \Mage_SalesRule_Model_Resource_Coupon::class, 'salesrule/resource_coupon' => \Mage_SalesRule_Model_Resource_Coupon::class, - 'salesrule_resource/coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class, 'salesrule/resource_coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class, + 'salesrule_resource/coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class, 'salesrule/resource_coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class, 'salesrule_resource/coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class, - 'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, 'salesrule_resource/report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, - 'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, + 'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, 'salesrule_resource/report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, + 'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, 'salesrule_resource/report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class, 'salesrule/resource_report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class, 'salesrule_resource/report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class, 'salesrule/resource_report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class, 'salesrule_resource/report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class, 'salesrule/resource_report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class, - 'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class, 'salesrule_resource/rule' => \Mage_SalesRule_Model_Resource_Rule::class, - 'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, + 'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class, 'salesrule_resource/rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, - 'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, + 'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, 'salesrule_resource/rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, - 'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, + 'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, 'salesrule/resource_rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, + 'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, 'salesrule_resource/rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class, 'salesrule/resource_rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class, 'salesrule/resource_rule_product_collection' => \Mage_SalesRule_Model_Resource_Rule_Product_Collection::class, @@ -5539,14 +5526,14 @@ 'sales/email_template' => \Mage_Sales_Model_Email_Template::class, 'sales/entity_order' => \Mage_Sales_Model_Entity_Order::class, 'sales_entity/order' => \Mage_Sales_Model_Entity_Order::class, - 'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class, 'sales_entity/order_address' => \Mage_Sales_Model_Entity_Order_Address::class, - 'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, + 'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class, 'sales/entity_order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, - 'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, + 'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, 'sales_entity/order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, - 'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, + 'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, 'sales_entity/order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, + 'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, 'sales_entity/order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class, 'sales/entity_order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class, 'sales/entity_order_attribute_backend_shipping' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Shipping::class, @@ -5555,54 +5542,54 @@ 'sales/entity_order_collection' => \Mage_Sales_Model_Entity_Order_Collection::class, 'sales_entity/order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class, 'sales/entity_order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class, - 'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, 'sales_entity/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, - 'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, + 'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, 'sales/entity_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, - 'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, + 'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, 'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, + 'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, 'sales/entity_order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class, 'sales_entity/order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class, 'sales/entity_order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class, 'sales_entity/order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class, 'sales_entity/order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class, 'sales/entity_order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class, - 'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, 'sales/entity_order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, - 'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, + 'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, 'sales_entity/order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, + 'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, 'sales/entity_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class, 'sales_entity/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class, - 'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class, 'sales/entity_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class, + 'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class, 'sales/entity_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Order::class, 'sales_entity/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Order::class, 'sales_entity/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class, 'sales/entity_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class, 'sales/entity_order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class, 'sales_entity/order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class, - 'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, 'sales/entity_order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, + 'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, 'sales_entity/order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class, 'sales/entity_order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class, 'sales_entity/order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class, 'sales/entity_order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class, - 'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, 'sales/entity_order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, + 'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, 'sales/entity_order_item' => \Mage_Sales_Model_Entity_Order_Item::class, 'sales_entity/order_item' => \Mage_Sales_Model_Entity_Order_Item::class, 'sales/entity_order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class, 'sales_entity/order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class, - 'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, 'sales/entity_order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, + 'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, 'sales_entity/order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class, 'sales/entity_order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class, 'sales/entity_order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class, 'sales_entity/order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class, - 'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, 'sales_entity/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, - 'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, + 'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, 'sales/entity_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, + 'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, 'sales/entity_order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class, 'sales_entity/order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class, 'sales/entity_order_shipment_comment' => \Mage_Sales_Model_Entity_Order_Shipment_Comment::class, @@ -5611,66 +5598,66 @@ 'sales_entity/order_shipment_comment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Comment_Collection::class, 'sales_entity/order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class, 'sales/entity_order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class, - 'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, 'sales/entity_order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, - 'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, + 'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, 'sales_entity/order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, - 'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, + 'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, 'sales_entity/order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, - 'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, + 'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, 'sales_entity/order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, - 'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, + 'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, 'sales_entity/order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, + 'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, 'sales_entity/quote' => \Mage_Sales_Model_Entity_Quote::class, 'sales/entity_quote' => \Mage_Sales_Model_Entity_Quote::class, - 'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, 'sales_entity/quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, + 'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, 'sales_entity/quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class, 'sales/entity_quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class, - 'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, 'sales/entity_quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, - 'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, + 'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, 'sales/entity_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, - 'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, + 'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, 'sales_entity/quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, - 'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, + 'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, 'sales/entity_quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, + 'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, 'sales_entity/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales/entity_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales_entity/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class, 'sales/entity_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class, - 'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, 'sales_entity/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, - 'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, 'sales/entity_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/entity_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales_entity/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales/entity_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class, 'sales_entity/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class, 'sales_entity/quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class, 'sales/entity_quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class, - 'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, 'sales_entity/quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, - 'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, + 'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, 'sales/entity_quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, - 'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, + 'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, 'sales_entity/quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, + 'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, 'sales/entity_quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class, 'sales_entity/quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class, 'sales/entity_quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class, 'sales_entity/quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class, - 'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, 'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, - 'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, + 'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, 'sales/entity_quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, - 'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, + 'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, 'sales/entity_quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, + 'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, 'sales_entity/quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class, 'sales/entity_quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class, - 'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, 'sales_entity/sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, - 'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class, + 'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, 'sales_entity/setup' => \Mage_Sales_Model_Entity_Setup::class, + 'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class, 'sales/mysql4_abstract' => \Mage_Sales_Model_Mysql4_Abstract::class, 'sales/mysql4_billing_agreement' => \Mage_Sales_Model_Mysql4_Billing_Agreement::class, 'sales/mysql4_billing_agreement_collection' => \Mage_Sales_Model_Mysql4_Billing_Agreement_Collection::class, @@ -5865,50 +5852,50 @@ 'sales/recurring_profile' => \Mage_Sales_Model_Recurring_Profile::class, 'sales_resource/abstract' => \Mage_Sales_Model_Resource_Abstract::class, 'sales/resource_abstract' => \Mage_Sales_Model_Resource_Abstract::class, - 'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, 'sales_resource/billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, - 'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, + 'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, 'sales_resource/billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, + 'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, 'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, 'sales/resource_collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, 'sales_resource/helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, 'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, - 'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class, 'sales_resource/order' => \Mage_Sales_Model_Resource_Order::class, + 'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class, 'sales_resource/order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class, 'sales/resource_order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class, - 'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class, 'sales_resource/order_address' => \Mage_Sales_Model_Resource_Order_Address::class, + 'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class, 'sales/resource_order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class, 'sales_resource/order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class, 'sales/resource_order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class, 'sales_resource/order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class, 'sales/resource_order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class, 'sales_resource/order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class, - 'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, 'sales/resource_order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, + 'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, 'sales_resource/order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class, 'sales/resource_order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class, 'sales/resource_order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class, 'sales_resource/order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class, - 'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, 'sales/resource_order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, - 'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, + 'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, 'sales/resource_order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, - 'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, + 'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, 'sales/resource_order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, - 'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, + 'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, 'sales_resource/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, + 'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, 'sales/resource_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class, 'sales_resource/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class, - 'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, 'sales/resource_order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, - 'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, + 'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, 'sales_resource/order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, + 'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, 'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, 'sales/resource_order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, - 'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, 'sales/resource_order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, + 'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, 'sales_resource/order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class, 'sales/resource_order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class, 'sales_resource/order_creditmemo_item_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item_Collection::class, @@ -5917,138 +5904,138 @@ 'sales/resource_order_grid_collection' => \Mage_Sales_Model_Resource_Order_Grid_Collection::class, 'sales/resource_order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class, 'sales_resource/order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class, - 'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, 'sales/resource_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, - 'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, + 'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, 'sales_resource/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, + 'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, 'sales_resource/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class, 'sales/resource_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class, 'sales/resource_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class, 'sales_resource/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class, 'sales/resource_order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class, 'sales_resource/order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class, - 'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, 'sales/resource_order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, + 'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, 'sales/resource_order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class, 'sales_resource/order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class, - 'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, 'sales/resource_order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, - 'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, + 'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, 'sales_resource/order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, + 'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, 'sales/resource_order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class, 'sales_resource/order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class, - 'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class, 'sales_resource/order_item' => \Mage_Sales_Model_Resource_Order_Item::class, + 'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class, 'sales/resource_order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class, 'sales_resource/order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class, - 'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, 'sales_resource/order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, - 'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, + 'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, 'sales/resource_order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, + 'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, 'sales_resource/order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, 'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, - 'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, 'sales_resource/order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, - 'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, + 'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, 'sales_resource/order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, - 'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, + 'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, 'sales/resource_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, + 'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, 'sales_resource/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class, 'sales/resource_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class, 'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, 'sales/resource_order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, - 'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, 'sales/resource_order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, - 'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, + 'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, 'sales/resource_order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, + 'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, 'sales_resource/order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class, 'sales/resource_order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class, - 'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, 'sales_resource/order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, - 'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, + 'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, 'sales_resource/order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, - 'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, + 'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, 'sales_resource/order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, - 'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, + 'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, 'sales_resource/order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, + 'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, 'sales_resource/order_status' => \Mage_Sales_Model_Resource_Order_Status::class, 'sales/resource_order_status' => \Mage_Sales_Model_Resource_Order_Status::class, 'sales_resource/order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class, 'sales/resource_order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class, - 'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, 'sales_resource/order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, - 'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, + 'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, 'sales_resource/order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, - 'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, + 'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, 'sales/resource_order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, - 'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, + 'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, 'sales_resource/order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, - 'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class, + 'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, 'sales/resource_quote' => \Mage_Sales_Model_Resource_Quote::class, + 'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class, 'sales_resource/quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class, 'sales/resource_quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class, 'sales/resource_quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class, 'sales_resource/quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class, 'sales/resource_quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class, 'sales_resource/quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class, - 'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, 'sales/resource_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, + 'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, 'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, 'sales/resource_quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, - 'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, 'sales_resource/quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, + 'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, 'sales_resource/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales/resource_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales/resource_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class, 'sales_resource/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class, 'sales/resource_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class, 'sales_resource/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class, - 'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/resource_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, 'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales/resource_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, - 'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, 'sales_resource/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, - 'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, + 'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, 'sales/resource_quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, + 'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, 'sales_resource/quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class, 'sales/resource_quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class, - 'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, 'sales/resource_quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, - 'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, + 'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, 'sales_resource/quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, - 'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, + 'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, 'sales_resource/quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, + 'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, 'sales_resource/quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class, 'sales/resource_quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class, - 'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, 'sales/resource_quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, + 'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, 'sales/resource_quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class, 'sales_resource/quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class, - 'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, 'sales/resource_quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, - 'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, + 'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, 'sales/resource_quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, - 'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, + 'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, 'sales_resource/quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, - 'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, + 'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, 'sales/resource_quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, - 'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, + 'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, 'sales/resource_recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, + 'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, 'sales/resource_recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class, 'sales_resource/recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class, - 'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class, 'sales/resource_report' => \Mage_Sales_Model_Resource_Report::class, + 'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class, 'sales/resource_report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class, 'sales_resource/report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class, - 'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, 'sales/resource_report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, + 'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, 'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, 'sales/resource_report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, - 'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, 'sales_resource/report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, - 'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, + 'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, 'sales_resource/report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, + 'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, 'sales/resource_report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class, 'sales_resource/report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class, 'sales_resource/report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class, @@ -6061,24 +6048,24 @@ 'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class, 'sales_resource/report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class, 'sales/resource_report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class, - 'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, 'sales/resource_report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, - 'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, + 'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, 'sales_resource/report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, + 'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, 'sales_resource/report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class, 'sales/resource_report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class, 'sales_resource/report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class, 'sales/resource_report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class, - 'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, 'sales_resource/report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, + 'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, 'sales_resource/report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class, 'sales/resource_report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class, 'sales_resource/report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class, 'sales/resource_report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class, - 'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, 'sales/resource_sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, - 'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class, + 'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, 'sales/resource_setup' => \Mage_Sales_Model_Resource_Setup::class, + 'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class, 'sales/service_order' => \Mage_Sales_Model_Service_Order::class, 'sales/service_quote' => \Mage_Sales_Model_Service_Quote::class, 'sales/status_list' => \Mage_Sales_Model_Status_List::class, @@ -6088,8 +6075,8 @@ 'sendfriend/observer' => \Mage_Sendfriend_Model_Observer::class, 'sendfriend_resource/sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class, 'sendfriend/resource_sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class, - 'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, 'sendfriend/resource_sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, + 'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, 'sendfriend/resource_setup' => \Mage_Sendfriend_Model_Resource_Setup::class, 'sendfriend_resource/setup' => \Mage_Sendfriend_Model_Resource_Setup::class, 'sendfriend/sendfriend' => \Mage_Sendfriend_Model_Sendfriend::class, @@ -6108,8 +6095,8 @@ 'shipping/rate_result_abstract' => \Mage_Shipping_Model_Rate_Result_Abstract::class, 'shipping/rate_result_error' => \Mage_Shipping_Model_Rate_Result_Error::class, 'shipping/rate_result_method' => \Mage_Shipping_Model_Rate_Result_Method::class, - 'shipping/resource_carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class, 'shipping_resource/carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class, + 'shipping/resource_carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class, 'shipping/resource_carrier_tablerate_collection' => \Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection::class, 'shipping_resource/carrier_tablerate_collection' => \Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection::class, 'shipping/shipment_request' => \Mage_Shipping_Model_Shipment_Request::class, @@ -6129,16 +6116,16 @@ 'sitemap/observer' => \Mage_Sitemap_Model_Observer::class, 'sitemap_resource/catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class, 'sitemap/resource_catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class, - 'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, 'sitemap/resource_catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, - 'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, + 'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, 'sitemap_resource/catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, - 'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, + 'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, 'sitemap_resource/cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, + 'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, 'sitemap_resource/sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class, 'sitemap/resource_sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class, - 'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, 'sitemap_resource/sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, + 'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, 'sitemap/sitemap' => \Mage_Sitemap_Model_Sitemap::class, 'tag/api' => \Mage_Tag_Model_Api::class, 'tag/api_v2' => \Mage_Tag_Model_Api_V2::class, @@ -6151,21 +6138,21 @@ 'tag/mysql4_tag' => \Mage_Tag_Model_Mysql4_Tag::class, 'tag/mysql4_tag_collection' => \Mage_Tag_Model_Mysql4_Tag_Collection::class, 'tag/mysql4_tag_relation' => \Mage_Tag_Model_Mysql4_Tag_Relation::class, - 'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag/resource_customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag_resource/customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, - 'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, + 'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag_resource/indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, - 'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, + 'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, 'tag_resource/popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, + 'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, 'tag_resource/product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class, 'tag/resource_product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class, 'tag_resource/tag' => \Mage_Tag_Model_Resource_Tag::class, 'tag/resource_tag' => \Mage_Tag_Model_Resource_Tag::class, - 'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, 'tag_resource/tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, - 'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, + 'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, 'tag_resource/tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, + 'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, 'tag/session' => \Mage_Tag_Model_Session::class, 'tag/tag' => \Mage_Tag_Model_Tag::class, 'tag/tag_relation' => \Mage_Tag_Model_Tag_Relation::class, @@ -6204,16 +6191,16 @@ 'tax/resource_calculation_rate' => \Mage_Tax_Model_Resource_Calculation_Rate::class, 'tax/resource_calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class, 'tax_resource/calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class, - 'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, 'tax/resource_calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, - 'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, + 'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, 'tax/resource_calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, - 'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, + 'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, 'tax/resource_calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, - 'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, + 'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, 'tax_resource/calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, - 'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class, + 'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, 'tax/resource_class' => \Mage_Tax_Model_Resource_Class::class, + 'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class, 'tax/resource_class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class, 'tax_resource/class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class, 'tax_resource/report_collection' => \Mage_Tax_Model_Resource_Report_Collection::class, @@ -6224,16 +6211,16 @@ 'tax/resource_report_tax_createdat' => \Mage_Tax_Model_Resource_Report_Tax_Createdat::class, 'tax_resource/report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class, 'tax/resource_report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class, - 'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, 'tax/resource_report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, - 'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, + 'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, 'tax_resource/sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, + 'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, 'tax_resource/sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class, 'tax/resource_sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class, - 'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class, 'tax/resource_sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class, - 'tax_resource/sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class, + 'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class, 'tax/resource_sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class, + 'tax_resource/sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class, 'tax/resource_setup' => \Mage_Tax_Model_Resource_Setup::class, 'tax_resource/setup' => \Mage_Tax_Model_Resource_Setup::class, 'tax/sales_order_tax' => \Mage_Tax_Model_Sales_Order_Tax::class, @@ -6316,10 +6303,10 @@ 'weee/observer' => \Mage_Weee_Model_Observer::class, 'weee/resource_attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class, 'weee_resource/attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class, - 'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class, 'weee/resource_setup' => \Mage_Weee_Model_Resource_Setup::class, - 'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class, + 'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class, 'weee/resource_tax' => \Mage_Weee_Model_Resource_Tax::class, + 'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class, 'weee/tax' => \Mage_Weee_Model_Tax::class, 'weee/total_creditmemo_weee' => \Mage_Weee_Model_Total_Creditmemo_Weee::class, 'weee/total_invoice_weee' => \Mage_Weee_Model_Total_Invoice_Weee::class, @@ -6329,12 +6316,12 @@ 'widget/mysql4_widget_instance' => \Mage_Widget_Model_Mysql4_Widget_Instance::class, 'widget/mysql4_widget_instance_collection' => \Mage_Widget_Model_Mysql4_Widget_Instance_Collection::class, 'widget/observer' => \Mage_Widget_Model_Observer::class, - 'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class, 'widget/resource_widget' => \Mage_Widget_Model_Resource_Widget::class, + 'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class, 'widget_resource/widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class, 'widget/resource_widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class, - 'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, 'widget_resource/widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, + 'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, 'widget/template_filter' => \Mage_Widget_Model_Template_Filter::class, 'widget/widget' => \Mage_Widget_Model_Widget::class, 'widget/widget_config' => \Mage_Widget_Model_Widget_Config::class, @@ -6351,14 +6338,14 @@ 'wishlist/mysql4_wishlist' => \Mage_Wishlist_Model_Mysql4_Wishlist::class, 'wishlist/mysql4_wishlist_collection' => \Mage_Wishlist_Model_Mysql4_Wishlist_Collection::class, 'wishlist/observer' => \Mage_Wishlist_Model_Observer::class, - 'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class, 'wishlist_resource/item' => \Mage_Wishlist_Model_Resource_Item::class, + 'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class, 'wishlist_resource/item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class, 'wishlist/resource_item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class, 'wishlist/resource_item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, 'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, - 'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, 'wishlist_resource/item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, + 'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, 'wishlist_resource/product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class, 'wishlist/resource_product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class, 'wishlist/resource_wishlist' => \Mage_Wishlist_Model_Resource_Wishlist::class, @@ -6367,7 +6354,6 @@ 'wishlist/resource_wishlist_collection' => \Mage_Wishlist_Model_Resource_Wishlist_Collection::class, 'wishlist/session' => \Mage_Wishlist_Model_Session::class, 'wishlist/wishlist' => \Mage_Wishlist_Model_Wishlist::class, - 'varien/autoload' => \Varien_Autoload::class, ]) ); override( \Mage_Checkout_Helper_Cart::_getSingletonModel(0), @@ -6377,11 +6363,10 @@ 'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class, 'adminnotification/mysql4_inbox_collection' => \Mage_AdminNotification_Model_Mysql4_Inbox_Collection::class, 'adminnotification/observer' => \Mage_AdminNotification_Model_Observer::class, - 'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, 'adminnotification/resource_inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, - 'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, + 'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, 'adminnotification/resource_inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, - 'adminnotification/survey' => \Mage_AdminNotification_Model_Survey::class, + 'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, 'admin/acl' => \Mage_Admin_Model_Acl::class, 'admin/acl_assert_ip' => \Mage_Admin_Model_Acl_Assert_Ip::class, 'admin/acl_assert_time' => \Mage_Admin_Model_Acl_Assert_Time::class, @@ -6410,38 +6395,38 @@ 'admin/redirectpolicy' => \Mage_Admin_Model_Redirectpolicy::class, 'admin/resource_acl' => \Mage_Admin_Model_Resource_Acl::class, 'admin_resource/acl' => \Mage_Admin_Model_Resource_Acl::class, - 'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, 'admin/resource_acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, + 'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, 'admin/resource_acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class, 'admin_resource/acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class, - 'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class, 'admin/resource_block' => \Mage_Admin_Model_Resource_Block::class, - 'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, + 'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class, 'admin/resource_block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, + 'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, 'admin_resource/permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class, 'admin/resource_permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class, - 'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class, 'admin/resource_role' => \Mage_Admin_Model_Resource_Role::class, + 'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class, 'admin/resource_role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class, 'admin_resource/role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class, - 'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class, 'admin_resource/roles' => \Mage_Admin_Model_Resource_Roles::class, - 'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, + 'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class, 'admin_resource/roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, - 'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, + 'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, 'admin/resource_roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, + 'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, 'admin/resource_rules' => \Mage_Admin_Model_Resource_Rules::class, 'admin_resource/rules' => \Mage_Admin_Model_Resource_Rules::class, 'admin_resource/rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, 'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, - 'admin_resource/user' => \Mage_Admin_Model_Resource_User::class, 'admin/resource_user' => \Mage_Admin_Model_Resource_User::class, + 'admin_resource/user' => \Mage_Admin_Model_Resource_User::class, 'admin/resource_user_collection' => \Mage_Admin_Model_Resource_User_Collection::class, 'admin_resource/user_collection' => \Mage_Admin_Model_Resource_User_Collection::class, - 'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class, 'admin_resource/variable' => \Mage_Admin_Model_Resource_Variable::class, - 'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, + 'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class, 'admin/resource_variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, + 'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, 'admin/role' => \Mage_Admin_Model_Role::class, 'admin/roles' => \Mage_Admin_Model_Roles::class, 'admin/rules' => \Mage_Admin_Model_Rules::class, @@ -6476,6 +6461,7 @@ 'adminhtml/system_config_backend_baseurl' => \Mage_Adminhtml_Model_System_Config_Backend_Baseurl::class, 'adminhtml/system_config_backend_cache' => \Mage_Adminhtml_Model_System_Config_Backend_Cache::class, 'adminhtml/system_config_backend_catalog_inventory_managestock' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock::class, + 'adminhtml/system_config_backend_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Separator::class, 'adminhtml/system_config_backend_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Type::class, 'adminhtml/system_config_backend_category' => \Mage_Adminhtml_Model_System_Config_Backend_Category::class, 'adminhtml/system_config_backend_cookie' => \Mage_Adminhtml_Model_System_Config_Backend_Cookie::class, @@ -6528,12 +6514,14 @@ 'adminhtml/system_config_source_catalog_listMode' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListMode::class, 'adminhtml/system_config_source_catalog_listPerPage' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListPerPage::class, 'adminhtml/system_config_source_catalog_listSort' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort::class, + 'adminhtml/system_config_source_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Separator::class, 'adminhtml/system_config_source_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Type::class, 'adminhtml/system_config_source_catalog_timeFormat' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_TimeFormat::class, 'adminhtml/system_config_source_category' => \Mage_Adminhtml_Model_System_Config_Source_Category::class, 'adminhtml/system_config_source_checktype' => \Mage_Adminhtml_Model_System_Config_Source_Checktype::class, 'adminhtml/system_config_source_cms_page' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Page::class, 'adminhtml/system_config_source_cms_wysiwyg_enabled' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Wysiwyg_Enabled::class, + 'adminhtml/system_config_source_cookie_samesite' => \Mage_Adminhtml_Model_System_Config_Source_Cookie_Samesite::class, 'adminhtml/system_config_source_country' => \Mage_Adminhtml_Model_System_Config_Source_Country::class, 'adminhtml/system_config_source_country_full' => \Mage_Adminhtml_Model_System_Config_Source_Country_Full::class, 'adminhtml/system_config_source_cron_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency::class, @@ -6560,6 +6548,7 @@ 'adminhtml/system_config_source_locale_timezone' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Timezone::class, 'adminhtml/system_config_source_locale_weekdaycodes' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdaycodes::class, 'adminhtml/system_config_source_locale_weekdays' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdays::class, + 'adminhtml/system_config_source_log_level' => \Mage_Adminhtml_Model_System_Config_Source_Log_Level::class, 'adminhtml/system_config_source_nooptreq' => \Mage_Adminhtml_Model_System_Config_Source_Nooptreq::class, 'adminhtml/system_config_source_notification_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Notification_Frequency::class, 'adminhtml/system_config_source_order_status' => \Mage_Adminhtml_Model_System_Config_Source_Order_Status::class, @@ -6583,7 +6572,6 @@ 'adminhtml/system_config_source_shipping_flatrate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Flatrate::class, 'adminhtml/system_config_source_shipping_tablerate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Tablerate::class, 'adminhtml/system_config_source_shipping_taxclass' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Taxclass::class, - 'adminhtml/system_config_source_startdateenddate' => \Mage_Adminhtml_Model_System_Config_Source_Startdateenddate::class, 'adminhtml/system_config_source_storage_media_database' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Database::class, 'adminhtml/system_config_source_storage_media_storage' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Storage::class, 'adminhtml/system_config_source_store' => \Mage_Adminhtml_Model_System_Config_Source_Store::class, @@ -6639,22 +6627,22 @@ 'api2_resource/acl_filter_attribute' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute::class, 'api2/resource_acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class, 'api2_resource/acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class, - 'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, 'api2_resource/acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, + 'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, 'api2/resource_acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class, 'api2_resource/acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class, 'api2_resource/acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class, 'api2/resource_acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class, 'api2/resource_acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class, 'api2_resource/acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class, - 'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class, 'api2/resource_setup' => \Mage_Api2_Model_Resource_Setup::class, + 'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class, 'api2/resource_validator' => \Mage_Api2_Model_Resource_Validator::class, 'api2_resource/validator' => \Mage_Api2_Model_Resource_Validator::class, 'api2/resource_validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class, 'api2_resource/validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class, - 'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, 'api2/resource_validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, + 'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, 'api2/response' => \Mage_Api2_Model_Response::class, 'api2/route_abstract' => \Mage_Api2_Model_Route_Abstract::class, 'api2/route_apiType' => \Mage_Api2_Model_Route_ApiType::class, @@ -6686,8 +6674,8 @@ 'api/mysql4_user_collection' => \Mage_Api_Model_Mysql4_User_Collection::class, 'api/resource_abstract' => \Mage_Api_Model_Resource_Abstract::class, 'api_resource/abstract' => \Mage_Api_Model_Resource_Abstract::class, - 'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class, 'api_resource/acl' => \Mage_Api_Model_Resource_Acl::class, + 'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class, 'api_resource/acl_role' => \Mage_Api_Model_Resource_Acl_Role::class, 'api/resource_acl_role' => \Mage_Api_Model_Resource_Acl_Role::class, 'api/resource_acl_role_collection' => \Mage_Api_Model_Resource_Acl_Role_Collection::class, @@ -6696,18 +6684,18 @@ 'api_resource/permissions_collection' => \Mage_Api_Model_Resource_Permissions_Collection::class, 'api_resource/role' => \Mage_Api_Model_Resource_Role::class, 'api/resource_role' => \Mage_Api_Model_Resource_Role::class, - 'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, 'api_resource/role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, + 'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, 'api/resource_roles' => \Mage_Api_Model_Resource_Roles::class, 'api_resource/roles' => \Mage_Api_Model_Resource_Roles::class, - 'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, 'api_resource/roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, - 'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, + 'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, 'api_resource/roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, - 'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class, + 'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, 'api_resource/rules' => \Mage_Api_Model_Resource_Rules::class, - 'api/resource_rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class, + 'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class, 'api_resource/rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class, + 'api/resource_rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class, 'api/resource_user' => \Mage_Api_Model_Resource_User::class, 'api_resource/user' => \Mage_Api_Model_Resource_User::class, 'api/resource_user_collection' => \Mage_Api_Model_Resource_User_Collection::class, @@ -6734,15 +6722,6 @@ 'authorizenet/directpost_request' => \Mage_Authorizenet_Model_Directpost_Request::class, 'authorizenet/directpost_response' => \Mage_Authorizenet_Model_Directpost_Response::class, 'authorizenet/directpost_session' => \Mage_Authorizenet_Model_Directpost_Session::class, - 'backup/backup' => \Mage_Backup_Model_Backup::class, - 'backup/config_backend_cron' => \Mage_Backup_Model_Config_Backend_Cron::class, - 'backup/config_source_type' => \Mage_Backup_Model_Config_Source_Type::class, - 'backup/db' => \Mage_Backup_Model_Db::class, - 'backup/fs_collection' => \Mage_Backup_Model_Fs_Collection::class, - 'backup/mysql4_db' => \Mage_Backup_Model_Mysql4_Db::class, - 'backup/observer' => \Mage_Backup_Model_Observer::class, - 'backup/resource_db' => \Mage_Backup_Model_Resource_Db::class, - 'backup/resource_helper_mysql4' => \Mage_Backup_Model_Resource_Helper_Mysql4::class, 'bundle/catalogIndex_data_bundle' => \Mage_Bundle_Model_CatalogIndex_Data_Bundle::class, 'bundle/mysql4_bundle' => \Mage_Bundle_Model_Mysql4_Bundle::class, 'bundle/mysql4_indexer_price' => \Mage_Bundle_Model_Mysql4_Indexer_Price::class, @@ -6768,10 +6747,10 @@ 'bundle_resource/option' => \Mage_Bundle_Model_Resource_Option::class, 'bundle/resource_option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class, 'bundle_resource/option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class, - 'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, 'bundle_resource/price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, - 'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class, + 'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, 'bundle_resource/selection' => \Mage_Bundle_Model_Resource_Selection::class, + 'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class, 'bundle_resource/selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class, 'bundle/resource_selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class, 'bundle/sales_order_pdf_items_abstract' => \Mage_Bundle_Model_Sales_Order_Pdf_Items_Abstract::class, @@ -6787,8 +6766,8 @@ 'captcha/config_form_frontend' => \Mage_Captcha_Model_Config_Form_Frontend::class, 'captcha/config_mode' => \Mage_Captcha_Model_Config_Mode::class, 'captcha/observer' => \Mage_Captcha_Model_Observer::class, - 'captcha_resource/log' => \Mage_Captcha_Model_Resource_Log::class, 'captcha/resource_log' => \Mage_Captcha_Model_Resource_Log::class, + 'captcha_resource/log' => \Mage_Captcha_Model_Resource_Log::class, 'captcha/zend' => \Mage_Captcha_Model_Zend::class, 'catalogindex/aggregation' => \Mage_CatalogIndex_Model_Aggregation::class, 'catalogindex/attribute' => \Mage_CatalogIndex_Model_Attribute::class, @@ -6831,8 +6810,8 @@ 'catalogindex/resource_data_abstract' => \Mage_CatalogIndex_Model_Resource_Data_Abstract::class, 'catalogindex_resource/data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class, 'catalogindex/resource_data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class, - 'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, 'catalogindex_resource/data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, + 'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, 'catalogindex_resource/indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class, 'catalogindex/resource_indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class, 'catalogindex/resource_indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class, @@ -6864,20 +6843,20 @@ 'cataloginventory/mysql4_stock_item_collection' => \Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection::class, 'cataloginventory/mysql4_stock_status' => \Mage_CatalogInventory_Model_Mysql4_Stock_Status::class, 'cataloginventory/observer' => \Mage_CatalogInventory_Model_Observer::class, - 'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, 'cataloginventory_resource/indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, + 'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, 'cataloginventory/resource_indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class, 'cataloginventory_resource/indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class, - 'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, 'cataloginventory/resource_indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, + 'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, 'cataloginventory/resource_indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class, 'cataloginventory_resource/indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class, 'cataloginventory_resource/stock' => \Mage_CatalogInventory_Model_Resource_Stock::class, 'cataloginventory/resource_stock' => \Mage_CatalogInventory_Model_Resource_Stock::class, - 'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, 'cataloginventory/resource_stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, - 'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, + 'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, 'cataloginventory/resource_stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, + 'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, 'cataloginventory/resource_stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class, 'cataloginventory_resource/stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class, 'cataloginventory/source_backorders' => \Mage_CatalogInventory_Model_Source_Backorders::class, @@ -6900,8 +6879,8 @@ 'catalogrule/observer' => \Mage_CatalogRule_Model_Observer::class, 'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class, 'catalogrule/resource_rule' => \Mage_CatalogRule_Model_Resource_Rule::class, - 'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, 'catalogrule_resource/rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, + 'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, 'catalogrule_resource/rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class, 'catalogrule/resource_rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class, 'catalogrule_resource/rule_product_price_collection' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price_Collection::class, @@ -6930,24 +6909,24 @@ 'catalogsearch/query' => \Mage_CatalogSearch_Model_Query::class, 'catalogsearch_resource/advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class, 'catalogsearch/resource_advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class, - 'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, 'catalogsearch_resource/advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, + 'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, 'catalogsearch_resource/fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class, 'catalogsearch/resource_fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class, 'catalogsearch_resource/fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class, 'catalogsearch/resource_fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class, - 'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, 'catalogsearch_resource/fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, - 'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, + 'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, 'catalogsearch/resource_helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, - 'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, + 'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, 'catalogsearch_resource/indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, - 'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class, + 'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, 'catalogsearch_resource/query' => \Mage_CatalogSearch_Model_Resource_Query::class, - 'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, + 'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class, 'catalogsearch_resource/query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, - 'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, + 'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, 'catalogsearch/resource_search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, + 'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, 'catalogsearch/session' => \Mage_CatalogSearch_Model_Session::class, 'catalogsearch/system_config_backend_sitemap' => \Mage_CatalogSearch_Model_System_Config_Backend_Sitemap::class, 'catalog/abstract' => \Mage_Catalog_Model_Abstract::class, @@ -7090,144 +7069,144 @@ 'catalog/product_website' => \Mage_Catalog_Model_Product_Website::class, 'catalog/resource_abstract' => \Mage_Catalog_Model_Resource_Abstract::class, 'catalog_resource/abstract' => \Mage_Catalog_Model_Resource_Abstract::class, - 'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class, 'catalog/resource_attribute' => \Mage_Catalog_Model_Resource_Attribute::class, - 'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class, + 'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class, 'catalog_resource/category' => \Mage_Catalog_Model_Resource_Category::class, + 'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class, 'catalog_resource/category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class, 'catalog/resource_category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class, - 'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, 'catalog/resource_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, - 'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, + 'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, 'catalog/resource_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, + 'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, 'catalog_resource/category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class, 'catalog/resource_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class, 'catalog_resource/category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class, 'catalog/resource_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class, 'catalog/resource_category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class, 'catalog_resource/category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class, - 'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, 'catalog_resource/category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, - 'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, + 'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, 'catalog/resource_category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, + 'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, 'catalog_resource/category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class, 'catalog/resource_category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class, 'catalog/resource_category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class, 'catalog_resource/category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class, - 'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, 'catalog_resource/collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, + 'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, 'catalog_resource/config' => \Mage_Catalog_Model_Resource_Config::class, 'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class, - 'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, 'catalog/resource_eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, + 'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, 'catalog_resource/eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class, 'catalog/resource_eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class, 'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, 'catalog_resource/eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, - 'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, 'catalog/resource_eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, - 'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, + 'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, 'catalog_resource/eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, + 'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, 'catalog_resource/eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, - 'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, + 'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, 'catalog_resource/eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, + 'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, 'catalog/resource_eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class, 'catalog_resource/eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class, 'catalog/resource_eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class, 'catalog_resource/eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class, 'catalog/resource_eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class, 'catalog_resource/eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class, - 'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, 'catalog/resource_eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, + 'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, 'catalog/resource_eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, 'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, 'catalog/resource_eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class, 'catalog_resource/eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class, - 'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, 'catalog_resource/eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, - 'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, + 'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, 'catalog_resource/eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, + 'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, 'catalog_resource/eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class, 'catalog/resource_eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class, - 'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, 'catalog_resource/eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, + 'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, 'catalog/resource_eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, 'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, - 'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, 'catalog/resource_eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, - 'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, + 'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, 'catalog/resource_eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, - 'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, + 'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, 'catalog_resource/eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, + 'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, 'catalog_resource/eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, 'catalog_resource/eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, 'catalog/resource_eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class, 'catalog/resource_eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, + 'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, 'catalog/resource_eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class, 'catalog/resource_eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class, 'catalog_resource/eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class, 'catalog_resource/eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class, 'catalog/resource_eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class, - 'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, 'catalog_resource/eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, - 'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, + 'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, 'catalog_resource/eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, - 'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, + 'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, 'catalog_resource/eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, + 'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, 'catalog/resource_eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class, 'catalog/resource_eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class, 'catalog/resource_eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class, - 'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, 'catalog/resource_eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, - 'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, + 'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, 'catalog_resource/eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, + 'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, 'catalog_resource/eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class, 'catalog/resource_eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class, - 'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, 'catalog/resource_eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, - 'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, + 'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, 'catalog/resource_eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, + 'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, 'catalog/resource_eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class, 'catalog_resource/eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class, - 'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, 'catalog/resource_eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, + 'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, 'catalog_resource/eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class, 'catalog/resource_eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class, 'catalog_resource/eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class, 'catalog/resource_eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class, - 'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, 'catalog/resource_eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, - 'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, + 'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, 'catalog_resource/eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, - 'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, + 'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, 'catalog/resource_eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, + 'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, 'catalog/resource_eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, 'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, - 'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, 'catalog/resource_eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, + 'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, 'catalog/resource_eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class, 'catalog_resource/eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class, - 'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, 'catalog_resource/eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, - 'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, + 'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, 'catalog/resource_eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, - 'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, + 'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, 'catalog/resource_eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, + 'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, 'catalog_resource/eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, + 'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, 'catalog/resource_eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class, 'catalog_resource/eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class, 'catalog/resource_eav_mysql4_sendfriend' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend::class, @@ -7236,16 +7215,16 @@ 'catalog/resource_eav_mysql4_sendfriend_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection::class, 'catalog_resource/eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class, 'catalog/resource_eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class, - 'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, 'catalog/resource_eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, - 'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, + 'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, 'catalog/resource_helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, + 'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, 'catalog_resource/layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class, 'catalog/resource_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class, 'catalog/resource_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class, 'catalog_resource/layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class, - 'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, 'catalog/resource_layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, + 'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, 'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class, 'catalog_resource/product' => \Mage_Catalog_Model_Resource_Product::class, 'catalog/resource_product_action' => \Mage_Catalog_Model_Resource_Product_Action::class, @@ -7256,42 +7235,42 @@ 'catalog_resource/product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class, 'catalog/resource_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class, 'catalog_resource/product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class, - 'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, 'catalog/resource_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, - 'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, + 'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, 'catalog_resource/product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, + 'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, 'catalog/resource_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class, - 'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, 'catalog_resource/product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, - 'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, + 'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, 'catalog/resource_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, - 'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, + 'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, 'catalog_resource/product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, - 'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, + 'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, + 'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, 'catalog_resource/product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class, 'catalog/resource_product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class, - 'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, 'catalog/resource_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, + 'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, 'catalog/resource_product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class, 'catalog_resource/product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class, - 'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, 'catalog/resource_product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, + 'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, 'catalog/resource_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class, 'catalog_resource/product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class, - 'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, 'catalog_resource/product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, - 'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, + 'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, 'catalog/resource_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, + 'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, 'catalog/resource_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class, 'catalog_resource/product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class, - 'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, 'catalog_resource/product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, + 'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, 'catalog_resource/product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, 'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, - 'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, 'catalog_resource/product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, + 'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, 'catalog/resource_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class, 'catalog_resource/product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class, 'catalog_resource/product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class, @@ -7302,12 +7281,12 @@ 'catalog_resource/product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class, 'catalog/resource_product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, 'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, - 'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, 'catalog_resource/product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, - 'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, + 'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, 'catalog/resource_product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, - 'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, + 'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, 'catalog_resource/product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, + 'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, 'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, 'catalog_resource/product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, 'catalog_resource/product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class, @@ -7316,14 +7295,14 @@ 'catalog/resource_product_status' => \Mage_Catalog_Model_Resource_Product_Status::class, 'catalog_resource/product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class, 'catalog/resource_product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class, - 'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, 'catalog/resource_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, - 'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, + 'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, 'catalog_resource/product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, + 'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, 'catalog_resource/product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class, 'catalog/resource_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class, - 'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, 'catalog_resource/product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, + 'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, 'catalog/resource_setup' => \Mage_Catalog_Model_Resource_Setup::class, 'catalog_resource/setup' => \Mage_Catalog_Model_Resource_Setup::class, 'catalog_resource/url' => \Mage_Catalog_Model_Resource_Url::class, @@ -7369,12 +7348,12 @@ 'checkout/observer' => \Mage_Checkout_Model_Observer::class, 'checkout_resource/agreement' => \Mage_Checkout_Model_Resource_Agreement::class, 'checkout/resource_agreement' => \Mage_Checkout_Model_Resource_Agreement::class, - 'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, 'checkout/resource_agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, - 'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class, + 'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, 'checkout_resource/cart' => \Mage_Checkout_Model_Resource_Cart::class, - 'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class, + 'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class, 'checkout/resource_setup' => \Mage_Checkout_Model_Resource_Setup::class, + 'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class, 'checkout/session' => \Mage_Checkout_Model_Session::class, 'checkout/type_abstract' => \Mage_Checkout_Model_Type_Abstract::class, 'checkout/type_multishipping' => \Mage_Checkout_Model_Type_Multishipping::class, @@ -7389,25 +7368,25 @@ 'cms/mysql4_page_service' => \Mage_Cms_Model_Mysql4_Page_Service::class, 'cms/observer' => \Mage_Cms_Model_Observer::class, 'cms/page' => \Mage_Cms_Model_Page::class, - 'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class, 'cms/resource_block' => \Mage_Cms_Model_Resource_Block::class, + 'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class, 'cms_resource/block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class, 'cms/resource_block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class, 'cms/resource_page' => \Mage_Cms_Model_Resource_Page::class, 'cms_resource/page' => \Mage_Cms_Model_Resource_Page::class, - 'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, 'cms_resource/page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, - 'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class, + 'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, 'cms/resource_page_service' => \Mage_Cms_Model_Resource_Page_Service::class, + 'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class, 'cms/template_filter' => \Mage_Cms_Model_Template_Filter::class, 'cms/wysiwyg_config' => \Mage_Cms_Model_Wysiwyg_Config::class, 'cms/wysiwyg_images_storage' => \Mage_Cms_Model_Wysiwyg_Images_Storage::class, 'cms/wysiwyg_images_storage_collection' => \Mage_Cms_Model_Wysiwyg_Images_Storage_Collection::class, 'configurableswatches/observer' => \Mage_ConfigurableSwatches_Model_Observer::class, - 'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, 'configurableswatches_resource/catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, - 'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, + 'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, 'configurableswatches_resource/catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, + 'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, 'configurableswatches_resource/catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class, 'configurableswatches/resource_catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class, 'configurableswatches/system_config_source_catalog_product_configattribute' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute::class, @@ -7514,152 +7493,152 @@ 'core/mysql4_website_collection' => \Mage_Core_Model_Mysql4_Website_Collection::class, 'core/observer' => \Mage_Core_Model_Observer::class, 'core/resource' => \Mage_Core_Model_Resource::class, + 'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, 'core_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, 'core/resource_abstract' => \Mage_Core_Model_Resource_Abstract::class, - 'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, + 'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class, 'core/resource_cache' => \Mage_Core_Model_Resource_Cache::class, 'core_resource/cache' => \Mage_Core_Model_Resource_Cache::class, - 'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class, + 'core/resource_config' => \Mage_Core_Model_Resource_Config::class, 'core_resource/config' => \Mage_Core_Model_Resource_Config::class, 'payment_resource/config' => \Mage_Core_Model_Resource_Config::class, - 'core/resource_config' => \Mage_Core_Model_Resource_Config::class, - 'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, 'core/resource_config_data' => \Mage_Core_Model_Resource_Config_Data::class, + 'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, 'payment_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, - 'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'core_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, - 'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, - 'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, + 'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'payment_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, - 'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, + 'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, + 'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, 'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, 'core/resource_db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, - 'core/resource_design' => \Mage_Core_Model_Resource_Design::class, + 'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, 'core_resource/design' => \Mage_Core_Model_Resource_Design::class, + 'core/resource_design' => \Mage_Core_Model_Resource_Design::class, 'payment_resource/design' => \Mage_Core_Model_Resource_Design::class, 'payment_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, - 'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, 'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, - 'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, + 'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, 'payment_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, 'core/resource_design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, + 'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, 'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, 'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, 'core/resource_email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, - 'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, - 'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, 'payment_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, - 'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, + 'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, + 'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, 'core/resource_email_template' => \Mage_Core_Model_Resource_Email_Template::class, 'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, - 'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, + 'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, 'core/resource_email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, + 'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, 'core_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, - 'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, - 'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, 'core_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, - 'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, - 'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, + 'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, 'core_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, 'payment_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, 'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, - 'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, + 'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, 'payment_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, 'core/resource_file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, - 'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, + 'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, 'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, 'core/resource_file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, - 'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, - 'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, - 'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, 'core/resource_file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, - 'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class, + 'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, + 'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, 'payment_resource/flag' => \Mage_Core_Model_Resource_Flag::class, + 'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class, 'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class, 'payment_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, - 'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, 'core_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, - 'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, + 'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, 'core/resource_helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, + 'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, 'core_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, 'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, 'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, 'core/resource_iterator' => \Mage_Core_Model_Resource_Iterator::class, 'payment_resource/language' => \Mage_Core_Model_Resource_Language::class, - 'core/resource_language' => \Mage_Core_Model_Resource_Language::class, 'core_resource/language' => \Mage_Core_Model_Resource_Language::class, + 'core/resource_language' => \Mage_Core_Model_Resource_Language::class, 'payment_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, - 'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, 'core/resource_language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, - 'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class, + 'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, 'core_resource/layout' => \Mage_Core_Model_Resource_Layout::class, 'core/resource_layout' => \Mage_Core_Model_Resource_Layout::class, + 'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class, 'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class, - 'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class, 'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class, + 'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class, 'core/resource_session' => \Mage_Core_Model_Resource_Session::class, - 'core_resource/session' => \Mage_Core_Model_Resource_Session::class, 'payment_resource/session' => \Mage_Core_Model_Resource_Session::class, + 'core_resource/session' => \Mage_Core_Model_Resource_Session::class, 'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class, 'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class, 'payment_resource/setup' => \Mage_Core_Model_Resource_Setup::class, - 'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core/resource_setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, + 'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'payment_resource/store' => \Mage_Core_Model_Resource_Store::class, 'core_resource/store' => \Mage_Core_Model_Resource_Store::class, 'core/resource_store' => \Mage_Core_Model_Resource_Store::class, - 'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, 'core/resource_store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, + 'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, 'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, - 'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'core/resource_store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'payment_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, - 'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, - 'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, + 'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'payment_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, - 'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, - 'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class, + 'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, + 'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, 'core_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, - 'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class, + 'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class, + 'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, 'core_resource/translate' => \Mage_Core_Model_Resource_Translate::class, + 'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class, 'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class, - 'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, - 'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class, 'payment_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, - 'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class, + 'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, 'core/resource_type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, 'payment_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'core/resource_type_db' => \Mage_Core_Model_Resource_Type_Db::class, - 'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'core_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, 'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, 'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, - 'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, - 'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, 'payment_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, 'payment_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, - 'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, 'core_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, - 'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, - 'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, + 'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, 'payment_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, + 'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, + 'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, 'core_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'core_resource/variable' => \Mage_Core_Model_Resource_Variable::class, - 'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class, 'core/resource_variable' => \Mage_Core_Model_Resource_Variable::class, + 'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class, 'core/resource_variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, - 'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, 'core_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, + 'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, + 'core/resource_website' => \Mage_Core_Model_Resource_Website::class, 'core_resource/website' => \Mage_Core_Model_Resource_Website::class, 'payment_resource/website' => \Mage_Core_Model_Resource_Website::class, - 'core/resource_website' => \Mage_Core_Model_Resource_Website::class, - 'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core/resource_website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, + 'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core/session' => \Mage_Core_Model_Session::class, 'core/session_abstract' => \Mage_Core_Model_Session_Abstract::class, @@ -7689,10 +7668,10 @@ 'cron/mysql4_schedule' => \Mage_Cron_Model_Mysql4_Schedule::class, 'cron/mysql4_schedule_collection' => \Mage_Cron_Model_Mysql4_Schedule_Collection::class, 'cron/observer' => \Mage_Cron_Model_Observer::class, - 'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class, 'cron/resource_schedule' => \Mage_Cron_Model_Resource_Schedule::class, - 'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, + 'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class, 'cron/resource_schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, + 'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, 'cron/schedule' => \Mage_Cron_Model_Schedule::class, 'currencysymbol/observer' => \Mage_CurrencySymbol_Model_Observer::class, 'currencysymbol/system_currencysymbol' => \Mage_CurrencySymbol_Model_System_Currencysymbol::class, @@ -7767,16 +7746,16 @@ 'customer_resource/address' => \Mage_Customer_Model_Resource_Address::class, 'customer/resource_address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class, 'customer_resource/address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class, - 'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, 'customer_resource/address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, - 'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, + 'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, 'customer/resource_address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, - 'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, + 'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, 'customer/resource_address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, - 'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, + 'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, 'customer_resource/address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, - 'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, + 'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, 'customer_resource/address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, + 'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, 'customer/resource_attribute' => \Mage_Customer_Model_Resource_Attribute::class, 'customer_resource/attribute' => \Mage_Customer_Model_Resource_Attribute::class, 'customer_resource/attribute_collection' => \Mage_Customer_Model_Resource_Attribute_Collection::class, @@ -7785,22 +7764,22 @@ 'customer_resource/customer' => \Mage_Customer_Model_Resource_Customer::class, 'customer_resource/customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class, 'customer/resource_customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class, - 'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, 'customer/resource_flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, - 'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, + 'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, 'customer/resource_flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, - 'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, + 'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, 'customer/resource_form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, - 'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, + 'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, 'customer/resource_form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, + 'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, 'customer/resource_group' => \Mage_Customer_Model_Resource_Group::class, 'customer_resource/group' => \Mage_Customer_Model_Resource_Group::class, 'customer_resource/group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class, 'customer/resource_group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class, - 'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class, 'customer_resource/setup' => \Mage_Customer_Model_Resource_Setup::class, - 'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, + 'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class, 'customer_resource/wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, + 'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, 'customer/session' => \Mage_Customer_Model_Session::class, 'dataflow/batch' => \Mage_Dataflow_Model_Batch::class, 'dataflow/batch_abstract' => \Mage_Dataflow_Model_Batch_Abstract::class, @@ -7852,10 +7831,10 @@ 'dataflow/mysql4_session' => \Mage_Dataflow_Model_Mysql4_Session::class, 'dataflow/profile' => \Mage_Dataflow_Model_Profile::class, 'dataflow/profile_history' => \Mage_Dataflow_Model_Profile_History::class, - 'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class, 'dataflow/resource_batch' => \Mage_Dataflow_Model_Resource_Batch::class, - 'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, + 'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class, 'dataflow/resource_batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, + 'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, 'dataflow/resource_batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class, 'dataflow_resource/batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class, 'dataflow_resource/batch_export' => \Mage_Dataflow_Model_Resource_Batch_Export::class, @@ -7866,12 +7845,12 @@ 'dataflow/resource_import' => \Mage_Dataflow_Model_Resource_Import::class, 'dataflow_resource/import_collection' => \Mage_Dataflow_Model_Resource_Import_Collection::class, 'dataflow/resource_import_collection' => \Mage_Dataflow_Model_Resource_Import_Collection::class, - 'dataflow_resource/profile' => \Mage_Dataflow_Model_Resource_Profile::class, 'dataflow/resource_profile' => \Mage_Dataflow_Model_Resource_Profile::class, + 'dataflow_resource/profile' => \Mage_Dataflow_Model_Resource_Profile::class, 'dataflow/resource_profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class, 'dataflow_resource/profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class, - 'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, 'dataflow_resource/profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, + 'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, 'dataflow_resource/profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class, 'dataflow/resource_profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class, 'dataflow_resource/session' => \Mage_Dataflow_Model_Resource_Session::class, @@ -7905,8 +7884,8 @@ 'directory/resource_country' => \Mage_Directory_Model_Resource_Country::class, 'directory_resource/country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class, 'directory/resource_country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class, - 'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class, 'directory/resource_country_format' => \Mage_Directory_Model_Resource_Country_Format::class, + 'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class, 'directory_resource/country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class, 'directory/resource_country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class, 'directory_resource/currency' => \Mage_Directory_Model_Resource_Currency::class, @@ -7937,8 +7916,8 @@ 'downloadable/observer' => \Mage_Downloadable_Model_Observer::class, 'downloadable/product_price' => \Mage_Downloadable_Model_Product_Price::class, 'downloadable/product_type' => \Mage_Downloadable_Model_Product_Type::class, - 'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, 'downloadable_resource/indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, + 'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, 'downloadable/resource_link' => \Mage_Downloadable_Model_Resource_Link::class, 'downloadable_resource/link' => \Mage_Downloadable_Model_Resource_Link::class, 'downloadable/resource_link_collection' => \Mage_Downloadable_Model_Resource_Link_Collection::class, @@ -7947,12 +7926,12 @@ 'downloadable_resource/link_purchased' => \Mage_Downloadable_Model_Resource_Link_Purchased::class, 'downloadable/resource_link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class, 'downloadable_resource/link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class, - 'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, 'downloadable/resource_link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, + 'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, 'downloadable/resource_link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, 'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, - 'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class, 'downloadable/resource_sample' => \Mage_Downloadable_Model_Resource_Sample::class, + 'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class, 'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, 'downloadable/resource_sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, 'downloadable/sales_order_pdf_items_abstract' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Abstract::class, @@ -8040,46 +8019,46 @@ 'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class, 'eav_resource/attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class, 'eav/resource_attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class, - 'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class, 'eav_resource/config' => \Mage_Eav_Model_Resource_Config::class, + 'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class, 'eav/resource_entity_attribute' => \Mage_Eav_Model_Resource_Entity_Attribute::class, 'eav_resource/entity_attribute' => \Mage_Eav_Model_Resource_Entity_Attribute::class, 'eav_resource/entity_attribute_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Collection::class, 'eav/resource_entity_attribute_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Collection::class, 'eav_resource/entity_attribute_group' => \Mage_Eav_Model_Resource_Entity_Attribute_Group::class, 'eav/resource_entity_attribute_group' => \Mage_Eav_Model_Resource_Entity_Attribute_Group::class, - 'eav/resource_entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class, 'eav_resource/entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class, + 'eav/resource_entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class, 'eav/resource_entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class, 'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class, - 'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, 'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, - 'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, + 'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, 'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, - 'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, + 'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, 'eav_resource/entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, + 'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, 'eav_resource/entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class, 'eav/resource_entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class, 'eav_resource/entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class, 'eav/resource_entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class, - 'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, 'eav_resource/entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, + 'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, 'eav/resource_form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class, 'eav_resource/form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class, - 'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, 'eav/resource_form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, + 'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, 'eav/resource_form_element' => \Mage_Eav_Model_Resource_Form_Element::class, 'eav_resource/form_element' => \Mage_Eav_Model_Resource_Form_Element::class, - 'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, 'eav_resource/form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, - 'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, + 'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, 'eav/resource_form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, + 'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, 'eav_resource/form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, 'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, 'eav/resource_form_type' => \Mage_Eav_Model_Resource_Form_Type::class, 'eav_resource/form_type' => \Mage_Eav_Model_Resource_Form_Type::class, - 'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class, 'eav_resource/form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class, + 'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class, 'eav_resource/helper_mysql4' => \Mage_Eav_Model_Resource_Helper_Mysql4::class, 'eav/resource_helper_mysql4' => \Mage_Eav_Model_Resource_Helper_Mysql4::class, 'giftmessage/api' => \Mage_GiftMessage_Model_Api::class, @@ -8091,12 +8070,12 @@ 'giftmessage/mysql4_message_collection' => \Mage_GiftMessage_Model_Mysql4_Message_Collection::class, 'giftmessage/mysql4_setup' => \Mage_GiftMessage_Model_Mysql4_Setup::class, 'giftmessage/observer' => \Mage_GiftMessage_Model_Observer::class, - 'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class, 'giftmessage/resource_message' => \Mage_GiftMessage_Model_Resource_Message::class, - 'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, + 'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class, 'giftmessage_resource/message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, - 'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class, + 'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, 'giftmessage_resource/setup' => \Mage_GiftMessage_Model_Resource_Setup::class, + 'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class, 'googleanalytics/observer' => \Mage_GoogleAnalytics_Model_Observer::class, 'googleanalytics/system_config_source_type' => \Mage_GoogleAnalytics_Model_System_Config_Source_Type::class, 'googlecheckout/payment' => \Mage_GoogleCheckout_Model_Payment::class, @@ -8132,8 +8111,8 @@ 'importexport/product_attribute_backend_urlkey' => \Mage_ImportExport_Model_Product_Attribute_Backend_Urlkey::class, 'importexport_resource/helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class, 'importexport/resource_helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class, - 'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, 'importexport_resource/import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, + 'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, 'importexport_resource/setup' => \Mage_ImportExport_Model_Resource_Setup::class, 'importexport/resource_setup' => \Mage_ImportExport_Model_Resource_Setup::class, 'importexport/source_export_entity' => \Mage_ImportExport_Model_Source_Export_Entity::class, @@ -8155,16 +8134,16 @@ 'index/process' => \Mage_Index_Model_Process::class, 'index_resource/abstract' => \Mage_Index_Model_Resource_Abstract::class, 'index/resource_abstract' => \Mage_Index_Model_Resource_Abstract::class, - 'index/resource_event' => \Mage_Index_Model_Resource_Event::class, 'index_resource/event' => \Mage_Index_Model_Resource_Event::class, + 'index/resource_event' => \Mage_Index_Model_Resource_Event::class, 'index/resource_event_collection' => \Mage_Index_Model_Resource_Event_Collection::class, 'index_resource/event_collection' => \Mage_Index_Model_Resource_Event_Collection::class, 'index/resource_helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class, 'index_resource/helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class, - 'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, 'index/resource_lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, - 'index_resource/process' => \Mage_Index_Model_Resource_Process::class, + 'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, 'index/resource_process' => \Mage_Index_Model_Resource_Process::class, + 'index_resource/process' => \Mage_Index_Model_Resource_Process::class, 'index/resource_process_collection' => \Mage_Index_Model_Resource_Process_Collection::class, 'index_resource/process_collection' => \Mage_Index_Model_Resource_Process_Collection::class, 'index/resource_setup' => \Mage_Index_Model_Resource_Setup::class, @@ -8197,22 +8176,22 @@ 'log/mysql4_visitor_online_collection' => \Mage_Log_Model_Mysql4_Visitor_Online_Collection::class, 'log_resource/aggregation' => \Mage_Log_Model_Resource_Aggregation::class, 'log/resource_aggregation' => \Mage_Log_Model_Resource_Aggregation::class, - 'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class, 'log/resource_customer' => \Mage_Log_Model_Resource_Customer::class, + 'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class, 'log/resource_log' => \Mage_Log_Model_Resource_Log::class, 'log_resource/log' => \Mage_Log_Model_Resource_Log::class, 'log_resource/visitor' => \Mage_Log_Model_Resource_Visitor::class, 'log/resource_visitor' => \Mage_Log_Model_Resource_Visitor::class, 'log_resource/visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class, 'log/resource_visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class, - 'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, 'log_resource/visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, - 'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, + 'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, 'log_resource/visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, + 'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, 'log/visitor' => \Mage_Log_Model_Visitor::class, 'log/visitor_online' => \Mage_Log_Model_Visitor_Online::class, - 'media_resource/image' => \Mage_Media_Model_File_Image::class, 'media/file_image' => \Mage_Media_Model_File_Image::class, + 'media_resource/image' => \Mage_Media_Model_File_Image::class, 'media/image' => \Mage_Media_Model_Image::class, 'newsletter/message' => \Mage_Newsletter_Model_Message::class, 'newsletter/mysql4_problem' => \Mage_Newsletter_Model_Mysql4_Problem::class, @@ -8230,14 +8209,14 @@ 'newsletter_resource/problem' => \Mage_Newsletter_Model_Resource_Problem::class, 'newsletter/resource_problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class, 'newsletter_resource/problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class, - 'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class, 'newsletter/resource_queue' => \Mage_Newsletter_Model_Resource_Queue::class, - 'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, + 'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class, 'newsletter/resource_queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, - 'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, + 'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, 'newsletter/resource_subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, - 'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, + 'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, 'newsletter/resource_subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, + 'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, 'newsletter_resource/template' => \Mage_Newsletter_Model_Resource_Template::class, 'newsletter/resource_template' => \Mage_Newsletter_Model_Resource_Template::class, 'newsletter_resource/template_collection' => \Mage_Newsletter_Model_Resource_Template_Collection::class, @@ -8250,20 +8229,20 @@ 'oauth/consumer_validator_keyLength' => \Mage_Oauth_Model_Consumer_Validator_KeyLength::class, 'oauth/nonce' => \Mage_Oauth_Model_Nonce::class, 'oauth/observer' => \Mage_Oauth_Model_Observer::class, - 'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class, 'oauth/resource_consumer' => \Mage_Oauth_Model_Resource_Consumer::class, + 'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class, 'oauth/resource_consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class, 'oauth_resource/consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class, 'oauth_resource/nonce' => \Mage_Oauth_Model_Resource_Nonce::class, 'oauth/resource_nonce' => \Mage_Oauth_Model_Resource_Nonce::class, 'oauth_resource/nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class, 'oauth/resource_nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class, - 'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class, 'oauth/resource_setup' => \Mage_Oauth_Model_Resource_Setup::class, - 'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class, + 'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class, 'oauth_resource/token' => \Mage_Oauth_Model_Resource_Token::class, - 'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, + 'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class, 'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, + 'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth/server' => \Mage_Oauth_Model_Server::class, 'oauth/token' => \Mage_Oauth_Model_Token::class, 'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class, @@ -8280,8 +8259,8 @@ 'paygate/authorizenet_source_paymentAction' => \Mage_Paygate_Model_Authorizenet_Source_PaymentAction::class, 'paygate/mysql4_authorizenet_debug' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug::class, 'paygate/mysql4_authorizenet_debug_collection' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection::class, - 'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, 'paygate/resource_authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, + 'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, 'paygate_resource/authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class, 'paygate/resource_authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class, 'payment/billing_agreementAbstract' => \Mage_Payment_Model_Billing_AgreementAbstract::class, @@ -8344,12 +8323,12 @@ 'paypal/resource_cert' => \Mage_Paypal_Model_Resource_Cert::class, 'paypal_resource/payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class, 'paypal/resource_payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class, - 'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, 'paypal/resource_payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, + 'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, 'paypal/resource_report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class, 'paypal_resource/report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class, - 'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, 'paypal/resource_report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, + 'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, 'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, 'paypal/resource_report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, 'paypal/resource_setup' => \Mage_Paypal_Model_Resource_Setup::class, @@ -8374,8 +8353,8 @@ 'persistent/observer' => \Mage_Persistent_Model_Observer::class, 'persistent/observer_session' => \Mage_Persistent_Model_Observer_Session::class, 'persistent/persistent_config' => \Mage_Persistent_Model_Persistent_Config::class, - 'persistent/resource_session' => \Mage_Persistent_Model_Resource_Session::class, 'persistent_resource/session' => \Mage_Persistent_Model_Resource_Session::class, + 'persistent/resource_session' => \Mage_Persistent_Model_Resource_Session::class, 'persistent/session' => \Mage_Persistent_Model_Session::class, 'poll/mysql4_poll' => \Mage_Poll_Model_Mysql4_Poll::class, 'poll/mysql4_poll_answer' => \Mage_Poll_Model_Mysql4_Poll_Answer::class, @@ -8385,16 +8364,16 @@ 'poll/poll' => \Mage_Poll_Model_Poll::class, 'poll/poll_answer' => \Mage_Poll_Model_Poll_Answer::class, 'poll/poll_vote' => \Mage_Poll_Model_Poll_Vote::class, - 'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class, 'poll_resource/poll' => \Mage_Poll_Model_Resource_Poll::class, + 'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class, 'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, 'poll/resource_poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, - 'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, 'poll_resource/poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, - 'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, + 'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, 'poll_resource/poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, - 'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, + 'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, 'poll/resource_poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, + 'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, 'productalert/email' => \Mage_ProductAlert_Model_Email::class, 'productalert/mysql4_price' => \Mage_ProductAlert_Model_Mysql4_Price::class, 'productalert/mysql4_price_collection' => \Mage_ProductAlert_Model_Mysql4_Price_Collection::class, @@ -8404,20 +8383,20 @@ 'productalert/mysql4_stock_customer_collection' => \Mage_ProductAlert_Model_Mysql4_Stock_Customer_Collection::class, 'productalert/observer' => \Mage_ProductAlert_Model_Observer::class, 'productalert/price' => \Mage_ProductAlert_Model_Price::class, - 'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, 'productalert_resource/abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, - 'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class, + 'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, 'productalert_resource/price' => \Mage_ProductAlert_Model_Resource_Price::class, - 'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, + 'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class, 'productalert/resource_price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, - 'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, + 'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, 'productalert/resource_price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, + 'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, 'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class, 'productalert/resource_stock' => \Mage_ProductAlert_Model_Resource_Stock::class, - 'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, 'productalert/resource_stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, - 'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, + 'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, 'productalert/resource_stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, + 'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, 'productalert/stock' => \Mage_ProductAlert_Model_Stock::class, 'rating/mysql4_rating' => \Mage_Rating_Model_Mysql4_Rating::class, 'rating/mysql4_rating_collection' => \Mage_Rating_Model_Mysql4_Rating_Collection::class, @@ -8431,20 +8410,20 @@ 'rating/rating_entity' => \Mage_Rating_Model_Rating_Entity::class, 'rating/rating_option' => \Mage_Rating_Model_Rating_Option::class, 'rating/rating_option_vote' => \Mage_Rating_Model_Rating_Option_Vote::class, - 'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class, 'rating/resource_rating' => \Mage_Rating_Model_Resource_Rating::class, + 'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class, 'rating_resource/rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class, 'rating/resource_rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class, 'rating/resource_rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class, 'rating_resource/rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class, - 'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, 'rating/resource_rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, - 'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, + 'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, 'rating_resource/rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, + 'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, 'rating_resource/rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class, 'rating/resource_rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class, - 'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, 'rating/resource_rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, + 'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, 'reports/config' => \Mage_Reports_Model_Config::class, 'reports/event' => \Mage_Reports_Model_Event::class, 'reports/event_observer' => \Mage_Reports_Model_Event_Observer::class, @@ -8490,6 +8469,7 @@ 'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class, 'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class, 'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class, + 'reports/observer' => \Mage_Reports_Model_Observer::class, 'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class, 'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class, 'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class, @@ -8498,88 +8478,88 @@ 'reports_resource/accounts_collection' => \Mage_Reports_Model_Resource_Accounts_Collection::class, 'reports/resource_coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class, 'reports_resource/coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class, - 'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, 'reports/resource_customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, - 'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, + 'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, 'reports/resource_customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, - 'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, + 'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, 'reports_resource/customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, - 'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, + 'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, 'reports/resource_entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, + 'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, 'reports_resource/event' => \Mage_Reports_Model_Resource_Event::class, 'reports/resource_event' => \Mage_Reports_Model_Resource_Event::class, 'reports_resource/event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, 'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, 'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class, 'reports/resource_event_type' => \Mage_Reports_Model_Resource_Event_Type::class, - 'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, 'reports/resource_event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, - 'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, + 'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, 'reports_resource/helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, - 'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, + 'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, 'reports/resource_invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, - 'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, + 'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, 'reports_resource/order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, - 'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, + 'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, 'reports_resource/product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, + 'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, 'reports/resource_product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class, 'reports_resource/product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class, 'reports_resource/product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class, 'reports/resource_product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class, - 'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, 'reports/resource_product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, + 'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, 'reports_resource/product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class, 'reports/resource_product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class, - 'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, 'reports_resource/product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, - 'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, + 'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, 'reports/resource_product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, - 'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, + 'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, 'reports_resource/product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, - 'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, + 'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, 'reports/resource_product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, + 'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, 'reports_resource/product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class, 'reports/resource_product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class, - 'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, 'reports_resource/product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, - 'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, + 'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, 'reports_resource/product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, - 'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, + 'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, 'reports/resource_quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, - 'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class, + 'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, 'reports_resource/refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class, + 'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class, 'reports/resource_report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class, 'reports_resource/report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class, 'reports/resource_report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class, 'reports_resource/report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class, - 'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, 'reports_resource/report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, + 'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, 'reports/resource_report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class, 'reports_resource/report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class, - 'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, 'reports/resource_report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, + 'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, 'reports_resource/review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, 'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, - 'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, 'reports_resource/review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, + 'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, 'reports_resource/review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class, 'reports/resource_review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class, 'reports_resource/shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class, 'reports/resource_shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class, - 'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, 'reports_resource/shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, + 'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, 'reports_resource/tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class, 'reports/resource_tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class, - 'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, 'reports/resource_tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, - 'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, + 'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, 'reports/resource_tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, - 'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, + 'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, 'reports/resource_tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, + 'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, 'reports_resource/wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class, 'reports/resource_wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class, - 'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, 'reports_resource/wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, + 'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, 'reports/session' => \Mage_Reports_Model_Session::class, 'reports/test' => \Mage_Reports_Model_Test::class, 'reports/totals' => \Mage_Reports_Model_Totals::class, @@ -8596,14 +8576,14 @@ 'review/resource_review_collection' => \Mage_Review_Model_Resource_Review_Collection::class, 'review_resource/review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class, 'review/resource_review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class, - 'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class, 'review_resource/review_status' => \Mage_Review_Model_Resource_Review_Status::class, - 'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, + 'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class, 'review_resource/review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, + 'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, 'review/resource_review_summary' => \Mage_Review_Model_Resource_Review_Summary::class, 'review_resource/review_summary' => \Mage_Review_Model_Resource_Review_Summary::class, - 'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, 'review/resource_review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, + 'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, 'review/review' => \Mage_Review_Model_Review::class, 'review/review_status' => \Mage_Review_Model_Review_Status::class, 'review/review_summary' => \Mage_Review_Model_Review_Summary::class, @@ -8626,14 +8606,14 @@ 'rule/mysql4_rule_collection' => \Mage_Rule_Model_Mysql4_Rule_Collection::class, 'rule/renderer_actions' => \Mage_Rule_Model_Renderer_Actions::class, 'rule/renderer_conditions' => \Mage_Rule_Model_Renderer_Conditions::class, - 'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class, 'rule/resource_abstract' => \Mage_Rule_Model_Resource_Abstract::class, - 'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class, + 'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class, 'rule/resource_rule' => \Mage_Rule_Model_Resource_Rule::class, - 'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, + 'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class, 'rule_resource/rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, - 'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, + 'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, 'rule_resource/rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, + 'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, 'rule/resource_rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class, 'rule_resource/rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class, 'rule/rule' => \Mage_Rule_Model_Rule::class, @@ -8662,24 +8642,24 @@ 'salesrule/resource_coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class, 'salesrule/resource_coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class, 'salesrule_resource/coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class, - 'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, 'salesrule_resource/report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, - 'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, + 'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, 'salesrule_resource/report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, + 'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, 'salesrule_resource/report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class, 'salesrule/resource_report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class, 'salesrule_resource/report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class, 'salesrule/resource_report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class, 'salesrule_resource/report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class, 'salesrule/resource_report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class, - 'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class, 'salesrule_resource/rule' => \Mage_SalesRule_Model_Resource_Rule::class, - 'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, + 'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class, 'salesrule_resource/rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, - 'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, + 'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, 'salesrule_resource/rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, - 'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, + 'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, 'salesrule/resource_rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, + 'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, 'salesrule_resource/rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class, 'salesrule/resource_rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class, 'salesrule_resource/rule_product_collection' => \Mage_SalesRule_Model_Resource_Rule_Product_Collection::class, @@ -8724,14 +8704,14 @@ 'sales/email_template' => \Mage_Sales_Model_Email_Template::class, 'sales/entity_order' => \Mage_Sales_Model_Entity_Order::class, 'sales_entity/order' => \Mage_Sales_Model_Entity_Order::class, - 'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class, 'sales_entity/order_address' => \Mage_Sales_Model_Entity_Order_Address::class, - 'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, + 'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class, 'sales/entity_order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, - 'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, + 'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, 'sales_entity/order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, - 'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, + 'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, 'sales_entity/order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, + 'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, 'sales/entity_order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class, 'sales_entity/order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class, 'sales/entity_order_attribute_backend_shipping' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Shipping::class, @@ -8740,22 +8720,22 @@ 'sales/entity_order_collection' => \Mage_Sales_Model_Entity_Order_Collection::class, 'sales_entity/order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class, 'sales/entity_order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class, - 'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, 'sales_entity/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, - 'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, + 'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, 'sales/entity_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, - 'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, + 'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, 'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, + 'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, 'sales/entity_order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class, 'sales_entity/order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class, 'sales/entity_order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class, 'sales_entity/order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class, 'sales_entity/order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class, 'sales/entity_order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class, - 'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, 'sales/entity_order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, - 'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, + 'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, 'sales_entity/order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, + 'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, 'sales/entity_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class, 'sales_entity/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class, 'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class, @@ -8766,28 +8746,28 @@ 'sales/entity_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class, 'sales/entity_order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class, 'sales_entity/order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class, - 'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, 'sales/entity_order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, + 'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, 'sales_entity/order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class, 'sales/entity_order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class, 'sales_entity/order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class, 'sales/entity_order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class, - 'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, 'sales/entity_order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, + 'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, 'sales/entity_order_item' => \Mage_Sales_Model_Entity_Order_Item::class, 'sales_entity/order_item' => \Mage_Sales_Model_Entity_Order_Item::class, 'sales/entity_order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class, 'sales_entity/order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class, - 'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, 'sales/entity_order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, + 'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, 'sales_entity/order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class, 'sales/entity_order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class, 'sales_entity/order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class, 'sales/entity_order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class, - 'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, 'sales_entity/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, - 'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, + 'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, 'sales/entity_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, + 'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, 'sales/entity_order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class, 'sales_entity/order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class, 'sales/entity_order_shipment_comment' => \Mage_Sales_Model_Entity_Order_Shipment_Comment::class, @@ -8796,66 +8776,66 @@ 'sales_entity/order_shipment_comment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Comment_Collection::class, 'sales/entity_order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class, 'sales_entity/order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class, - 'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, 'sales/entity_order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, - 'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, + 'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, 'sales_entity/order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, - 'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, + 'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, 'sales_entity/order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, - 'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, + 'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, 'sales_entity/order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, - 'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, + 'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, 'sales_entity/order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, + 'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, 'sales_entity/quote' => \Mage_Sales_Model_Entity_Quote::class, 'sales/entity_quote' => \Mage_Sales_Model_Entity_Quote::class, - 'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, 'sales_entity/quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, + 'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, 'sales_entity/quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class, 'sales/entity_quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class, - 'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, 'sales/entity_quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, - 'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, + 'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, 'sales/entity_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, - 'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, + 'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, 'sales_entity/quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, - 'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, + 'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, 'sales/entity_quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, + 'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, 'sales_entity/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales/entity_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales_entity/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class, 'sales/entity_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class, - 'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, 'sales_entity/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, - 'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, 'sales/entity_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/entity_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales_entity/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales/entity_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class, 'sales_entity/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class, 'sales/entity_quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class, 'sales_entity/quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class, - 'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, 'sales_entity/quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, - 'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, + 'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, 'sales/entity_quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, - 'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, + 'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, 'sales_entity/quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, + 'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, 'sales/entity_quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class, 'sales_entity/quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class, 'sales/entity_quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class, 'sales_entity/quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class, - 'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, 'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, - 'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, + 'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, 'sales/entity_quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, - 'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, + 'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, 'sales/entity_quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, + 'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, 'sales_entity/quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class, 'sales/entity_quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class, - 'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, 'sales_entity/sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, - 'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class, + 'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, 'sales_entity/setup' => \Mage_Sales_Model_Entity_Setup::class, + 'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class, 'sales/mysql4_abstract' => \Mage_Sales_Model_Mysql4_Abstract::class, 'sales/mysql4_billing_agreement' => \Mage_Sales_Model_Mysql4_Billing_Agreement::class, 'sales/mysql4_billing_agreement_collection' => \Mage_Sales_Model_Mysql4_Billing_Agreement_Collection::class, @@ -9050,48 +9030,48 @@ 'sales/recurring_profile' => \Mage_Sales_Model_Recurring_Profile::class, 'sales_resource/abstract' => \Mage_Sales_Model_Resource_Abstract::class, 'sales/resource_abstract' => \Mage_Sales_Model_Resource_Abstract::class, - 'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, 'sales_resource/billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, - 'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, + 'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, 'sales_resource/billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, - 'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, + 'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, 'sales/resource_collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, - 'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, + 'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, 'sales_resource/helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, - 'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class, + 'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, 'sales_resource/order' => \Mage_Sales_Model_Resource_Order::class, + 'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class, 'sales_resource/order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class, 'sales/resource_order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class, - 'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class, 'sales_resource/order_address' => \Mage_Sales_Model_Resource_Order_Address::class, + 'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class, 'sales/resource_order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class, 'sales_resource/order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class, 'sales/resource_order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class, 'sales_resource/order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class, 'sales/resource_order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class, 'sales_resource/order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class, - 'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, 'sales/resource_order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, + 'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, 'sales_resource/order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class, 'sales/resource_order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class, 'sales/resource_order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class, 'sales_resource/order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class, - 'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, 'sales/resource_order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, + 'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, 'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, 'sales/resource_order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, 'sales/resource_order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, 'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, - 'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, 'sales_resource/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, + 'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, 'sales/resource_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class, 'sales_resource/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class, - 'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, 'sales/resource_order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, - 'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, + 'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, 'sales_resource/order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, - 'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, + 'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, 'sales/resource_order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, + 'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, 'sales/resource_order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, 'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, 'sales_resource/order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class, @@ -9102,84 +9082,84 @@ 'sales/resource_order_grid_collection' => \Mage_Sales_Model_Resource_Order_Grid_Collection::class, 'sales/resource_order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class, 'sales_resource/order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class, - 'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, 'sales/resource_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, - 'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, + 'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, 'sales_resource/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, + 'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, 'sales_resource/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class, 'sales/resource_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class, 'sales/resource_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class, 'sales_resource/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class, 'sales/resource_order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class, 'sales_resource/order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class, - 'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, 'sales/resource_order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, + 'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, 'sales/resource_order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class, 'sales_resource/order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class, - 'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, 'sales/resource_order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, - 'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, + 'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, 'sales_resource/order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, + 'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, 'sales/resource_order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class, 'sales_resource/order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class, - 'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class, 'sales_resource/order_item' => \Mage_Sales_Model_Resource_Order_Item::class, + 'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class, 'sales/resource_order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class, 'sales_resource/order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class, - 'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, 'sales_resource/order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, + 'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, 'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, 'sales/resource_order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, - 'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, 'sales_resource/order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, - 'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, + 'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, 'sales_resource/order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, - 'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, + 'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, 'sales_resource/order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, - 'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, + 'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, 'sales/resource_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, + 'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, 'sales_resource/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class, 'sales/resource_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class, - 'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, 'sales/resource_order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, + 'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, 'sales/resource_order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, 'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, - 'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, 'sales/resource_order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, + 'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, 'sales_resource/order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class, 'sales/resource_order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class, - 'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, 'sales_resource/order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, - 'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, + 'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, 'sales_resource/order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, - 'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, + 'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, 'sales_resource/order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, + 'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, 'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, 'sales_resource/order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, 'sales_resource/order_status' => \Mage_Sales_Model_Resource_Order_Status::class, 'sales/resource_order_status' => \Mage_Sales_Model_Resource_Order_Status::class, 'sales_resource/order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class, 'sales/resource_order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class, - 'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, 'sales_resource/order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, - 'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, + 'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, 'sales_resource/order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, - 'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, + 'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, 'sales/resource_order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, - 'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, + 'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, 'sales_resource/order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, - 'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class, + 'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, 'sales/resource_quote' => \Mage_Sales_Model_Resource_Quote::class, + 'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class, 'sales_resource/quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class, 'sales/resource_quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class, 'sales/resource_quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class, 'sales_resource/quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class, 'sales/resource_quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class, 'sales_resource/quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class, - 'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, 'sales/resource_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, - 'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, + 'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, 'sales/resource_quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, + 'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, 'sales_resource/quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, 'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, 'sales_resource/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class, @@ -9188,82 +9168,82 @@ 'sales_resource/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class, 'sales/resource_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class, 'sales_resource/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class, - 'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/resource_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, - 'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, + 'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/resource_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, + 'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales_resource/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, 'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, - 'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, 'sales/resource_quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, + 'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, 'sales_resource/quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class, 'sales/resource_quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class, - 'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, 'sales/resource_quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, - 'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, + 'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, 'sales_resource/quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, - 'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, + 'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, 'sales_resource/quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, + 'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, 'sales_resource/quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class, 'sales/resource_quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class, - 'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, 'sales/resource_quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, + 'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, 'sales/resource_quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class, 'sales_resource/quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class, - 'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, 'sales/resource_quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, - 'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, + 'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, 'sales/resource_quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, - 'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, + 'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, 'sales_resource/quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, - 'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, + 'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, 'sales/resource_quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, - 'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, + 'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, 'sales/resource_recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, + 'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, 'sales/resource_recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class, 'sales_resource/recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class, - 'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class, 'sales/resource_report' => \Mage_Sales_Model_Resource_Report::class, + 'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class, 'sales/resource_report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class, 'sales_resource/report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class, - 'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, 'sales/resource_report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, - 'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, + 'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, 'sales/resource_report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, + 'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, 'sales_resource/report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, 'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, - 'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, 'sales_resource/report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, + 'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, 'sales/resource_report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class, 'sales_resource/report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class, 'sales_resource/report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class, 'sales/resource_report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class, 'sales/resource_report_order' => \Mage_Sales_Model_Resource_Report_Order::class, 'sales_resource/report_order' => \Mage_Sales_Model_Resource_Report_Order::class, - 'sales/resource_report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class, 'sales_resource/report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class, - 'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class, + 'sales/resource_report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class, 'sales/resource_report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class, + 'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class, 'sales_resource/report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class, 'sales/resource_report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class, - 'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, 'sales/resource_report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, - 'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, + 'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, 'sales_resource/report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, + 'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, 'sales_resource/report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class, 'sales/resource_report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class, 'sales_resource/report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class, 'sales/resource_report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class, - 'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, 'sales_resource/report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, + 'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, 'sales_resource/report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class, 'sales/resource_report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class, 'sales_resource/report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class, 'sales/resource_report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class, - 'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, 'sales/resource_sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, - 'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class, + 'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, 'sales/resource_setup' => \Mage_Sales_Model_Resource_Setup::class, + 'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class, 'sales/service_order' => \Mage_Sales_Model_Service_Order::class, 'sales/service_quote' => \Mage_Sales_Model_Service_Quote::class, 'sales/status_list' => \Mage_Sales_Model_Status_List::class, @@ -9273,8 +9253,8 @@ 'sendfriend/observer' => \Mage_Sendfriend_Model_Observer::class, 'sendfriend_resource/sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class, 'sendfriend/resource_sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class, - 'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, 'sendfriend/resource_sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, + 'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, 'sendfriend/resource_setup' => \Mage_Sendfriend_Model_Resource_Setup::class, 'sendfriend_resource/setup' => \Mage_Sendfriend_Model_Resource_Setup::class, 'sendfriend/sendfriend' => \Mage_Sendfriend_Model_Sendfriend::class, @@ -9314,16 +9294,16 @@ 'sitemap/observer' => \Mage_Sitemap_Model_Observer::class, 'sitemap_resource/catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class, 'sitemap/resource_catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class, - 'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, 'sitemap/resource_catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, + 'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, 'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, 'sitemap_resource/catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, 'sitemap_resource/cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, 'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, 'sitemap_resource/sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class, 'sitemap/resource_sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class, - 'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, 'sitemap_resource/sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, + 'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, 'sitemap/sitemap' => \Mage_Sitemap_Model_Sitemap::class, 'tag/api' => \Mage_Tag_Model_Api::class, 'tag/api_v2' => \Mage_Tag_Model_Api_V2::class, @@ -9336,21 +9316,21 @@ 'tag/mysql4_tag' => \Mage_Tag_Model_Mysql4_Tag::class, 'tag/mysql4_tag_collection' => \Mage_Tag_Model_Mysql4_Tag_Collection::class, 'tag/mysql4_tag_relation' => \Mage_Tag_Model_Mysql4_Tag_Relation::class, - 'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag/resource_customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag_resource/customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, - 'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, + 'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag_resource/indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, - 'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, + 'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, 'tag_resource/popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, + 'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, 'tag_resource/product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class, 'tag/resource_product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class, 'tag_resource/tag' => \Mage_Tag_Model_Resource_Tag::class, 'tag/resource_tag' => \Mage_Tag_Model_Resource_Tag::class, - 'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, 'tag_resource/tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, - 'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, + 'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, 'tag_resource/tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, + 'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, 'tag/session' => \Mage_Tag_Model_Session::class, 'tag/tag' => \Mage_Tag_Model_Tag::class, 'tag/tag_relation' => \Mage_Tag_Model_Tag_Relation::class, @@ -9389,16 +9369,16 @@ 'tax/resource_calculation_rate' => \Mage_Tax_Model_Resource_Calculation_Rate::class, 'tax/resource_calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class, 'tax_resource/calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class, - 'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, 'tax/resource_calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, - 'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, + 'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, 'tax/resource_calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, - 'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, + 'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, 'tax/resource_calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, - 'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, + 'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, 'tax_resource/calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, - 'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class, + 'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, 'tax/resource_class' => \Mage_Tax_Model_Resource_Class::class, + 'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class, 'tax/resource_class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class, 'tax_resource/class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class, 'tax_resource/report_collection' => \Mage_Tax_Model_Resource_Report_Collection::class, @@ -9409,10 +9389,10 @@ 'tax/resource_report_tax_createdat' => \Mage_Tax_Model_Resource_Report_Tax_Createdat::class, 'tax_resource/report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class, 'tax/resource_report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class, - 'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, 'tax/resource_report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, - 'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, + 'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, 'tax_resource/sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, + 'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, 'tax_resource/sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class, 'tax/resource_sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class, 'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class, @@ -9501,8 +9481,8 @@ 'weee/observer' => \Mage_Weee_Model_Observer::class, 'weee/resource_attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class, 'weee_resource/attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class, - 'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class, 'weee/resource_setup' => \Mage_Weee_Model_Resource_Setup::class, + 'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class, 'weee/resource_tax' => \Mage_Weee_Model_Resource_Tax::class, 'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class, 'weee/tax' => \Mage_Weee_Model_Tax::class, @@ -9514,12 +9494,12 @@ 'widget/mysql4_widget_instance' => \Mage_Widget_Model_Mysql4_Widget_Instance::class, 'widget/mysql4_widget_instance_collection' => \Mage_Widget_Model_Mysql4_Widget_Instance_Collection::class, 'widget/observer' => \Mage_Widget_Model_Observer::class, - 'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class, 'widget/resource_widget' => \Mage_Widget_Model_Resource_Widget::class, + 'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class, 'widget_resource/widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class, 'widget/resource_widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class, - 'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, 'widget_resource/widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, + 'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, 'widget/template_filter' => \Mage_Widget_Model_Template_Filter::class, 'widget/widget' => \Mage_Widget_Model_Widget::class, 'widget/widget_config' => \Mage_Widget_Model_Widget_Config::class, @@ -9536,14 +9516,14 @@ 'wishlist/mysql4_wishlist' => \Mage_Wishlist_Model_Mysql4_Wishlist::class, 'wishlist/mysql4_wishlist_collection' => \Mage_Wishlist_Model_Mysql4_Wishlist_Collection::class, 'wishlist/observer' => \Mage_Wishlist_Model_Observer::class, - 'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class, 'wishlist_resource/item' => \Mage_Wishlist_Model_Resource_Item::class, + 'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class, 'wishlist_resource/item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class, 'wishlist/resource_item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class, - 'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, 'wishlist/resource_item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, - 'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, + 'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, 'wishlist_resource/item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, + 'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, 'wishlist_resource/product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class, 'wishlist/resource_product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class, 'wishlist/resource_wishlist' => \Mage_Wishlist_Model_Resource_Wishlist::class, @@ -9552,7 +9532,6 @@ 'wishlist/resource_wishlist_collection' => \Mage_Wishlist_Model_Resource_Wishlist_Collection::class, 'wishlist/session' => \Mage_Wishlist_Model_Session::class, 'wishlist/wishlist' => \Mage_Wishlist_Model_Wishlist::class, - 'varien/autoload' => \Varien_Autoload::class, ]) ); override( \Mage_Core_Model_Factory::getModel(0), @@ -9562,11 +9541,10 @@ 'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class, 'adminnotification/mysql4_inbox_collection' => \Mage_AdminNotification_Model_Mysql4_Inbox_Collection::class, 'adminnotification/observer' => \Mage_AdminNotification_Model_Observer::class, - 'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, 'adminnotification/resource_inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, - 'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, + 'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, 'adminnotification/resource_inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, - 'adminnotification/survey' => \Mage_AdminNotification_Model_Survey::class, + 'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, 'admin/acl' => \Mage_Admin_Model_Acl::class, 'admin/acl_assert_ip' => \Mage_Admin_Model_Acl_Assert_Ip::class, 'admin/acl_assert_time' => \Mage_Admin_Model_Acl_Assert_Time::class, @@ -9595,38 +9573,38 @@ 'admin/redirectpolicy' => \Mage_Admin_Model_Redirectpolicy::class, 'admin/resource_acl' => \Mage_Admin_Model_Resource_Acl::class, 'admin_resource/acl' => \Mage_Admin_Model_Resource_Acl::class, - 'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, 'admin/resource_acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, + 'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, 'admin/resource_acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class, 'admin_resource/acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class, - 'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class, 'admin/resource_block' => \Mage_Admin_Model_Resource_Block::class, - 'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, + 'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class, 'admin/resource_block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, + 'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, 'admin_resource/permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class, 'admin/resource_permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class, 'admin/resource_role' => \Mage_Admin_Model_Resource_Role::class, 'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class, 'admin/resource_role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class, 'admin_resource/role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class, - 'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class, 'admin_resource/roles' => \Mage_Admin_Model_Resource_Roles::class, - 'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, + 'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class, 'admin_resource/roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, - 'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, + 'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, 'admin/resource_roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, + 'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, 'admin/resource_rules' => \Mage_Admin_Model_Resource_Rules::class, 'admin_resource/rules' => \Mage_Admin_Model_Resource_Rules::class, - 'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, 'admin_resource/rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, + 'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, 'admin_resource/user' => \Mage_Admin_Model_Resource_User::class, 'admin/resource_user' => \Mage_Admin_Model_Resource_User::class, 'admin/resource_user_collection' => \Mage_Admin_Model_Resource_User_Collection::class, 'admin_resource/user_collection' => \Mage_Admin_Model_Resource_User_Collection::class, - 'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class, 'admin_resource/variable' => \Mage_Admin_Model_Resource_Variable::class, - 'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, + 'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class, 'admin/resource_variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, + 'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, 'admin/role' => \Mage_Admin_Model_Role::class, 'admin/roles' => \Mage_Admin_Model_Roles::class, 'admin/rules' => \Mage_Admin_Model_Rules::class, @@ -9661,6 +9639,7 @@ 'adminhtml/system_config_backend_baseurl' => \Mage_Adminhtml_Model_System_Config_Backend_Baseurl::class, 'adminhtml/system_config_backend_cache' => \Mage_Adminhtml_Model_System_Config_Backend_Cache::class, 'adminhtml/system_config_backend_catalog_inventory_managestock' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock::class, + 'adminhtml/system_config_backend_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Separator::class, 'adminhtml/system_config_backend_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Type::class, 'adminhtml/system_config_backend_category' => \Mage_Adminhtml_Model_System_Config_Backend_Category::class, 'adminhtml/system_config_backend_cookie' => \Mage_Adminhtml_Model_System_Config_Backend_Cookie::class, @@ -9713,12 +9692,14 @@ 'adminhtml/system_config_source_catalog_listMode' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListMode::class, 'adminhtml/system_config_source_catalog_listPerPage' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListPerPage::class, 'adminhtml/system_config_source_catalog_listSort' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort::class, + 'adminhtml/system_config_source_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Separator::class, 'adminhtml/system_config_source_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Type::class, 'adminhtml/system_config_source_catalog_timeFormat' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_TimeFormat::class, 'adminhtml/system_config_source_category' => \Mage_Adminhtml_Model_System_Config_Source_Category::class, 'adminhtml/system_config_source_checktype' => \Mage_Adminhtml_Model_System_Config_Source_Checktype::class, 'adminhtml/system_config_source_cms_page' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Page::class, 'adminhtml/system_config_source_cms_wysiwyg_enabled' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Wysiwyg_Enabled::class, + 'adminhtml/system_config_source_cookie_samesite' => \Mage_Adminhtml_Model_System_Config_Source_Cookie_Samesite::class, 'adminhtml/system_config_source_country' => \Mage_Adminhtml_Model_System_Config_Source_Country::class, 'adminhtml/system_config_source_country_full' => \Mage_Adminhtml_Model_System_Config_Source_Country_Full::class, 'adminhtml/system_config_source_cron_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency::class, @@ -9745,6 +9726,7 @@ 'adminhtml/system_config_source_locale_timezone' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Timezone::class, 'adminhtml/system_config_source_locale_weekdaycodes' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdaycodes::class, 'adminhtml/system_config_source_locale_weekdays' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdays::class, + 'adminhtml/system_config_source_log_level' => \Mage_Adminhtml_Model_System_Config_Source_Log_Level::class, 'adminhtml/system_config_source_nooptreq' => \Mage_Adminhtml_Model_System_Config_Source_Nooptreq::class, 'adminhtml/system_config_source_notification_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Notification_Frequency::class, 'adminhtml/system_config_source_order_status' => \Mage_Adminhtml_Model_System_Config_Source_Order_Status::class, @@ -9768,7 +9750,6 @@ 'adminhtml/system_config_source_shipping_flatrate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Flatrate::class, 'adminhtml/system_config_source_shipping_tablerate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Tablerate::class, 'adminhtml/system_config_source_shipping_taxclass' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Taxclass::class, - 'adminhtml/system_config_source_startdateenddate' => \Mage_Adminhtml_Model_System_Config_Source_Startdateenddate::class, 'adminhtml/system_config_source_storage_media_database' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Database::class, 'adminhtml/system_config_source_storage_media_storage' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Storage::class, 'adminhtml/system_config_source_store' => \Mage_Adminhtml_Model_System_Config_Source_Store::class, @@ -9824,22 +9805,22 @@ 'api2_resource/acl_filter_attribute' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute::class, 'api2/resource_acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class, 'api2_resource/acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class, - 'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, 'api2_resource/acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, + 'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, 'api2/resource_acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class, 'api2_resource/acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class, 'api2_resource/acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class, 'api2/resource_acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class, 'api2/resource_acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class, 'api2_resource/acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class, - 'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class, 'api2/resource_setup' => \Mage_Api2_Model_Resource_Setup::class, + 'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class, 'api2/resource_validator' => \Mage_Api2_Model_Resource_Validator::class, 'api2_resource/validator' => \Mage_Api2_Model_Resource_Validator::class, 'api2/resource_validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class, 'api2_resource/validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class, - 'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, 'api2/resource_validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, + 'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, 'api2/response' => \Mage_Api2_Model_Response::class, 'api2/route_abstract' => \Mage_Api2_Model_Route_Abstract::class, 'api2/route_apiType' => \Mage_Api2_Model_Route_ApiType::class, @@ -9871,8 +9852,8 @@ 'api/mysql4_user_collection' => \Mage_Api_Model_Mysql4_User_Collection::class, 'api/resource_abstract' => \Mage_Api_Model_Resource_Abstract::class, 'api_resource/abstract' => \Mage_Api_Model_Resource_Abstract::class, - 'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class, 'api_resource/acl' => \Mage_Api_Model_Resource_Acl::class, + 'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class, 'api_resource/acl_role' => \Mage_Api_Model_Resource_Acl_Role::class, 'api/resource_acl_role' => \Mage_Api_Model_Resource_Acl_Role::class, 'api/resource_acl_role_collection' => \Mage_Api_Model_Resource_Acl_Role_Collection::class, @@ -9881,14 +9862,14 @@ 'api_resource/permissions_collection' => \Mage_Api_Model_Resource_Permissions_Collection::class, 'api_resource/role' => \Mage_Api_Model_Resource_Role::class, 'api/resource_role' => \Mage_Api_Model_Resource_Role::class, - 'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, 'api_resource/role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, + 'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, 'api/resource_roles' => \Mage_Api_Model_Resource_Roles::class, 'api_resource/roles' => \Mage_Api_Model_Resource_Roles::class, - 'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, 'api_resource/roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, - 'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, + 'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, 'api_resource/roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, + 'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, 'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class, 'api_resource/rules' => \Mage_Api_Model_Resource_Rules::class, 'api_resource/rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class, @@ -9919,15 +9900,6 @@ 'authorizenet/directpost_request' => \Mage_Authorizenet_Model_Directpost_Request::class, 'authorizenet/directpost_response' => \Mage_Authorizenet_Model_Directpost_Response::class, 'authorizenet/directpost_session' => \Mage_Authorizenet_Model_Directpost_Session::class, - 'backup/backup' => \Mage_Backup_Model_Backup::class, - 'backup/config_backend_cron' => \Mage_Backup_Model_Config_Backend_Cron::class, - 'backup/config_source_type' => \Mage_Backup_Model_Config_Source_Type::class, - 'backup/db' => \Mage_Backup_Model_Db::class, - 'backup/fs_collection' => \Mage_Backup_Model_Fs_Collection::class, - 'backup/mysql4_db' => \Mage_Backup_Model_Mysql4_Db::class, - 'backup/observer' => \Mage_Backup_Model_Observer::class, - 'backup/resource_db' => \Mage_Backup_Model_Resource_Db::class, - 'backup/resource_helper_mysql4' => \Mage_Backup_Model_Resource_Helper_Mysql4::class, 'bundle/catalogIndex_data_bundle' => \Mage_Bundle_Model_CatalogIndex_Data_Bundle::class, 'bundle/mysql4_bundle' => \Mage_Bundle_Model_Mysql4_Bundle::class, 'bundle/mysql4_indexer_price' => \Mage_Bundle_Model_Mysql4_Indexer_Price::class, @@ -9947,16 +9919,16 @@ 'bundle/resource_bundle' => \Mage_Bundle_Model_Resource_Bundle::class, 'bundle/resource_indexer_price' => \Mage_Bundle_Model_Resource_Indexer_Price::class, 'bundle_resource/indexer_price' => \Mage_Bundle_Model_Resource_Indexer_Price::class, - 'bundle/resource_indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class, 'bundle_resource/indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class, + 'bundle/resource_indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class, 'bundle/resource_option' => \Mage_Bundle_Model_Resource_Option::class, 'bundle_resource/option' => \Mage_Bundle_Model_Resource_Option::class, 'bundle/resource_option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class, 'bundle_resource/option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class, 'bundle_resource/price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, 'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, - 'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class, 'bundle_resource/selection' => \Mage_Bundle_Model_Resource_Selection::class, + 'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class, 'bundle_resource/selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class, 'bundle/resource_selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class, 'bundle/sales_order_pdf_items_abstract' => \Mage_Bundle_Model_Sales_Order_Pdf_Items_Abstract::class, @@ -10016,14 +9988,14 @@ 'catalogindex/resource_data_abstract' => \Mage_CatalogIndex_Model_Resource_Data_Abstract::class, 'catalogindex_resource/data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class, 'catalogindex/resource_data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class, - 'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, 'catalogindex_resource/data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, + 'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, 'catalogindex_resource/indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class, 'catalogindex/resource_indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class, 'catalogindex/resource_indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class, 'catalogindex_resource/indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class, - 'catalogindex_resource/indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class, 'catalogindex/resource_indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class, + 'catalogindex_resource/indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class, 'catalogindex_resource/indexer_minimalprice' => \Mage_CatalogIndex_Model_Resource_Indexer_Minimalprice::class, 'catalogindex/resource_indexer_minimalprice' => \Mage_CatalogIndex_Model_Resource_Indexer_Minimalprice::class, 'catalogindex/resource_indexer_price' => \Mage_CatalogIndex_Model_Resource_Indexer_Price::class, @@ -10049,20 +10021,20 @@ 'cataloginventory/mysql4_stock_item_collection' => \Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection::class, 'cataloginventory/mysql4_stock_status' => \Mage_CatalogInventory_Model_Mysql4_Stock_Status::class, 'cataloginventory/observer' => \Mage_CatalogInventory_Model_Observer::class, - 'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, 'cataloginventory_resource/indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, + 'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, 'cataloginventory/resource_indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class, 'cataloginventory_resource/indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class, - 'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, 'cataloginventory/resource_indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, + 'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, 'cataloginventory/resource_indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class, 'cataloginventory_resource/indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class, 'cataloginventory_resource/stock' => \Mage_CatalogInventory_Model_Resource_Stock::class, 'cataloginventory/resource_stock' => \Mage_CatalogInventory_Model_Resource_Stock::class, 'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, 'cataloginventory/resource_stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, - 'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, 'cataloginventory/resource_stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, + 'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, 'cataloginventory/resource_stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class, 'cataloginventory_resource/stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class, 'cataloginventory/source_backorders' => \Mage_CatalogInventory_Model_Source_Backorders::class, @@ -10083,10 +10055,10 @@ 'catalogrule/mysql4_rule_product_price' => \Mage_CatalogRule_Model_Mysql4_Rule_Product_Price::class, 'catalogrule/mysql4_rule_product_price_collection' => \Mage_CatalogRule_Model_Mysql4_Rule_Product_Price_Collection::class, 'catalogrule/observer' => \Mage_CatalogRule_Model_Observer::class, - 'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class, 'catalogrule/resource_rule' => \Mage_CatalogRule_Model_Resource_Rule::class, - 'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, + 'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class, 'catalogrule_resource/rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, + 'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, 'catalogrule_resource/rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class, 'catalogrule/resource_rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class, 'catalogrule_resource/rule_product_price_collection' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price_Collection::class, @@ -10115,24 +10087,24 @@ 'catalogsearch/query' => \Mage_CatalogSearch_Model_Query::class, 'catalogsearch_resource/advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class, 'catalogsearch/resource_advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class, - 'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, 'catalogsearch_resource/advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, + 'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, 'catalogsearch_resource/fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class, 'catalogsearch/resource_fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class, 'catalogsearch_resource/fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class, 'catalogsearch/resource_fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class, 'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, 'catalogsearch_resource/fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, - 'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, 'catalogsearch/resource_helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, - 'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, + 'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, 'catalogsearch_resource/indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, + 'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, 'catalogsearch_resource/query' => \Mage_CatalogSearch_Model_Resource_Query::class, 'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class, - 'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, 'catalogsearch_resource/query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, - 'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, + 'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, 'catalogsearch/resource_search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, + 'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, 'catalogsearch/session' => \Mage_CatalogSearch_Model_Session::class, 'catalogsearch/system_config_backend_sitemap' => \Mage_CatalogSearch_Model_System_Config_Backend_Sitemap::class, 'catalog/abstract' => \Mage_Catalog_Model_Abstract::class, @@ -10275,144 +10247,144 @@ 'catalog/product_website' => \Mage_Catalog_Model_Product_Website::class, 'catalog/resource_abstract' => \Mage_Catalog_Model_Resource_Abstract::class, 'catalog_resource/abstract' => \Mage_Catalog_Model_Resource_Abstract::class, - 'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class, 'catalog/resource_attribute' => \Mage_Catalog_Model_Resource_Attribute::class, - 'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class, + 'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class, 'catalog_resource/category' => \Mage_Catalog_Model_Resource_Category::class, + 'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class, 'catalog_resource/category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class, 'catalog/resource_category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class, - 'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, 'catalog/resource_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, - 'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, + 'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, 'catalog/resource_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, + 'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, 'catalog_resource/category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class, 'catalog/resource_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class, 'catalog_resource/category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class, 'catalog/resource_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class, 'catalog/resource_category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class, 'catalog_resource/category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class, - 'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, 'catalog_resource/category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, - 'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, + 'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, 'catalog/resource_category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, + 'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, 'catalog_resource/category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class, 'catalog/resource_category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class, 'catalog/resource_category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class, 'catalog_resource/category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class, - 'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, 'catalog_resource/collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, - 'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class, + 'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, 'catalog_resource/config' => \Mage_Catalog_Model_Resource_Config::class, - 'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, + 'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class, 'catalog/resource_eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, + 'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, 'catalog_resource/eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class, 'catalog/resource_eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class, - 'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, 'catalog_resource/eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, - 'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, + 'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, 'catalog/resource_eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, - 'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, + 'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, 'catalog_resource/eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, + 'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, 'catalog_resource/eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, - 'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, + 'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, 'catalog_resource/eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, + 'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, 'catalog/resource_eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class, 'catalog_resource/eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class, 'catalog/resource_eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class, 'catalog_resource/eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class, 'catalog/resource_eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class, 'catalog_resource/eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class, - 'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, 'catalog/resource_eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, - 'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, + 'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, 'catalog/resource_eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, + 'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, 'catalog/resource_eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class, 'catalog_resource/eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class, - 'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, 'catalog_resource/eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, + 'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, 'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, 'catalog_resource/eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, 'catalog_resource/eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class, 'catalog/resource_eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class, - 'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, 'catalog_resource/eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, - 'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, + 'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, 'catalog/resource_eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, - 'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, + 'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, 'catalog/resource_eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, - 'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, + 'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, 'catalog/resource_eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, + 'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, 'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, 'catalog_resource/eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, 'catalog_resource/eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, - 'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, 'catalog/resource_eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, + 'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class, 'catalog/resource_eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, + 'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, 'catalog/resource_eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class, 'catalog/resource_eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class, 'catalog_resource/eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class, 'catalog_resource/eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class, 'catalog/resource_eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class, - 'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, 'catalog_resource/eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, - 'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, + 'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, 'catalog_resource/eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, - 'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, + 'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, 'catalog_resource/eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, + 'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, 'catalog/resource_eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class, 'catalog/resource_eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class, 'catalog/resource_eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class, - 'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, 'catalog/resource_eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, - 'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, + 'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, 'catalog_resource/eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, + 'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, 'catalog_resource/eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class, 'catalog/resource_eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class, 'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, 'catalog/resource_eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, - 'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, 'catalog/resource_eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, + 'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, 'catalog/resource_eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class, 'catalog_resource/eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class, - 'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, 'catalog/resource_eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, + 'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, 'catalog_resource/eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class, 'catalog/resource_eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class, 'catalog_resource/eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class, 'catalog/resource_eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class, 'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, 'catalog/resource_eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, - 'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, 'catalog_resource/eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, - 'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, + 'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, 'catalog/resource_eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, - 'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, + 'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, 'catalog/resource_eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, - 'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, + 'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, 'catalog/resource_eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, + 'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, 'catalog/resource_eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class, 'catalog_resource/eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class, - 'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, 'catalog_resource/eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, - 'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, + 'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, 'catalog/resource_eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, - 'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, + 'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, 'catalog/resource_eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, + 'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, 'catalog_resource/eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, + 'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, 'catalog/resource_eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class, 'catalog_resource/eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class, 'catalog/resource_eav_mysql4_sendfriend' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend::class, @@ -10421,98 +10393,98 @@ 'catalog/resource_eav_mysql4_sendfriend_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection::class, 'catalog_resource/eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class, 'catalog/resource_eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class, - 'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, 'catalog/resource_eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, + 'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, 'catalog/resource_helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, 'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, 'catalog_resource/layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class, 'catalog/resource_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class, 'catalog/resource_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class, 'catalog_resource/layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class, - 'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, 'catalog/resource_layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, - 'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class, + 'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, 'catalog_resource/product' => \Mage_Catalog_Model_Resource_Product::class, + 'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class, 'catalog/resource_product_action' => \Mage_Catalog_Model_Resource_Product_Action::class, 'catalog_resource/product_action' => \Mage_Catalog_Model_Resource_Product_Action::class, - 'catalog_resource/product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class, 'catalog/resource_product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class, + 'catalog_resource/product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class, 'catalog/resource_product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class, 'catalog_resource/product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class, 'catalog/resource_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class, 'catalog_resource/product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class, - 'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, 'catalog/resource_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, + 'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, 'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, 'catalog_resource/product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, 'catalog/resource_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class, - 'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, 'catalog_resource/product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, + 'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, 'catalog/resource_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, 'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, - 'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, - 'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, + 'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, + 'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, 'catalog_resource/product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class, 'catalog/resource_product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class, - 'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, 'catalog/resource_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, + 'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, 'catalog/resource_product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class, 'catalog_resource/product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class, - 'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, 'catalog/resource_product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, + 'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, 'catalog/resource_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class, 'catalog_resource/product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class, - 'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, 'catalog_resource/product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, - 'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, + 'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, 'catalog/resource_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, + 'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, 'catalog/resource_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class, 'catalog_resource/product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class, - 'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, 'catalog_resource/product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, - 'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, + 'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, 'catalog_resource/product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, - 'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, + 'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, 'catalog_resource/product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, + 'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, 'catalog/resource_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class, 'catalog_resource/product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class, 'catalog_resource/product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class, 'catalog/resource_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class, - 'catalog/resource_product_link' => \Mage_Catalog_Model_Resource_Product_Link::class, 'catalog_resource/product_link' => \Mage_Catalog_Model_Resource_Product_Link::class, + 'catalog/resource_product_link' => \Mage_Catalog_Model_Resource_Product_Link::class, 'catalog/resource_product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class, 'catalog_resource/product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class, - 'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, 'catalog/resource_product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, - 'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, + 'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, 'catalog_resource/product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, - 'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, + 'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, 'catalog/resource_product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, - 'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, + 'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, 'catalog_resource/product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, - 'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, + 'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, 'catalog_resource/product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, + 'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, 'catalog_resource/product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class, 'catalog/resource_product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class, 'catalog_resource/product_status' => \Mage_Catalog_Model_Resource_Product_Status::class, 'catalog/resource_product_status' => \Mage_Catalog_Model_Resource_Product_Status::class, 'catalog_resource/product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class, 'catalog/resource_product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class, - 'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, 'catalog/resource_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, - 'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, + 'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, 'catalog_resource/product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, + 'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, 'catalog_resource/product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class, 'catalog/resource_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class, - 'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, 'catalog_resource/product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, + 'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, 'catalog/resource_setup' => \Mage_Catalog_Model_Resource_Setup::class, 'catalog_resource/setup' => \Mage_Catalog_Model_Resource_Setup::class, - 'catalog/resource_url' => \Mage_Catalog_Model_Resource_Url::class, 'catalog_resource/url' => \Mage_Catalog_Model_Resource_Url::class, + 'catalog/resource_url' => \Mage_Catalog_Model_Resource_Url::class, 'catalog/session' => \Mage_Catalog_Model_Session::class, 'catalog/system_config_backend_catalog_category_flat' => \Mage_Catalog_Model_System_Config_Backend_Catalog_Category_Flat::class, 'catalog/system_config_backend_catalog_product_flat' => \Mage_Catalog_Model_System_Config_Backend_Catalog_Product_Flat::class, @@ -10554,12 +10526,12 @@ 'checkout/observer' => \Mage_Checkout_Model_Observer::class, 'checkout_resource/agreement' => \Mage_Checkout_Model_Resource_Agreement::class, 'checkout/resource_agreement' => \Mage_Checkout_Model_Resource_Agreement::class, - 'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, 'checkout/resource_agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, - 'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class, + 'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, 'checkout_resource/cart' => \Mage_Checkout_Model_Resource_Cart::class, - 'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class, + 'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class, 'checkout/resource_setup' => \Mage_Checkout_Model_Resource_Setup::class, + 'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class, 'checkout/session' => \Mage_Checkout_Model_Session::class, 'checkout/type_abstract' => \Mage_Checkout_Model_Type_Abstract::class, 'checkout/type_multishipping' => \Mage_Checkout_Model_Type_Multishipping::class, @@ -10574,25 +10546,25 @@ 'cms/mysql4_page_service' => \Mage_Cms_Model_Mysql4_Page_Service::class, 'cms/observer' => \Mage_Cms_Model_Observer::class, 'cms/page' => \Mage_Cms_Model_Page::class, - 'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class, 'cms/resource_block' => \Mage_Cms_Model_Resource_Block::class, + 'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class, 'cms_resource/block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class, 'cms/resource_block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class, 'cms/resource_page' => \Mage_Cms_Model_Resource_Page::class, 'cms_resource/page' => \Mage_Cms_Model_Resource_Page::class, 'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, 'cms_resource/page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, - 'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class, 'cms/resource_page_service' => \Mage_Cms_Model_Resource_Page_Service::class, + 'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class, 'cms/template_filter' => \Mage_Cms_Model_Template_Filter::class, 'cms/wysiwyg_config' => \Mage_Cms_Model_Wysiwyg_Config::class, 'cms/wysiwyg_images_storage' => \Mage_Cms_Model_Wysiwyg_Images_Storage::class, 'cms/wysiwyg_images_storage_collection' => \Mage_Cms_Model_Wysiwyg_Images_Storage_Collection::class, 'configurableswatches/observer' => \Mage_ConfigurableSwatches_Model_Observer::class, - 'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, 'configurableswatches_resource/catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, - 'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, + 'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, 'configurableswatches_resource/catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, + 'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, 'configurableswatches_resource/catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class, 'configurableswatches/resource_catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class, 'configurableswatches/system_config_source_catalog_product_configattribute' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute::class, @@ -10699,152 +10671,152 @@ 'core/mysql4_website_collection' => \Mage_Core_Model_Mysql4_Website_Collection::class, 'core/observer' => \Mage_Core_Model_Observer::class, 'core/resource' => \Mage_Core_Model_Resource::class, + 'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, 'core_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, 'core/resource_abstract' => \Mage_Core_Model_Resource_Abstract::class, - 'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, + 'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class, 'core/resource_cache' => \Mage_Core_Model_Resource_Cache::class, 'core_resource/cache' => \Mage_Core_Model_Resource_Cache::class, - 'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class, - 'core_resource/config' => \Mage_Core_Model_Resource_Config::class, 'payment_resource/config' => \Mage_Core_Model_Resource_Config::class, 'core/resource_config' => \Mage_Core_Model_Resource_Config::class, - 'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, + 'core_resource/config' => \Mage_Core_Model_Resource_Config::class, 'core/resource_config_data' => \Mage_Core_Model_Resource_Config_Data::class, + 'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, 'payment_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, - 'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'core_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, + 'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, - 'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, - 'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, 'payment_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, + 'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, + 'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, 'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, - 'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, 'core/resource_db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, - 'core/resource_design' => \Mage_Core_Model_Resource_Design::class, + 'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, 'core_resource/design' => \Mage_Core_Model_Resource_Design::class, + 'core/resource_design' => \Mage_Core_Model_Resource_Design::class, 'payment_resource/design' => \Mage_Core_Model_Resource_Design::class, - 'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, 'payment_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, + 'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, 'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, - 'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, 'payment_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, 'core/resource_design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, - 'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, - 'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, + 'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, 'core/resource_email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, - 'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, - 'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, + 'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, + 'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, 'payment_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, - 'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, + 'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, + 'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, 'core/resource_email_template' => \Mage_Core_Model_Resource_Email_Template::class, + 'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, 'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, - 'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, 'core/resource_email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, + 'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, 'core_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, 'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, 'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, 'core_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, - 'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, - 'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, 'core_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, 'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, - 'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, 'payment_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, + 'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, + 'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, 'payment_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, 'core/resource_file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, - 'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, - 'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, 'core/resource_file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, + 'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, 'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, 'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, - 'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, 'core/resource_file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, - 'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class, - 'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class, + 'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, 'payment_resource/flag' => \Mage_Core_Model_Resource_Flag::class, + 'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class, + 'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class, 'payment_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, - 'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, 'core_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, - 'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, + 'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, 'core/resource_helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, + 'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, 'core_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, - 'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, - 'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, 'core/resource_iterator' => \Mage_Core_Model_Resource_Iterator::class, - 'core_resource/language' => \Mage_Core_Model_Resource_Language::class, + 'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, + 'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, 'payment_resource/language' => \Mage_Core_Model_Resource_Language::class, + 'core_resource/language' => \Mage_Core_Model_Resource_Language::class, 'core/resource_language' => \Mage_Core_Model_Resource_Language::class, 'payment_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, - 'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, 'core/resource_language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, - 'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class, + 'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, 'core_resource/layout' => \Mage_Core_Model_Resource_Layout::class, 'core/resource_layout' => \Mage_Core_Model_Resource_Layout::class, - 'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class, + 'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class, 'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class, 'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class, + 'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class, + 'core/resource_session' => \Mage_Core_Model_Resource_Session::class, 'payment_resource/session' => \Mage_Core_Model_Resource_Session::class, 'core_resource/session' => \Mage_Core_Model_Resource_Session::class, - 'core/resource_session' => \Mage_Core_Model_Resource_Session::class, 'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class, 'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class, 'payment_resource/setup' => \Mage_Core_Model_Resource_Setup::class, - 'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core/resource_setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, - 'payment_resource/store' => \Mage_Core_Model_Resource_Store::class, - 'core_resource/store' => \Mage_Core_Model_Resource_Store::class, + 'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core/resource_store' => \Mage_Core_Model_Resource_Store::class, - 'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, + 'core_resource/store' => \Mage_Core_Model_Resource_Store::class, + 'payment_resource/store' => \Mage_Core_Model_Resource_Store::class, 'core/resource_store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, 'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, - 'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, + 'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, 'core/resource_store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'payment_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, - 'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, - 'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, + 'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'payment_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, + 'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, + 'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, 'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, - 'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class, 'core_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, - 'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class, - 'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class, + 'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class, 'core_resource/translate' => \Mage_Core_Model_Resource_Translate::class, - 'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, - 'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class, + 'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class, + 'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class, 'payment_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, - 'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class, + 'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, 'core/resource_type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, 'payment_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, - 'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'core/resource_type_db' => \Mage_Core_Model_Resource_Type_Db::class, + 'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, - 'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, - 'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, 'core_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, - 'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, - 'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, + 'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, 'payment_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, 'payment_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, - 'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, 'core_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, + 'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, 'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, 'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, 'payment_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, - 'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, - 'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'core_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, + 'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, + 'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'core_resource/variable' => \Mage_Core_Model_Resource_Variable::class, - 'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class, 'core/resource_variable' => \Mage_Core_Model_Resource_Variable::class, + 'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class, 'core/resource_variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, - 'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, 'core_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, - 'core_resource/website' => \Mage_Core_Model_Resource_Website::class, + 'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, 'payment_resource/website' => \Mage_Core_Model_Resource_Website::class, + 'core_resource/website' => \Mage_Core_Model_Resource_Website::class, 'core/resource_website' => \Mage_Core_Model_Resource_Website::class, - 'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core/resource_website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, + 'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core/session' => \Mage_Core_Model_Session::class, 'core/session_abstract' => \Mage_Core_Model_Session_Abstract::class, @@ -10874,10 +10846,10 @@ 'cron/mysql4_schedule' => \Mage_Cron_Model_Mysql4_Schedule::class, 'cron/mysql4_schedule_collection' => \Mage_Cron_Model_Mysql4_Schedule_Collection::class, 'cron/observer' => \Mage_Cron_Model_Observer::class, - 'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class, 'cron/resource_schedule' => \Mage_Cron_Model_Resource_Schedule::class, - 'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, + 'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class, 'cron/resource_schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, + 'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, 'cron/schedule' => \Mage_Cron_Model_Schedule::class, 'currencysymbol/observer' => \Mage_CurrencySymbol_Model_Observer::class, 'currencysymbol/system_currencysymbol' => \Mage_CurrencySymbol_Model_System_Currencysymbol::class, @@ -10954,14 +10926,14 @@ 'customer_resource/address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class, 'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, 'customer_resource/address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, - 'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, 'customer/resource_address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, - 'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, + 'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, 'customer/resource_address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, - 'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, + 'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, 'customer_resource/address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, - 'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, + 'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, 'customer_resource/address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, + 'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, 'customer/resource_attribute' => \Mage_Customer_Model_Resource_Attribute::class, 'customer_resource/attribute' => \Mage_Customer_Model_Resource_Attribute::class, 'customer_resource/attribute_collection' => \Mage_Customer_Model_Resource_Attribute_Collection::class, @@ -10970,20 +10942,20 @@ 'customer_resource/customer' => \Mage_Customer_Model_Resource_Customer::class, 'customer_resource/customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class, 'customer/resource_customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class, - 'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, 'customer/resource_flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, - 'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, + 'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, 'customer/resource_flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, - 'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, + 'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, 'customer/resource_form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, + 'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, 'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, 'customer/resource_form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, 'customer/resource_group' => \Mage_Customer_Model_Resource_Group::class, 'customer_resource/group' => \Mage_Customer_Model_Resource_Group::class, 'customer_resource/group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class, 'customer/resource_group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class, - 'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class, 'customer_resource/setup' => \Mage_Customer_Model_Resource_Setup::class, + 'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class, 'customer_resource/wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, 'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, 'customer/session' => \Mage_Customer_Model_Session::class, @@ -11037,10 +11009,10 @@ 'dataflow/mysql4_session' => \Mage_Dataflow_Model_Mysql4_Session::class, 'dataflow/profile' => \Mage_Dataflow_Model_Profile::class, 'dataflow/profile_history' => \Mage_Dataflow_Model_Profile_History::class, - 'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class, 'dataflow/resource_batch' => \Mage_Dataflow_Model_Resource_Batch::class, - 'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, + 'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class, 'dataflow/resource_batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, + 'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, 'dataflow/resource_batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class, 'dataflow_resource/batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class, 'dataflow_resource/batch_export' => \Mage_Dataflow_Model_Resource_Batch_Export::class, @@ -11055,12 +11027,12 @@ 'dataflow/resource_profile' => \Mage_Dataflow_Model_Resource_Profile::class, 'dataflow/resource_profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class, 'dataflow_resource/profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class, - 'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, 'dataflow_resource/profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, + 'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, 'dataflow_resource/profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class, 'dataflow/resource_profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class, - 'dataflow/resource_session' => \Mage_Dataflow_Model_Resource_Session::class, 'dataflow_resource/session' => \Mage_Dataflow_Model_Resource_Session::class, + 'dataflow/resource_session' => \Mage_Dataflow_Model_Resource_Session::class, 'dataflow/session' => \Mage_Dataflow_Model_Session::class, 'dataflow/session_adapter_http' => \Mage_Dataflow_Model_Session_Adapter_Http::class, 'dataflow/session_parser_csv' => \Mage_Dataflow_Model_Session_Parser_Csv::class, @@ -11090,18 +11062,18 @@ 'directory/resource_country' => \Mage_Directory_Model_Resource_Country::class, 'directory_resource/country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class, 'directory/resource_country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class, - 'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class, 'directory/resource_country_format' => \Mage_Directory_Model_Resource_Country_Format::class, + 'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class, 'directory_resource/country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class, 'directory/resource_country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class, 'directory_resource/currency' => \Mage_Directory_Model_Resource_Currency::class, 'directory/resource_currency' => \Mage_Directory_Model_Resource_Currency::class, - 'directory/resource_currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class, 'directory_resource/currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class, + 'directory/resource_currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class, 'directory/resource_region' => \Mage_Directory_Model_Resource_Region::class, 'directory_resource/region' => \Mage_Directory_Model_Resource_Region::class, - 'directory/resource_region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class, 'directory_resource/region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class, + 'directory/resource_region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class, 'downloadable/catalogIndex_data_downloadable' => \Mage_Downloadable_Model_CatalogIndex_Data_Downloadable::class, 'downloadable/link' => \Mage_Downloadable_Model_Link::class, 'downloadable/link_api' => \Mage_Downloadable_Model_Link_Api::class, @@ -11122,8 +11094,8 @@ 'downloadable/observer' => \Mage_Downloadable_Model_Observer::class, 'downloadable/product_price' => \Mage_Downloadable_Model_Product_Price::class, 'downloadable/product_type' => \Mage_Downloadable_Model_Product_Type::class, - 'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, 'downloadable_resource/indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, + 'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, 'downloadable/resource_link' => \Mage_Downloadable_Model_Resource_Link::class, 'downloadable_resource/link' => \Mage_Downloadable_Model_Resource_Link::class, 'downloadable/resource_link_collection' => \Mage_Downloadable_Model_Resource_Link_Collection::class, @@ -11132,14 +11104,14 @@ 'downloadable_resource/link_purchased' => \Mage_Downloadable_Model_Resource_Link_Purchased::class, 'downloadable/resource_link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class, 'downloadable_resource/link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class, - 'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, 'downloadable/resource_link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, - 'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, + 'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, 'downloadable/resource_link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, - 'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class, + 'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, 'downloadable/resource_sample' => \Mage_Downloadable_Model_Resource_Sample::class, - 'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, + 'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class, 'downloadable/resource_sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, + 'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, 'downloadable/sales_order_pdf_items_abstract' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Abstract::class, 'downloadable/sales_order_pdf_items_creditmemo' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Creditmemo::class, 'downloadable/sales_order_pdf_items_invoice' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Invoice::class, @@ -11221,8 +11193,8 @@ 'eav/mysql4_form_fieldset_collection' => \Mage_Eav_Model_Mysql4_Form_Fieldset_Collection::class, 'eav/mysql4_form_type' => \Mage_Eav_Model_Mysql4_Form_Type::class, 'eav/mysql4_form_type_collection' => \Mage_Eav_Model_Mysql4_Form_Type_Collection::class, - 'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class, 'eav_resource/attribute' => \Mage_Eav_Model_Resource_Attribute::class, + 'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class, 'eav_resource/attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class, 'eav/resource_attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class, 'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class, @@ -11239,28 +11211,28 @@ 'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class, 'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, 'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, - 'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, 'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, - 'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, + 'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, 'eav_resource/entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, + 'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, 'eav_resource/entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class, 'eav/resource_entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class, 'eav_resource/entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class, 'eav/resource_entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class, - 'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, 'eav_resource/entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, + 'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, 'eav/resource_form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class, 'eav_resource/form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class, - 'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, 'eav/resource_form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, + 'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, 'eav/resource_form_element' => \Mage_Eav_Model_Resource_Form_Element::class, 'eav_resource/form_element' => \Mage_Eav_Model_Resource_Form_Element::class, - 'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, 'eav_resource/form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, - 'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, + 'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, 'eav/resource_form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, - 'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, + 'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, 'eav_resource/form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, + 'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, 'eav/resource_form_type' => \Mage_Eav_Model_Resource_Form_Type::class, 'eav_resource/form_type' => \Mage_Eav_Model_Resource_Form_Type::class, 'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class, @@ -11276,12 +11248,12 @@ 'giftmessage/mysql4_message_collection' => \Mage_GiftMessage_Model_Mysql4_Message_Collection::class, 'giftmessage/mysql4_setup' => \Mage_GiftMessage_Model_Mysql4_Setup::class, 'giftmessage/observer' => \Mage_GiftMessage_Model_Observer::class, - 'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class, 'giftmessage/resource_message' => \Mage_GiftMessage_Model_Resource_Message::class, - 'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, + 'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class, 'giftmessage_resource/message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, - 'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class, + 'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, 'giftmessage_resource/setup' => \Mage_GiftMessage_Model_Resource_Setup::class, + 'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class, 'googleanalytics/observer' => \Mage_GoogleAnalytics_Model_Observer::class, 'googleanalytics/system_config_source_type' => \Mage_GoogleAnalytics_Model_System_Config_Source_Type::class, 'googlecheckout/payment' => \Mage_GoogleCheckout_Model_Payment::class, @@ -11317,8 +11289,8 @@ 'importexport/product_attribute_backend_urlkey' => \Mage_ImportExport_Model_Product_Attribute_Backend_Urlkey::class, 'importexport_resource/helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class, 'importexport/resource_helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class, - 'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, 'importexport_resource/import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, + 'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, 'importexport_resource/setup' => \Mage_ImportExport_Model_Resource_Setup::class, 'importexport/resource_setup' => \Mage_ImportExport_Model_Resource_Setup::class, 'importexport/source_export_entity' => \Mage_ImportExport_Model_Source_Export_Entity::class, @@ -11340,16 +11312,16 @@ 'index/process' => \Mage_Index_Model_Process::class, 'index_resource/abstract' => \Mage_Index_Model_Resource_Abstract::class, 'index/resource_abstract' => \Mage_Index_Model_Resource_Abstract::class, - 'index/resource_event' => \Mage_Index_Model_Resource_Event::class, 'index_resource/event' => \Mage_Index_Model_Resource_Event::class, + 'index/resource_event' => \Mage_Index_Model_Resource_Event::class, 'index/resource_event_collection' => \Mage_Index_Model_Resource_Event_Collection::class, 'index_resource/event_collection' => \Mage_Index_Model_Resource_Event_Collection::class, 'index/resource_helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class, 'index_resource/helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class, - 'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, 'index/resource_lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, - 'index_resource/process' => \Mage_Index_Model_Resource_Process::class, + 'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, 'index/resource_process' => \Mage_Index_Model_Resource_Process::class, + 'index_resource/process' => \Mage_Index_Model_Resource_Process::class, 'index/resource_process_collection' => \Mage_Index_Model_Resource_Process_Collection::class, 'index_resource/process_collection' => \Mage_Index_Model_Resource_Process_Collection::class, 'index/resource_setup' => \Mage_Index_Model_Resource_Setup::class, @@ -11382,22 +11354,22 @@ 'log/mysql4_visitor_online_collection' => \Mage_Log_Model_Mysql4_Visitor_Online_Collection::class, 'log_resource/aggregation' => \Mage_Log_Model_Resource_Aggregation::class, 'log/resource_aggregation' => \Mage_Log_Model_Resource_Aggregation::class, - 'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class, 'log/resource_customer' => \Mage_Log_Model_Resource_Customer::class, + 'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class, 'log/resource_log' => \Mage_Log_Model_Resource_Log::class, 'log_resource/log' => \Mage_Log_Model_Resource_Log::class, 'log_resource/visitor' => \Mage_Log_Model_Resource_Visitor::class, 'log/resource_visitor' => \Mage_Log_Model_Resource_Visitor::class, 'log_resource/visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class, 'log/resource_visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class, - 'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, 'log_resource/visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, - 'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, + 'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, 'log_resource/visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, + 'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, 'log/visitor' => \Mage_Log_Model_Visitor::class, 'log/visitor_online' => \Mage_Log_Model_Visitor_Online::class, - 'media_resource/image' => \Mage_Media_Model_File_Image::class, 'media/file_image' => \Mage_Media_Model_File_Image::class, + 'media_resource/image' => \Mage_Media_Model_File_Image::class, 'media/image' => \Mage_Media_Model_Image::class, 'newsletter/message' => \Mage_Newsletter_Model_Message::class, 'newsletter/mysql4_problem' => \Mage_Newsletter_Model_Mysql4_Problem::class, @@ -11415,14 +11387,14 @@ 'newsletter_resource/problem' => \Mage_Newsletter_Model_Resource_Problem::class, 'newsletter/resource_problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class, 'newsletter_resource/problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class, - 'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class, 'newsletter/resource_queue' => \Mage_Newsletter_Model_Resource_Queue::class, - 'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, + 'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class, 'newsletter/resource_queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, - 'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, + 'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, 'newsletter/resource_subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, - 'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, + 'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, 'newsletter/resource_subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, + 'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, 'newsletter_resource/template' => \Mage_Newsletter_Model_Resource_Template::class, 'newsletter/resource_template' => \Mage_Newsletter_Model_Resource_Template::class, 'newsletter_resource/template_collection' => \Mage_Newsletter_Model_Resource_Template_Collection::class, @@ -11435,20 +11407,20 @@ 'oauth/consumer_validator_keyLength' => \Mage_Oauth_Model_Consumer_Validator_KeyLength::class, 'oauth/nonce' => \Mage_Oauth_Model_Nonce::class, 'oauth/observer' => \Mage_Oauth_Model_Observer::class, - 'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class, 'oauth/resource_consumer' => \Mage_Oauth_Model_Resource_Consumer::class, + 'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class, 'oauth/resource_consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class, 'oauth_resource/consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class, 'oauth_resource/nonce' => \Mage_Oauth_Model_Resource_Nonce::class, 'oauth/resource_nonce' => \Mage_Oauth_Model_Resource_Nonce::class, 'oauth_resource/nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class, 'oauth/resource_nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class, - 'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class, 'oauth/resource_setup' => \Mage_Oauth_Model_Resource_Setup::class, + 'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class, 'oauth_resource/token' => \Mage_Oauth_Model_Resource_Token::class, 'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class, - 'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, + 'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth/server' => \Mage_Oauth_Model_Server::class, 'oauth/token' => \Mage_Oauth_Model_Token::class, 'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class, @@ -11465,8 +11437,8 @@ 'paygate/authorizenet_source_paymentAction' => \Mage_Paygate_Model_Authorizenet_Source_PaymentAction::class, 'paygate/mysql4_authorizenet_debug' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug::class, 'paygate/mysql4_authorizenet_debug_collection' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection::class, - 'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, 'paygate/resource_authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, + 'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, 'paygate_resource/authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class, 'paygate/resource_authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class, 'payment/billing_agreementAbstract' => \Mage_Payment_Model_Billing_AgreementAbstract::class, @@ -11529,14 +11501,14 @@ 'paypal/resource_cert' => \Mage_Paypal_Model_Resource_Cert::class, 'paypal_resource/payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class, 'paypal/resource_payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class, - 'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, 'paypal/resource_payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, + 'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, 'paypal/resource_report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class, 'paypal_resource/report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class, - 'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, 'paypal/resource_report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, - 'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, + 'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, 'paypal/resource_report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, + 'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, 'paypal/resource_setup' => \Mage_Paypal_Model_Resource_Setup::class, 'paypal_resource/setup' => \Mage_Paypal_Model_Resource_Setup::class, 'paypal/session' => \Mage_Paypal_Model_Session::class, @@ -11570,16 +11542,16 @@ 'poll/poll' => \Mage_Poll_Model_Poll::class, 'poll/poll_answer' => \Mage_Poll_Model_Poll_Answer::class, 'poll/poll_vote' => \Mage_Poll_Model_Poll_Vote::class, - 'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class, 'poll_resource/poll' => \Mage_Poll_Model_Resource_Poll::class, - 'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, + 'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class, 'poll/resource_poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, - 'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, + 'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, 'poll_resource/poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, - 'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, + 'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, 'poll_resource/poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, - 'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, + 'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, 'poll/resource_poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, + 'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, 'productalert/email' => \Mage_ProductAlert_Model_Email::class, 'productalert/mysql4_price' => \Mage_ProductAlert_Model_Mysql4_Price::class, 'productalert/mysql4_price_collection' => \Mage_ProductAlert_Model_Mysql4_Price_Collection::class, @@ -11589,20 +11561,20 @@ 'productalert/mysql4_stock_customer_collection' => \Mage_ProductAlert_Model_Mysql4_Stock_Customer_Collection::class, 'productalert/observer' => \Mage_ProductAlert_Model_Observer::class, 'productalert/price' => \Mage_ProductAlert_Model_Price::class, - 'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, 'productalert_resource/abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, - 'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class, + 'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, 'productalert_resource/price' => \Mage_ProductAlert_Model_Resource_Price::class, - 'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, + 'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class, 'productalert/resource_price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, - 'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, + 'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, 'productalert/resource_price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, - 'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class, + 'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, 'productalert/resource_stock' => \Mage_ProductAlert_Model_Resource_Stock::class, - 'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, + 'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class, 'productalert/resource_stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, - 'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, + 'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, 'productalert/resource_stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, + 'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, 'productalert/stock' => \Mage_ProductAlert_Model_Stock::class, 'rating/mysql4_rating' => \Mage_Rating_Model_Mysql4_Rating::class, 'rating/mysql4_rating_collection' => \Mage_Rating_Model_Mysql4_Rating_Collection::class, @@ -11616,20 +11588,20 @@ 'rating/rating_entity' => \Mage_Rating_Model_Rating_Entity::class, 'rating/rating_option' => \Mage_Rating_Model_Rating_Option::class, 'rating/rating_option_vote' => \Mage_Rating_Model_Rating_Option_Vote::class, - 'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class, 'rating/resource_rating' => \Mage_Rating_Model_Resource_Rating::class, + 'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class, 'rating_resource/rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class, 'rating/resource_rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class, 'rating/resource_rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class, 'rating_resource/rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class, - 'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, 'rating/resource_rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, - 'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, + 'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, 'rating_resource/rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, + 'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, 'rating_resource/rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class, 'rating/resource_rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class, - 'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, 'rating/resource_rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, + 'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, 'reports/config' => \Mage_Reports_Model_Config::class, 'reports/event' => \Mage_Reports_Model_Event::class, 'reports/event_observer' => \Mage_Reports_Model_Event_Observer::class, @@ -11675,6 +11647,7 @@ 'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class, 'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class, 'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class, + 'reports/observer' => \Mage_Reports_Model_Observer::class, 'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class, 'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class, 'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class, @@ -11683,52 +11656,52 @@ 'reports_resource/accounts_collection' => \Mage_Reports_Model_Resource_Accounts_Collection::class, 'reports/resource_coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class, 'reports_resource/coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class, - 'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, 'reports/resource_customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, - 'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, + 'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, 'reports/resource_customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, - 'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, + 'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, 'reports_resource/customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, - 'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, + 'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, 'reports/resource_entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, + 'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, 'reports_resource/event' => \Mage_Reports_Model_Resource_Event::class, 'reports/resource_event' => \Mage_Reports_Model_Resource_Event::class, - 'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, 'reports_resource/event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, - 'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class, + 'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, 'reports/resource_event_type' => \Mage_Reports_Model_Resource_Event_Type::class, - 'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, + 'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class, 'reports/resource_event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, - 'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, + 'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, 'reports_resource/helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, - 'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, + 'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, 'reports/resource_invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, - 'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, + 'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, 'reports_resource/order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, - 'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, + 'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, 'reports_resource/product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, + 'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, 'reports/resource_product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class, 'reports_resource/product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class, 'reports_resource/product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class, 'reports/resource_product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class, - 'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, 'reports/resource_product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, + 'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, 'reports_resource/product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class, 'reports/resource_product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class, - 'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, 'reports_resource/product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, + 'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, 'reports/resource_product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, 'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, 'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, 'reports_resource/product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, - 'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, 'reports/resource_product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, + 'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, 'reports_resource/product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class, 'reports/resource_product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class, - 'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, 'reports_resource/product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, - 'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, + 'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, 'reports_resource/product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, + 'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, 'reports/resource_quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, 'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, 'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class, @@ -11737,34 +11710,34 @@ 'reports_resource/report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class, 'reports/resource_report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class, 'reports_resource/report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class, - 'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, 'reports_resource/report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, + 'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, 'reports/resource_report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class, 'reports_resource/report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class, - 'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, 'reports/resource_report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, - 'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, + 'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, 'reports_resource/review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, - 'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, + 'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, 'reports_resource/review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, + 'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, 'reports_resource/review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class, 'reports/resource_review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class, 'reports_resource/shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class, 'reports/resource_shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class, - 'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, 'reports_resource/shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, + 'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, 'reports_resource/tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class, 'reports/resource_tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class, 'reports/resource_tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, 'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, 'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, 'reports/resource_tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, - 'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, 'reports/resource_tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, + 'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, 'reports_resource/wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class, 'reports/resource_wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class, - 'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, 'reports_resource/wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, + 'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, 'reports/session' => \Mage_Reports_Model_Session::class, 'reports/test' => \Mage_Reports_Model_Test::class, 'reports/totals' => \Mage_Reports_Model_Totals::class, @@ -11783,12 +11756,12 @@ 'review/resource_review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class, 'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class, 'review_resource/review_status' => \Mage_Review_Model_Resource_Review_Status::class, - 'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, 'review_resource/review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, + 'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, 'review/resource_review_summary' => \Mage_Review_Model_Resource_Review_Summary::class, 'review_resource/review_summary' => \Mage_Review_Model_Resource_Review_Summary::class, - 'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, 'review/resource_review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, + 'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, 'review/review' => \Mage_Review_Model_Review::class, 'review/review_status' => \Mage_Review_Model_Review_Status::class, 'review/review_summary' => \Mage_Review_Model_Review_Summary::class, @@ -11811,12 +11784,12 @@ 'rule/mysql4_rule_collection' => \Mage_Rule_Model_Mysql4_Rule_Collection::class, 'rule/renderer_actions' => \Mage_Rule_Model_Renderer_Actions::class, 'rule/renderer_conditions' => \Mage_Rule_Model_Renderer_Conditions::class, - 'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class, 'rule/resource_abstract' => \Mage_Rule_Model_Resource_Abstract::class, - 'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class, + 'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class, 'rule/resource_rule' => \Mage_Rule_Model_Resource_Rule::class, - 'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, + 'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class, 'rule_resource/rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, + 'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, 'rule_resource/rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, 'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, 'rule/resource_rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class, @@ -11843,28 +11816,28 @@ 'salesrule/quote_nominal_discount' => \Mage_SalesRule_Model_Quote_Nominal_Discount::class, 'salesrule_resource/coupon' => \Mage_SalesRule_Model_Resource_Coupon::class, 'salesrule/resource_coupon' => \Mage_SalesRule_Model_Resource_Coupon::class, - 'salesrule_resource/coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class, 'salesrule/resource_coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class, + 'salesrule_resource/coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class, 'salesrule/resource_coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class, 'salesrule_resource/coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class, - 'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, 'salesrule_resource/report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, - 'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, + 'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, 'salesrule_resource/report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, + 'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, 'salesrule_resource/report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class, 'salesrule/resource_report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class, 'salesrule_resource/report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class, 'salesrule/resource_report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class, 'salesrule_resource/report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class, 'salesrule/resource_report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class, - 'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class, 'salesrule_resource/rule' => \Mage_SalesRule_Model_Resource_Rule::class, - 'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, + 'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class, 'salesrule_resource/rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, - 'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, + 'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, 'salesrule_resource/rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, - 'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, + 'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, 'salesrule/resource_rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, + 'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, 'salesrule_resource/rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class, 'salesrule/resource_rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class, 'salesrule/resource_rule_product_collection' => \Mage_SalesRule_Model_Resource_Rule_Product_Collection::class, @@ -11909,14 +11882,14 @@ 'sales/email_template' => \Mage_Sales_Model_Email_Template::class, 'sales/entity_order' => \Mage_Sales_Model_Entity_Order::class, 'sales_entity/order' => \Mage_Sales_Model_Entity_Order::class, - 'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class, 'sales_entity/order_address' => \Mage_Sales_Model_Entity_Order_Address::class, - 'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, + 'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class, 'sales/entity_order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, - 'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, + 'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, 'sales_entity/order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, - 'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, + 'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, 'sales_entity/order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, + 'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, 'sales_entity/order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class, 'sales/entity_order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class, 'sales/entity_order_attribute_backend_shipping' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Shipping::class, @@ -11925,54 +11898,54 @@ 'sales/entity_order_collection' => \Mage_Sales_Model_Entity_Order_Collection::class, 'sales_entity/order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class, 'sales/entity_order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class, - 'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, 'sales_entity/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, - 'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, + 'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, 'sales/entity_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, - 'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, + 'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, 'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, + 'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, 'sales/entity_order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class, 'sales_entity/order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class, 'sales/entity_order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class, 'sales_entity/order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class, 'sales_entity/order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class, 'sales/entity_order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class, - 'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, 'sales/entity_order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, - 'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, + 'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, 'sales_entity/order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, + 'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, 'sales/entity_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class, 'sales_entity/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class, - 'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class, 'sales/entity_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class, + 'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class, 'sales/entity_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Order::class, 'sales_entity/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Order::class, 'sales_entity/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class, 'sales/entity_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class, 'sales/entity_order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class, 'sales_entity/order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class, - 'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, 'sales/entity_order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, + 'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, 'sales_entity/order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class, 'sales/entity_order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class, 'sales_entity/order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class, 'sales/entity_order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class, - 'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, 'sales/entity_order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, + 'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, 'sales/entity_order_item' => \Mage_Sales_Model_Entity_Order_Item::class, 'sales_entity/order_item' => \Mage_Sales_Model_Entity_Order_Item::class, 'sales/entity_order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class, 'sales_entity/order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class, - 'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, 'sales/entity_order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, + 'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, 'sales_entity/order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class, 'sales/entity_order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class, 'sales/entity_order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class, 'sales_entity/order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class, - 'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, 'sales_entity/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, - 'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, + 'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, 'sales/entity_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, + 'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, 'sales/entity_order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class, 'sales_entity/order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class, 'sales/entity_order_shipment_comment' => \Mage_Sales_Model_Entity_Order_Shipment_Comment::class, @@ -11981,66 +11954,66 @@ 'sales_entity/order_shipment_comment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Comment_Collection::class, 'sales_entity/order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class, 'sales/entity_order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class, - 'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, 'sales/entity_order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, - 'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, + 'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, 'sales_entity/order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, - 'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, + 'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, 'sales_entity/order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, - 'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, + 'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, 'sales_entity/order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, - 'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, + 'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, 'sales_entity/order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, + 'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, 'sales_entity/quote' => \Mage_Sales_Model_Entity_Quote::class, 'sales/entity_quote' => \Mage_Sales_Model_Entity_Quote::class, - 'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, 'sales_entity/quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, + 'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, 'sales_entity/quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class, 'sales/entity_quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class, - 'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, 'sales/entity_quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, - 'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, + 'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, 'sales/entity_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, - 'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, + 'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, 'sales_entity/quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, - 'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, + 'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, 'sales/entity_quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, + 'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, 'sales_entity/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales/entity_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales_entity/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class, 'sales/entity_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class, - 'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, 'sales_entity/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, - 'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, 'sales/entity_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/entity_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales_entity/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales/entity_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class, 'sales_entity/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class, 'sales_entity/quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class, 'sales/entity_quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class, - 'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, 'sales_entity/quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, - 'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, + 'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, 'sales/entity_quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, - 'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, + 'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, 'sales_entity/quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, + 'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, 'sales/entity_quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class, 'sales_entity/quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class, 'sales/entity_quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class, 'sales_entity/quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class, - 'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, 'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, - 'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, + 'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, 'sales/entity_quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, - 'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, + 'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, 'sales/entity_quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, + 'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, 'sales_entity/quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class, 'sales/entity_quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class, - 'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, 'sales_entity/sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, - 'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class, + 'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, 'sales_entity/setup' => \Mage_Sales_Model_Entity_Setup::class, + 'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class, 'sales/mysql4_abstract' => \Mage_Sales_Model_Mysql4_Abstract::class, 'sales/mysql4_billing_agreement' => \Mage_Sales_Model_Mysql4_Billing_Agreement::class, 'sales/mysql4_billing_agreement_collection' => \Mage_Sales_Model_Mysql4_Billing_Agreement_Collection::class, @@ -12235,50 +12208,50 @@ 'sales/recurring_profile' => \Mage_Sales_Model_Recurring_Profile::class, 'sales_resource/abstract' => \Mage_Sales_Model_Resource_Abstract::class, 'sales/resource_abstract' => \Mage_Sales_Model_Resource_Abstract::class, - 'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, 'sales_resource/billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, - 'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, + 'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, 'sales_resource/billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, + 'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, 'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, 'sales/resource_collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, 'sales_resource/helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, 'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, - 'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class, 'sales_resource/order' => \Mage_Sales_Model_Resource_Order::class, + 'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class, 'sales_resource/order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class, 'sales/resource_order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class, - 'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class, 'sales_resource/order_address' => \Mage_Sales_Model_Resource_Order_Address::class, + 'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class, 'sales/resource_order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class, 'sales_resource/order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class, 'sales/resource_order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class, 'sales_resource/order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class, 'sales/resource_order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class, 'sales_resource/order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class, - 'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, 'sales/resource_order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, + 'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, 'sales_resource/order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class, 'sales/resource_order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class, 'sales/resource_order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class, 'sales_resource/order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class, - 'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, 'sales/resource_order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, - 'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, + 'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, 'sales/resource_order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, - 'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, + 'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, 'sales/resource_order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, - 'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, + 'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, 'sales_resource/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, + 'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, 'sales/resource_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class, 'sales_resource/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class, - 'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, 'sales/resource_order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, - 'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, + 'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, 'sales_resource/order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, + 'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, 'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, 'sales/resource_order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, - 'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, 'sales/resource_order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, + 'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, 'sales_resource/order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class, 'sales/resource_order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class, 'sales_resource/order_creditmemo_item_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item_Collection::class, @@ -12287,138 +12260,138 @@ 'sales/resource_order_grid_collection' => \Mage_Sales_Model_Resource_Order_Grid_Collection::class, 'sales/resource_order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class, 'sales_resource/order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class, - 'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, 'sales/resource_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, - 'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, + 'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, 'sales_resource/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, + 'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, 'sales_resource/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class, 'sales/resource_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class, 'sales/resource_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class, 'sales_resource/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class, 'sales/resource_order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class, 'sales_resource/order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class, - 'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, 'sales/resource_order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, + 'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, 'sales/resource_order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class, 'sales_resource/order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class, - 'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, 'sales/resource_order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, - 'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, + 'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, 'sales_resource/order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, + 'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, 'sales/resource_order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class, 'sales_resource/order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class, - 'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class, 'sales_resource/order_item' => \Mage_Sales_Model_Resource_Order_Item::class, + 'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class, 'sales/resource_order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class, 'sales_resource/order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class, - 'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, 'sales_resource/order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, - 'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, + 'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, 'sales/resource_order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, + 'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, 'sales_resource/order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, 'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, - 'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, 'sales_resource/order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, - 'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, + 'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, 'sales_resource/order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, - 'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, + 'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, 'sales/resource_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, + 'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, 'sales_resource/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class, 'sales/resource_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class, 'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, 'sales/resource_order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, - 'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, 'sales/resource_order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, - 'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, + 'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, 'sales/resource_order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, + 'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, 'sales_resource/order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class, 'sales/resource_order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class, - 'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, 'sales_resource/order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, - 'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, + 'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, 'sales_resource/order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, - 'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, + 'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, 'sales_resource/order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, - 'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, + 'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, 'sales_resource/order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, + 'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, 'sales_resource/order_status' => \Mage_Sales_Model_Resource_Order_Status::class, 'sales/resource_order_status' => \Mage_Sales_Model_Resource_Order_Status::class, 'sales_resource/order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class, 'sales/resource_order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class, - 'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, 'sales_resource/order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, - 'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, + 'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, 'sales_resource/order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, - 'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, + 'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, 'sales/resource_order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, - 'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, + 'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, 'sales_resource/order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, - 'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class, + 'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, 'sales/resource_quote' => \Mage_Sales_Model_Resource_Quote::class, + 'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class, 'sales_resource/quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class, 'sales/resource_quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class, 'sales/resource_quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class, 'sales_resource/quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class, 'sales/resource_quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class, 'sales_resource/quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class, - 'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, 'sales/resource_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, + 'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, 'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, 'sales/resource_quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, - 'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, 'sales_resource/quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, + 'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, 'sales_resource/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales/resource_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales/resource_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class, 'sales_resource/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class, 'sales/resource_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class, 'sales_resource/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class, - 'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/resource_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, 'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales/resource_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, - 'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, 'sales_resource/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, - 'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, + 'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, 'sales/resource_quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, + 'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, 'sales_resource/quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class, 'sales/resource_quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class, - 'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, 'sales/resource_quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, - 'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, + 'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, 'sales_resource/quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, - 'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, + 'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, 'sales_resource/quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, + 'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, 'sales_resource/quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class, 'sales/resource_quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class, - 'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, 'sales/resource_quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, + 'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, 'sales/resource_quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class, 'sales_resource/quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class, - 'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, 'sales/resource_quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, - 'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, + 'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, 'sales/resource_quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, - 'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, + 'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, 'sales_resource/quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, - 'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, + 'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, 'sales/resource_quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, - 'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, + 'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, 'sales/resource_recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, + 'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, 'sales/resource_recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class, 'sales_resource/recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class, - 'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class, 'sales/resource_report' => \Mage_Sales_Model_Resource_Report::class, + 'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class, 'sales/resource_report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class, 'sales_resource/report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class, - 'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, 'sales/resource_report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, + 'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, 'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, 'sales/resource_report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, - 'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, 'sales_resource/report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, - 'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, + 'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, 'sales_resource/report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, + 'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, 'sales/resource_report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class, 'sales_resource/report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class, 'sales_resource/report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class, @@ -12431,24 +12404,24 @@ 'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class, 'sales_resource/report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class, 'sales/resource_report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class, - 'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, 'sales/resource_report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, - 'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, + 'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, 'sales_resource/report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, + 'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, 'sales_resource/report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class, 'sales/resource_report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class, 'sales_resource/report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class, 'sales/resource_report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class, - 'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, 'sales_resource/report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, + 'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, 'sales_resource/report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class, 'sales/resource_report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class, 'sales_resource/report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class, 'sales/resource_report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class, - 'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, 'sales/resource_sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, - 'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class, + 'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, 'sales/resource_setup' => \Mage_Sales_Model_Resource_Setup::class, + 'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class, 'sales/service_order' => \Mage_Sales_Model_Service_Order::class, 'sales/service_quote' => \Mage_Sales_Model_Service_Quote::class, 'sales/status_list' => \Mage_Sales_Model_Status_List::class, @@ -12458,8 +12431,8 @@ 'sendfriend/observer' => \Mage_Sendfriend_Model_Observer::class, 'sendfriend_resource/sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class, 'sendfriend/resource_sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class, - 'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, 'sendfriend/resource_sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, + 'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, 'sendfriend/resource_setup' => \Mage_Sendfriend_Model_Resource_Setup::class, 'sendfriend_resource/setup' => \Mage_Sendfriend_Model_Resource_Setup::class, 'sendfriend/sendfriend' => \Mage_Sendfriend_Model_Sendfriend::class, @@ -12478,8 +12451,8 @@ 'shipping/rate_result_abstract' => \Mage_Shipping_Model_Rate_Result_Abstract::class, 'shipping/rate_result_error' => \Mage_Shipping_Model_Rate_Result_Error::class, 'shipping/rate_result_method' => \Mage_Shipping_Model_Rate_Result_Method::class, - 'shipping/resource_carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class, 'shipping_resource/carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class, + 'shipping/resource_carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class, 'shipping/resource_carrier_tablerate_collection' => \Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection::class, 'shipping_resource/carrier_tablerate_collection' => \Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection::class, 'shipping/shipment_request' => \Mage_Shipping_Model_Shipment_Request::class, @@ -12499,16 +12472,16 @@ 'sitemap/observer' => \Mage_Sitemap_Model_Observer::class, 'sitemap_resource/catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class, 'sitemap/resource_catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class, - 'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, 'sitemap/resource_catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, - 'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, + 'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, 'sitemap_resource/catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, - 'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, + 'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, 'sitemap_resource/cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, + 'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, 'sitemap_resource/sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class, 'sitemap/resource_sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class, - 'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, 'sitemap_resource/sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, + 'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, 'sitemap/sitemap' => \Mage_Sitemap_Model_Sitemap::class, 'tag/api' => \Mage_Tag_Model_Api::class, 'tag/api_v2' => \Mage_Tag_Model_Api_V2::class, @@ -12521,21 +12494,21 @@ 'tag/mysql4_tag' => \Mage_Tag_Model_Mysql4_Tag::class, 'tag/mysql4_tag_collection' => \Mage_Tag_Model_Mysql4_Tag_Collection::class, 'tag/mysql4_tag_relation' => \Mage_Tag_Model_Mysql4_Tag_Relation::class, - 'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag/resource_customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag_resource/customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, - 'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, + 'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag_resource/indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, - 'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, + 'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, 'tag_resource/popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, + 'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, 'tag_resource/product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class, 'tag/resource_product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class, 'tag_resource/tag' => \Mage_Tag_Model_Resource_Tag::class, 'tag/resource_tag' => \Mage_Tag_Model_Resource_Tag::class, - 'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, 'tag_resource/tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, - 'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, + 'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, 'tag_resource/tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, + 'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, 'tag/session' => \Mage_Tag_Model_Session::class, 'tag/tag' => \Mage_Tag_Model_Tag::class, 'tag/tag_relation' => \Mage_Tag_Model_Tag_Relation::class, @@ -12574,16 +12547,16 @@ 'tax/resource_calculation_rate' => \Mage_Tax_Model_Resource_Calculation_Rate::class, 'tax/resource_calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class, 'tax_resource/calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class, - 'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, 'tax/resource_calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, - 'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, + 'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, 'tax/resource_calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, - 'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, + 'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, 'tax/resource_calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, - 'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, + 'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, 'tax_resource/calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, - 'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class, + 'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, 'tax/resource_class' => \Mage_Tax_Model_Resource_Class::class, + 'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class, 'tax/resource_class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class, 'tax_resource/class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class, 'tax_resource/report_collection' => \Mage_Tax_Model_Resource_Report_Collection::class, @@ -12594,16 +12567,16 @@ 'tax/resource_report_tax_createdat' => \Mage_Tax_Model_Resource_Report_Tax_Createdat::class, 'tax_resource/report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class, 'tax/resource_report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class, - 'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, 'tax/resource_report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, - 'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, + 'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, 'tax_resource/sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, + 'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, 'tax_resource/sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class, 'tax/resource_sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class, - 'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class, 'tax/resource_sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class, - 'tax_resource/sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class, + 'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class, 'tax/resource_sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class, + 'tax_resource/sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class, 'tax/resource_setup' => \Mage_Tax_Model_Resource_Setup::class, 'tax_resource/setup' => \Mage_Tax_Model_Resource_Setup::class, 'tax/sales_order_tax' => \Mage_Tax_Model_Sales_Order_Tax::class, @@ -12686,10 +12659,10 @@ 'weee/observer' => \Mage_Weee_Model_Observer::class, 'weee/resource_attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class, 'weee_resource/attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class, - 'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class, 'weee/resource_setup' => \Mage_Weee_Model_Resource_Setup::class, - 'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class, + 'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class, 'weee/resource_tax' => \Mage_Weee_Model_Resource_Tax::class, + 'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class, 'weee/tax' => \Mage_Weee_Model_Tax::class, 'weee/total_creditmemo_weee' => \Mage_Weee_Model_Total_Creditmemo_Weee::class, 'weee/total_invoice_weee' => \Mage_Weee_Model_Total_Invoice_Weee::class, @@ -12699,12 +12672,12 @@ 'widget/mysql4_widget_instance' => \Mage_Widget_Model_Mysql4_Widget_Instance::class, 'widget/mysql4_widget_instance_collection' => \Mage_Widget_Model_Mysql4_Widget_Instance_Collection::class, 'widget/observer' => \Mage_Widget_Model_Observer::class, - 'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class, 'widget/resource_widget' => \Mage_Widget_Model_Resource_Widget::class, + 'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class, 'widget_resource/widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class, 'widget/resource_widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class, - 'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, 'widget_resource/widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, + 'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, 'widget/template_filter' => \Mage_Widget_Model_Template_Filter::class, 'widget/widget' => \Mage_Widget_Model_Widget::class, 'widget/widget_config' => \Mage_Widget_Model_Widget_Config::class, @@ -12721,14 +12694,14 @@ 'wishlist/mysql4_wishlist' => \Mage_Wishlist_Model_Mysql4_Wishlist::class, 'wishlist/mysql4_wishlist_collection' => \Mage_Wishlist_Model_Mysql4_Wishlist_Collection::class, 'wishlist/observer' => \Mage_Wishlist_Model_Observer::class, - 'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class, 'wishlist_resource/item' => \Mage_Wishlist_Model_Resource_Item::class, + 'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class, 'wishlist_resource/item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class, 'wishlist/resource_item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class, 'wishlist/resource_item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, 'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, - 'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, 'wishlist_resource/item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, + 'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, 'wishlist_resource/product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class, 'wishlist/resource_product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class, 'wishlist/resource_wishlist' => \Mage_Wishlist_Model_Resource_Wishlist::class, @@ -12737,7 +12710,6 @@ 'wishlist/resource_wishlist_collection' => \Mage_Wishlist_Model_Resource_Wishlist_Collection::class, 'wishlist/session' => \Mage_Wishlist_Model_Session::class, 'wishlist/wishlist' => \Mage_Wishlist_Model_Wishlist::class, - 'varien/autoload' => \Varien_Autoload::class, ]) ); override( \Mage_Core_Model_Factory::getSingleton(0), @@ -12747,11 +12719,10 @@ 'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class, 'adminnotification/mysql4_inbox_collection' => \Mage_AdminNotification_Model_Mysql4_Inbox_Collection::class, 'adminnotification/observer' => \Mage_AdminNotification_Model_Observer::class, - 'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, 'adminnotification/resource_inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, - 'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, + 'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, 'adminnotification/resource_inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, - 'adminnotification/survey' => \Mage_AdminNotification_Model_Survey::class, + 'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, 'admin/acl' => \Mage_Admin_Model_Acl::class, 'admin/acl_assert_ip' => \Mage_Admin_Model_Acl_Assert_Ip::class, 'admin/acl_assert_time' => \Mage_Admin_Model_Acl_Assert_Time::class, @@ -12780,38 +12751,38 @@ 'admin/redirectpolicy' => \Mage_Admin_Model_Redirectpolicy::class, 'admin/resource_acl' => \Mage_Admin_Model_Resource_Acl::class, 'admin_resource/acl' => \Mage_Admin_Model_Resource_Acl::class, - 'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, 'admin/resource_acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, + 'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, 'admin/resource_acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class, 'admin_resource/acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class, - 'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class, 'admin/resource_block' => \Mage_Admin_Model_Resource_Block::class, - 'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, + 'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class, 'admin/resource_block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, + 'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, 'admin_resource/permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class, 'admin/resource_permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class, - 'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class, 'admin/resource_role' => \Mage_Admin_Model_Resource_Role::class, + 'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class, 'admin/resource_role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class, 'admin_resource/role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class, - 'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class, 'admin_resource/roles' => \Mage_Admin_Model_Resource_Roles::class, - 'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, + 'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class, 'admin_resource/roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, - 'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, + 'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, 'admin/resource_roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, + 'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, 'admin/resource_rules' => \Mage_Admin_Model_Resource_Rules::class, 'admin_resource/rules' => \Mage_Admin_Model_Resource_Rules::class, 'admin_resource/rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, 'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, - 'admin_resource/user' => \Mage_Admin_Model_Resource_User::class, 'admin/resource_user' => \Mage_Admin_Model_Resource_User::class, + 'admin_resource/user' => \Mage_Admin_Model_Resource_User::class, 'admin/resource_user_collection' => \Mage_Admin_Model_Resource_User_Collection::class, 'admin_resource/user_collection' => \Mage_Admin_Model_Resource_User_Collection::class, - 'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class, 'admin_resource/variable' => \Mage_Admin_Model_Resource_Variable::class, - 'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, + 'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class, 'admin/resource_variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, + 'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, 'admin/role' => \Mage_Admin_Model_Role::class, 'admin/roles' => \Mage_Admin_Model_Roles::class, 'admin/rules' => \Mage_Admin_Model_Rules::class, @@ -12846,6 +12817,7 @@ 'adminhtml/system_config_backend_baseurl' => \Mage_Adminhtml_Model_System_Config_Backend_Baseurl::class, 'adminhtml/system_config_backend_cache' => \Mage_Adminhtml_Model_System_Config_Backend_Cache::class, 'adminhtml/system_config_backend_catalog_inventory_managestock' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock::class, + 'adminhtml/system_config_backend_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Separator::class, 'adminhtml/system_config_backend_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Type::class, 'adminhtml/system_config_backend_category' => \Mage_Adminhtml_Model_System_Config_Backend_Category::class, 'adminhtml/system_config_backend_cookie' => \Mage_Adminhtml_Model_System_Config_Backend_Cookie::class, @@ -12898,12 +12870,14 @@ 'adminhtml/system_config_source_catalog_listMode' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListMode::class, 'adminhtml/system_config_source_catalog_listPerPage' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListPerPage::class, 'adminhtml/system_config_source_catalog_listSort' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort::class, + 'adminhtml/system_config_source_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Separator::class, 'adminhtml/system_config_source_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Type::class, 'adminhtml/system_config_source_catalog_timeFormat' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_TimeFormat::class, 'adminhtml/system_config_source_category' => \Mage_Adminhtml_Model_System_Config_Source_Category::class, 'adminhtml/system_config_source_checktype' => \Mage_Adminhtml_Model_System_Config_Source_Checktype::class, 'adminhtml/system_config_source_cms_page' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Page::class, 'adminhtml/system_config_source_cms_wysiwyg_enabled' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Wysiwyg_Enabled::class, + 'adminhtml/system_config_source_cookie_samesite' => \Mage_Adminhtml_Model_System_Config_Source_Cookie_Samesite::class, 'adminhtml/system_config_source_country' => \Mage_Adminhtml_Model_System_Config_Source_Country::class, 'adminhtml/system_config_source_country_full' => \Mage_Adminhtml_Model_System_Config_Source_Country_Full::class, 'adminhtml/system_config_source_cron_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency::class, @@ -12930,6 +12904,7 @@ 'adminhtml/system_config_source_locale_timezone' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Timezone::class, 'adminhtml/system_config_source_locale_weekdaycodes' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdaycodes::class, 'adminhtml/system_config_source_locale_weekdays' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdays::class, + 'adminhtml/system_config_source_log_level' => \Mage_Adminhtml_Model_System_Config_Source_Log_Level::class, 'adminhtml/system_config_source_nooptreq' => \Mage_Adminhtml_Model_System_Config_Source_Nooptreq::class, 'adminhtml/system_config_source_notification_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Notification_Frequency::class, 'adminhtml/system_config_source_order_status' => \Mage_Adminhtml_Model_System_Config_Source_Order_Status::class, @@ -12953,7 +12928,6 @@ 'adminhtml/system_config_source_shipping_flatrate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Flatrate::class, 'adminhtml/system_config_source_shipping_tablerate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Tablerate::class, 'adminhtml/system_config_source_shipping_taxclass' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Taxclass::class, - 'adminhtml/system_config_source_startdateenddate' => \Mage_Adminhtml_Model_System_Config_Source_Startdateenddate::class, 'adminhtml/system_config_source_storage_media_database' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Database::class, 'adminhtml/system_config_source_storage_media_storage' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Storage::class, 'adminhtml/system_config_source_store' => \Mage_Adminhtml_Model_System_Config_Source_Store::class, @@ -13009,22 +12983,22 @@ 'api2_resource/acl_filter_attribute' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute::class, 'api2/resource_acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class, 'api2_resource/acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class, - 'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, 'api2_resource/acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, + 'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, 'api2/resource_acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class, 'api2_resource/acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class, 'api2_resource/acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class, 'api2/resource_acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class, 'api2/resource_acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class, 'api2_resource/acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class, - 'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class, 'api2/resource_setup' => \Mage_Api2_Model_Resource_Setup::class, + 'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class, 'api2/resource_validator' => \Mage_Api2_Model_Resource_Validator::class, 'api2_resource/validator' => \Mage_Api2_Model_Resource_Validator::class, 'api2/resource_validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class, 'api2_resource/validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class, - 'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, 'api2/resource_validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, + 'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, 'api2/response' => \Mage_Api2_Model_Response::class, 'api2/route_abstract' => \Mage_Api2_Model_Route_Abstract::class, 'api2/route_apiType' => \Mage_Api2_Model_Route_ApiType::class, @@ -13056,8 +13030,8 @@ 'api/mysql4_user_collection' => \Mage_Api_Model_Mysql4_User_Collection::class, 'api/resource_abstract' => \Mage_Api_Model_Resource_Abstract::class, 'api_resource/abstract' => \Mage_Api_Model_Resource_Abstract::class, - 'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class, 'api_resource/acl' => \Mage_Api_Model_Resource_Acl::class, + 'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class, 'api_resource/acl_role' => \Mage_Api_Model_Resource_Acl_Role::class, 'api/resource_acl_role' => \Mage_Api_Model_Resource_Acl_Role::class, 'api/resource_acl_role_collection' => \Mage_Api_Model_Resource_Acl_Role_Collection::class, @@ -13066,18 +13040,18 @@ 'api_resource/permissions_collection' => \Mage_Api_Model_Resource_Permissions_Collection::class, 'api_resource/role' => \Mage_Api_Model_Resource_Role::class, 'api/resource_role' => \Mage_Api_Model_Resource_Role::class, - 'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, 'api_resource/role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, + 'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, 'api/resource_roles' => \Mage_Api_Model_Resource_Roles::class, 'api_resource/roles' => \Mage_Api_Model_Resource_Roles::class, - 'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, 'api_resource/roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, - 'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, + 'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, 'api_resource/roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, - 'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class, + 'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, 'api_resource/rules' => \Mage_Api_Model_Resource_Rules::class, - 'api/resource_rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class, + 'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class, 'api_resource/rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class, + 'api/resource_rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class, 'api/resource_user' => \Mage_Api_Model_Resource_User::class, 'api_resource/user' => \Mage_Api_Model_Resource_User::class, 'api/resource_user_collection' => \Mage_Api_Model_Resource_User_Collection::class, @@ -13104,15 +13078,6 @@ 'authorizenet/directpost_request' => \Mage_Authorizenet_Model_Directpost_Request::class, 'authorizenet/directpost_response' => \Mage_Authorizenet_Model_Directpost_Response::class, 'authorizenet/directpost_session' => \Mage_Authorizenet_Model_Directpost_Session::class, - 'backup/backup' => \Mage_Backup_Model_Backup::class, - 'backup/config_backend_cron' => \Mage_Backup_Model_Config_Backend_Cron::class, - 'backup/config_source_type' => \Mage_Backup_Model_Config_Source_Type::class, - 'backup/db' => \Mage_Backup_Model_Db::class, - 'backup/fs_collection' => \Mage_Backup_Model_Fs_Collection::class, - 'backup/mysql4_db' => \Mage_Backup_Model_Mysql4_Db::class, - 'backup/observer' => \Mage_Backup_Model_Observer::class, - 'backup/resource_db' => \Mage_Backup_Model_Resource_Db::class, - 'backup/resource_helper_mysql4' => \Mage_Backup_Model_Resource_Helper_Mysql4::class, 'bundle/catalogIndex_data_bundle' => \Mage_Bundle_Model_CatalogIndex_Data_Bundle::class, 'bundle/mysql4_bundle' => \Mage_Bundle_Model_Mysql4_Bundle::class, 'bundle/mysql4_indexer_price' => \Mage_Bundle_Model_Mysql4_Indexer_Price::class, @@ -13138,10 +13103,10 @@ 'bundle_resource/option' => \Mage_Bundle_Model_Resource_Option::class, 'bundle/resource_option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class, 'bundle_resource/option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class, - 'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, 'bundle_resource/price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, - 'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class, + 'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, 'bundle_resource/selection' => \Mage_Bundle_Model_Resource_Selection::class, + 'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class, 'bundle_resource/selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class, 'bundle/resource_selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class, 'bundle/sales_order_pdf_items_abstract' => \Mage_Bundle_Model_Sales_Order_Pdf_Items_Abstract::class, @@ -13157,8 +13122,8 @@ 'captcha/config_form_frontend' => \Mage_Captcha_Model_Config_Form_Frontend::class, 'captcha/config_mode' => \Mage_Captcha_Model_Config_Mode::class, 'captcha/observer' => \Mage_Captcha_Model_Observer::class, - 'captcha_resource/log' => \Mage_Captcha_Model_Resource_Log::class, 'captcha/resource_log' => \Mage_Captcha_Model_Resource_Log::class, + 'captcha_resource/log' => \Mage_Captcha_Model_Resource_Log::class, 'captcha/zend' => \Mage_Captcha_Model_Zend::class, 'catalogindex/aggregation' => \Mage_CatalogIndex_Model_Aggregation::class, 'catalogindex/attribute' => \Mage_CatalogIndex_Model_Attribute::class, @@ -13201,8 +13166,8 @@ 'catalogindex/resource_data_abstract' => \Mage_CatalogIndex_Model_Resource_Data_Abstract::class, 'catalogindex_resource/data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class, 'catalogindex/resource_data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class, - 'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, 'catalogindex_resource/data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, + 'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, 'catalogindex_resource/indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class, 'catalogindex/resource_indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class, 'catalogindex/resource_indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class, @@ -13234,20 +13199,20 @@ 'cataloginventory/mysql4_stock_item_collection' => \Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection::class, 'cataloginventory/mysql4_stock_status' => \Mage_CatalogInventory_Model_Mysql4_Stock_Status::class, 'cataloginventory/observer' => \Mage_CatalogInventory_Model_Observer::class, - 'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, 'cataloginventory_resource/indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, + 'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, 'cataloginventory/resource_indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class, 'cataloginventory_resource/indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class, - 'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, 'cataloginventory/resource_indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, + 'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, 'cataloginventory/resource_indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class, 'cataloginventory_resource/indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class, 'cataloginventory_resource/stock' => \Mage_CatalogInventory_Model_Resource_Stock::class, 'cataloginventory/resource_stock' => \Mage_CatalogInventory_Model_Resource_Stock::class, - 'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, 'cataloginventory/resource_stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, - 'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, + 'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, 'cataloginventory/resource_stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, + 'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, 'cataloginventory/resource_stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class, 'cataloginventory_resource/stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class, 'cataloginventory/source_backorders' => \Mage_CatalogInventory_Model_Source_Backorders::class, @@ -13270,8 +13235,8 @@ 'catalogrule/observer' => \Mage_CatalogRule_Model_Observer::class, 'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class, 'catalogrule/resource_rule' => \Mage_CatalogRule_Model_Resource_Rule::class, - 'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, 'catalogrule_resource/rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, + 'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, 'catalogrule_resource/rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class, 'catalogrule/resource_rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class, 'catalogrule_resource/rule_product_price_collection' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price_Collection::class, @@ -13300,24 +13265,24 @@ 'catalogsearch/query' => \Mage_CatalogSearch_Model_Query::class, 'catalogsearch_resource/advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class, 'catalogsearch/resource_advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class, - 'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, 'catalogsearch_resource/advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, + 'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, 'catalogsearch_resource/fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class, 'catalogsearch/resource_fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class, 'catalogsearch_resource/fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class, 'catalogsearch/resource_fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class, - 'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, 'catalogsearch_resource/fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, - 'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, + 'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, 'catalogsearch/resource_helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, - 'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, + 'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, 'catalogsearch_resource/indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, - 'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class, + 'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, 'catalogsearch_resource/query' => \Mage_CatalogSearch_Model_Resource_Query::class, - 'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, + 'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class, 'catalogsearch_resource/query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, - 'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, + 'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, 'catalogsearch/resource_search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, + 'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, 'catalogsearch/session' => \Mage_CatalogSearch_Model_Session::class, 'catalogsearch/system_config_backend_sitemap' => \Mage_CatalogSearch_Model_System_Config_Backend_Sitemap::class, 'catalog/abstract' => \Mage_Catalog_Model_Abstract::class, @@ -13460,144 +13425,144 @@ 'catalog/product_website' => \Mage_Catalog_Model_Product_Website::class, 'catalog/resource_abstract' => \Mage_Catalog_Model_Resource_Abstract::class, 'catalog_resource/abstract' => \Mage_Catalog_Model_Resource_Abstract::class, - 'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class, 'catalog/resource_attribute' => \Mage_Catalog_Model_Resource_Attribute::class, - 'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class, + 'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class, 'catalog_resource/category' => \Mage_Catalog_Model_Resource_Category::class, + 'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class, 'catalog_resource/category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class, 'catalog/resource_category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class, - 'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, 'catalog/resource_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, - 'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, + 'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, 'catalog/resource_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, + 'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, 'catalog_resource/category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class, 'catalog/resource_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class, 'catalog_resource/category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class, 'catalog/resource_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class, 'catalog/resource_category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class, 'catalog_resource/category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class, - 'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, 'catalog_resource/category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, - 'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, + 'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, 'catalog/resource_category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, + 'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, 'catalog_resource/category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class, 'catalog/resource_category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class, 'catalog/resource_category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class, 'catalog_resource/category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class, - 'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, 'catalog_resource/collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, + 'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, 'catalog_resource/config' => \Mage_Catalog_Model_Resource_Config::class, 'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class, - 'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, 'catalog/resource_eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, + 'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, 'catalog_resource/eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class, 'catalog/resource_eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class, 'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, 'catalog_resource/eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, - 'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, 'catalog/resource_eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, - 'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, + 'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, 'catalog_resource/eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, + 'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, 'catalog_resource/eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, - 'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, + 'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, 'catalog_resource/eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, + 'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, 'catalog/resource_eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class, 'catalog_resource/eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class, 'catalog/resource_eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class, 'catalog_resource/eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class, 'catalog/resource_eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class, 'catalog_resource/eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class, - 'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, 'catalog/resource_eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, + 'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, 'catalog/resource_eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, 'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, 'catalog/resource_eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class, 'catalog_resource/eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class, - 'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, 'catalog_resource/eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, - 'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, + 'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, 'catalog_resource/eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, + 'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, 'catalog_resource/eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class, 'catalog/resource_eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class, - 'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, 'catalog_resource/eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, + 'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, 'catalog/resource_eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, 'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, - 'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, 'catalog/resource_eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, - 'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, + 'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, 'catalog/resource_eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, - 'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, + 'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, 'catalog_resource/eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, + 'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, 'catalog_resource/eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, 'catalog_resource/eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, 'catalog/resource_eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class, 'catalog/resource_eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, + 'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, 'catalog/resource_eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class, 'catalog/resource_eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class, 'catalog_resource/eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class, 'catalog_resource/eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class, 'catalog/resource_eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class, - 'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, 'catalog_resource/eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, - 'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, + 'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, 'catalog_resource/eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, - 'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, + 'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, 'catalog_resource/eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, + 'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, 'catalog/resource_eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class, 'catalog/resource_eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class, 'catalog/resource_eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class, - 'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, 'catalog/resource_eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, - 'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, + 'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, 'catalog_resource/eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, + 'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, 'catalog_resource/eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class, 'catalog/resource_eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class, - 'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, 'catalog/resource_eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, - 'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, + 'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, 'catalog/resource_eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, + 'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, 'catalog/resource_eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class, 'catalog_resource/eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class, - 'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, 'catalog/resource_eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, + 'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, 'catalog_resource/eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class, 'catalog/resource_eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class, 'catalog_resource/eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class, 'catalog/resource_eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class, - 'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, 'catalog/resource_eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, - 'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, + 'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, 'catalog_resource/eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, - 'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, + 'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, 'catalog/resource_eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, + 'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, 'catalog/resource_eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, 'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, - 'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, 'catalog/resource_eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, + 'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, 'catalog/resource_eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class, 'catalog_resource/eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class, - 'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, 'catalog_resource/eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, - 'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, + 'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, 'catalog/resource_eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, - 'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, + 'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, 'catalog/resource_eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, + 'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, 'catalog_resource/eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, + 'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, 'catalog/resource_eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class, 'catalog_resource/eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class, 'catalog/resource_eav_mysql4_sendfriend' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend::class, @@ -13606,16 +13571,16 @@ 'catalog/resource_eav_mysql4_sendfriend_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection::class, 'catalog_resource/eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class, 'catalog/resource_eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class, - 'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, 'catalog/resource_eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, - 'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, + 'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, 'catalog/resource_helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, + 'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, 'catalog_resource/layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class, 'catalog/resource_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class, 'catalog/resource_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class, 'catalog_resource/layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class, - 'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, 'catalog/resource_layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, + 'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, 'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class, 'catalog_resource/product' => \Mage_Catalog_Model_Resource_Product::class, 'catalog/resource_product_action' => \Mage_Catalog_Model_Resource_Product_Action::class, @@ -13626,42 +13591,42 @@ 'catalog_resource/product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class, 'catalog/resource_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class, 'catalog_resource/product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class, - 'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, 'catalog/resource_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, - 'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, + 'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, 'catalog_resource/product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, + 'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, 'catalog/resource_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class, - 'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, 'catalog_resource/product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, - 'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, + 'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, 'catalog/resource_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, - 'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, + 'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, 'catalog_resource/product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, - 'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, + 'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, + 'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, 'catalog_resource/product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class, 'catalog/resource_product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class, - 'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, 'catalog/resource_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, + 'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, 'catalog/resource_product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class, 'catalog_resource/product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class, - 'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, 'catalog/resource_product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, + 'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, 'catalog/resource_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class, 'catalog_resource/product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class, - 'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, 'catalog_resource/product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, - 'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, + 'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, 'catalog/resource_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, + 'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, 'catalog/resource_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class, 'catalog_resource/product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class, - 'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, 'catalog_resource/product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, + 'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, 'catalog_resource/product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, 'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, - 'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, 'catalog_resource/product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, + 'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, 'catalog/resource_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class, 'catalog_resource/product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class, 'catalog_resource/product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class, @@ -13672,12 +13637,12 @@ 'catalog_resource/product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class, 'catalog/resource_product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, 'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, - 'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, 'catalog_resource/product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, - 'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, + 'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, 'catalog/resource_product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, - 'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, + 'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, 'catalog_resource/product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, + 'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, 'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, 'catalog_resource/product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, 'catalog_resource/product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class, @@ -13686,14 +13651,14 @@ 'catalog/resource_product_status' => \Mage_Catalog_Model_Resource_Product_Status::class, 'catalog_resource/product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class, 'catalog/resource_product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class, - 'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, 'catalog/resource_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, - 'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, + 'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, 'catalog_resource/product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, + 'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, 'catalog_resource/product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class, 'catalog/resource_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class, - 'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, 'catalog_resource/product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, + 'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, 'catalog/resource_setup' => \Mage_Catalog_Model_Resource_Setup::class, 'catalog_resource/setup' => \Mage_Catalog_Model_Resource_Setup::class, 'catalog_resource/url' => \Mage_Catalog_Model_Resource_Url::class, @@ -13739,12 +13704,12 @@ 'checkout/observer' => \Mage_Checkout_Model_Observer::class, 'checkout_resource/agreement' => \Mage_Checkout_Model_Resource_Agreement::class, 'checkout/resource_agreement' => \Mage_Checkout_Model_Resource_Agreement::class, - 'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, 'checkout/resource_agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, - 'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class, + 'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, 'checkout_resource/cart' => \Mage_Checkout_Model_Resource_Cart::class, - 'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class, + 'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class, 'checkout/resource_setup' => \Mage_Checkout_Model_Resource_Setup::class, + 'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class, 'checkout/session' => \Mage_Checkout_Model_Session::class, 'checkout/type_abstract' => \Mage_Checkout_Model_Type_Abstract::class, 'checkout/type_multishipping' => \Mage_Checkout_Model_Type_Multishipping::class, @@ -13759,25 +13724,25 @@ 'cms/mysql4_page_service' => \Mage_Cms_Model_Mysql4_Page_Service::class, 'cms/observer' => \Mage_Cms_Model_Observer::class, 'cms/page' => \Mage_Cms_Model_Page::class, - 'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class, 'cms/resource_block' => \Mage_Cms_Model_Resource_Block::class, + 'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class, 'cms_resource/block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class, 'cms/resource_block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class, 'cms/resource_page' => \Mage_Cms_Model_Resource_Page::class, 'cms_resource/page' => \Mage_Cms_Model_Resource_Page::class, - 'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, 'cms_resource/page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, - 'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class, + 'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, 'cms/resource_page_service' => \Mage_Cms_Model_Resource_Page_Service::class, + 'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class, 'cms/template_filter' => \Mage_Cms_Model_Template_Filter::class, 'cms/wysiwyg_config' => \Mage_Cms_Model_Wysiwyg_Config::class, 'cms/wysiwyg_images_storage' => \Mage_Cms_Model_Wysiwyg_Images_Storage::class, 'cms/wysiwyg_images_storage_collection' => \Mage_Cms_Model_Wysiwyg_Images_Storage_Collection::class, 'configurableswatches/observer' => \Mage_ConfigurableSwatches_Model_Observer::class, - 'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, 'configurableswatches_resource/catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, - 'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, + 'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, 'configurableswatches_resource/catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, + 'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, 'configurableswatches_resource/catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class, 'configurableswatches/resource_catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class, 'configurableswatches/system_config_source_catalog_product_configattribute' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute::class, @@ -13884,152 +13849,152 @@ 'core/mysql4_website_collection' => \Mage_Core_Model_Mysql4_Website_Collection::class, 'core/observer' => \Mage_Core_Model_Observer::class, 'core/resource' => \Mage_Core_Model_Resource::class, + 'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, 'core_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, 'core/resource_abstract' => \Mage_Core_Model_Resource_Abstract::class, - 'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, + 'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class, 'core/resource_cache' => \Mage_Core_Model_Resource_Cache::class, 'core_resource/cache' => \Mage_Core_Model_Resource_Cache::class, - 'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class, 'core_resource/config' => \Mage_Core_Model_Resource_Config::class, 'payment_resource/config' => \Mage_Core_Model_Resource_Config::class, 'core/resource_config' => \Mage_Core_Model_Resource_Config::class, - 'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, 'core/resource_config_data' => \Mage_Core_Model_Resource_Config_Data::class, + 'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, 'payment_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, - 'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'core_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, - 'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, - 'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, + 'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'payment_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, - 'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, + 'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, + 'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, 'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, 'core/resource_db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, - 'core/resource_design' => \Mage_Core_Model_Resource_Design::class, + 'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, 'core_resource/design' => \Mage_Core_Model_Resource_Design::class, + 'core/resource_design' => \Mage_Core_Model_Resource_Design::class, 'payment_resource/design' => \Mage_Core_Model_Resource_Design::class, - 'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, - 'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, 'payment_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, - 'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, + 'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, + 'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, 'payment_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, 'core/resource_design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, + 'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, 'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, 'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, 'core/resource_email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, - 'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, - 'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, 'payment_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, - 'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, + 'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, + 'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, 'core/resource_email_template' => \Mage_Core_Model_Resource_Email_Template::class, 'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, - 'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, + 'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, 'core/resource_email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, + 'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, 'core_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, - 'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, - 'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, 'core_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, - 'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, - 'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, + 'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, 'core_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, 'payment_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, 'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, - 'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, + 'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, 'payment_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, 'core/resource_file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, - 'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, + 'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, 'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, 'core/resource_file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, - 'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, - 'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, 'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, + 'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, 'core/resource_file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, 'payment_resource/flag' => \Mage_Core_Model_Resource_Flag::class, - 'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class, 'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class, + 'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class, 'payment_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, - 'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, 'core_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, - 'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, + 'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, 'core/resource_helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, + 'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, 'core_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, 'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, 'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, 'core/resource_iterator' => \Mage_Core_Model_Resource_Iterator::class, - 'core/resource_language' => \Mage_Core_Model_Resource_Language::class, - 'core_resource/language' => \Mage_Core_Model_Resource_Language::class, 'payment_resource/language' => \Mage_Core_Model_Resource_Language::class, + 'core_resource/language' => \Mage_Core_Model_Resource_Language::class, + 'core/resource_language' => \Mage_Core_Model_Resource_Language::class, 'payment_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, - 'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, 'core/resource_language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, - 'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class, + 'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, 'core_resource/layout' => \Mage_Core_Model_Resource_Layout::class, 'core/resource_layout' => \Mage_Core_Model_Resource_Layout::class, + 'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class, 'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class, - 'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class, 'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class, + 'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class, 'core/resource_session' => \Mage_Core_Model_Resource_Session::class, - 'core_resource/session' => \Mage_Core_Model_Resource_Session::class, 'payment_resource/session' => \Mage_Core_Model_Resource_Session::class, + 'core_resource/session' => \Mage_Core_Model_Resource_Session::class, 'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class, 'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class, 'payment_resource/setup' => \Mage_Core_Model_Resource_Setup::class, - 'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core/resource_setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, + 'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'payment_resource/store' => \Mage_Core_Model_Resource_Store::class, 'core_resource/store' => \Mage_Core_Model_Resource_Store::class, 'core/resource_store' => \Mage_Core_Model_Resource_Store::class, - 'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, 'core/resource_store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, + 'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, 'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, - 'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'core/resource_store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'payment_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, - 'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, - 'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, + 'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'payment_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, - 'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, + 'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, + 'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, 'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class, + 'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, 'core_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, 'core_resource/translate' => \Mage_Core_Model_Resource_Translate::class, - 'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class, 'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class, - 'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, - 'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class, + 'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class, 'payment_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, - 'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class, + 'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, 'core/resource_type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, 'payment_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'core/resource_type_db' => \Mage_Core_Model_Resource_Type_Db::class, - 'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'core_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, 'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, 'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, - 'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, - 'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, 'payment_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, 'payment_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, - 'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, 'core_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, - 'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, - 'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, + 'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, 'payment_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, + 'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, + 'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, 'core_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'core_resource/variable' => \Mage_Core_Model_Resource_Variable::class, - 'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class, 'core/resource_variable' => \Mage_Core_Model_Resource_Variable::class, + 'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class, 'core/resource_variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, - 'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, 'core_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, + 'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, + 'core/resource_website' => \Mage_Core_Model_Resource_Website::class, 'core_resource/website' => \Mage_Core_Model_Resource_Website::class, 'payment_resource/website' => \Mage_Core_Model_Resource_Website::class, - 'core/resource_website' => \Mage_Core_Model_Resource_Website::class, - 'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core/resource_website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, + 'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core/session' => \Mage_Core_Model_Session::class, 'core/session_abstract' => \Mage_Core_Model_Session_Abstract::class, @@ -14059,10 +14024,10 @@ 'cron/mysql4_schedule' => \Mage_Cron_Model_Mysql4_Schedule::class, 'cron/mysql4_schedule_collection' => \Mage_Cron_Model_Mysql4_Schedule_Collection::class, 'cron/observer' => \Mage_Cron_Model_Observer::class, - 'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class, 'cron/resource_schedule' => \Mage_Cron_Model_Resource_Schedule::class, - 'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, + 'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class, 'cron/resource_schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, + 'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, 'cron/schedule' => \Mage_Cron_Model_Schedule::class, 'currencysymbol/observer' => \Mage_CurrencySymbol_Model_Observer::class, 'currencysymbol/system_currencysymbol' => \Mage_CurrencySymbol_Model_System_Currencysymbol::class, @@ -14137,16 +14102,16 @@ 'customer_resource/address' => \Mage_Customer_Model_Resource_Address::class, 'customer/resource_address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class, 'customer_resource/address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class, - 'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, 'customer_resource/address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, - 'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, + 'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, 'customer/resource_address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, - 'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, + 'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, 'customer/resource_address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, - 'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, + 'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, 'customer_resource/address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, - 'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, + 'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, 'customer_resource/address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, + 'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, 'customer/resource_attribute' => \Mage_Customer_Model_Resource_Attribute::class, 'customer_resource/attribute' => \Mage_Customer_Model_Resource_Attribute::class, 'customer_resource/attribute_collection' => \Mage_Customer_Model_Resource_Attribute_Collection::class, @@ -14155,22 +14120,22 @@ 'customer_resource/customer' => \Mage_Customer_Model_Resource_Customer::class, 'customer_resource/customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class, 'customer/resource_customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class, - 'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, 'customer/resource_flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, - 'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, + 'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, 'customer/resource_flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, - 'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, + 'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, 'customer/resource_form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, - 'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, + 'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, 'customer/resource_form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, + 'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, 'customer/resource_group' => \Mage_Customer_Model_Resource_Group::class, 'customer_resource/group' => \Mage_Customer_Model_Resource_Group::class, 'customer_resource/group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class, 'customer/resource_group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class, - 'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class, 'customer_resource/setup' => \Mage_Customer_Model_Resource_Setup::class, - 'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, + 'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class, 'customer_resource/wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, + 'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, 'customer/session' => \Mage_Customer_Model_Session::class, 'dataflow/batch' => \Mage_Dataflow_Model_Batch::class, 'dataflow/batch_abstract' => \Mage_Dataflow_Model_Batch_Abstract::class, @@ -14222,10 +14187,10 @@ 'dataflow/mysql4_session' => \Mage_Dataflow_Model_Mysql4_Session::class, 'dataflow/profile' => \Mage_Dataflow_Model_Profile::class, 'dataflow/profile_history' => \Mage_Dataflow_Model_Profile_History::class, - 'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class, 'dataflow/resource_batch' => \Mage_Dataflow_Model_Resource_Batch::class, - 'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, + 'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class, 'dataflow/resource_batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, + 'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, 'dataflow/resource_batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class, 'dataflow_resource/batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class, 'dataflow_resource/batch_export' => \Mage_Dataflow_Model_Resource_Batch_Export::class, @@ -14236,12 +14201,12 @@ 'dataflow/resource_import' => \Mage_Dataflow_Model_Resource_Import::class, 'dataflow_resource/import_collection' => \Mage_Dataflow_Model_Resource_Import_Collection::class, 'dataflow/resource_import_collection' => \Mage_Dataflow_Model_Resource_Import_Collection::class, - 'dataflow_resource/profile' => \Mage_Dataflow_Model_Resource_Profile::class, 'dataflow/resource_profile' => \Mage_Dataflow_Model_Resource_Profile::class, + 'dataflow_resource/profile' => \Mage_Dataflow_Model_Resource_Profile::class, 'dataflow/resource_profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class, 'dataflow_resource/profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class, - 'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, 'dataflow_resource/profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, + 'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, 'dataflow_resource/profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class, 'dataflow/resource_profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class, 'dataflow_resource/session' => \Mage_Dataflow_Model_Resource_Session::class, @@ -14275,8 +14240,8 @@ 'directory/resource_country' => \Mage_Directory_Model_Resource_Country::class, 'directory_resource/country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class, 'directory/resource_country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class, - 'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class, 'directory/resource_country_format' => \Mage_Directory_Model_Resource_Country_Format::class, + 'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class, 'directory_resource/country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class, 'directory/resource_country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class, 'directory_resource/currency' => \Mage_Directory_Model_Resource_Currency::class, @@ -14307,8 +14272,8 @@ 'downloadable/observer' => \Mage_Downloadable_Model_Observer::class, 'downloadable/product_price' => \Mage_Downloadable_Model_Product_Price::class, 'downloadable/product_type' => \Mage_Downloadable_Model_Product_Type::class, - 'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, 'downloadable_resource/indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, + 'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, 'downloadable/resource_link' => \Mage_Downloadable_Model_Resource_Link::class, 'downloadable_resource/link' => \Mage_Downloadable_Model_Resource_Link::class, 'downloadable/resource_link_collection' => \Mage_Downloadable_Model_Resource_Link_Collection::class, @@ -14317,12 +14282,12 @@ 'downloadable_resource/link_purchased' => \Mage_Downloadable_Model_Resource_Link_Purchased::class, 'downloadable/resource_link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class, 'downloadable_resource/link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class, - 'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, 'downloadable/resource_link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, + 'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, 'downloadable/resource_link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, 'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, - 'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class, 'downloadable/resource_sample' => \Mage_Downloadable_Model_Resource_Sample::class, + 'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class, 'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, 'downloadable/resource_sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, 'downloadable/sales_order_pdf_items_abstract' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Abstract::class, @@ -14410,46 +14375,46 @@ 'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class, 'eav_resource/attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class, 'eav/resource_attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class, - 'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class, 'eav_resource/config' => \Mage_Eav_Model_Resource_Config::class, + 'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class, 'eav/resource_entity_attribute' => \Mage_Eav_Model_Resource_Entity_Attribute::class, 'eav_resource/entity_attribute' => \Mage_Eav_Model_Resource_Entity_Attribute::class, 'eav_resource/entity_attribute_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Collection::class, 'eav/resource_entity_attribute_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Collection::class, 'eav_resource/entity_attribute_group' => \Mage_Eav_Model_Resource_Entity_Attribute_Group::class, 'eav/resource_entity_attribute_group' => \Mage_Eav_Model_Resource_Entity_Attribute_Group::class, - 'eav/resource_entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class, 'eav_resource/entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class, + 'eav/resource_entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class, 'eav/resource_entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class, 'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class, - 'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, 'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, - 'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, + 'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, 'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, - 'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, + 'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, 'eav_resource/entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, + 'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, 'eav_resource/entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class, 'eav/resource_entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class, 'eav_resource/entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class, 'eav/resource_entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class, - 'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, 'eav_resource/entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, + 'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, 'eav/resource_form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class, 'eav_resource/form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class, - 'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, 'eav/resource_form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, + 'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, 'eav/resource_form_element' => \Mage_Eav_Model_Resource_Form_Element::class, 'eav_resource/form_element' => \Mage_Eav_Model_Resource_Form_Element::class, - 'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, 'eav_resource/form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, - 'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, + 'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, 'eav/resource_form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, + 'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, 'eav_resource/form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, 'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, 'eav/resource_form_type' => \Mage_Eav_Model_Resource_Form_Type::class, 'eav_resource/form_type' => \Mage_Eav_Model_Resource_Form_Type::class, - 'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class, 'eav_resource/form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class, + 'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class, 'eav_resource/helper_mysql4' => \Mage_Eav_Model_Resource_Helper_Mysql4::class, 'eav/resource_helper_mysql4' => \Mage_Eav_Model_Resource_Helper_Mysql4::class, 'giftmessage/api' => \Mage_GiftMessage_Model_Api::class, @@ -14461,12 +14426,12 @@ 'giftmessage/mysql4_message_collection' => \Mage_GiftMessage_Model_Mysql4_Message_Collection::class, 'giftmessage/mysql4_setup' => \Mage_GiftMessage_Model_Mysql4_Setup::class, 'giftmessage/observer' => \Mage_GiftMessage_Model_Observer::class, - 'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class, 'giftmessage/resource_message' => \Mage_GiftMessage_Model_Resource_Message::class, - 'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, + 'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class, 'giftmessage_resource/message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, - 'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class, + 'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, 'giftmessage_resource/setup' => \Mage_GiftMessage_Model_Resource_Setup::class, + 'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class, 'googleanalytics/observer' => \Mage_GoogleAnalytics_Model_Observer::class, 'googleanalytics/system_config_source_type' => \Mage_GoogleAnalytics_Model_System_Config_Source_Type::class, 'googlecheckout/payment' => \Mage_GoogleCheckout_Model_Payment::class, @@ -14502,8 +14467,8 @@ 'importexport/product_attribute_backend_urlkey' => \Mage_ImportExport_Model_Product_Attribute_Backend_Urlkey::class, 'importexport_resource/helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class, 'importexport/resource_helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class, - 'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, 'importexport_resource/import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, + 'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, 'importexport_resource/setup' => \Mage_ImportExport_Model_Resource_Setup::class, 'importexport/resource_setup' => \Mage_ImportExport_Model_Resource_Setup::class, 'importexport/source_export_entity' => \Mage_ImportExport_Model_Source_Export_Entity::class, @@ -14525,16 +14490,16 @@ 'index/process' => \Mage_Index_Model_Process::class, 'index_resource/abstract' => \Mage_Index_Model_Resource_Abstract::class, 'index/resource_abstract' => \Mage_Index_Model_Resource_Abstract::class, - 'index/resource_event' => \Mage_Index_Model_Resource_Event::class, 'index_resource/event' => \Mage_Index_Model_Resource_Event::class, + 'index/resource_event' => \Mage_Index_Model_Resource_Event::class, 'index/resource_event_collection' => \Mage_Index_Model_Resource_Event_Collection::class, 'index_resource/event_collection' => \Mage_Index_Model_Resource_Event_Collection::class, 'index/resource_helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class, 'index_resource/helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class, - 'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, 'index/resource_lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, - 'index_resource/process' => \Mage_Index_Model_Resource_Process::class, + 'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, 'index/resource_process' => \Mage_Index_Model_Resource_Process::class, + 'index_resource/process' => \Mage_Index_Model_Resource_Process::class, 'index/resource_process_collection' => \Mage_Index_Model_Resource_Process_Collection::class, 'index_resource/process_collection' => \Mage_Index_Model_Resource_Process_Collection::class, 'index/resource_setup' => \Mage_Index_Model_Resource_Setup::class, @@ -14567,22 +14532,22 @@ 'log/mysql4_visitor_online_collection' => \Mage_Log_Model_Mysql4_Visitor_Online_Collection::class, 'log_resource/aggregation' => \Mage_Log_Model_Resource_Aggregation::class, 'log/resource_aggregation' => \Mage_Log_Model_Resource_Aggregation::class, - 'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class, 'log/resource_customer' => \Mage_Log_Model_Resource_Customer::class, + 'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class, 'log/resource_log' => \Mage_Log_Model_Resource_Log::class, 'log_resource/log' => \Mage_Log_Model_Resource_Log::class, 'log_resource/visitor' => \Mage_Log_Model_Resource_Visitor::class, 'log/resource_visitor' => \Mage_Log_Model_Resource_Visitor::class, 'log_resource/visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class, 'log/resource_visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class, - 'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, 'log_resource/visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, - 'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, + 'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, 'log_resource/visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, + 'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, 'log/visitor' => \Mage_Log_Model_Visitor::class, 'log/visitor_online' => \Mage_Log_Model_Visitor_Online::class, - 'media_resource/image' => \Mage_Media_Model_File_Image::class, 'media/file_image' => \Mage_Media_Model_File_Image::class, + 'media_resource/image' => \Mage_Media_Model_File_Image::class, 'media/image' => \Mage_Media_Model_Image::class, 'newsletter/message' => \Mage_Newsletter_Model_Message::class, 'newsletter/mysql4_problem' => \Mage_Newsletter_Model_Mysql4_Problem::class, @@ -14600,14 +14565,14 @@ 'newsletter_resource/problem' => \Mage_Newsletter_Model_Resource_Problem::class, 'newsletter/resource_problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class, 'newsletter_resource/problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class, - 'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class, 'newsletter/resource_queue' => \Mage_Newsletter_Model_Resource_Queue::class, - 'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, + 'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class, 'newsletter/resource_queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, - 'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, + 'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, 'newsletter/resource_subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, - 'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, + 'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, 'newsletter/resource_subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, + 'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, 'newsletter_resource/template' => \Mage_Newsletter_Model_Resource_Template::class, 'newsletter/resource_template' => \Mage_Newsletter_Model_Resource_Template::class, 'newsletter_resource/template_collection' => \Mage_Newsletter_Model_Resource_Template_Collection::class, @@ -14620,20 +14585,20 @@ 'oauth/consumer_validator_keyLength' => \Mage_Oauth_Model_Consumer_Validator_KeyLength::class, 'oauth/nonce' => \Mage_Oauth_Model_Nonce::class, 'oauth/observer' => \Mage_Oauth_Model_Observer::class, - 'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class, 'oauth/resource_consumer' => \Mage_Oauth_Model_Resource_Consumer::class, + 'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class, 'oauth/resource_consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class, 'oauth_resource/consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class, 'oauth_resource/nonce' => \Mage_Oauth_Model_Resource_Nonce::class, 'oauth/resource_nonce' => \Mage_Oauth_Model_Resource_Nonce::class, 'oauth_resource/nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class, 'oauth/resource_nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class, - 'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class, 'oauth/resource_setup' => \Mage_Oauth_Model_Resource_Setup::class, - 'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class, + 'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class, 'oauth_resource/token' => \Mage_Oauth_Model_Resource_Token::class, - 'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, + 'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class, 'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, + 'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth/server' => \Mage_Oauth_Model_Server::class, 'oauth/token' => \Mage_Oauth_Model_Token::class, 'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class, @@ -14650,8 +14615,8 @@ 'paygate/authorizenet_source_paymentAction' => \Mage_Paygate_Model_Authorizenet_Source_PaymentAction::class, 'paygate/mysql4_authorizenet_debug' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug::class, 'paygate/mysql4_authorizenet_debug_collection' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection::class, - 'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, 'paygate/resource_authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, + 'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, 'paygate_resource/authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class, 'paygate/resource_authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class, 'payment/billing_agreementAbstract' => \Mage_Payment_Model_Billing_AgreementAbstract::class, @@ -14714,12 +14679,12 @@ 'paypal/resource_cert' => \Mage_Paypal_Model_Resource_Cert::class, 'paypal_resource/payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class, 'paypal/resource_payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class, - 'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, 'paypal/resource_payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, + 'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, 'paypal/resource_report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class, 'paypal_resource/report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class, - 'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, 'paypal/resource_report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, + 'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, 'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, 'paypal/resource_report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, 'paypal/resource_setup' => \Mage_Paypal_Model_Resource_Setup::class, @@ -14744,8 +14709,8 @@ 'persistent/observer' => \Mage_Persistent_Model_Observer::class, 'persistent/observer_session' => \Mage_Persistent_Model_Observer_Session::class, 'persistent/persistent_config' => \Mage_Persistent_Model_Persistent_Config::class, - 'persistent/resource_session' => \Mage_Persistent_Model_Resource_Session::class, 'persistent_resource/session' => \Mage_Persistent_Model_Resource_Session::class, + 'persistent/resource_session' => \Mage_Persistent_Model_Resource_Session::class, 'persistent/session' => \Mage_Persistent_Model_Session::class, 'poll/mysql4_poll' => \Mage_Poll_Model_Mysql4_Poll::class, 'poll/mysql4_poll_answer' => \Mage_Poll_Model_Mysql4_Poll_Answer::class, @@ -14755,16 +14720,16 @@ 'poll/poll' => \Mage_Poll_Model_Poll::class, 'poll/poll_answer' => \Mage_Poll_Model_Poll_Answer::class, 'poll/poll_vote' => \Mage_Poll_Model_Poll_Vote::class, - 'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class, 'poll_resource/poll' => \Mage_Poll_Model_Resource_Poll::class, + 'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class, 'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, 'poll/resource_poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, - 'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, 'poll_resource/poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, - 'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, + 'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, 'poll_resource/poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, - 'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, + 'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, 'poll/resource_poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, + 'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, 'productalert/email' => \Mage_ProductAlert_Model_Email::class, 'productalert/mysql4_price' => \Mage_ProductAlert_Model_Mysql4_Price::class, 'productalert/mysql4_price_collection' => \Mage_ProductAlert_Model_Mysql4_Price_Collection::class, @@ -14774,20 +14739,20 @@ 'productalert/mysql4_stock_customer_collection' => \Mage_ProductAlert_Model_Mysql4_Stock_Customer_Collection::class, 'productalert/observer' => \Mage_ProductAlert_Model_Observer::class, 'productalert/price' => \Mage_ProductAlert_Model_Price::class, - 'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, 'productalert_resource/abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, - 'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class, + 'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, 'productalert_resource/price' => \Mage_ProductAlert_Model_Resource_Price::class, - 'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, + 'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class, 'productalert/resource_price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, - 'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, + 'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, 'productalert/resource_price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, + 'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, 'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class, 'productalert/resource_stock' => \Mage_ProductAlert_Model_Resource_Stock::class, - 'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, 'productalert/resource_stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, - 'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, + 'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, 'productalert/resource_stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, + 'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, 'productalert/stock' => \Mage_ProductAlert_Model_Stock::class, 'rating/mysql4_rating' => \Mage_Rating_Model_Mysql4_Rating::class, 'rating/mysql4_rating_collection' => \Mage_Rating_Model_Mysql4_Rating_Collection::class, @@ -14801,20 +14766,20 @@ 'rating/rating_entity' => \Mage_Rating_Model_Rating_Entity::class, 'rating/rating_option' => \Mage_Rating_Model_Rating_Option::class, 'rating/rating_option_vote' => \Mage_Rating_Model_Rating_Option_Vote::class, - 'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class, 'rating/resource_rating' => \Mage_Rating_Model_Resource_Rating::class, + 'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class, 'rating_resource/rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class, 'rating/resource_rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class, 'rating/resource_rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class, 'rating_resource/rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class, - 'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, 'rating/resource_rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, - 'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, + 'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, 'rating_resource/rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, + 'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, 'rating_resource/rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class, 'rating/resource_rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class, - 'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, 'rating/resource_rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, + 'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, 'reports/config' => \Mage_Reports_Model_Config::class, 'reports/event' => \Mage_Reports_Model_Event::class, 'reports/event_observer' => \Mage_Reports_Model_Event_Observer::class, @@ -14860,6 +14825,7 @@ 'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class, 'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class, 'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class, + 'reports/observer' => \Mage_Reports_Model_Observer::class, 'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class, 'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class, 'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class, @@ -14868,88 +14834,88 @@ 'reports_resource/accounts_collection' => \Mage_Reports_Model_Resource_Accounts_Collection::class, 'reports/resource_coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class, 'reports_resource/coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class, - 'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, 'reports/resource_customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, - 'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, + 'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, 'reports/resource_customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, - 'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, + 'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, 'reports_resource/customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, - 'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, + 'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, 'reports/resource_entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, + 'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, 'reports_resource/event' => \Mage_Reports_Model_Resource_Event::class, 'reports/resource_event' => \Mage_Reports_Model_Resource_Event::class, 'reports_resource/event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, 'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, 'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class, 'reports/resource_event_type' => \Mage_Reports_Model_Resource_Event_Type::class, - 'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, 'reports/resource_event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, - 'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, + 'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, 'reports_resource/helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, - 'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, + 'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, 'reports/resource_invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, - 'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, + 'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, 'reports_resource/order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, - 'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, + 'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, 'reports_resource/product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, + 'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, 'reports/resource_product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class, 'reports_resource/product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class, 'reports_resource/product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class, 'reports/resource_product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class, - 'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, 'reports/resource_product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, + 'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, 'reports_resource/product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class, 'reports/resource_product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class, - 'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, 'reports_resource/product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, - 'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, + 'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, 'reports/resource_product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, - 'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, + 'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, 'reports_resource/product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, - 'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, + 'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, 'reports/resource_product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, + 'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, 'reports_resource/product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class, 'reports/resource_product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class, - 'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, 'reports_resource/product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, - 'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, + 'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, 'reports_resource/product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, - 'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, + 'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, 'reports/resource_quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, - 'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class, + 'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, 'reports_resource/refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class, + 'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class, 'reports/resource_report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class, 'reports_resource/report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class, 'reports/resource_report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class, 'reports_resource/report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class, - 'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, 'reports_resource/report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, + 'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, 'reports/resource_report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class, 'reports_resource/report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class, - 'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, 'reports/resource_report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, + 'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, 'reports_resource/review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, 'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, - 'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, 'reports_resource/review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, + 'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, 'reports_resource/review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class, 'reports/resource_review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class, 'reports_resource/shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class, 'reports/resource_shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class, - 'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, 'reports_resource/shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, + 'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, 'reports_resource/tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class, 'reports/resource_tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class, - 'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, 'reports/resource_tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, - 'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, + 'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, 'reports/resource_tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, - 'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, + 'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, 'reports/resource_tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, + 'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, 'reports_resource/wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class, 'reports/resource_wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class, - 'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, 'reports_resource/wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, + 'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, 'reports/session' => \Mage_Reports_Model_Session::class, 'reports/test' => \Mage_Reports_Model_Test::class, 'reports/totals' => \Mage_Reports_Model_Totals::class, @@ -14966,14 +14932,14 @@ 'review/resource_review_collection' => \Mage_Review_Model_Resource_Review_Collection::class, 'review_resource/review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class, 'review/resource_review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class, - 'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class, 'review_resource/review_status' => \Mage_Review_Model_Resource_Review_Status::class, - 'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, + 'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class, 'review_resource/review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, + 'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, 'review/resource_review_summary' => \Mage_Review_Model_Resource_Review_Summary::class, 'review_resource/review_summary' => \Mage_Review_Model_Resource_Review_Summary::class, - 'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, 'review/resource_review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, + 'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, 'review/review' => \Mage_Review_Model_Review::class, 'review/review_status' => \Mage_Review_Model_Review_Status::class, 'review/review_summary' => \Mage_Review_Model_Review_Summary::class, @@ -14996,14 +14962,14 @@ 'rule/mysql4_rule_collection' => \Mage_Rule_Model_Mysql4_Rule_Collection::class, 'rule/renderer_actions' => \Mage_Rule_Model_Renderer_Actions::class, 'rule/renderer_conditions' => \Mage_Rule_Model_Renderer_Conditions::class, - 'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class, 'rule/resource_abstract' => \Mage_Rule_Model_Resource_Abstract::class, - 'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class, + 'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class, 'rule/resource_rule' => \Mage_Rule_Model_Resource_Rule::class, - 'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, + 'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class, 'rule_resource/rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, - 'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, + 'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, 'rule_resource/rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, + 'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, 'rule/resource_rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class, 'rule_resource/rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class, 'rule/rule' => \Mage_Rule_Model_Rule::class, @@ -15032,24 +14998,24 @@ 'salesrule/resource_coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class, 'salesrule/resource_coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class, 'salesrule_resource/coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class, - 'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, 'salesrule_resource/report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, - 'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, + 'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, 'salesrule_resource/report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, + 'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, 'salesrule_resource/report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class, 'salesrule/resource_report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class, 'salesrule_resource/report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class, 'salesrule/resource_report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class, 'salesrule_resource/report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class, 'salesrule/resource_report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class, - 'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class, 'salesrule_resource/rule' => \Mage_SalesRule_Model_Resource_Rule::class, - 'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, + 'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class, 'salesrule_resource/rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, - 'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, + 'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, 'salesrule_resource/rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, - 'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, + 'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, 'salesrule/resource_rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, + 'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, 'salesrule_resource/rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class, 'salesrule/resource_rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class, 'salesrule_resource/rule_product_collection' => \Mage_SalesRule_Model_Resource_Rule_Product_Collection::class, @@ -15094,14 +15060,14 @@ 'sales/email_template' => \Mage_Sales_Model_Email_Template::class, 'sales/entity_order' => \Mage_Sales_Model_Entity_Order::class, 'sales_entity/order' => \Mage_Sales_Model_Entity_Order::class, - 'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class, 'sales_entity/order_address' => \Mage_Sales_Model_Entity_Order_Address::class, - 'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, + 'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class, 'sales/entity_order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, - 'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, + 'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, 'sales_entity/order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, - 'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, + 'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, 'sales_entity/order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, + 'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, 'sales/entity_order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class, 'sales_entity/order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class, 'sales/entity_order_attribute_backend_shipping' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Shipping::class, @@ -15110,22 +15076,22 @@ 'sales/entity_order_collection' => \Mage_Sales_Model_Entity_Order_Collection::class, 'sales_entity/order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class, 'sales/entity_order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class, - 'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, 'sales_entity/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, - 'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, + 'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, 'sales/entity_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, - 'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, + 'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, 'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, + 'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, 'sales/entity_order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class, 'sales_entity/order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class, 'sales/entity_order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class, 'sales_entity/order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class, 'sales_entity/order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class, 'sales/entity_order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class, - 'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, 'sales/entity_order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, - 'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, + 'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, 'sales_entity/order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, + 'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, 'sales/entity_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class, 'sales_entity/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class, 'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class, @@ -15136,28 +15102,28 @@ 'sales/entity_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class, 'sales/entity_order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class, 'sales_entity/order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class, - 'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, 'sales/entity_order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, + 'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, 'sales_entity/order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class, 'sales/entity_order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class, 'sales_entity/order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class, 'sales/entity_order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class, - 'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, 'sales/entity_order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, + 'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, 'sales/entity_order_item' => \Mage_Sales_Model_Entity_Order_Item::class, 'sales_entity/order_item' => \Mage_Sales_Model_Entity_Order_Item::class, 'sales/entity_order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class, 'sales_entity/order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class, - 'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, 'sales/entity_order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, + 'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, 'sales_entity/order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class, 'sales/entity_order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class, 'sales_entity/order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class, 'sales/entity_order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class, - 'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, 'sales_entity/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, - 'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, + 'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, 'sales/entity_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, + 'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, 'sales/entity_order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class, 'sales_entity/order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class, 'sales/entity_order_shipment_comment' => \Mage_Sales_Model_Entity_Order_Shipment_Comment::class, @@ -15166,66 +15132,66 @@ 'sales_entity/order_shipment_comment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Comment_Collection::class, 'sales/entity_order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class, 'sales_entity/order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class, - 'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, 'sales/entity_order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, - 'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, + 'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, 'sales_entity/order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, - 'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, + 'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, 'sales_entity/order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, - 'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, + 'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, 'sales_entity/order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, - 'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, + 'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, 'sales_entity/order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, + 'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, 'sales_entity/quote' => \Mage_Sales_Model_Entity_Quote::class, 'sales/entity_quote' => \Mage_Sales_Model_Entity_Quote::class, - 'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, 'sales_entity/quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, + 'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, 'sales_entity/quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class, 'sales/entity_quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class, - 'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, 'sales/entity_quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, - 'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, + 'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, 'sales/entity_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, - 'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, + 'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, 'sales_entity/quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, - 'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, + 'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, 'sales/entity_quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, + 'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, 'sales_entity/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales/entity_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales_entity/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class, 'sales/entity_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class, - 'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, 'sales_entity/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, - 'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, 'sales/entity_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/entity_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales_entity/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales/entity_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class, 'sales_entity/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class, 'sales/entity_quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class, 'sales_entity/quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class, - 'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, 'sales_entity/quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, - 'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, + 'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, 'sales/entity_quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, - 'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, + 'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, 'sales_entity/quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, + 'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, 'sales/entity_quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class, 'sales_entity/quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class, 'sales/entity_quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class, 'sales_entity/quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class, - 'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, 'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, - 'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, + 'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, 'sales/entity_quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, - 'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, + 'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, 'sales/entity_quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, + 'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, 'sales_entity/quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class, 'sales/entity_quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class, - 'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, 'sales_entity/sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, - 'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class, + 'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, 'sales_entity/setup' => \Mage_Sales_Model_Entity_Setup::class, + 'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class, 'sales/mysql4_abstract' => \Mage_Sales_Model_Mysql4_Abstract::class, 'sales/mysql4_billing_agreement' => \Mage_Sales_Model_Mysql4_Billing_Agreement::class, 'sales/mysql4_billing_agreement_collection' => \Mage_Sales_Model_Mysql4_Billing_Agreement_Collection::class, @@ -15420,48 +15386,48 @@ 'sales/recurring_profile' => \Mage_Sales_Model_Recurring_Profile::class, 'sales_resource/abstract' => \Mage_Sales_Model_Resource_Abstract::class, 'sales/resource_abstract' => \Mage_Sales_Model_Resource_Abstract::class, - 'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, 'sales_resource/billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, - 'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, + 'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, 'sales_resource/billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, - 'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, + 'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, 'sales/resource_collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, - 'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, + 'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, 'sales_resource/helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, - 'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class, + 'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, 'sales_resource/order' => \Mage_Sales_Model_Resource_Order::class, + 'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class, 'sales_resource/order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class, 'sales/resource_order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class, - 'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class, 'sales_resource/order_address' => \Mage_Sales_Model_Resource_Order_Address::class, + 'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class, 'sales/resource_order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class, 'sales_resource/order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class, 'sales/resource_order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class, 'sales_resource/order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class, 'sales/resource_order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class, 'sales_resource/order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class, - 'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, 'sales/resource_order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, + 'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, 'sales_resource/order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class, 'sales/resource_order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class, 'sales/resource_order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class, 'sales_resource/order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class, - 'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, 'sales/resource_order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, + 'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, 'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, 'sales/resource_order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, 'sales/resource_order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, 'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, - 'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, 'sales_resource/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, + 'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, 'sales/resource_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class, 'sales_resource/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class, - 'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, 'sales/resource_order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, - 'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, + 'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, 'sales_resource/order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, - 'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, + 'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, 'sales/resource_order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, + 'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, 'sales/resource_order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, 'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, 'sales_resource/order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class, @@ -15472,84 +15438,84 @@ 'sales/resource_order_grid_collection' => \Mage_Sales_Model_Resource_Order_Grid_Collection::class, 'sales/resource_order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class, 'sales_resource/order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class, - 'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, 'sales/resource_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, - 'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, + 'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, 'sales_resource/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, + 'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, 'sales_resource/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class, 'sales/resource_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class, 'sales/resource_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class, 'sales_resource/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class, 'sales/resource_order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class, 'sales_resource/order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class, - 'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, 'sales/resource_order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, + 'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, 'sales/resource_order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class, 'sales_resource/order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class, - 'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, 'sales/resource_order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, - 'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, + 'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, 'sales_resource/order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, + 'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, 'sales/resource_order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class, 'sales_resource/order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class, - 'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class, 'sales_resource/order_item' => \Mage_Sales_Model_Resource_Order_Item::class, + 'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class, 'sales/resource_order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class, 'sales_resource/order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class, - 'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, 'sales_resource/order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, + 'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, 'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, 'sales/resource_order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, - 'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, 'sales_resource/order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, - 'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, + 'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, 'sales_resource/order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, - 'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, + 'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, 'sales_resource/order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, - 'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, + 'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, 'sales/resource_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, + 'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, 'sales_resource/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class, 'sales/resource_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class, - 'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, 'sales/resource_order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, + 'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, 'sales/resource_order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, 'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, - 'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, 'sales/resource_order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, + 'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, 'sales_resource/order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class, 'sales/resource_order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class, - 'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, 'sales_resource/order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, - 'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, + 'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, 'sales_resource/order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, - 'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, + 'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, 'sales_resource/order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, + 'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, 'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, 'sales_resource/order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, 'sales_resource/order_status' => \Mage_Sales_Model_Resource_Order_Status::class, 'sales/resource_order_status' => \Mage_Sales_Model_Resource_Order_Status::class, 'sales_resource/order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class, 'sales/resource_order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class, - 'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, 'sales_resource/order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, - 'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, + 'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, 'sales_resource/order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, - 'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, + 'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, 'sales/resource_order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, - 'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, + 'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, 'sales_resource/order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, - 'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class, + 'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, 'sales/resource_quote' => \Mage_Sales_Model_Resource_Quote::class, + 'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class, 'sales_resource/quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class, 'sales/resource_quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class, 'sales/resource_quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class, 'sales_resource/quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class, 'sales/resource_quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class, 'sales_resource/quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class, - 'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, 'sales/resource_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, - 'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, + 'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, 'sales/resource_quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, + 'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, 'sales_resource/quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, 'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, 'sales_resource/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class, @@ -15558,82 +15524,82 @@ 'sales_resource/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class, 'sales/resource_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class, 'sales_resource/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class, - 'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/resource_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, - 'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, + 'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/resource_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, + 'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales_resource/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, 'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, - 'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, 'sales/resource_quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, + 'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, 'sales_resource/quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class, 'sales/resource_quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class, - 'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, 'sales/resource_quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, - 'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, + 'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, 'sales_resource/quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, - 'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, + 'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, 'sales_resource/quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, + 'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, 'sales_resource/quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class, 'sales/resource_quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class, - 'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, 'sales/resource_quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, + 'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, 'sales/resource_quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class, 'sales_resource/quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class, - 'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, 'sales/resource_quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, - 'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, + 'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, 'sales/resource_quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, - 'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, + 'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, 'sales_resource/quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, - 'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, + 'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, 'sales/resource_quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, - 'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, + 'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, 'sales/resource_recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, + 'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, 'sales/resource_recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class, 'sales_resource/recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class, - 'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class, 'sales/resource_report' => \Mage_Sales_Model_Resource_Report::class, + 'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class, 'sales/resource_report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class, 'sales_resource/report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class, - 'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, 'sales/resource_report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, - 'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, + 'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, 'sales/resource_report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, + 'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, 'sales_resource/report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, 'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, - 'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, 'sales_resource/report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, + 'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, 'sales/resource_report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class, 'sales_resource/report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class, 'sales_resource/report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class, 'sales/resource_report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class, 'sales/resource_report_order' => \Mage_Sales_Model_Resource_Report_Order::class, 'sales_resource/report_order' => \Mage_Sales_Model_Resource_Report_Order::class, - 'sales/resource_report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class, 'sales_resource/report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class, - 'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class, + 'sales/resource_report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class, 'sales/resource_report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class, + 'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class, 'sales_resource/report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class, 'sales/resource_report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class, - 'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, 'sales/resource_report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, - 'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, + 'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, 'sales_resource/report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, + 'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, 'sales_resource/report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class, 'sales/resource_report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class, 'sales_resource/report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class, 'sales/resource_report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class, - 'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, 'sales_resource/report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, + 'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, 'sales_resource/report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class, 'sales/resource_report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class, 'sales_resource/report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class, 'sales/resource_report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class, - 'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, 'sales/resource_sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, - 'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class, + 'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, 'sales/resource_setup' => \Mage_Sales_Model_Resource_Setup::class, + 'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class, 'sales/service_order' => \Mage_Sales_Model_Service_Order::class, 'sales/service_quote' => \Mage_Sales_Model_Service_Quote::class, 'sales/status_list' => \Mage_Sales_Model_Status_List::class, @@ -15643,8 +15609,8 @@ 'sendfriend/observer' => \Mage_Sendfriend_Model_Observer::class, 'sendfriend_resource/sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class, 'sendfriend/resource_sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class, - 'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, 'sendfriend/resource_sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, + 'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, 'sendfriend/resource_setup' => \Mage_Sendfriend_Model_Resource_Setup::class, 'sendfriend_resource/setup' => \Mage_Sendfriend_Model_Resource_Setup::class, 'sendfriend/sendfriend' => \Mage_Sendfriend_Model_Sendfriend::class, @@ -15684,16 +15650,16 @@ 'sitemap/observer' => \Mage_Sitemap_Model_Observer::class, 'sitemap_resource/catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class, 'sitemap/resource_catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class, - 'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, 'sitemap/resource_catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, + 'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, 'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, 'sitemap_resource/catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, 'sitemap_resource/cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, 'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, 'sitemap_resource/sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class, 'sitemap/resource_sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class, - 'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, 'sitemap_resource/sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, + 'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, 'sitemap/sitemap' => \Mage_Sitemap_Model_Sitemap::class, 'tag/api' => \Mage_Tag_Model_Api::class, 'tag/api_v2' => \Mage_Tag_Model_Api_V2::class, @@ -15706,21 +15672,21 @@ 'tag/mysql4_tag' => \Mage_Tag_Model_Mysql4_Tag::class, 'tag/mysql4_tag_collection' => \Mage_Tag_Model_Mysql4_Tag_Collection::class, 'tag/mysql4_tag_relation' => \Mage_Tag_Model_Mysql4_Tag_Relation::class, - 'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag/resource_customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag_resource/customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, - 'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, + 'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag_resource/indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, - 'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, + 'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, 'tag_resource/popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, + 'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, 'tag_resource/product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class, 'tag/resource_product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class, 'tag_resource/tag' => \Mage_Tag_Model_Resource_Tag::class, 'tag/resource_tag' => \Mage_Tag_Model_Resource_Tag::class, - 'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, 'tag_resource/tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, - 'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, + 'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, 'tag_resource/tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, + 'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, 'tag/session' => \Mage_Tag_Model_Session::class, 'tag/tag' => \Mage_Tag_Model_Tag::class, 'tag/tag_relation' => \Mage_Tag_Model_Tag_Relation::class, @@ -15759,16 +15725,16 @@ 'tax/resource_calculation_rate' => \Mage_Tax_Model_Resource_Calculation_Rate::class, 'tax/resource_calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class, 'tax_resource/calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class, - 'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, 'tax/resource_calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, - 'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, + 'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, 'tax/resource_calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, - 'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, + 'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, 'tax/resource_calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, - 'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, + 'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, 'tax_resource/calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, - 'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class, + 'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, 'tax/resource_class' => \Mage_Tax_Model_Resource_Class::class, + 'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class, 'tax/resource_class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class, 'tax_resource/class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class, 'tax_resource/report_collection' => \Mage_Tax_Model_Resource_Report_Collection::class, @@ -15779,10 +15745,10 @@ 'tax/resource_report_tax_createdat' => \Mage_Tax_Model_Resource_Report_Tax_Createdat::class, 'tax_resource/report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class, 'tax/resource_report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class, - 'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, 'tax/resource_report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, - 'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, + 'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, 'tax_resource/sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, + 'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, 'tax_resource/sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class, 'tax/resource_sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class, 'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class, @@ -15871,8 +15837,8 @@ 'weee/observer' => \Mage_Weee_Model_Observer::class, 'weee/resource_attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class, 'weee_resource/attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class, - 'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class, 'weee/resource_setup' => \Mage_Weee_Model_Resource_Setup::class, + 'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class, 'weee/resource_tax' => \Mage_Weee_Model_Resource_Tax::class, 'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class, 'weee/tax' => \Mage_Weee_Model_Tax::class, @@ -15884,12 +15850,12 @@ 'widget/mysql4_widget_instance' => \Mage_Widget_Model_Mysql4_Widget_Instance::class, 'widget/mysql4_widget_instance_collection' => \Mage_Widget_Model_Mysql4_Widget_Instance_Collection::class, 'widget/observer' => \Mage_Widget_Model_Observer::class, - 'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class, 'widget/resource_widget' => \Mage_Widget_Model_Resource_Widget::class, + 'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class, 'widget_resource/widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class, 'widget/resource_widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class, - 'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, 'widget_resource/widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, + 'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, 'widget/template_filter' => \Mage_Widget_Model_Template_Filter::class, 'widget/widget' => \Mage_Widget_Model_Widget::class, 'widget/widget_config' => \Mage_Widget_Model_Widget_Config::class, @@ -15906,14 +15872,14 @@ 'wishlist/mysql4_wishlist' => \Mage_Wishlist_Model_Mysql4_Wishlist::class, 'wishlist/mysql4_wishlist_collection' => \Mage_Wishlist_Model_Mysql4_Wishlist_Collection::class, 'wishlist/observer' => \Mage_Wishlist_Model_Observer::class, - 'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class, 'wishlist_resource/item' => \Mage_Wishlist_Model_Resource_Item::class, + 'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class, 'wishlist_resource/item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class, 'wishlist/resource_item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class, - 'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, 'wishlist/resource_item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, - 'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, + 'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, 'wishlist_resource/item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, + 'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, 'wishlist_resource/product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class, 'wishlist/resource_product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class, 'wishlist/resource_wishlist' => \Mage_Wishlist_Model_Resource_Wishlist::class, @@ -15922,7 +15888,6 @@ 'wishlist/resource_wishlist_collection' => \Mage_Wishlist_Model_Resource_Wishlist_Collection::class, 'wishlist/session' => \Mage_Wishlist_Model_Session::class, 'wishlist/wishlist' => \Mage_Wishlist_Model_Wishlist::class, - 'varien/autoload' => \Varien_Autoload::class, ]) ); override( \Mage_Customer_AccountController::_getModel(0), @@ -15932,11 +15897,10 @@ 'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class, 'adminnotification/mysql4_inbox_collection' => \Mage_AdminNotification_Model_Mysql4_Inbox_Collection::class, 'adminnotification/observer' => \Mage_AdminNotification_Model_Observer::class, - 'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, 'adminnotification/resource_inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, - 'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, + 'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, 'adminnotification/resource_inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, - 'adminnotification/survey' => \Mage_AdminNotification_Model_Survey::class, + 'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, 'admin/acl' => \Mage_Admin_Model_Acl::class, 'admin/acl_assert_ip' => \Mage_Admin_Model_Acl_Assert_Ip::class, 'admin/acl_assert_time' => \Mage_Admin_Model_Acl_Assert_Time::class, @@ -15965,38 +15929,38 @@ 'admin/redirectpolicy' => \Mage_Admin_Model_Redirectpolicy::class, 'admin/resource_acl' => \Mage_Admin_Model_Resource_Acl::class, 'admin_resource/acl' => \Mage_Admin_Model_Resource_Acl::class, - 'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, 'admin/resource_acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, + 'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, 'admin/resource_acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class, 'admin_resource/acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class, - 'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class, 'admin/resource_block' => \Mage_Admin_Model_Resource_Block::class, - 'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, + 'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class, 'admin/resource_block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, + 'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, 'admin_resource/permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class, 'admin/resource_permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class, 'admin/resource_role' => \Mage_Admin_Model_Resource_Role::class, 'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class, 'admin/resource_role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class, 'admin_resource/role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class, - 'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class, 'admin_resource/roles' => \Mage_Admin_Model_Resource_Roles::class, - 'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, + 'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class, 'admin_resource/roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, - 'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, + 'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, 'admin/resource_roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, + 'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, 'admin/resource_rules' => \Mage_Admin_Model_Resource_Rules::class, 'admin_resource/rules' => \Mage_Admin_Model_Resource_Rules::class, - 'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, 'admin_resource/rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, + 'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, 'admin_resource/user' => \Mage_Admin_Model_Resource_User::class, 'admin/resource_user' => \Mage_Admin_Model_Resource_User::class, 'admin/resource_user_collection' => \Mage_Admin_Model_Resource_User_Collection::class, 'admin_resource/user_collection' => \Mage_Admin_Model_Resource_User_Collection::class, - 'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class, 'admin_resource/variable' => \Mage_Admin_Model_Resource_Variable::class, - 'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, + 'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class, 'admin/resource_variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, + 'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, 'admin/role' => \Mage_Admin_Model_Role::class, 'admin/roles' => \Mage_Admin_Model_Roles::class, 'admin/rules' => \Mage_Admin_Model_Rules::class, @@ -16031,6 +15995,7 @@ 'adminhtml/system_config_backend_baseurl' => \Mage_Adminhtml_Model_System_Config_Backend_Baseurl::class, 'adminhtml/system_config_backend_cache' => \Mage_Adminhtml_Model_System_Config_Backend_Cache::class, 'adminhtml/system_config_backend_catalog_inventory_managestock' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock::class, + 'adminhtml/system_config_backend_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Separator::class, 'adminhtml/system_config_backend_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Type::class, 'adminhtml/system_config_backend_category' => \Mage_Adminhtml_Model_System_Config_Backend_Category::class, 'adminhtml/system_config_backend_cookie' => \Mage_Adminhtml_Model_System_Config_Backend_Cookie::class, @@ -16083,12 +16048,14 @@ 'adminhtml/system_config_source_catalog_listMode' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListMode::class, 'adminhtml/system_config_source_catalog_listPerPage' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListPerPage::class, 'adminhtml/system_config_source_catalog_listSort' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort::class, + 'adminhtml/system_config_source_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Separator::class, 'adminhtml/system_config_source_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Type::class, 'adminhtml/system_config_source_catalog_timeFormat' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_TimeFormat::class, 'adminhtml/system_config_source_category' => \Mage_Adminhtml_Model_System_Config_Source_Category::class, 'adminhtml/system_config_source_checktype' => \Mage_Adminhtml_Model_System_Config_Source_Checktype::class, 'adminhtml/system_config_source_cms_page' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Page::class, 'adminhtml/system_config_source_cms_wysiwyg_enabled' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Wysiwyg_Enabled::class, + 'adminhtml/system_config_source_cookie_samesite' => \Mage_Adminhtml_Model_System_Config_Source_Cookie_Samesite::class, 'adminhtml/system_config_source_country' => \Mage_Adminhtml_Model_System_Config_Source_Country::class, 'adminhtml/system_config_source_country_full' => \Mage_Adminhtml_Model_System_Config_Source_Country_Full::class, 'adminhtml/system_config_source_cron_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency::class, @@ -16115,6 +16082,7 @@ 'adminhtml/system_config_source_locale_timezone' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Timezone::class, 'adminhtml/system_config_source_locale_weekdaycodes' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdaycodes::class, 'adminhtml/system_config_source_locale_weekdays' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdays::class, + 'adminhtml/system_config_source_log_level' => \Mage_Adminhtml_Model_System_Config_Source_Log_Level::class, 'adminhtml/system_config_source_nooptreq' => \Mage_Adminhtml_Model_System_Config_Source_Nooptreq::class, 'adminhtml/system_config_source_notification_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Notification_Frequency::class, 'adminhtml/system_config_source_order_status' => \Mage_Adminhtml_Model_System_Config_Source_Order_Status::class, @@ -16138,7 +16106,6 @@ 'adminhtml/system_config_source_shipping_flatrate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Flatrate::class, 'adminhtml/system_config_source_shipping_tablerate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Tablerate::class, 'adminhtml/system_config_source_shipping_taxclass' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Taxclass::class, - 'adminhtml/system_config_source_startdateenddate' => \Mage_Adminhtml_Model_System_Config_Source_Startdateenddate::class, 'adminhtml/system_config_source_storage_media_database' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Database::class, 'adminhtml/system_config_source_storage_media_storage' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Storage::class, 'adminhtml/system_config_source_store' => \Mage_Adminhtml_Model_System_Config_Source_Store::class, @@ -16194,22 +16161,22 @@ 'api2_resource/acl_filter_attribute' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute::class, 'api2/resource_acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class, 'api2_resource/acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class, - 'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, 'api2_resource/acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, + 'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, 'api2/resource_acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class, 'api2_resource/acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class, 'api2_resource/acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class, 'api2/resource_acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class, 'api2/resource_acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class, 'api2_resource/acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class, - 'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class, 'api2/resource_setup' => \Mage_Api2_Model_Resource_Setup::class, + 'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class, 'api2/resource_validator' => \Mage_Api2_Model_Resource_Validator::class, 'api2_resource/validator' => \Mage_Api2_Model_Resource_Validator::class, 'api2/resource_validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class, 'api2_resource/validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class, - 'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, 'api2/resource_validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, + 'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, 'api2/response' => \Mage_Api2_Model_Response::class, 'api2/route_abstract' => \Mage_Api2_Model_Route_Abstract::class, 'api2/route_apiType' => \Mage_Api2_Model_Route_ApiType::class, @@ -16241,8 +16208,8 @@ 'api/mysql4_user_collection' => \Mage_Api_Model_Mysql4_User_Collection::class, 'api/resource_abstract' => \Mage_Api_Model_Resource_Abstract::class, 'api_resource/abstract' => \Mage_Api_Model_Resource_Abstract::class, - 'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class, 'api_resource/acl' => \Mage_Api_Model_Resource_Acl::class, + 'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class, 'api_resource/acl_role' => \Mage_Api_Model_Resource_Acl_Role::class, 'api/resource_acl_role' => \Mage_Api_Model_Resource_Acl_Role::class, 'api/resource_acl_role_collection' => \Mage_Api_Model_Resource_Acl_Role_Collection::class, @@ -16251,14 +16218,14 @@ 'api_resource/permissions_collection' => \Mage_Api_Model_Resource_Permissions_Collection::class, 'api_resource/role' => \Mage_Api_Model_Resource_Role::class, 'api/resource_role' => \Mage_Api_Model_Resource_Role::class, - 'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, 'api_resource/role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, + 'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, 'api/resource_roles' => \Mage_Api_Model_Resource_Roles::class, 'api_resource/roles' => \Mage_Api_Model_Resource_Roles::class, - 'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, 'api_resource/roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, - 'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, + 'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, 'api_resource/roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, + 'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, 'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class, 'api_resource/rules' => \Mage_Api_Model_Resource_Rules::class, 'api_resource/rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class, @@ -16289,15 +16256,6 @@ 'authorizenet/directpost_request' => \Mage_Authorizenet_Model_Directpost_Request::class, 'authorizenet/directpost_response' => \Mage_Authorizenet_Model_Directpost_Response::class, 'authorizenet/directpost_session' => \Mage_Authorizenet_Model_Directpost_Session::class, - 'backup/backup' => \Mage_Backup_Model_Backup::class, - 'backup/config_backend_cron' => \Mage_Backup_Model_Config_Backend_Cron::class, - 'backup/config_source_type' => \Mage_Backup_Model_Config_Source_Type::class, - 'backup/db' => \Mage_Backup_Model_Db::class, - 'backup/fs_collection' => \Mage_Backup_Model_Fs_Collection::class, - 'backup/mysql4_db' => \Mage_Backup_Model_Mysql4_Db::class, - 'backup/observer' => \Mage_Backup_Model_Observer::class, - 'backup/resource_db' => \Mage_Backup_Model_Resource_Db::class, - 'backup/resource_helper_mysql4' => \Mage_Backup_Model_Resource_Helper_Mysql4::class, 'bundle/catalogIndex_data_bundle' => \Mage_Bundle_Model_CatalogIndex_Data_Bundle::class, 'bundle/mysql4_bundle' => \Mage_Bundle_Model_Mysql4_Bundle::class, 'bundle/mysql4_indexer_price' => \Mage_Bundle_Model_Mysql4_Indexer_Price::class, @@ -16317,16 +16275,16 @@ 'bundle/resource_bundle' => \Mage_Bundle_Model_Resource_Bundle::class, 'bundle/resource_indexer_price' => \Mage_Bundle_Model_Resource_Indexer_Price::class, 'bundle_resource/indexer_price' => \Mage_Bundle_Model_Resource_Indexer_Price::class, - 'bundle/resource_indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class, 'bundle_resource/indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class, + 'bundle/resource_indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class, 'bundle/resource_option' => \Mage_Bundle_Model_Resource_Option::class, 'bundle_resource/option' => \Mage_Bundle_Model_Resource_Option::class, 'bundle/resource_option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class, 'bundle_resource/option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class, 'bundle_resource/price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, 'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, - 'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class, 'bundle_resource/selection' => \Mage_Bundle_Model_Resource_Selection::class, + 'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class, 'bundle_resource/selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class, 'bundle/resource_selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class, 'bundle/sales_order_pdf_items_abstract' => \Mage_Bundle_Model_Sales_Order_Pdf_Items_Abstract::class, @@ -16386,14 +16344,14 @@ 'catalogindex/resource_data_abstract' => \Mage_CatalogIndex_Model_Resource_Data_Abstract::class, 'catalogindex_resource/data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class, 'catalogindex/resource_data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class, - 'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, 'catalogindex_resource/data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, + 'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, 'catalogindex_resource/indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class, 'catalogindex/resource_indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class, 'catalogindex/resource_indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class, 'catalogindex_resource/indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class, - 'catalogindex_resource/indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class, 'catalogindex/resource_indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class, + 'catalogindex_resource/indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class, 'catalogindex_resource/indexer_minimalprice' => \Mage_CatalogIndex_Model_Resource_Indexer_Minimalprice::class, 'catalogindex/resource_indexer_minimalprice' => \Mage_CatalogIndex_Model_Resource_Indexer_Minimalprice::class, 'catalogindex/resource_indexer_price' => \Mage_CatalogIndex_Model_Resource_Indexer_Price::class, @@ -16419,20 +16377,20 @@ 'cataloginventory/mysql4_stock_item_collection' => \Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection::class, 'cataloginventory/mysql4_stock_status' => \Mage_CatalogInventory_Model_Mysql4_Stock_Status::class, 'cataloginventory/observer' => \Mage_CatalogInventory_Model_Observer::class, - 'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, 'cataloginventory_resource/indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, + 'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, 'cataloginventory/resource_indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class, 'cataloginventory_resource/indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class, - 'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, 'cataloginventory/resource_indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, + 'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, 'cataloginventory/resource_indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class, 'cataloginventory_resource/indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class, 'cataloginventory_resource/stock' => \Mage_CatalogInventory_Model_Resource_Stock::class, 'cataloginventory/resource_stock' => \Mage_CatalogInventory_Model_Resource_Stock::class, 'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, 'cataloginventory/resource_stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, - 'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, 'cataloginventory/resource_stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, + 'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, 'cataloginventory/resource_stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class, 'cataloginventory_resource/stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class, 'cataloginventory/source_backorders' => \Mage_CatalogInventory_Model_Source_Backorders::class, @@ -16453,10 +16411,10 @@ 'catalogrule/mysql4_rule_product_price' => \Mage_CatalogRule_Model_Mysql4_Rule_Product_Price::class, 'catalogrule/mysql4_rule_product_price_collection' => \Mage_CatalogRule_Model_Mysql4_Rule_Product_Price_Collection::class, 'catalogrule/observer' => \Mage_CatalogRule_Model_Observer::class, - 'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class, 'catalogrule/resource_rule' => \Mage_CatalogRule_Model_Resource_Rule::class, - 'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, + 'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class, 'catalogrule_resource/rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, + 'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, 'catalogrule_resource/rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class, 'catalogrule/resource_rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class, 'catalogrule_resource/rule_product_price_collection' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price_Collection::class, @@ -16485,24 +16443,24 @@ 'catalogsearch/query' => \Mage_CatalogSearch_Model_Query::class, 'catalogsearch_resource/advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class, 'catalogsearch/resource_advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class, - 'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, 'catalogsearch_resource/advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, + 'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, 'catalogsearch_resource/fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class, 'catalogsearch/resource_fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class, 'catalogsearch_resource/fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class, 'catalogsearch/resource_fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class, 'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, 'catalogsearch_resource/fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, - 'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, 'catalogsearch/resource_helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, - 'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, + 'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, 'catalogsearch_resource/indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, + 'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, 'catalogsearch_resource/query' => \Mage_CatalogSearch_Model_Resource_Query::class, 'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class, - 'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, 'catalogsearch_resource/query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, - 'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, + 'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, 'catalogsearch/resource_search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, + 'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, 'catalogsearch/session' => \Mage_CatalogSearch_Model_Session::class, 'catalogsearch/system_config_backend_sitemap' => \Mage_CatalogSearch_Model_System_Config_Backend_Sitemap::class, 'catalog/abstract' => \Mage_Catalog_Model_Abstract::class, @@ -16645,144 +16603,144 @@ 'catalog/product_website' => \Mage_Catalog_Model_Product_Website::class, 'catalog/resource_abstract' => \Mage_Catalog_Model_Resource_Abstract::class, 'catalog_resource/abstract' => \Mage_Catalog_Model_Resource_Abstract::class, - 'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class, 'catalog/resource_attribute' => \Mage_Catalog_Model_Resource_Attribute::class, - 'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class, + 'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class, 'catalog_resource/category' => \Mage_Catalog_Model_Resource_Category::class, + 'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class, 'catalog_resource/category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class, 'catalog/resource_category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class, - 'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, 'catalog/resource_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, - 'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, + 'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, 'catalog/resource_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, + 'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, 'catalog_resource/category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class, 'catalog/resource_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class, 'catalog_resource/category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class, 'catalog/resource_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class, 'catalog/resource_category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class, 'catalog_resource/category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class, - 'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, 'catalog_resource/category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, - 'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, + 'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, 'catalog/resource_category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, + 'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, 'catalog_resource/category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class, 'catalog/resource_category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class, 'catalog/resource_category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class, 'catalog_resource/category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class, - 'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, 'catalog_resource/collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, - 'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class, + 'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, 'catalog_resource/config' => \Mage_Catalog_Model_Resource_Config::class, - 'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, + 'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class, 'catalog/resource_eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, + 'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, 'catalog_resource/eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class, 'catalog/resource_eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class, - 'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, 'catalog_resource/eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, - 'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, + 'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, 'catalog/resource_eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, - 'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, + 'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, 'catalog_resource/eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, + 'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, 'catalog_resource/eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, - 'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, + 'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, 'catalog_resource/eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, + 'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, 'catalog/resource_eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class, 'catalog_resource/eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class, 'catalog/resource_eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class, 'catalog_resource/eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class, 'catalog/resource_eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class, 'catalog_resource/eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class, - 'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, 'catalog/resource_eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, - 'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, + 'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, 'catalog/resource_eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, + 'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, 'catalog/resource_eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class, 'catalog_resource/eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class, - 'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, 'catalog_resource/eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, + 'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, 'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, 'catalog_resource/eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, 'catalog_resource/eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class, 'catalog/resource_eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class, - 'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, 'catalog_resource/eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, - 'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, + 'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, 'catalog/resource_eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, - 'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, + 'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, 'catalog/resource_eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, - 'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, + 'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, 'catalog/resource_eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, + 'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, 'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, 'catalog_resource/eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, 'catalog_resource/eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, - 'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, 'catalog/resource_eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, + 'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class, 'catalog/resource_eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, + 'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, 'catalog/resource_eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class, 'catalog/resource_eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class, 'catalog_resource/eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class, 'catalog_resource/eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class, 'catalog/resource_eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class, - 'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, 'catalog_resource/eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, - 'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, + 'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, 'catalog_resource/eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, - 'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, + 'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, 'catalog_resource/eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, + 'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, 'catalog/resource_eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class, 'catalog/resource_eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class, 'catalog/resource_eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class, - 'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, 'catalog/resource_eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, - 'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, + 'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, 'catalog_resource/eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, + 'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, 'catalog_resource/eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class, 'catalog/resource_eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class, 'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, 'catalog/resource_eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, - 'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, 'catalog/resource_eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, + 'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, 'catalog/resource_eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class, 'catalog_resource/eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class, - 'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, 'catalog/resource_eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, + 'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, 'catalog_resource/eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class, 'catalog/resource_eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class, 'catalog_resource/eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class, 'catalog/resource_eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class, 'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, 'catalog/resource_eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, - 'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, 'catalog_resource/eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, - 'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, + 'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, 'catalog/resource_eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, - 'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, + 'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, 'catalog/resource_eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, - 'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, + 'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, 'catalog/resource_eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, + 'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, 'catalog/resource_eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class, 'catalog_resource/eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class, - 'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, 'catalog_resource/eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, - 'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, + 'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, 'catalog/resource_eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, - 'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, + 'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, 'catalog/resource_eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, + 'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, 'catalog_resource/eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, + 'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, 'catalog/resource_eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class, 'catalog_resource/eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class, 'catalog/resource_eav_mysql4_sendfriend' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend::class, @@ -16791,98 +16749,98 @@ 'catalog/resource_eav_mysql4_sendfriend_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection::class, 'catalog_resource/eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class, 'catalog/resource_eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class, - 'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, 'catalog/resource_eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, + 'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, 'catalog/resource_helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, 'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, 'catalog_resource/layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class, 'catalog/resource_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class, 'catalog/resource_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class, 'catalog_resource/layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class, - 'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, 'catalog/resource_layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, - 'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class, + 'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, 'catalog_resource/product' => \Mage_Catalog_Model_Resource_Product::class, + 'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class, 'catalog/resource_product_action' => \Mage_Catalog_Model_Resource_Product_Action::class, 'catalog_resource/product_action' => \Mage_Catalog_Model_Resource_Product_Action::class, - 'catalog_resource/product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class, 'catalog/resource_product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class, + 'catalog_resource/product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class, 'catalog/resource_product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class, 'catalog_resource/product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class, 'catalog/resource_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class, 'catalog_resource/product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class, - 'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, 'catalog/resource_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, + 'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, 'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, 'catalog_resource/product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, 'catalog/resource_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class, - 'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, 'catalog_resource/product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, + 'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, 'catalog/resource_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, 'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, - 'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, - 'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, + 'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, + 'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, 'catalog_resource/product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class, 'catalog/resource_product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class, - 'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, 'catalog/resource_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, + 'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, 'catalog/resource_product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class, 'catalog_resource/product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class, - 'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, 'catalog/resource_product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, + 'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, 'catalog/resource_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class, 'catalog_resource/product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class, - 'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, 'catalog_resource/product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, - 'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, + 'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, 'catalog/resource_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, + 'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, 'catalog/resource_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class, 'catalog_resource/product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class, - 'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, 'catalog_resource/product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, - 'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, + 'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, 'catalog_resource/product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, - 'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, + 'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, 'catalog_resource/product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, + 'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, 'catalog/resource_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class, 'catalog_resource/product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class, 'catalog_resource/product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class, 'catalog/resource_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class, - 'catalog/resource_product_link' => \Mage_Catalog_Model_Resource_Product_Link::class, 'catalog_resource/product_link' => \Mage_Catalog_Model_Resource_Product_Link::class, + 'catalog/resource_product_link' => \Mage_Catalog_Model_Resource_Product_Link::class, 'catalog/resource_product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class, 'catalog_resource/product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class, - 'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, 'catalog/resource_product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, - 'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, + 'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, 'catalog_resource/product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, - 'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, + 'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, 'catalog/resource_product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, - 'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, + 'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, 'catalog_resource/product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, - 'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, + 'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, 'catalog_resource/product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, + 'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, 'catalog_resource/product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class, 'catalog/resource_product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class, 'catalog_resource/product_status' => \Mage_Catalog_Model_Resource_Product_Status::class, 'catalog/resource_product_status' => \Mage_Catalog_Model_Resource_Product_Status::class, 'catalog_resource/product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class, 'catalog/resource_product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class, - 'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, 'catalog/resource_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, - 'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, + 'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, 'catalog_resource/product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, + 'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, 'catalog_resource/product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class, 'catalog/resource_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class, - 'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, 'catalog_resource/product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, + 'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, 'catalog/resource_setup' => \Mage_Catalog_Model_Resource_Setup::class, 'catalog_resource/setup' => \Mage_Catalog_Model_Resource_Setup::class, - 'catalog/resource_url' => \Mage_Catalog_Model_Resource_Url::class, 'catalog_resource/url' => \Mage_Catalog_Model_Resource_Url::class, + 'catalog/resource_url' => \Mage_Catalog_Model_Resource_Url::class, 'catalog/session' => \Mage_Catalog_Model_Session::class, 'catalog/system_config_backend_catalog_category_flat' => \Mage_Catalog_Model_System_Config_Backend_Catalog_Category_Flat::class, 'catalog/system_config_backend_catalog_product_flat' => \Mage_Catalog_Model_System_Config_Backend_Catalog_Product_Flat::class, @@ -16924,12 +16882,12 @@ 'checkout/observer' => \Mage_Checkout_Model_Observer::class, 'checkout_resource/agreement' => \Mage_Checkout_Model_Resource_Agreement::class, 'checkout/resource_agreement' => \Mage_Checkout_Model_Resource_Agreement::class, - 'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, 'checkout/resource_agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, - 'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class, + 'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, 'checkout_resource/cart' => \Mage_Checkout_Model_Resource_Cart::class, - 'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class, + 'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class, 'checkout/resource_setup' => \Mage_Checkout_Model_Resource_Setup::class, + 'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class, 'checkout/session' => \Mage_Checkout_Model_Session::class, 'checkout/type_abstract' => \Mage_Checkout_Model_Type_Abstract::class, 'checkout/type_multishipping' => \Mage_Checkout_Model_Type_Multishipping::class, @@ -16944,25 +16902,25 @@ 'cms/mysql4_page_service' => \Mage_Cms_Model_Mysql4_Page_Service::class, 'cms/observer' => \Mage_Cms_Model_Observer::class, 'cms/page' => \Mage_Cms_Model_Page::class, - 'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class, 'cms/resource_block' => \Mage_Cms_Model_Resource_Block::class, + 'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class, 'cms_resource/block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class, 'cms/resource_block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class, 'cms/resource_page' => \Mage_Cms_Model_Resource_Page::class, 'cms_resource/page' => \Mage_Cms_Model_Resource_Page::class, 'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, 'cms_resource/page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, - 'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class, 'cms/resource_page_service' => \Mage_Cms_Model_Resource_Page_Service::class, + 'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class, 'cms/template_filter' => \Mage_Cms_Model_Template_Filter::class, 'cms/wysiwyg_config' => \Mage_Cms_Model_Wysiwyg_Config::class, 'cms/wysiwyg_images_storage' => \Mage_Cms_Model_Wysiwyg_Images_Storage::class, 'cms/wysiwyg_images_storage_collection' => \Mage_Cms_Model_Wysiwyg_Images_Storage_Collection::class, 'configurableswatches/observer' => \Mage_ConfigurableSwatches_Model_Observer::class, - 'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, 'configurableswatches_resource/catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, - 'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, + 'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, 'configurableswatches_resource/catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, + 'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, 'configurableswatches_resource/catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class, 'configurableswatches/resource_catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class, 'configurableswatches/system_config_source_catalog_product_configattribute' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute::class, @@ -17069,152 +17027,152 @@ 'core/mysql4_website_collection' => \Mage_Core_Model_Mysql4_Website_Collection::class, 'core/observer' => \Mage_Core_Model_Observer::class, 'core/resource' => \Mage_Core_Model_Resource::class, + 'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, 'core_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, 'core/resource_abstract' => \Mage_Core_Model_Resource_Abstract::class, - 'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, + 'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class, 'core/resource_cache' => \Mage_Core_Model_Resource_Cache::class, 'core_resource/cache' => \Mage_Core_Model_Resource_Cache::class, - 'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class, + 'core/resource_config' => \Mage_Core_Model_Resource_Config::class, 'core_resource/config' => \Mage_Core_Model_Resource_Config::class, 'payment_resource/config' => \Mage_Core_Model_Resource_Config::class, - 'core/resource_config' => \Mage_Core_Model_Resource_Config::class, - 'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, 'core/resource_config_data' => \Mage_Core_Model_Resource_Config_Data::class, + 'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, 'payment_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, - 'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'core_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, + 'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, - 'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, - 'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, 'payment_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, + 'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, + 'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, 'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, - 'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, 'core/resource_db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, - 'core/resource_design' => \Mage_Core_Model_Resource_Design::class, + 'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, 'core_resource/design' => \Mage_Core_Model_Resource_Design::class, + 'core/resource_design' => \Mage_Core_Model_Resource_Design::class, 'payment_resource/design' => \Mage_Core_Model_Resource_Design::class, 'payment_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, - 'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, 'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, - 'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, + 'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, 'payment_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, 'core/resource_design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, - 'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, - 'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, + 'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, 'core/resource_email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, - 'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, - 'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, + 'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, + 'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, 'payment_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, - 'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, + 'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, + 'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, 'core/resource_email_template' => \Mage_Core_Model_Resource_Email_Template::class, + 'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, 'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, - 'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, 'core/resource_email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, + 'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, 'core_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, 'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, 'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, 'core_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, - 'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, - 'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, 'core_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, 'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, - 'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, 'payment_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, + 'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, + 'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, 'payment_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, 'core/resource_file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, - 'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, - 'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, 'core/resource_file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, + 'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, 'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, - 'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, - 'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, 'core/resource_file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, - 'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class, + 'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, + 'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, 'payment_resource/flag' => \Mage_Core_Model_Resource_Flag::class, + 'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class, 'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class, 'payment_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, - 'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, 'core_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, - 'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, + 'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, 'core/resource_helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, + 'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, 'core_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, - 'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, - 'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, 'core/resource_iterator' => \Mage_Core_Model_Resource_Iterator::class, + 'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, + 'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, 'payment_resource/language' => \Mage_Core_Model_Resource_Language::class, - 'core/resource_language' => \Mage_Core_Model_Resource_Language::class, 'core_resource/language' => \Mage_Core_Model_Resource_Language::class, + 'core/resource_language' => \Mage_Core_Model_Resource_Language::class, 'payment_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, - 'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, 'core/resource_language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, - 'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class, + 'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, 'core_resource/layout' => \Mage_Core_Model_Resource_Layout::class, 'core/resource_layout' => \Mage_Core_Model_Resource_Layout::class, - 'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class, + 'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class, 'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class, 'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class, + 'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class, + 'core/resource_session' => \Mage_Core_Model_Resource_Session::class, 'payment_resource/session' => \Mage_Core_Model_Resource_Session::class, 'core_resource/session' => \Mage_Core_Model_Resource_Session::class, - 'core/resource_session' => \Mage_Core_Model_Resource_Session::class, 'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class, 'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class, 'payment_resource/setup' => \Mage_Core_Model_Resource_Setup::class, - 'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core/resource_setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, - 'payment_resource/store' => \Mage_Core_Model_Resource_Store::class, - 'core_resource/store' => \Mage_Core_Model_Resource_Store::class, + 'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core/resource_store' => \Mage_Core_Model_Resource_Store::class, - 'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, + 'core_resource/store' => \Mage_Core_Model_Resource_Store::class, + 'payment_resource/store' => \Mage_Core_Model_Resource_Store::class, 'core/resource_store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, 'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, - 'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, + 'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, 'core/resource_store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'payment_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, - 'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, - 'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, + 'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'payment_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, - 'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, - 'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class, + 'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, + 'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, 'core_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, - 'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class, + 'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class, + 'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, 'core_resource/translate' => \Mage_Core_Model_Resource_Translate::class, + 'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class, 'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class, - 'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, - 'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class, 'payment_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, - 'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class, + 'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, 'core/resource_type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, 'payment_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, - 'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'core/resource_type_db' => \Mage_Core_Model_Resource_Type_Db::class, + 'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, - 'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, - 'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, 'core_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, - 'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, - 'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, + 'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, 'payment_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, 'payment_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, - 'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, 'core_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, + 'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, 'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, 'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, 'payment_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, - 'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, - 'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'core_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, + 'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, + 'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'core_resource/variable' => \Mage_Core_Model_Resource_Variable::class, - 'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class, 'core/resource_variable' => \Mage_Core_Model_Resource_Variable::class, + 'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class, 'core/resource_variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, - 'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, 'core_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, - 'core_resource/website' => \Mage_Core_Model_Resource_Website::class, + 'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, 'payment_resource/website' => \Mage_Core_Model_Resource_Website::class, + 'core_resource/website' => \Mage_Core_Model_Resource_Website::class, 'core/resource_website' => \Mage_Core_Model_Resource_Website::class, - 'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core/resource_website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, + 'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core/session' => \Mage_Core_Model_Session::class, 'core/session_abstract' => \Mage_Core_Model_Session_Abstract::class, @@ -17244,10 +17202,10 @@ 'cron/mysql4_schedule' => \Mage_Cron_Model_Mysql4_Schedule::class, 'cron/mysql4_schedule_collection' => \Mage_Cron_Model_Mysql4_Schedule_Collection::class, 'cron/observer' => \Mage_Cron_Model_Observer::class, - 'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class, 'cron/resource_schedule' => \Mage_Cron_Model_Resource_Schedule::class, - 'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, + 'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class, 'cron/resource_schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, + 'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, 'cron/schedule' => \Mage_Cron_Model_Schedule::class, 'currencysymbol/observer' => \Mage_CurrencySymbol_Model_Observer::class, 'currencysymbol/system_currencysymbol' => \Mage_CurrencySymbol_Model_System_Currencysymbol::class, @@ -17324,14 +17282,14 @@ 'customer_resource/address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class, 'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, 'customer_resource/address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, - 'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, 'customer/resource_address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, - 'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, + 'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, 'customer/resource_address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, - 'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, + 'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, 'customer_resource/address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, - 'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, + 'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, 'customer_resource/address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, + 'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, 'customer/resource_attribute' => \Mage_Customer_Model_Resource_Attribute::class, 'customer_resource/attribute' => \Mage_Customer_Model_Resource_Attribute::class, 'customer_resource/attribute_collection' => \Mage_Customer_Model_Resource_Attribute_Collection::class, @@ -17340,20 +17298,20 @@ 'customer_resource/customer' => \Mage_Customer_Model_Resource_Customer::class, 'customer_resource/customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class, 'customer/resource_customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class, - 'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, 'customer/resource_flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, - 'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, + 'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, 'customer/resource_flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, - 'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, + 'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, 'customer/resource_form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, + 'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, 'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, 'customer/resource_form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, 'customer/resource_group' => \Mage_Customer_Model_Resource_Group::class, 'customer_resource/group' => \Mage_Customer_Model_Resource_Group::class, 'customer_resource/group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class, 'customer/resource_group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class, - 'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class, 'customer_resource/setup' => \Mage_Customer_Model_Resource_Setup::class, + 'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class, 'customer_resource/wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, 'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, 'customer/session' => \Mage_Customer_Model_Session::class, @@ -17407,10 +17365,10 @@ 'dataflow/mysql4_session' => \Mage_Dataflow_Model_Mysql4_Session::class, 'dataflow/profile' => \Mage_Dataflow_Model_Profile::class, 'dataflow/profile_history' => \Mage_Dataflow_Model_Profile_History::class, - 'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class, 'dataflow/resource_batch' => \Mage_Dataflow_Model_Resource_Batch::class, - 'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, + 'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class, 'dataflow/resource_batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, + 'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, 'dataflow/resource_batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class, 'dataflow_resource/batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class, 'dataflow_resource/batch_export' => \Mage_Dataflow_Model_Resource_Batch_Export::class, @@ -17425,12 +17383,12 @@ 'dataflow/resource_profile' => \Mage_Dataflow_Model_Resource_Profile::class, 'dataflow/resource_profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class, 'dataflow_resource/profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class, - 'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, 'dataflow_resource/profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, + 'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, 'dataflow_resource/profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class, 'dataflow/resource_profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class, - 'dataflow/resource_session' => \Mage_Dataflow_Model_Resource_Session::class, 'dataflow_resource/session' => \Mage_Dataflow_Model_Resource_Session::class, + 'dataflow/resource_session' => \Mage_Dataflow_Model_Resource_Session::class, 'dataflow/session' => \Mage_Dataflow_Model_Session::class, 'dataflow/session_adapter_http' => \Mage_Dataflow_Model_Session_Adapter_Http::class, 'dataflow/session_parser_csv' => \Mage_Dataflow_Model_Session_Parser_Csv::class, @@ -17460,18 +17418,18 @@ 'directory/resource_country' => \Mage_Directory_Model_Resource_Country::class, 'directory_resource/country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class, 'directory/resource_country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class, - 'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class, 'directory/resource_country_format' => \Mage_Directory_Model_Resource_Country_Format::class, + 'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class, 'directory_resource/country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class, 'directory/resource_country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class, 'directory_resource/currency' => \Mage_Directory_Model_Resource_Currency::class, 'directory/resource_currency' => \Mage_Directory_Model_Resource_Currency::class, - 'directory/resource_currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class, 'directory_resource/currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class, + 'directory/resource_currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class, 'directory/resource_region' => \Mage_Directory_Model_Resource_Region::class, 'directory_resource/region' => \Mage_Directory_Model_Resource_Region::class, - 'directory/resource_region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class, 'directory_resource/region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class, + 'directory/resource_region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class, 'downloadable/catalogIndex_data_downloadable' => \Mage_Downloadable_Model_CatalogIndex_Data_Downloadable::class, 'downloadable/link' => \Mage_Downloadable_Model_Link::class, 'downloadable/link_api' => \Mage_Downloadable_Model_Link_Api::class, @@ -17492,8 +17450,8 @@ 'downloadable/observer' => \Mage_Downloadable_Model_Observer::class, 'downloadable/product_price' => \Mage_Downloadable_Model_Product_Price::class, 'downloadable/product_type' => \Mage_Downloadable_Model_Product_Type::class, - 'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, 'downloadable_resource/indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, + 'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, 'downloadable/resource_link' => \Mage_Downloadable_Model_Resource_Link::class, 'downloadable_resource/link' => \Mage_Downloadable_Model_Resource_Link::class, 'downloadable/resource_link_collection' => \Mage_Downloadable_Model_Resource_Link_Collection::class, @@ -17502,14 +17460,14 @@ 'downloadable_resource/link_purchased' => \Mage_Downloadable_Model_Resource_Link_Purchased::class, 'downloadable/resource_link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class, 'downloadable_resource/link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class, - 'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, 'downloadable/resource_link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, - 'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, + 'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, 'downloadable/resource_link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, - 'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class, + 'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, 'downloadable/resource_sample' => \Mage_Downloadable_Model_Resource_Sample::class, - 'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, + 'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class, 'downloadable/resource_sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, + 'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, 'downloadable/sales_order_pdf_items_abstract' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Abstract::class, 'downloadable/sales_order_pdf_items_creditmemo' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Creditmemo::class, 'downloadable/sales_order_pdf_items_invoice' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Invoice::class, @@ -17591,8 +17549,8 @@ 'eav/mysql4_form_fieldset_collection' => \Mage_Eav_Model_Mysql4_Form_Fieldset_Collection::class, 'eav/mysql4_form_type' => \Mage_Eav_Model_Mysql4_Form_Type::class, 'eav/mysql4_form_type_collection' => \Mage_Eav_Model_Mysql4_Form_Type_Collection::class, - 'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class, 'eav_resource/attribute' => \Mage_Eav_Model_Resource_Attribute::class, + 'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class, 'eav_resource/attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class, 'eav/resource_attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class, 'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class, @@ -17609,28 +17567,28 @@ 'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class, 'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, 'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, - 'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, 'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, - 'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, + 'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, 'eav_resource/entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, + 'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, 'eav_resource/entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class, 'eav/resource_entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class, 'eav_resource/entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class, 'eav/resource_entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class, - 'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, 'eav_resource/entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, + 'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, 'eav/resource_form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class, 'eav_resource/form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class, - 'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, 'eav/resource_form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, + 'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, 'eav/resource_form_element' => \Mage_Eav_Model_Resource_Form_Element::class, 'eav_resource/form_element' => \Mage_Eav_Model_Resource_Form_Element::class, - 'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, 'eav_resource/form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, - 'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, + 'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, 'eav/resource_form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, - 'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, + 'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, 'eav_resource/form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, + 'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, 'eav/resource_form_type' => \Mage_Eav_Model_Resource_Form_Type::class, 'eav_resource/form_type' => \Mage_Eav_Model_Resource_Form_Type::class, 'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class, @@ -17646,12 +17604,12 @@ 'giftmessage/mysql4_message_collection' => \Mage_GiftMessage_Model_Mysql4_Message_Collection::class, 'giftmessage/mysql4_setup' => \Mage_GiftMessage_Model_Mysql4_Setup::class, 'giftmessage/observer' => \Mage_GiftMessage_Model_Observer::class, - 'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class, 'giftmessage/resource_message' => \Mage_GiftMessage_Model_Resource_Message::class, - 'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, + 'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class, 'giftmessage_resource/message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, - 'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class, + 'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, 'giftmessage_resource/setup' => \Mage_GiftMessage_Model_Resource_Setup::class, + 'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class, 'googleanalytics/observer' => \Mage_GoogleAnalytics_Model_Observer::class, 'googleanalytics/system_config_source_type' => \Mage_GoogleAnalytics_Model_System_Config_Source_Type::class, 'googlecheckout/payment' => \Mage_GoogleCheckout_Model_Payment::class, @@ -17687,8 +17645,8 @@ 'importexport/product_attribute_backend_urlkey' => \Mage_ImportExport_Model_Product_Attribute_Backend_Urlkey::class, 'importexport_resource/helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class, 'importexport/resource_helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class, - 'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, 'importexport_resource/import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, + 'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, 'importexport_resource/setup' => \Mage_ImportExport_Model_Resource_Setup::class, 'importexport/resource_setup' => \Mage_ImportExport_Model_Resource_Setup::class, 'importexport/source_export_entity' => \Mage_ImportExport_Model_Source_Export_Entity::class, @@ -17710,16 +17668,16 @@ 'index/process' => \Mage_Index_Model_Process::class, 'index_resource/abstract' => \Mage_Index_Model_Resource_Abstract::class, 'index/resource_abstract' => \Mage_Index_Model_Resource_Abstract::class, - 'index/resource_event' => \Mage_Index_Model_Resource_Event::class, 'index_resource/event' => \Mage_Index_Model_Resource_Event::class, + 'index/resource_event' => \Mage_Index_Model_Resource_Event::class, 'index/resource_event_collection' => \Mage_Index_Model_Resource_Event_Collection::class, 'index_resource/event_collection' => \Mage_Index_Model_Resource_Event_Collection::class, 'index/resource_helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class, 'index_resource/helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class, - 'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, 'index/resource_lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, - 'index_resource/process' => \Mage_Index_Model_Resource_Process::class, + 'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, 'index/resource_process' => \Mage_Index_Model_Resource_Process::class, + 'index_resource/process' => \Mage_Index_Model_Resource_Process::class, 'index/resource_process_collection' => \Mage_Index_Model_Resource_Process_Collection::class, 'index_resource/process_collection' => \Mage_Index_Model_Resource_Process_Collection::class, 'index/resource_setup' => \Mage_Index_Model_Resource_Setup::class, @@ -17752,22 +17710,22 @@ 'log/mysql4_visitor_online_collection' => \Mage_Log_Model_Mysql4_Visitor_Online_Collection::class, 'log_resource/aggregation' => \Mage_Log_Model_Resource_Aggregation::class, 'log/resource_aggregation' => \Mage_Log_Model_Resource_Aggregation::class, - 'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class, 'log/resource_customer' => \Mage_Log_Model_Resource_Customer::class, + 'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class, 'log/resource_log' => \Mage_Log_Model_Resource_Log::class, 'log_resource/log' => \Mage_Log_Model_Resource_Log::class, 'log_resource/visitor' => \Mage_Log_Model_Resource_Visitor::class, 'log/resource_visitor' => \Mage_Log_Model_Resource_Visitor::class, 'log_resource/visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class, 'log/resource_visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class, - 'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, 'log_resource/visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, - 'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, + 'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, 'log_resource/visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, + 'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, 'log/visitor' => \Mage_Log_Model_Visitor::class, 'log/visitor_online' => \Mage_Log_Model_Visitor_Online::class, - 'media_resource/image' => \Mage_Media_Model_File_Image::class, 'media/file_image' => \Mage_Media_Model_File_Image::class, + 'media_resource/image' => \Mage_Media_Model_File_Image::class, 'media/image' => \Mage_Media_Model_Image::class, 'newsletter/message' => \Mage_Newsletter_Model_Message::class, 'newsletter/mysql4_problem' => \Mage_Newsletter_Model_Mysql4_Problem::class, @@ -17785,14 +17743,14 @@ 'newsletter_resource/problem' => \Mage_Newsletter_Model_Resource_Problem::class, 'newsletter/resource_problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class, 'newsletter_resource/problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class, - 'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class, 'newsletter/resource_queue' => \Mage_Newsletter_Model_Resource_Queue::class, - 'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, + 'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class, 'newsletter/resource_queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, - 'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, + 'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, 'newsletter/resource_subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, - 'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, + 'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, 'newsletter/resource_subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, + 'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, 'newsletter_resource/template' => \Mage_Newsletter_Model_Resource_Template::class, 'newsletter/resource_template' => \Mage_Newsletter_Model_Resource_Template::class, 'newsletter_resource/template_collection' => \Mage_Newsletter_Model_Resource_Template_Collection::class, @@ -17805,20 +17763,20 @@ 'oauth/consumer_validator_keyLength' => \Mage_Oauth_Model_Consumer_Validator_KeyLength::class, 'oauth/nonce' => \Mage_Oauth_Model_Nonce::class, 'oauth/observer' => \Mage_Oauth_Model_Observer::class, - 'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class, 'oauth/resource_consumer' => \Mage_Oauth_Model_Resource_Consumer::class, + 'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class, 'oauth/resource_consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class, 'oauth_resource/consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class, 'oauth_resource/nonce' => \Mage_Oauth_Model_Resource_Nonce::class, 'oauth/resource_nonce' => \Mage_Oauth_Model_Resource_Nonce::class, 'oauth_resource/nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class, 'oauth/resource_nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class, - 'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class, 'oauth/resource_setup' => \Mage_Oauth_Model_Resource_Setup::class, + 'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class, 'oauth_resource/token' => \Mage_Oauth_Model_Resource_Token::class, 'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class, - 'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, + 'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth/server' => \Mage_Oauth_Model_Server::class, 'oauth/token' => \Mage_Oauth_Model_Token::class, 'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class, @@ -17835,8 +17793,8 @@ 'paygate/authorizenet_source_paymentAction' => \Mage_Paygate_Model_Authorizenet_Source_PaymentAction::class, 'paygate/mysql4_authorizenet_debug' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug::class, 'paygate/mysql4_authorizenet_debug_collection' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection::class, - 'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, 'paygate/resource_authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, + 'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, 'paygate_resource/authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class, 'paygate/resource_authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class, 'payment/billing_agreementAbstract' => \Mage_Payment_Model_Billing_AgreementAbstract::class, @@ -17899,14 +17857,14 @@ 'paypal/resource_cert' => \Mage_Paypal_Model_Resource_Cert::class, 'paypal_resource/payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class, 'paypal/resource_payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class, - 'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, 'paypal/resource_payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, + 'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, 'paypal/resource_report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class, 'paypal_resource/report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class, - 'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, 'paypal/resource_report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, - 'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, + 'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, 'paypal/resource_report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, + 'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, 'paypal/resource_setup' => \Mage_Paypal_Model_Resource_Setup::class, 'paypal_resource/setup' => \Mage_Paypal_Model_Resource_Setup::class, 'paypal/session' => \Mage_Paypal_Model_Session::class, @@ -17940,16 +17898,16 @@ 'poll/poll' => \Mage_Poll_Model_Poll::class, 'poll/poll_answer' => \Mage_Poll_Model_Poll_Answer::class, 'poll/poll_vote' => \Mage_Poll_Model_Poll_Vote::class, - 'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class, 'poll_resource/poll' => \Mage_Poll_Model_Resource_Poll::class, - 'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, + 'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class, 'poll/resource_poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, - 'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, + 'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, 'poll_resource/poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, - 'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, + 'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, 'poll_resource/poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, - 'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, + 'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, 'poll/resource_poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, + 'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, 'productalert/email' => \Mage_ProductAlert_Model_Email::class, 'productalert/mysql4_price' => \Mage_ProductAlert_Model_Mysql4_Price::class, 'productalert/mysql4_price_collection' => \Mage_ProductAlert_Model_Mysql4_Price_Collection::class, @@ -17959,20 +17917,20 @@ 'productalert/mysql4_stock_customer_collection' => \Mage_ProductAlert_Model_Mysql4_Stock_Customer_Collection::class, 'productalert/observer' => \Mage_ProductAlert_Model_Observer::class, 'productalert/price' => \Mage_ProductAlert_Model_Price::class, - 'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, 'productalert_resource/abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, - 'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class, + 'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, 'productalert_resource/price' => \Mage_ProductAlert_Model_Resource_Price::class, - 'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, + 'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class, 'productalert/resource_price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, - 'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, + 'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, 'productalert/resource_price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, - 'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class, + 'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, 'productalert/resource_stock' => \Mage_ProductAlert_Model_Resource_Stock::class, - 'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, + 'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class, 'productalert/resource_stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, - 'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, + 'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, 'productalert/resource_stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, + 'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, 'productalert/stock' => \Mage_ProductAlert_Model_Stock::class, 'rating/mysql4_rating' => \Mage_Rating_Model_Mysql4_Rating::class, 'rating/mysql4_rating_collection' => \Mage_Rating_Model_Mysql4_Rating_Collection::class, @@ -17986,20 +17944,20 @@ 'rating/rating_entity' => \Mage_Rating_Model_Rating_Entity::class, 'rating/rating_option' => \Mage_Rating_Model_Rating_Option::class, 'rating/rating_option_vote' => \Mage_Rating_Model_Rating_Option_Vote::class, - 'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class, 'rating/resource_rating' => \Mage_Rating_Model_Resource_Rating::class, + 'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class, 'rating_resource/rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class, 'rating/resource_rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class, 'rating/resource_rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class, 'rating_resource/rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class, - 'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, 'rating/resource_rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, - 'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, + 'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, 'rating_resource/rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, + 'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, 'rating_resource/rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class, 'rating/resource_rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class, - 'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, 'rating/resource_rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, + 'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, 'reports/config' => \Mage_Reports_Model_Config::class, 'reports/event' => \Mage_Reports_Model_Event::class, 'reports/event_observer' => \Mage_Reports_Model_Event_Observer::class, @@ -18045,6 +18003,7 @@ 'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class, 'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class, 'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class, + 'reports/observer' => \Mage_Reports_Model_Observer::class, 'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class, 'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class, 'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class, @@ -18053,52 +18012,52 @@ 'reports_resource/accounts_collection' => \Mage_Reports_Model_Resource_Accounts_Collection::class, 'reports/resource_coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class, 'reports_resource/coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class, - 'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, 'reports/resource_customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, - 'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, + 'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, 'reports/resource_customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, - 'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, + 'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, 'reports_resource/customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, - 'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, + 'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, 'reports/resource_entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, + 'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, 'reports_resource/event' => \Mage_Reports_Model_Resource_Event::class, 'reports/resource_event' => \Mage_Reports_Model_Resource_Event::class, - 'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, 'reports_resource/event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, - 'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class, + 'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, 'reports/resource_event_type' => \Mage_Reports_Model_Resource_Event_Type::class, - 'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, + 'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class, 'reports/resource_event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, - 'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, + 'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, 'reports_resource/helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, - 'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, + 'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, 'reports/resource_invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, - 'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, + 'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, 'reports_resource/order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, - 'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, + 'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, 'reports_resource/product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, + 'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, 'reports/resource_product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class, 'reports_resource/product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class, 'reports_resource/product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class, 'reports/resource_product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class, - 'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, 'reports/resource_product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, + 'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, 'reports_resource/product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class, 'reports/resource_product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class, - 'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, 'reports_resource/product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, + 'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, 'reports/resource_product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, 'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, 'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, 'reports_resource/product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, - 'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, 'reports/resource_product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, + 'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, 'reports_resource/product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class, 'reports/resource_product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class, - 'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, 'reports_resource/product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, - 'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, + 'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, 'reports_resource/product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, + 'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, 'reports/resource_quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, 'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, 'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class, @@ -18107,34 +18066,34 @@ 'reports_resource/report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class, 'reports/resource_report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class, 'reports_resource/report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class, - 'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, 'reports_resource/report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, + 'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, 'reports/resource_report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class, 'reports_resource/report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class, - 'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, 'reports/resource_report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, - 'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, + 'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, 'reports_resource/review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, - 'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, + 'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, 'reports_resource/review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, + 'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, 'reports_resource/review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class, 'reports/resource_review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class, 'reports_resource/shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class, 'reports/resource_shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class, - 'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, 'reports_resource/shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, + 'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, 'reports_resource/tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class, 'reports/resource_tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class, 'reports/resource_tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, 'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, 'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, 'reports/resource_tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, - 'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, 'reports/resource_tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, + 'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, 'reports_resource/wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class, 'reports/resource_wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class, - 'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, 'reports_resource/wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, + 'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, 'reports/session' => \Mage_Reports_Model_Session::class, 'reports/test' => \Mage_Reports_Model_Test::class, 'reports/totals' => \Mage_Reports_Model_Totals::class, @@ -18153,12 +18112,12 @@ 'review/resource_review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class, 'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class, 'review_resource/review_status' => \Mage_Review_Model_Resource_Review_Status::class, - 'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, 'review_resource/review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, + 'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, 'review/resource_review_summary' => \Mage_Review_Model_Resource_Review_Summary::class, 'review_resource/review_summary' => \Mage_Review_Model_Resource_Review_Summary::class, - 'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, 'review/resource_review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, + 'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, 'review/review' => \Mage_Review_Model_Review::class, 'review/review_status' => \Mage_Review_Model_Review_Status::class, 'review/review_summary' => \Mage_Review_Model_Review_Summary::class, @@ -18181,12 +18140,12 @@ 'rule/mysql4_rule_collection' => \Mage_Rule_Model_Mysql4_Rule_Collection::class, 'rule/renderer_actions' => \Mage_Rule_Model_Renderer_Actions::class, 'rule/renderer_conditions' => \Mage_Rule_Model_Renderer_Conditions::class, - 'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class, 'rule/resource_abstract' => \Mage_Rule_Model_Resource_Abstract::class, - 'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class, + 'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class, 'rule/resource_rule' => \Mage_Rule_Model_Resource_Rule::class, - 'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, + 'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class, 'rule_resource/rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, + 'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, 'rule_resource/rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, 'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, 'rule/resource_rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class, @@ -18213,28 +18172,28 @@ 'salesrule/quote_nominal_discount' => \Mage_SalesRule_Model_Quote_Nominal_Discount::class, 'salesrule_resource/coupon' => \Mage_SalesRule_Model_Resource_Coupon::class, 'salesrule/resource_coupon' => \Mage_SalesRule_Model_Resource_Coupon::class, - 'salesrule_resource/coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class, 'salesrule/resource_coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class, + 'salesrule_resource/coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class, 'salesrule/resource_coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class, 'salesrule_resource/coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class, - 'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, 'salesrule_resource/report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, - 'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, + 'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, 'salesrule_resource/report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, + 'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, 'salesrule_resource/report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class, 'salesrule/resource_report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class, 'salesrule_resource/report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class, 'salesrule/resource_report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class, 'salesrule_resource/report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class, 'salesrule/resource_report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class, - 'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class, 'salesrule_resource/rule' => \Mage_SalesRule_Model_Resource_Rule::class, - 'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, + 'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class, 'salesrule_resource/rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, - 'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, + 'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, 'salesrule_resource/rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, - 'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, + 'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, 'salesrule/resource_rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, + 'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, 'salesrule_resource/rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class, 'salesrule/resource_rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class, 'salesrule/resource_rule_product_collection' => \Mage_SalesRule_Model_Resource_Rule_Product_Collection::class, @@ -18279,14 +18238,14 @@ 'sales/email_template' => \Mage_Sales_Model_Email_Template::class, 'sales/entity_order' => \Mage_Sales_Model_Entity_Order::class, 'sales_entity/order' => \Mage_Sales_Model_Entity_Order::class, - 'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class, 'sales_entity/order_address' => \Mage_Sales_Model_Entity_Order_Address::class, - 'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, + 'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class, 'sales/entity_order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, - 'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, + 'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, 'sales_entity/order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, - 'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, + 'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, 'sales_entity/order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, + 'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, 'sales_entity/order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class, 'sales/entity_order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class, 'sales/entity_order_attribute_backend_shipping' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Shipping::class, @@ -18295,54 +18254,54 @@ 'sales/entity_order_collection' => \Mage_Sales_Model_Entity_Order_Collection::class, 'sales_entity/order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class, 'sales/entity_order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class, - 'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, 'sales_entity/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, - 'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, + 'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, 'sales/entity_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, - 'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, + 'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, 'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, + 'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, 'sales/entity_order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class, 'sales_entity/order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class, 'sales/entity_order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class, 'sales_entity/order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class, 'sales_entity/order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class, 'sales/entity_order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class, - 'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, 'sales/entity_order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, - 'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, + 'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, 'sales_entity/order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, + 'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, 'sales/entity_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class, 'sales_entity/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class, - 'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class, 'sales/entity_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class, + 'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class, 'sales/entity_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Order::class, 'sales_entity/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Order::class, 'sales_entity/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class, 'sales/entity_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class, 'sales/entity_order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class, 'sales_entity/order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class, - 'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, 'sales/entity_order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, + 'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, 'sales_entity/order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class, 'sales/entity_order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class, 'sales_entity/order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class, 'sales/entity_order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class, - 'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, 'sales/entity_order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, + 'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, 'sales/entity_order_item' => \Mage_Sales_Model_Entity_Order_Item::class, 'sales_entity/order_item' => \Mage_Sales_Model_Entity_Order_Item::class, 'sales/entity_order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class, 'sales_entity/order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class, - 'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, 'sales/entity_order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, + 'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, 'sales_entity/order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class, 'sales/entity_order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class, 'sales/entity_order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class, 'sales_entity/order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class, - 'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, 'sales_entity/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, - 'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, + 'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, 'sales/entity_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, + 'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, 'sales/entity_order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class, 'sales_entity/order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class, 'sales/entity_order_shipment_comment' => \Mage_Sales_Model_Entity_Order_Shipment_Comment::class, @@ -18351,66 +18310,66 @@ 'sales_entity/order_shipment_comment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Comment_Collection::class, 'sales_entity/order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class, 'sales/entity_order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class, - 'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, 'sales/entity_order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, - 'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, + 'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, 'sales_entity/order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, - 'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, + 'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, 'sales_entity/order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, - 'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, + 'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, 'sales_entity/order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, - 'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, + 'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, 'sales_entity/order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, + 'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, 'sales_entity/quote' => \Mage_Sales_Model_Entity_Quote::class, 'sales/entity_quote' => \Mage_Sales_Model_Entity_Quote::class, - 'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, 'sales_entity/quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, + 'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, 'sales_entity/quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class, 'sales/entity_quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class, - 'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, 'sales/entity_quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, - 'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, + 'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, 'sales/entity_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, - 'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, + 'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, 'sales_entity/quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, - 'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, + 'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, 'sales/entity_quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, + 'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, 'sales_entity/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales/entity_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales_entity/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class, 'sales/entity_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class, - 'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, 'sales_entity/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, - 'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, 'sales/entity_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/entity_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales_entity/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales/entity_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class, 'sales_entity/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class, 'sales_entity/quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class, 'sales/entity_quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class, - 'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, 'sales_entity/quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, - 'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, + 'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, 'sales/entity_quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, - 'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, + 'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, 'sales_entity/quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, + 'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, 'sales/entity_quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class, 'sales_entity/quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class, 'sales/entity_quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class, 'sales_entity/quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class, - 'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, 'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, - 'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, + 'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, 'sales/entity_quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, - 'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, + 'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, 'sales/entity_quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, + 'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, 'sales_entity/quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class, 'sales/entity_quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class, - 'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, 'sales_entity/sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, - 'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class, + 'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, 'sales_entity/setup' => \Mage_Sales_Model_Entity_Setup::class, + 'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class, 'sales/mysql4_abstract' => \Mage_Sales_Model_Mysql4_Abstract::class, 'sales/mysql4_billing_agreement' => \Mage_Sales_Model_Mysql4_Billing_Agreement::class, 'sales/mysql4_billing_agreement_collection' => \Mage_Sales_Model_Mysql4_Billing_Agreement_Collection::class, @@ -18605,50 +18564,50 @@ 'sales/recurring_profile' => \Mage_Sales_Model_Recurring_Profile::class, 'sales_resource/abstract' => \Mage_Sales_Model_Resource_Abstract::class, 'sales/resource_abstract' => \Mage_Sales_Model_Resource_Abstract::class, - 'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, 'sales_resource/billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, - 'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, + 'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, 'sales_resource/billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, + 'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, 'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, 'sales/resource_collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, 'sales_resource/helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, 'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, - 'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class, 'sales_resource/order' => \Mage_Sales_Model_Resource_Order::class, + 'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class, 'sales_resource/order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class, 'sales/resource_order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class, - 'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class, 'sales_resource/order_address' => \Mage_Sales_Model_Resource_Order_Address::class, + 'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class, 'sales/resource_order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class, 'sales_resource/order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class, 'sales/resource_order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class, 'sales_resource/order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class, 'sales/resource_order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class, 'sales_resource/order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class, - 'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, 'sales/resource_order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, + 'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, 'sales_resource/order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class, 'sales/resource_order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class, 'sales/resource_order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class, 'sales_resource/order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class, - 'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, 'sales/resource_order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, - 'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, + 'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, 'sales/resource_order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, - 'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, + 'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, 'sales/resource_order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, - 'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, + 'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, 'sales_resource/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, + 'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, 'sales/resource_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class, 'sales_resource/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class, - 'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, 'sales/resource_order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, - 'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, + 'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, 'sales_resource/order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, + 'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, 'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, 'sales/resource_order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, - 'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, 'sales/resource_order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, + 'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, 'sales_resource/order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class, 'sales/resource_order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class, 'sales_resource/order_creditmemo_item_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item_Collection::class, @@ -18657,138 +18616,138 @@ 'sales/resource_order_grid_collection' => \Mage_Sales_Model_Resource_Order_Grid_Collection::class, 'sales/resource_order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class, 'sales_resource/order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class, - 'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, 'sales/resource_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, - 'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, + 'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, 'sales_resource/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, + 'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, 'sales_resource/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class, 'sales/resource_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class, 'sales/resource_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class, 'sales_resource/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class, 'sales/resource_order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class, 'sales_resource/order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class, - 'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, 'sales/resource_order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, + 'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, 'sales/resource_order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class, 'sales_resource/order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class, - 'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, 'sales/resource_order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, - 'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, + 'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, 'sales_resource/order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, + 'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, 'sales/resource_order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class, 'sales_resource/order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class, - 'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class, 'sales_resource/order_item' => \Mage_Sales_Model_Resource_Order_Item::class, + 'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class, 'sales/resource_order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class, 'sales_resource/order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class, - 'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, 'sales_resource/order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, - 'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, + 'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, 'sales/resource_order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, + 'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, 'sales_resource/order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, 'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, - 'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, 'sales_resource/order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, - 'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, + 'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, 'sales_resource/order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, - 'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, + 'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, 'sales/resource_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, + 'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, 'sales_resource/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class, 'sales/resource_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class, 'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, 'sales/resource_order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, - 'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, 'sales/resource_order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, - 'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, + 'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, 'sales/resource_order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, + 'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, 'sales_resource/order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class, 'sales/resource_order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class, - 'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, 'sales_resource/order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, - 'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, + 'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, 'sales_resource/order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, - 'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, + 'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, 'sales_resource/order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, - 'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, + 'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, 'sales_resource/order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, + 'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, 'sales_resource/order_status' => \Mage_Sales_Model_Resource_Order_Status::class, 'sales/resource_order_status' => \Mage_Sales_Model_Resource_Order_Status::class, 'sales_resource/order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class, 'sales/resource_order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class, - 'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, 'sales_resource/order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, - 'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, + 'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, 'sales_resource/order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, - 'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, + 'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, 'sales/resource_order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, - 'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, + 'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, 'sales_resource/order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, - 'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class, + 'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, 'sales/resource_quote' => \Mage_Sales_Model_Resource_Quote::class, + 'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class, 'sales_resource/quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class, 'sales/resource_quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class, 'sales/resource_quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class, 'sales_resource/quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class, 'sales/resource_quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class, 'sales_resource/quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class, - 'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, 'sales/resource_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, + 'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, 'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, 'sales/resource_quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, - 'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, 'sales_resource/quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, + 'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, 'sales_resource/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales/resource_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales/resource_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class, 'sales_resource/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class, 'sales/resource_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class, 'sales_resource/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class, - 'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/resource_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, 'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales/resource_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, - 'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, 'sales_resource/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, - 'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, + 'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, 'sales/resource_quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, + 'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, 'sales_resource/quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class, 'sales/resource_quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class, - 'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, 'sales/resource_quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, - 'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, + 'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, 'sales_resource/quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, - 'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, + 'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, 'sales_resource/quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, + 'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, 'sales_resource/quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class, 'sales/resource_quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class, - 'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, 'sales/resource_quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, + 'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, 'sales/resource_quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class, 'sales_resource/quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class, - 'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, 'sales/resource_quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, - 'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, + 'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, 'sales/resource_quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, - 'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, + 'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, 'sales_resource/quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, - 'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, + 'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, 'sales/resource_quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, - 'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, + 'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, 'sales/resource_recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, + 'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, 'sales/resource_recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class, 'sales_resource/recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class, - 'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class, 'sales/resource_report' => \Mage_Sales_Model_Resource_Report::class, + 'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class, 'sales/resource_report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class, 'sales_resource/report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class, - 'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, 'sales/resource_report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, + 'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, 'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, 'sales/resource_report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, - 'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, 'sales_resource/report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, - 'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, + 'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, 'sales_resource/report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, + 'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, 'sales/resource_report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class, 'sales_resource/report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class, 'sales_resource/report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class, @@ -18801,24 +18760,24 @@ 'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class, 'sales_resource/report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class, 'sales/resource_report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class, - 'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, 'sales/resource_report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, - 'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, + 'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, 'sales_resource/report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, + 'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, 'sales_resource/report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class, 'sales/resource_report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class, 'sales_resource/report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class, 'sales/resource_report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class, - 'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, 'sales_resource/report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, + 'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, 'sales_resource/report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class, 'sales/resource_report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class, 'sales_resource/report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class, 'sales/resource_report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class, - 'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, 'sales/resource_sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, - 'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class, + 'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, 'sales/resource_setup' => \Mage_Sales_Model_Resource_Setup::class, + 'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class, 'sales/service_order' => \Mage_Sales_Model_Service_Order::class, 'sales/service_quote' => \Mage_Sales_Model_Service_Quote::class, 'sales/status_list' => \Mage_Sales_Model_Status_List::class, @@ -18828,8 +18787,8 @@ 'sendfriend/observer' => \Mage_Sendfriend_Model_Observer::class, 'sendfriend_resource/sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class, 'sendfriend/resource_sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class, - 'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, 'sendfriend/resource_sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, + 'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, 'sendfriend/resource_setup' => \Mage_Sendfriend_Model_Resource_Setup::class, 'sendfriend_resource/setup' => \Mage_Sendfriend_Model_Resource_Setup::class, 'sendfriend/sendfriend' => \Mage_Sendfriend_Model_Sendfriend::class, @@ -18848,8 +18807,8 @@ 'shipping/rate_result_abstract' => \Mage_Shipping_Model_Rate_Result_Abstract::class, 'shipping/rate_result_error' => \Mage_Shipping_Model_Rate_Result_Error::class, 'shipping/rate_result_method' => \Mage_Shipping_Model_Rate_Result_Method::class, - 'shipping/resource_carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class, 'shipping_resource/carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class, + 'shipping/resource_carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class, 'shipping/resource_carrier_tablerate_collection' => \Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection::class, 'shipping_resource/carrier_tablerate_collection' => \Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection::class, 'shipping/shipment_request' => \Mage_Shipping_Model_Shipment_Request::class, @@ -18869,16 +18828,16 @@ 'sitemap/observer' => \Mage_Sitemap_Model_Observer::class, 'sitemap_resource/catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class, 'sitemap/resource_catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class, - 'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, 'sitemap/resource_catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, - 'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, + 'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, 'sitemap_resource/catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, - 'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, + 'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, 'sitemap_resource/cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, + 'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, 'sitemap_resource/sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class, 'sitemap/resource_sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class, - 'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, 'sitemap_resource/sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, + 'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, 'sitemap/sitemap' => \Mage_Sitemap_Model_Sitemap::class, 'tag/api' => \Mage_Tag_Model_Api::class, 'tag/api_v2' => \Mage_Tag_Model_Api_V2::class, @@ -18891,21 +18850,21 @@ 'tag/mysql4_tag' => \Mage_Tag_Model_Mysql4_Tag::class, 'tag/mysql4_tag_collection' => \Mage_Tag_Model_Mysql4_Tag_Collection::class, 'tag/mysql4_tag_relation' => \Mage_Tag_Model_Mysql4_Tag_Relation::class, - 'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag/resource_customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag_resource/customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, - 'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, + 'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag_resource/indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, - 'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, + 'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, 'tag_resource/popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, + 'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, 'tag_resource/product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class, 'tag/resource_product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class, 'tag_resource/tag' => \Mage_Tag_Model_Resource_Tag::class, 'tag/resource_tag' => \Mage_Tag_Model_Resource_Tag::class, - 'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, 'tag_resource/tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, - 'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, + 'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, 'tag_resource/tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, + 'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, 'tag/session' => \Mage_Tag_Model_Session::class, 'tag/tag' => \Mage_Tag_Model_Tag::class, 'tag/tag_relation' => \Mage_Tag_Model_Tag_Relation::class, @@ -18944,16 +18903,16 @@ 'tax/resource_calculation_rate' => \Mage_Tax_Model_Resource_Calculation_Rate::class, 'tax/resource_calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class, 'tax_resource/calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class, - 'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, 'tax/resource_calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, - 'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, + 'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, 'tax/resource_calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, - 'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, + 'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, 'tax/resource_calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, - 'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, + 'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, 'tax_resource/calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, - 'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class, + 'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, 'tax/resource_class' => \Mage_Tax_Model_Resource_Class::class, + 'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class, 'tax/resource_class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class, 'tax_resource/class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class, 'tax_resource/report_collection' => \Mage_Tax_Model_Resource_Report_Collection::class, @@ -18964,16 +18923,16 @@ 'tax/resource_report_tax_createdat' => \Mage_Tax_Model_Resource_Report_Tax_Createdat::class, 'tax_resource/report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class, 'tax/resource_report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class, - 'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, 'tax/resource_report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, - 'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, + 'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, 'tax_resource/sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, + 'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, 'tax_resource/sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class, 'tax/resource_sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class, - 'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class, 'tax/resource_sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class, - 'tax_resource/sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class, + 'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class, 'tax/resource_sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class, + 'tax_resource/sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class, 'tax/resource_setup' => \Mage_Tax_Model_Resource_Setup::class, 'tax_resource/setup' => \Mage_Tax_Model_Resource_Setup::class, 'tax/sales_order_tax' => \Mage_Tax_Model_Sales_Order_Tax::class, @@ -19056,10 +19015,10 @@ 'weee/observer' => \Mage_Weee_Model_Observer::class, 'weee/resource_attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class, 'weee_resource/attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class, - 'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class, 'weee/resource_setup' => \Mage_Weee_Model_Resource_Setup::class, - 'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class, + 'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class, 'weee/resource_tax' => \Mage_Weee_Model_Resource_Tax::class, + 'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class, 'weee/tax' => \Mage_Weee_Model_Tax::class, 'weee/total_creditmemo_weee' => \Mage_Weee_Model_Total_Creditmemo_Weee::class, 'weee/total_invoice_weee' => \Mage_Weee_Model_Total_Invoice_Weee::class, @@ -19069,12 +19028,12 @@ 'widget/mysql4_widget_instance' => \Mage_Widget_Model_Mysql4_Widget_Instance::class, 'widget/mysql4_widget_instance_collection' => \Mage_Widget_Model_Mysql4_Widget_Instance_Collection::class, 'widget/observer' => \Mage_Widget_Model_Observer::class, - 'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class, 'widget/resource_widget' => \Mage_Widget_Model_Resource_Widget::class, + 'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class, 'widget_resource/widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class, 'widget/resource_widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class, - 'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, 'widget_resource/widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, + 'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, 'widget/template_filter' => \Mage_Widget_Model_Template_Filter::class, 'widget/widget' => \Mage_Widget_Model_Widget::class, 'widget/widget_config' => \Mage_Widget_Model_Widget_Config::class, @@ -19091,14 +19050,14 @@ 'wishlist/mysql4_wishlist' => \Mage_Wishlist_Model_Mysql4_Wishlist::class, 'wishlist/mysql4_wishlist_collection' => \Mage_Wishlist_Model_Mysql4_Wishlist_Collection::class, 'wishlist/observer' => \Mage_Wishlist_Model_Observer::class, - 'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class, 'wishlist_resource/item' => \Mage_Wishlist_Model_Resource_Item::class, + 'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class, 'wishlist_resource/item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class, 'wishlist/resource_item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class, 'wishlist/resource_item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, 'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, - 'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, 'wishlist_resource/item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, + 'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, 'wishlist_resource/product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class, 'wishlist/resource_product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class, 'wishlist/resource_wishlist' => \Mage_Wishlist_Model_Resource_Wishlist::class, @@ -19107,7 +19066,6 @@ 'wishlist/resource_wishlist_collection' => \Mage_Wishlist_Model_Resource_Wishlist_Collection::class, 'wishlist/session' => \Mage_Wishlist_Model_Session::class, 'wishlist/wishlist' => \Mage_Wishlist_Model_Wishlist::class, - 'varien/autoload' => \Varien_Autoload::class, ]) ); override( \Mage_SalesRule_Model_Validator::_getSingleton(0), @@ -19117,11 +19075,10 @@ 'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class, 'adminnotification/mysql4_inbox_collection' => \Mage_AdminNotification_Model_Mysql4_Inbox_Collection::class, 'adminnotification/observer' => \Mage_AdminNotification_Model_Observer::class, - 'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, 'adminnotification/resource_inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, - 'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, + 'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, 'adminnotification/resource_inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, - 'adminnotification/survey' => \Mage_AdminNotification_Model_Survey::class, + 'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, 'admin/acl' => \Mage_Admin_Model_Acl::class, 'admin/acl_assert_ip' => \Mage_Admin_Model_Acl_Assert_Ip::class, 'admin/acl_assert_time' => \Mage_Admin_Model_Acl_Assert_Time::class, @@ -19150,38 +19107,38 @@ 'admin/redirectpolicy' => \Mage_Admin_Model_Redirectpolicy::class, 'admin/resource_acl' => \Mage_Admin_Model_Resource_Acl::class, 'admin_resource/acl' => \Mage_Admin_Model_Resource_Acl::class, - 'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, 'admin/resource_acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, + 'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, 'admin/resource_acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class, 'admin_resource/acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class, - 'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class, 'admin/resource_block' => \Mage_Admin_Model_Resource_Block::class, - 'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, + 'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class, 'admin/resource_block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, + 'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, 'admin_resource/permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class, 'admin/resource_permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class, - 'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class, 'admin/resource_role' => \Mage_Admin_Model_Resource_Role::class, + 'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class, 'admin/resource_role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class, 'admin_resource/role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class, - 'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class, 'admin_resource/roles' => \Mage_Admin_Model_Resource_Roles::class, - 'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, + 'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class, 'admin_resource/roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, - 'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, + 'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, 'admin/resource_roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, + 'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, 'admin/resource_rules' => \Mage_Admin_Model_Resource_Rules::class, 'admin_resource/rules' => \Mage_Admin_Model_Resource_Rules::class, 'admin_resource/rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, 'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, - 'admin_resource/user' => \Mage_Admin_Model_Resource_User::class, 'admin/resource_user' => \Mage_Admin_Model_Resource_User::class, + 'admin_resource/user' => \Mage_Admin_Model_Resource_User::class, 'admin/resource_user_collection' => \Mage_Admin_Model_Resource_User_Collection::class, 'admin_resource/user_collection' => \Mage_Admin_Model_Resource_User_Collection::class, - 'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class, 'admin_resource/variable' => \Mage_Admin_Model_Resource_Variable::class, - 'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, + 'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class, 'admin/resource_variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, + 'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, 'admin/role' => \Mage_Admin_Model_Role::class, 'admin/roles' => \Mage_Admin_Model_Roles::class, 'admin/rules' => \Mage_Admin_Model_Rules::class, @@ -19216,6 +19173,7 @@ 'adminhtml/system_config_backend_baseurl' => \Mage_Adminhtml_Model_System_Config_Backend_Baseurl::class, 'adminhtml/system_config_backend_cache' => \Mage_Adminhtml_Model_System_Config_Backend_Cache::class, 'adminhtml/system_config_backend_catalog_inventory_managestock' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock::class, + 'adminhtml/system_config_backend_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Separator::class, 'adminhtml/system_config_backend_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Type::class, 'adminhtml/system_config_backend_category' => \Mage_Adminhtml_Model_System_Config_Backend_Category::class, 'adminhtml/system_config_backend_cookie' => \Mage_Adminhtml_Model_System_Config_Backend_Cookie::class, @@ -19268,12 +19226,14 @@ 'adminhtml/system_config_source_catalog_listMode' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListMode::class, 'adminhtml/system_config_source_catalog_listPerPage' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListPerPage::class, 'adminhtml/system_config_source_catalog_listSort' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort::class, + 'adminhtml/system_config_source_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Separator::class, 'adminhtml/system_config_source_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Type::class, 'adminhtml/system_config_source_catalog_timeFormat' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_TimeFormat::class, 'adminhtml/system_config_source_category' => \Mage_Adminhtml_Model_System_Config_Source_Category::class, 'adminhtml/system_config_source_checktype' => \Mage_Adminhtml_Model_System_Config_Source_Checktype::class, 'adminhtml/system_config_source_cms_page' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Page::class, 'adminhtml/system_config_source_cms_wysiwyg_enabled' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Wysiwyg_Enabled::class, + 'adminhtml/system_config_source_cookie_samesite' => \Mage_Adminhtml_Model_System_Config_Source_Cookie_Samesite::class, 'adminhtml/system_config_source_country' => \Mage_Adminhtml_Model_System_Config_Source_Country::class, 'adminhtml/system_config_source_country_full' => \Mage_Adminhtml_Model_System_Config_Source_Country_Full::class, 'adminhtml/system_config_source_cron_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency::class, @@ -19300,6 +19260,7 @@ 'adminhtml/system_config_source_locale_timezone' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Timezone::class, 'adminhtml/system_config_source_locale_weekdaycodes' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdaycodes::class, 'adminhtml/system_config_source_locale_weekdays' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdays::class, + 'adminhtml/system_config_source_log_level' => \Mage_Adminhtml_Model_System_Config_Source_Log_Level::class, 'adminhtml/system_config_source_nooptreq' => \Mage_Adminhtml_Model_System_Config_Source_Nooptreq::class, 'adminhtml/system_config_source_notification_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Notification_Frequency::class, 'adminhtml/system_config_source_order_status' => \Mage_Adminhtml_Model_System_Config_Source_Order_Status::class, @@ -19323,7 +19284,6 @@ 'adminhtml/system_config_source_shipping_flatrate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Flatrate::class, 'adminhtml/system_config_source_shipping_tablerate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Tablerate::class, 'adminhtml/system_config_source_shipping_taxclass' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Taxclass::class, - 'adminhtml/system_config_source_startdateenddate' => \Mage_Adminhtml_Model_System_Config_Source_Startdateenddate::class, 'adminhtml/system_config_source_storage_media_database' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Database::class, 'adminhtml/system_config_source_storage_media_storage' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Storage::class, 'adminhtml/system_config_source_store' => \Mage_Adminhtml_Model_System_Config_Source_Store::class, @@ -19379,22 +19339,22 @@ 'api2_resource/acl_filter_attribute' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute::class, 'api2/resource_acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class, 'api2_resource/acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class, - 'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, 'api2_resource/acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, + 'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, 'api2/resource_acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class, 'api2_resource/acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class, 'api2_resource/acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class, 'api2/resource_acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class, 'api2/resource_acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class, 'api2_resource/acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class, - 'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class, 'api2/resource_setup' => \Mage_Api2_Model_Resource_Setup::class, + 'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class, 'api2/resource_validator' => \Mage_Api2_Model_Resource_Validator::class, 'api2_resource/validator' => \Mage_Api2_Model_Resource_Validator::class, 'api2/resource_validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class, 'api2_resource/validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class, - 'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, 'api2/resource_validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, + 'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, 'api2/response' => \Mage_Api2_Model_Response::class, 'api2/route_abstract' => \Mage_Api2_Model_Route_Abstract::class, 'api2/route_apiType' => \Mage_Api2_Model_Route_ApiType::class, @@ -19426,8 +19386,8 @@ 'api/mysql4_user_collection' => \Mage_Api_Model_Mysql4_User_Collection::class, 'api/resource_abstract' => \Mage_Api_Model_Resource_Abstract::class, 'api_resource/abstract' => \Mage_Api_Model_Resource_Abstract::class, - 'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class, 'api_resource/acl' => \Mage_Api_Model_Resource_Acl::class, + 'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class, 'api_resource/acl_role' => \Mage_Api_Model_Resource_Acl_Role::class, 'api/resource_acl_role' => \Mage_Api_Model_Resource_Acl_Role::class, 'api/resource_acl_role_collection' => \Mage_Api_Model_Resource_Acl_Role_Collection::class, @@ -19436,18 +19396,18 @@ 'api_resource/permissions_collection' => \Mage_Api_Model_Resource_Permissions_Collection::class, 'api_resource/role' => \Mage_Api_Model_Resource_Role::class, 'api/resource_role' => \Mage_Api_Model_Resource_Role::class, - 'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, 'api_resource/role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, + 'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, 'api/resource_roles' => \Mage_Api_Model_Resource_Roles::class, 'api_resource/roles' => \Mage_Api_Model_Resource_Roles::class, - 'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, 'api_resource/roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, - 'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, + 'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, 'api_resource/roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, - 'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class, + 'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, 'api_resource/rules' => \Mage_Api_Model_Resource_Rules::class, - 'api/resource_rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class, + 'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class, 'api_resource/rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class, + 'api/resource_rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class, 'api/resource_user' => \Mage_Api_Model_Resource_User::class, 'api_resource/user' => \Mage_Api_Model_Resource_User::class, 'api/resource_user_collection' => \Mage_Api_Model_Resource_User_Collection::class, @@ -19474,15 +19434,6 @@ 'authorizenet/directpost_request' => \Mage_Authorizenet_Model_Directpost_Request::class, 'authorizenet/directpost_response' => \Mage_Authorizenet_Model_Directpost_Response::class, 'authorizenet/directpost_session' => \Mage_Authorizenet_Model_Directpost_Session::class, - 'backup/backup' => \Mage_Backup_Model_Backup::class, - 'backup/config_backend_cron' => \Mage_Backup_Model_Config_Backend_Cron::class, - 'backup/config_source_type' => \Mage_Backup_Model_Config_Source_Type::class, - 'backup/db' => \Mage_Backup_Model_Db::class, - 'backup/fs_collection' => \Mage_Backup_Model_Fs_Collection::class, - 'backup/mysql4_db' => \Mage_Backup_Model_Mysql4_Db::class, - 'backup/observer' => \Mage_Backup_Model_Observer::class, - 'backup/resource_db' => \Mage_Backup_Model_Resource_Db::class, - 'backup/resource_helper_mysql4' => \Mage_Backup_Model_Resource_Helper_Mysql4::class, 'bundle/catalogIndex_data_bundle' => \Mage_Bundle_Model_CatalogIndex_Data_Bundle::class, 'bundle/mysql4_bundle' => \Mage_Bundle_Model_Mysql4_Bundle::class, 'bundle/mysql4_indexer_price' => \Mage_Bundle_Model_Mysql4_Indexer_Price::class, @@ -19508,10 +19459,10 @@ 'bundle_resource/option' => \Mage_Bundle_Model_Resource_Option::class, 'bundle/resource_option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class, 'bundle_resource/option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class, - 'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, 'bundle_resource/price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, - 'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class, + 'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, 'bundle_resource/selection' => \Mage_Bundle_Model_Resource_Selection::class, + 'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class, 'bundle_resource/selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class, 'bundle/resource_selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class, 'bundle/sales_order_pdf_items_abstract' => \Mage_Bundle_Model_Sales_Order_Pdf_Items_Abstract::class, @@ -19527,8 +19478,8 @@ 'captcha/config_form_frontend' => \Mage_Captcha_Model_Config_Form_Frontend::class, 'captcha/config_mode' => \Mage_Captcha_Model_Config_Mode::class, 'captcha/observer' => \Mage_Captcha_Model_Observer::class, - 'captcha_resource/log' => \Mage_Captcha_Model_Resource_Log::class, 'captcha/resource_log' => \Mage_Captcha_Model_Resource_Log::class, + 'captcha_resource/log' => \Mage_Captcha_Model_Resource_Log::class, 'captcha/zend' => \Mage_Captcha_Model_Zend::class, 'catalogindex/aggregation' => \Mage_CatalogIndex_Model_Aggregation::class, 'catalogindex/attribute' => \Mage_CatalogIndex_Model_Attribute::class, @@ -19571,8 +19522,8 @@ 'catalogindex/resource_data_abstract' => \Mage_CatalogIndex_Model_Resource_Data_Abstract::class, 'catalogindex_resource/data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class, 'catalogindex/resource_data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class, - 'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, 'catalogindex_resource/data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, + 'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, 'catalogindex_resource/indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class, 'catalogindex/resource_indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class, 'catalogindex/resource_indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class, @@ -19604,20 +19555,20 @@ 'cataloginventory/mysql4_stock_item_collection' => \Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection::class, 'cataloginventory/mysql4_stock_status' => \Mage_CatalogInventory_Model_Mysql4_Stock_Status::class, 'cataloginventory/observer' => \Mage_CatalogInventory_Model_Observer::class, - 'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, 'cataloginventory_resource/indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, + 'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, 'cataloginventory/resource_indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class, 'cataloginventory_resource/indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class, - 'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, 'cataloginventory/resource_indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, + 'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, 'cataloginventory/resource_indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class, 'cataloginventory_resource/indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class, 'cataloginventory_resource/stock' => \Mage_CatalogInventory_Model_Resource_Stock::class, 'cataloginventory/resource_stock' => \Mage_CatalogInventory_Model_Resource_Stock::class, - 'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, 'cataloginventory/resource_stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, - 'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, + 'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, 'cataloginventory/resource_stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, + 'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, 'cataloginventory/resource_stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class, 'cataloginventory_resource/stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class, 'cataloginventory/source_backorders' => \Mage_CatalogInventory_Model_Source_Backorders::class, @@ -19640,8 +19591,8 @@ 'catalogrule/observer' => \Mage_CatalogRule_Model_Observer::class, 'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class, 'catalogrule/resource_rule' => \Mage_CatalogRule_Model_Resource_Rule::class, - 'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, 'catalogrule_resource/rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, + 'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, 'catalogrule_resource/rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class, 'catalogrule/resource_rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class, 'catalogrule_resource/rule_product_price_collection' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price_Collection::class, @@ -19670,24 +19621,24 @@ 'catalogsearch/query' => \Mage_CatalogSearch_Model_Query::class, 'catalogsearch_resource/advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class, 'catalogsearch/resource_advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class, - 'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, 'catalogsearch_resource/advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, + 'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, 'catalogsearch_resource/fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class, 'catalogsearch/resource_fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class, 'catalogsearch_resource/fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class, 'catalogsearch/resource_fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class, - 'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, 'catalogsearch_resource/fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, - 'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, + 'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, 'catalogsearch/resource_helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, - 'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, + 'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, 'catalogsearch_resource/indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, - 'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class, + 'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, 'catalogsearch_resource/query' => \Mage_CatalogSearch_Model_Resource_Query::class, - 'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, + 'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class, 'catalogsearch_resource/query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, - 'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, + 'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, 'catalogsearch/resource_search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, + 'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, 'catalogsearch/session' => \Mage_CatalogSearch_Model_Session::class, 'catalogsearch/system_config_backend_sitemap' => \Mage_CatalogSearch_Model_System_Config_Backend_Sitemap::class, 'catalog/abstract' => \Mage_Catalog_Model_Abstract::class, @@ -19830,144 +19781,144 @@ 'catalog/product_website' => \Mage_Catalog_Model_Product_Website::class, 'catalog/resource_abstract' => \Mage_Catalog_Model_Resource_Abstract::class, 'catalog_resource/abstract' => \Mage_Catalog_Model_Resource_Abstract::class, - 'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class, 'catalog/resource_attribute' => \Mage_Catalog_Model_Resource_Attribute::class, - 'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class, + 'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class, 'catalog_resource/category' => \Mage_Catalog_Model_Resource_Category::class, + 'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class, 'catalog_resource/category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class, 'catalog/resource_category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class, - 'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, 'catalog/resource_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, - 'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, + 'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, 'catalog/resource_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, + 'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, 'catalog_resource/category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class, 'catalog/resource_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class, 'catalog_resource/category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class, 'catalog/resource_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class, 'catalog/resource_category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class, 'catalog_resource/category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class, - 'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, 'catalog_resource/category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, - 'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, + 'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, 'catalog/resource_category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, + 'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, 'catalog_resource/category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class, 'catalog/resource_category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class, 'catalog/resource_category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class, 'catalog_resource/category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class, - 'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, 'catalog_resource/collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, + 'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, 'catalog_resource/config' => \Mage_Catalog_Model_Resource_Config::class, 'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class, - 'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, 'catalog/resource_eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, + 'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, 'catalog_resource/eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class, 'catalog/resource_eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class, 'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, 'catalog_resource/eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, - 'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, 'catalog/resource_eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, - 'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, + 'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, 'catalog_resource/eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, + 'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, 'catalog_resource/eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, - 'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, + 'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, 'catalog_resource/eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, + 'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, 'catalog/resource_eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class, 'catalog_resource/eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class, 'catalog/resource_eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class, 'catalog_resource/eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class, 'catalog/resource_eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class, 'catalog_resource/eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class, - 'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, 'catalog/resource_eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, + 'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, 'catalog/resource_eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, 'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, 'catalog/resource_eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class, 'catalog_resource/eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class, - 'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, 'catalog_resource/eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, - 'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, + 'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, 'catalog_resource/eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, + 'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, 'catalog_resource/eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class, 'catalog/resource_eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class, - 'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, 'catalog_resource/eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, + 'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, 'catalog/resource_eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, 'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, - 'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, 'catalog/resource_eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, - 'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, + 'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, 'catalog/resource_eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, - 'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, + 'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, 'catalog_resource/eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, + 'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, 'catalog_resource/eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, 'catalog_resource/eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, 'catalog/resource_eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class, 'catalog/resource_eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, + 'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, 'catalog/resource_eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class, 'catalog/resource_eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class, 'catalog_resource/eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class, 'catalog_resource/eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class, 'catalog/resource_eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class, - 'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, 'catalog_resource/eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, - 'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, + 'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, 'catalog_resource/eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, - 'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, + 'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, 'catalog_resource/eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, + 'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, 'catalog/resource_eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class, 'catalog/resource_eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class, 'catalog/resource_eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class, - 'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, 'catalog/resource_eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, - 'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, + 'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, 'catalog_resource/eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, + 'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, 'catalog_resource/eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class, 'catalog/resource_eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class, - 'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, 'catalog/resource_eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, - 'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, + 'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, 'catalog/resource_eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, + 'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, 'catalog/resource_eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class, 'catalog_resource/eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class, - 'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, 'catalog/resource_eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, + 'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, 'catalog_resource/eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class, 'catalog/resource_eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class, 'catalog_resource/eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class, 'catalog/resource_eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class, - 'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, 'catalog/resource_eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, - 'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, + 'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, 'catalog_resource/eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, - 'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, + 'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, 'catalog/resource_eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, + 'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, 'catalog/resource_eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, 'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, - 'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, 'catalog/resource_eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, + 'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, 'catalog/resource_eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class, 'catalog_resource/eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class, - 'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, 'catalog_resource/eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, - 'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, + 'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, 'catalog/resource_eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, - 'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, + 'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, 'catalog/resource_eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, + 'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, 'catalog_resource/eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, + 'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, 'catalog/resource_eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class, 'catalog_resource/eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class, 'catalog/resource_eav_mysql4_sendfriend' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend::class, @@ -19976,16 +19927,16 @@ 'catalog/resource_eav_mysql4_sendfriend_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection::class, 'catalog_resource/eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class, 'catalog/resource_eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class, - 'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, 'catalog/resource_eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, - 'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, + 'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, 'catalog/resource_helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, + 'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, 'catalog_resource/layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class, 'catalog/resource_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class, 'catalog/resource_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class, 'catalog_resource/layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class, - 'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, 'catalog/resource_layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, + 'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, 'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class, 'catalog_resource/product' => \Mage_Catalog_Model_Resource_Product::class, 'catalog/resource_product_action' => \Mage_Catalog_Model_Resource_Product_Action::class, @@ -19996,42 +19947,42 @@ 'catalog_resource/product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class, 'catalog/resource_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class, 'catalog_resource/product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class, - 'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, 'catalog/resource_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, - 'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, + 'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, 'catalog_resource/product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, + 'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, 'catalog/resource_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class, - 'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, 'catalog_resource/product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, - 'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, + 'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, 'catalog/resource_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, - 'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, + 'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, 'catalog_resource/product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, - 'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, + 'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, + 'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, 'catalog_resource/product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class, 'catalog/resource_product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class, - 'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, 'catalog/resource_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, + 'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, 'catalog/resource_product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class, 'catalog_resource/product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class, - 'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, 'catalog/resource_product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, + 'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, 'catalog/resource_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class, 'catalog_resource/product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class, - 'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, 'catalog_resource/product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, - 'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, + 'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, 'catalog/resource_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, + 'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, 'catalog/resource_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class, 'catalog_resource/product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class, - 'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, 'catalog_resource/product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, + 'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, 'catalog_resource/product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, 'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, - 'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, 'catalog_resource/product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, + 'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, 'catalog/resource_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class, 'catalog_resource/product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class, 'catalog_resource/product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class, @@ -20042,12 +19993,12 @@ 'catalog_resource/product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class, 'catalog/resource_product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, 'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, - 'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, 'catalog_resource/product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, - 'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, + 'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, 'catalog/resource_product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, - 'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, + 'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, 'catalog_resource/product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, + 'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, 'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, 'catalog_resource/product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, 'catalog_resource/product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class, @@ -20056,14 +20007,14 @@ 'catalog/resource_product_status' => \Mage_Catalog_Model_Resource_Product_Status::class, 'catalog_resource/product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class, 'catalog/resource_product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class, - 'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, 'catalog/resource_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, - 'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, + 'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, 'catalog_resource/product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, + 'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, 'catalog_resource/product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class, 'catalog/resource_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class, - 'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, 'catalog_resource/product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, + 'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, 'catalog/resource_setup' => \Mage_Catalog_Model_Resource_Setup::class, 'catalog_resource/setup' => \Mage_Catalog_Model_Resource_Setup::class, 'catalog_resource/url' => \Mage_Catalog_Model_Resource_Url::class, @@ -20109,12 +20060,12 @@ 'checkout/observer' => \Mage_Checkout_Model_Observer::class, 'checkout_resource/agreement' => \Mage_Checkout_Model_Resource_Agreement::class, 'checkout/resource_agreement' => \Mage_Checkout_Model_Resource_Agreement::class, - 'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, 'checkout/resource_agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, - 'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class, + 'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, 'checkout_resource/cart' => \Mage_Checkout_Model_Resource_Cart::class, - 'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class, + 'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class, 'checkout/resource_setup' => \Mage_Checkout_Model_Resource_Setup::class, + 'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class, 'checkout/session' => \Mage_Checkout_Model_Session::class, 'checkout/type_abstract' => \Mage_Checkout_Model_Type_Abstract::class, 'checkout/type_multishipping' => \Mage_Checkout_Model_Type_Multishipping::class, @@ -20129,25 +20080,25 @@ 'cms/mysql4_page_service' => \Mage_Cms_Model_Mysql4_Page_Service::class, 'cms/observer' => \Mage_Cms_Model_Observer::class, 'cms/page' => \Mage_Cms_Model_Page::class, - 'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class, 'cms/resource_block' => \Mage_Cms_Model_Resource_Block::class, + 'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class, 'cms_resource/block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class, 'cms/resource_block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class, 'cms/resource_page' => \Mage_Cms_Model_Resource_Page::class, 'cms_resource/page' => \Mage_Cms_Model_Resource_Page::class, - 'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, 'cms_resource/page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, - 'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class, + 'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, 'cms/resource_page_service' => \Mage_Cms_Model_Resource_Page_Service::class, + 'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class, 'cms/template_filter' => \Mage_Cms_Model_Template_Filter::class, 'cms/wysiwyg_config' => \Mage_Cms_Model_Wysiwyg_Config::class, 'cms/wysiwyg_images_storage' => \Mage_Cms_Model_Wysiwyg_Images_Storage::class, 'cms/wysiwyg_images_storage_collection' => \Mage_Cms_Model_Wysiwyg_Images_Storage_Collection::class, 'configurableswatches/observer' => \Mage_ConfigurableSwatches_Model_Observer::class, - 'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, 'configurableswatches_resource/catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, - 'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, + 'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, 'configurableswatches_resource/catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, + 'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, 'configurableswatches_resource/catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class, 'configurableswatches/resource_catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class, 'configurableswatches/system_config_source_catalog_product_configattribute' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute::class, @@ -20254,152 +20205,152 @@ 'core/mysql4_website_collection' => \Mage_Core_Model_Mysql4_Website_Collection::class, 'core/observer' => \Mage_Core_Model_Observer::class, 'core/resource' => \Mage_Core_Model_Resource::class, + 'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, 'core_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, 'core/resource_abstract' => \Mage_Core_Model_Resource_Abstract::class, - 'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, + 'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class, 'core/resource_cache' => \Mage_Core_Model_Resource_Cache::class, 'core_resource/cache' => \Mage_Core_Model_Resource_Cache::class, - 'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class, - 'core_resource/config' => \Mage_Core_Model_Resource_Config::class, 'payment_resource/config' => \Mage_Core_Model_Resource_Config::class, 'core/resource_config' => \Mage_Core_Model_Resource_Config::class, - 'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, + 'core_resource/config' => \Mage_Core_Model_Resource_Config::class, 'core/resource_config_data' => \Mage_Core_Model_Resource_Config_Data::class, + 'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, 'payment_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, - 'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'core_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, - 'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, - 'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, + 'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'payment_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, - 'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, + 'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, + 'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, 'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, 'core/resource_db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, - 'core/resource_design' => \Mage_Core_Model_Resource_Design::class, + 'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, 'core_resource/design' => \Mage_Core_Model_Resource_Design::class, + 'core/resource_design' => \Mage_Core_Model_Resource_Design::class, 'payment_resource/design' => \Mage_Core_Model_Resource_Design::class, - 'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, 'payment_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, + 'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, 'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, - 'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, 'payment_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, 'core/resource_design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, + 'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, 'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, 'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, 'core/resource_email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, - 'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, - 'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, 'payment_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, - 'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, + 'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, + 'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, 'core/resource_email_template' => \Mage_Core_Model_Resource_Email_Template::class, 'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, - 'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, + 'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, 'core/resource_email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, + 'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, 'core_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, - 'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, - 'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, 'core_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, - 'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, - 'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, + 'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, 'core_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, 'payment_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, 'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, - 'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, + 'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, 'payment_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, 'core/resource_file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, - 'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, + 'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, 'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, 'core/resource_file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, - 'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, 'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, - 'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, 'core/resource_file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, - 'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class, - 'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class, + 'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, 'payment_resource/flag' => \Mage_Core_Model_Resource_Flag::class, + 'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class, + 'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class, 'payment_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, - 'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, 'core_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, - 'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, + 'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, 'core/resource_helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, + 'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, 'core_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, 'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, 'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, 'core/resource_iterator' => \Mage_Core_Model_Resource_Iterator::class, - 'core_resource/language' => \Mage_Core_Model_Resource_Language::class, 'payment_resource/language' => \Mage_Core_Model_Resource_Language::class, + 'core_resource/language' => \Mage_Core_Model_Resource_Language::class, 'core/resource_language' => \Mage_Core_Model_Resource_Language::class, 'payment_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, - 'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, 'core/resource_language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, - 'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class, + 'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, 'core_resource/layout' => \Mage_Core_Model_Resource_Layout::class, 'core/resource_layout' => \Mage_Core_Model_Resource_Layout::class, + 'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class, 'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class, - 'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class, 'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class, + 'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class, 'core/resource_session' => \Mage_Core_Model_Resource_Session::class, - 'core_resource/session' => \Mage_Core_Model_Resource_Session::class, 'payment_resource/session' => \Mage_Core_Model_Resource_Session::class, + 'core_resource/session' => \Mage_Core_Model_Resource_Session::class, 'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class, 'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class, 'payment_resource/setup' => \Mage_Core_Model_Resource_Setup::class, - 'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core/resource_setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, + 'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'payment_resource/store' => \Mage_Core_Model_Resource_Store::class, 'core_resource/store' => \Mage_Core_Model_Resource_Store::class, 'core/resource_store' => \Mage_Core_Model_Resource_Store::class, - 'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, 'core/resource_store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, + 'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, 'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, - 'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'core/resource_store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'payment_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, - 'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, - 'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, + 'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'payment_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, + 'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, + 'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, 'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, - 'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class, 'core_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, - 'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class, - 'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class, + 'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class, 'core_resource/translate' => \Mage_Core_Model_Resource_Translate::class, - 'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, - 'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class, + 'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class, + 'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class, 'payment_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, - 'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class, + 'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, 'core/resource_type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, 'payment_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'core/resource_type_db' => \Mage_Core_Model_Resource_Type_Db::class, - 'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'core_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, 'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, 'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, - 'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, - 'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, 'payment_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, 'payment_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, - 'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, 'core_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, - 'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, - 'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, + 'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, 'payment_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, + 'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, + 'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, 'core_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'core_resource/variable' => \Mage_Core_Model_Resource_Variable::class, - 'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class, 'core/resource_variable' => \Mage_Core_Model_Resource_Variable::class, + 'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class, 'core/resource_variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, - 'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, 'core_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, + 'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, + 'core/resource_website' => \Mage_Core_Model_Resource_Website::class, 'core_resource/website' => \Mage_Core_Model_Resource_Website::class, 'payment_resource/website' => \Mage_Core_Model_Resource_Website::class, - 'core/resource_website' => \Mage_Core_Model_Resource_Website::class, - 'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core/resource_website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, + 'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core/session' => \Mage_Core_Model_Session::class, 'core/session_abstract' => \Mage_Core_Model_Session_Abstract::class, @@ -20429,10 +20380,10 @@ 'cron/mysql4_schedule' => \Mage_Cron_Model_Mysql4_Schedule::class, 'cron/mysql4_schedule_collection' => \Mage_Cron_Model_Mysql4_Schedule_Collection::class, 'cron/observer' => \Mage_Cron_Model_Observer::class, - 'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class, 'cron/resource_schedule' => \Mage_Cron_Model_Resource_Schedule::class, - 'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, + 'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class, 'cron/resource_schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, + 'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, 'cron/schedule' => \Mage_Cron_Model_Schedule::class, 'currencysymbol/observer' => \Mage_CurrencySymbol_Model_Observer::class, 'currencysymbol/system_currencysymbol' => \Mage_CurrencySymbol_Model_System_Currencysymbol::class, @@ -20507,16 +20458,16 @@ 'customer_resource/address' => \Mage_Customer_Model_Resource_Address::class, 'customer/resource_address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class, 'customer_resource/address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class, - 'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, 'customer_resource/address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, - 'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, + 'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, 'customer/resource_address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, - 'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, + 'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, 'customer/resource_address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, - 'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, + 'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, 'customer_resource/address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, - 'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, + 'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, 'customer_resource/address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, + 'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, 'customer/resource_attribute' => \Mage_Customer_Model_Resource_Attribute::class, 'customer_resource/attribute' => \Mage_Customer_Model_Resource_Attribute::class, 'customer_resource/attribute_collection' => \Mage_Customer_Model_Resource_Attribute_Collection::class, @@ -20525,22 +20476,22 @@ 'customer_resource/customer' => \Mage_Customer_Model_Resource_Customer::class, 'customer_resource/customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class, 'customer/resource_customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class, - 'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, 'customer/resource_flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, - 'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, + 'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, 'customer/resource_flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, - 'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, + 'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, 'customer/resource_form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, - 'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, + 'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, 'customer/resource_form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, + 'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, 'customer/resource_group' => \Mage_Customer_Model_Resource_Group::class, 'customer_resource/group' => \Mage_Customer_Model_Resource_Group::class, 'customer_resource/group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class, 'customer/resource_group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class, - 'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class, 'customer_resource/setup' => \Mage_Customer_Model_Resource_Setup::class, - 'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, + 'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class, 'customer_resource/wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, + 'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, 'customer/session' => \Mage_Customer_Model_Session::class, 'dataflow/batch' => \Mage_Dataflow_Model_Batch::class, 'dataflow/batch_abstract' => \Mage_Dataflow_Model_Batch_Abstract::class, @@ -20592,10 +20543,10 @@ 'dataflow/mysql4_session' => \Mage_Dataflow_Model_Mysql4_Session::class, 'dataflow/profile' => \Mage_Dataflow_Model_Profile::class, 'dataflow/profile_history' => \Mage_Dataflow_Model_Profile_History::class, - 'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class, 'dataflow/resource_batch' => \Mage_Dataflow_Model_Resource_Batch::class, - 'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, + 'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class, 'dataflow/resource_batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, + 'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, 'dataflow/resource_batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class, 'dataflow_resource/batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class, 'dataflow_resource/batch_export' => \Mage_Dataflow_Model_Resource_Batch_Export::class, @@ -20606,12 +20557,12 @@ 'dataflow/resource_import' => \Mage_Dataflow_Model_Resource_Import::class, 'dataflow_resource/import_collection' => \Mage_Dataflow_Model_Resource_Import_Collection::class, 'dataflow/resource_import_collection' => \Mage_Dataflow_Model_Resource_Import_Collection::class, - 'dataflow_resource/profile' => \Mage_Dataflow_Model_Resource_Profile::class, 'dataflow/resource_profile' => \Mage_Dataflow_Model_Resource_Profile::class, + 'dataflow_resource/profile' => \Mage_Dataflow_Model_Resource_Profile::class, 'dataflow/resource_profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class, 'dataflow_resource/profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class, - 'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, 'dataflow_resource/profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, + 'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, 'dataflow_resource/profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class, 'dataflow/resource_profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class, 'dataflow_resource/session' => \Mage_Dataflow_Model_Resource_Session::class, @@ -20645,8 +20596,8 @@ 'directory/resource_country' => \Mage_Directory_Model_Resource_Country::class, 'directory_resource/country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class, 'directory/resource_country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class, - 'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class, 'directory/resource_country_format' => \Mage_Directory_Model_Resource_Country_Format::class, + 'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class, 'directory_resource/country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class, 'directory/resource_country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class, 'directory_resource/currency' => \Mage_Directory_Model_Resource_Currency::class, @@ -20677,8 +20628,8 @@ 'downloadable/observer' => \Mage_Downloadable_Model_Observer::class, 'downloadable/product_price' => \Mage_Downloadable_Model_Product_Price::class, 'downloadable/product_type' => \Mage_Downloadable_Model_Product_Type::class, - 'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, 'downloadable_resource/indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, + 'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, 'downloadable/resource_link' => \Mage_Downloadable_Model_Resource_Link::class, 'downloadable_resource/link' => \Mage_Downloadable_Model_Resource_Link::class, 'downloadable/resource_link_collection' => \Mage_Downloadable_Model_Resource_Link_Collection::class, @@ -20687,12 +20638,12 @@ 'downloadable_resource/link_purchased' => \Mage_Downloadable_Model_Resource_Link_Purchased::class, 'downloadable/resource_link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class, 'downloadable_resource/link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class, - 'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, 'downloadable/resource_link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, + 'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, 'downloadable/resource_link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, 'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, - 'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class, 'downloadable/resource_sample' => \Mage_Downloadable_Model_Resource_Sample::class, + 'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class, 'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, 'downloadable/resource_sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, 'downloadable/sales_order_pdf_items_abstract' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Abstract::class, @@ -20780,46 +20731,46 @@ 'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class, 'eav_resource/attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class, 'eav/resource_attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class, - 'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class, 'eav_resource/config' => \Mage_Eav_Model_Resource_Config::class, + 'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class, 'eav/resource_entity_attribute' => \Mage_Eav_Model_Resource_Entity_Attribute::class, 'eav_resource/entity_attribute' => \Mage_Eav_Model_Resource_Entity_Attribute::class, 'eav_resource/entity_attribute_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Collection::class, 'eav/resource_entity_attribute_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Collection::class, 'eav_resource/entity_attribute_group' => \Mage_Eav_Model_Resource_Entity_Attribute_Group::class, 'eav/resource_entity_attribute_group' => \Mage_Eav_Model_Resource_Entity_Attribute_Group::class, - 'eav/resource_entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class, 'eav_resource/entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class, + 'eav/resource_entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class, 'eav/resource_entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class, 'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class, - 'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, 'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, - 'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, + 'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, 'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, - 'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, + 'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, 'eav_resource/entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, + 'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, 'eav_resource/entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class, 'eav/resource_entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class, 'eav_resource/entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class, 'eav/resource_entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class, - 'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, 'eav_resource/entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, + 'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, 'eav/resource_form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class, 'eav_resource/form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class, - 'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, 'eav/resource_form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, + 'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, 'eav/resource_form_element' => \Mage_Eav_Model_Resource_Form_Element::class, 'eav_resource/form_element' => \Mage_Eav_Model_Resource_Form_Element::class, - 'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, 'eav_resource/form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, - 'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, + 'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, 'eav/resource_form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, + 'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, 'eav_resource/form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, 'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, 'eav/resource_form_type' => \Mage_Eav_Model_Resource_Form_Type::class, 'eav_resource/form_type' => \Mage_Eav_Model_Resource_Form_Type::class, - 'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class, 'eav_resource/form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class, + 'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class, 'eav_resource/helper_mysql4' => \Mage_Eav_Model_Resource_Helper_Mysql4::class, 'eav/resource_helper_mysql4' => \Mage_Eav_Model_Resource_Helper_Mysql4::class, 'giftmessage/api' => \Mage_GiftMessage_Model_Api::class, @@ -20831,12 +20782,12 @@ 'giftmessage/mysql4_message_collection' => \Mage_GiftMessage_Model_Mysql4_Message_Collection::class, 'giftmessage/mysql4_setup' => \Mage_GiftMessage_Model_Mysql4_Setup::class, 'giftmessage/observer' => \Mage_GiftMessage_Model_Observer::class, - 'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class, 'giftmessage/resource_message' => \Mage_GiftMessage_Model_Resource_Message::class, - 'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, + 'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class, 'giftmessage_resource/message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, - 'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class, + 'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, 'giftmessage_resource/setup' => \Mage_GiftMessage_Model_Resource_Setup::class, + 'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class, 'googleanalytics/observer' => \Mage_GoogleAnalytics_Model_Observer::class, 'googleanalytics/system_config_source_type' => \Mage_GoogleAnalytics_Model_System_Config_Source_Type::class, 'googlecheckout/payment' => \Mage_GoogleCheckout_Model_Payment::class, @@ -20872,8 +20823,8 @@ 'importexport/product_attribute_backend_urlkey' => \Mage_ImportExport_Model_Product_Attribute_Backend_Urlkey::class, 'importexport_resource/helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class, 'importexport/resource_helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class, - 'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, 'importexport_resource/import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, + 'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, 'importexport_resource/setup' => \Mage_ImportExport_Model_Resource_Setup::class, 'importexport/resource_setup' => \Mage_ImportExport_Model_Resource_Setup::class, 'importexport/source_export_entity' => \Mage_ImportExport_Model_Source_Export_Entity::class, @@ -20895,16 +20846,16 @@ 'index/process' => \Mage_Index_Model_Process::class, 'index_resource/abstract' => \Mage_Index_Model_Resource_Abstract::class, 'index/resource_abstract' => \Mage_Index_Model_Resource_Abstract::class, - 'index/resource_event' => \Mage_Index_Model_Resource_Event::class, 'index_resource/event' => \Mage_Index_Model_Resource_Event::class, + 'index/resource_event' => \Mage_Index_Model_Resource_Event::class, 'index/resource_event_collection' => \Mage_Index_Model_Resource_Event_Collection::class, 'index_resource/event_collection' => \Mage_Index_Model_Resource_Event_Collection::class, 'index/resource_helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class, 'index_resource/helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class, - 'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, 'index/resource_lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, - 'index_resource/process' => \Mage_Index_Model_Resource_Process::class, + 'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, 'index/resource_process' => \Mage_Index_Model_Resource_Process::class, + 'index_resource/process' => \Mage_Index_Model_Resource_Process::class, 'index/resource_process_collection' => \Mage_Index_Model_Resource_Process_Collection::class, 'index_resource/process_collection' => \Mage_Index_Model_Resource_Process_Collection::class, 'index/resource_setup' => \Mage_Index_Model_Resource_Setup::class, @@ -20937,22 +20888,22 @@ 'log/mysql4_visitor_online_collection' => \Mage_Log_Model_Mysql4_Visitor_Online_Collection::class, 'log_resource/aggregation' => \Mage_Log_Model_Resource_Aggregation::class, 'log/resource_aggregation' => \Mage_Log_Model_Resource_Aggregation::class, - 'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class, 'log/resource_customer' => \Mage_Log_Model_Resource_Customer::class, + 'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class, 'log/resource_log' => \Mage_Log_Model_Resource_Log::class, 'log_resource/log' => \Mage_Log_Model_Resource_Log::class, 'log_resource/visitor' => \Mage_Log_Model_Resource_Visitor::class, 'log/resource_visitor' => \Mage_Log_Model_Resource_Visitor::class, 'log_resource/visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class, 'log/resource_visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class, - 'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, 'log_resource/visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, - 'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, + 'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, 'log_resource/visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, + 'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, 'log/visitor' => \Mage_Log_Model_Visitor::class, 'log/visitor_online' => \Mage_Log_Model_Visitor_Online::class, - 'media_resource/image' => \Mage_Media_Model_File_Image::class, 'media/file_image' => \Mage_Media_Model_File_Image::class, + 'media_resource/image' => \Mage_Media_Model_File_Image::class, 'media/image' => \Mage_Media_Model_Image::class, 'newsletter/message' => \Mage_Newsletter_Model_Message::class, 'newsletter/mysql4_problem' => \Mage_Newsletter_Model_Mysql4_Problem::class, @@ -20970,14 +20921,14 @@ 'newsletter_resource/problem' => \Mage_Newsletter_Model_Resource_Problem::class, 'newsletter/resource_problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class, 'newsletter_resource/problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class, - 'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class, 'newsletter/resource_queue' => \Mage_Newsletter_Model_Resource_Queue::class, - 'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, + 'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class, 'newsletter/resource_queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, - 'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, + 'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, 'newsletter/resource_subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, - 'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, + 'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, 'newsletter/resource_subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, + 'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, 'newsletter_resource/template' => \Mage_Newsletter_Model_Resource_Template::class, 'newsletter/resource_template' => \Mage_Newsletter_Model_Resource_Template::class, 'newsletter_resource/template_collection' => \Mage_Newsletter_Model_Resource_Template_Collection::class, @@ -20990,20 +20941,20 @@ 'oauth/consumer_validator_keyLength' => \Mage_Oauth_Model_Consumer_Validator_KeyLength::class, 'oauth/nonce' => \Mage_Oauth_Model_Nonce::class, 'oauth/observer' => \Mage_Oauth_Model_Observer::class, - 'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class, 'oauth/resource_consumer' => \Mage_Oauth_Model_Resource_Consumer::class, + 'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class, 'oauth/resource_consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class, 'oauth_resource/consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class, 'oauth_resource/nonce' => \Mage_Oauth_Model_Resource_Nonce::class, 'oauth/resource_nonce' => \Mage_Oauth_Model_Resource_Nonce::class, 'oauth_resource/nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class, 'oauth/resource_nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class, - 'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class, 'oauth/resource_setup' => \Mage_Oauth_Model_Resource_Setup::class, - 'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class, + 'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class, 'oauth_resource/token' => \Mage_Oauth_Model_Resource_Token::class, - 'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, + 'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class, 'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, + 'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth/server' => \Mage_Oauth_Model_Server::class, 'oauth/token' => \Mage_Oauth_Model_Token::class, 'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class, @@ -21020,8 +20971,8 @@ 'paygate/authorizenet_source_paymentAction' => \Mage_Paygate_Model_Authorizenet_Source_PaymentAction::class, 'paygate/mysql4_authorizenet_debug' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug::class, 'paygate/mysql4_authorizenet_debug_collection' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection::class, - 'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, 'paygate/resource_authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, + 'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, 'paygate_resource/authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class, 'paygate/resource_authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class, 'payment/billing_agreementAbstract' => \Mage_Payment_Model_Billing_AgreementAbstract::class, @@ -21084,12 +21035,12 @@ 'paypal/resource_cert' => \Mage_Paypal_Model_Resource_Cert::class, 'paypal_resource/payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class, 'paypal/resource_payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class, - 'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, 'paypal/resource_payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, + 'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, 'paypal/resource_report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class, 'paypal_resource/report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class, - 'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, 'paypal/resource_report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, + 'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, 'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, 'paypal/resource_report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, 'paypal/resource_setup' => \Mage_Paypal_Model_Resource_Setup::class, @@ -21114,8 +21065,8 @@ 'persistent/observer' => \Mage_Persistent_Model_Observer::class, 'persistent/observer_session' => \Mage_Persistent_Model_Observer_Session::class, 'persistent/persistent_config' => \Mage_Persistent_Model_Persistent_Config::class, - 'persistent/resource_session' => \Mage_Persistent_Model_Resource_Session::class, 'persistent_resource/session' => \Mage_Persistent_Model_Resource_Session::class, + 'persistent/resource_session' => \Mage_Persistent_Model_Resource_Session::class, 'persistent/session' => \Mage_Persistent_Model_Session::class, 'poll/mysql4_poll' => \Mage_Poll_Model_Mysql4_Poll::class, 'poll/mysql4_poll_answer' => \Mage_Poll_Model_Mysql4_Poll_Answer::class, @@ -21125,16 +21076,16 @@ 'poll/poll' => \Mage_Poll_Model_Poll::class, 'poll/poll_answer' => \Mage_Poll_Model_Poll_Answer::class, 'poll/poll_vote' => \Mage_Poll_Model_Poll_Vote::class, - 'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class, 'poll_resource/poll' => \Mage_Poll_Model_Resource_Poll::class, + 'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class, 'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, 'poll/resource_poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, - 'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, 'poll_resource/poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, - 'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, + 'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, 'poll_resource/poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, - 'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, + 'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, 'poll/resource_poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, + 'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, 'productalert/email' => \Mage_ProductAlert_Model_Email::class, 'productalert/mysql4_price' => \Mage_ProductAlert_Model_Mysql4_Price::class, 'productalert/mysql4_price_collection' => \Mage_ProductAlert_Model_Mysql4_Price_Collection::class, @@ -21144,20 +21095,20 @@ 'productalert/mysql4_stock_customer_collection' => \Mage_ProductAlert_Model_Mysql4_Stock_Customer_Collection::class, 'productalert/observer' => \Mage_ProductAlert_Model_Observer::class, 'productalert/price' => \Mage_ProductAlert_Model_Price::class, - 'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, 'productalert_resource/abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, - 'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class, + 'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, 'productalert_resource/price' => \Mage_ProductAlert_Model_Resource_Price::class, - 'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, + 'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class, 'productalert/resource_price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, - 'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, + 'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, 'productalert/resource_price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, + 'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, 'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class, 'productalert/resource_stock' => \Mage_ProductAlert_Model_Resource_Stock::class, - 'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, 'productalert/resource_stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, - 'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, + 'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, 'productalert/resource_stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, + 'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, 'productalert/stock' => \Mage_ProductAlert_Model_Stock::class, 'rating/mysql4_rating' => \Mage_Rating_Model_Mysql4_Rating::class, 'rating/mysql4_rating_collection' => \Mage_Rating_Model_Mysql4_Rating_Collection::class, @@ -21171,20 +21122,20 @@ 'rating/rating_entity' => \Mage_Rating_Model_Rating_Entity::class, 'rating/rating_option' => \Mage_Rating_Model_Rating_Option::class, 'rating/rating_option_vote' => \Mage_Rating_Model_Rating_Option_Vote::class, - 'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class, 'rating/resource_rating' => \Mage_Rating_Model_Resource_Rating::class, + 'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class, 'rating_resource/rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class, 'rating/resource_rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class, 'rating/resource_rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class, 'rating_resource/rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class, - 'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, 'rating/resource_rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, - 'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, + 'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, 'rating_resource/rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, + 'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, 'rating_resource/rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class, 'rating/resource_rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class, - 'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, 'rating/resource_rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, + 'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, 'reports/config' => \Mage_Reports_Model_Config::class, 'reports/event' => \Mage_Reports_Model_Event::class, 'reports/event_observer' => \Mage_Reports_Model_Event_Observer::class, @@ -21230,6 +21181,7 @@ 'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class, 'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class, 'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class, + 'reports/observer' => \Mage_Reports_Model_Observer::class, 'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class, 'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class, 'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class, @@ -21238,88 +21190,88 @@ 'reports_resource/accounts_collection' => \Mage_Reports_Model_Resource_Accounts_Collection::class, 'reports/resource_coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class, 'reports_resource/coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class, - 'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, 'reports/resource_customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, - 'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, + 'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, 'reports/resource_customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, - 'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, + 'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, 'reports_resource/customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, - 'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, + 'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, 'reports/resource_entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, + 'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, 'reports_resource/event' => \Mage_Reports_Model_Resource_Event::class, 'reports/resource_event' => \Mage_Reports_Model_Resource_Event::class, 'reports_resource/event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, 'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, 'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class, 'reports/resource_event_type' => \Mage_Reports_Model_Resource_Event_Type::class, - 'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, 'reports/resource_event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, - 'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, + 'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, 'reports_resource/helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, - 'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, + 'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, 'reports/resource_invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, - 'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, + 'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, 'reports_resource/order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, - 'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, + 'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, 'reports_resource/product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, + 'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, 'reports/resource_product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class, 'reports_resource/product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class, 'reports_resource/product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class, 'reports/resource_product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class, - 'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, 'reports/resource_product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, + 'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, 'reports_resource/product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class, 'reports/resource_product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class, - 'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, 'reports_resource/product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, - 'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, + 'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, 'reports/resource_product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, - 'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, + 'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, 'reports_resource/product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, - 'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, + 'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, 'reports/resource_product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, + 'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, 'reports_resource/product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class, 'reports/resource_product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class, - 'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, 'reports_resource/product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, - 'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, + 'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, 'reports_resource/product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, - 'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, + 'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, 'reports/resource_quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, - 'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class, + 'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, 'reports_resource/refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class, + 'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class, 'reports/resource_report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class, 'reports_resource/report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class, 'reports/resource_report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class, 'reports_resource/report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class, - 'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, 'reports_resource/report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, + 'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, 'reports/resource_report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class, 'reports_resource/report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class, - 'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, 'reports/resource_report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, + 'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, 'reports_resource/review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, 'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, - 'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, 'reports_resource/review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, + 'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, 'reports_resource/review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class, 'reports/resource_review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class, 'reports_resource/shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class, 'reports/resource_shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class, - 'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, 'reports_resource/shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, + 'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, 'reports_resource/tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class, 'reports/resource_tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class, - 'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, 'reports/resource_tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, - 'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, + 'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, 'reports/resource_tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, - 'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, + 'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, 'reports/resource_tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, + 'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, 'reports_resource/wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class, 'reports/resource_wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class, - 'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, 'reports_resource/wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, + 'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, 'reports/session' => \Mage_Reports_Model_Session::class, 'reports/test' => \Mage_Reports_Model_Test::class, 'reports/totals' => \Mage_Reports_Model_Totals::class, @@ -21336,14 +21288,14 @@ 'review/resource_review_collection' => \Mage_Review_Model_Resource_Review_Collection::class, 'review_resource/review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class, 'review/resource_review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class, - 'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class, 'review_resource/review_status' => \Mage_Review_Model_Resource_Review_Status::class, - 'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, + 'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class, 'review_resource/review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, + 'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, 'review/resource_review_summary' => \Mage_Review_Model_Resource_Review_Summary::class, 'review_resource/review_summary' => \Mage_Review_Model_Resource_Review_Summary::class, - 'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, 'review/resource_review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, + 'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, 'review/review' => \Mage_Review_Model_Review::class, 'review/review_status' => \Mage_Review_Model_Review_Status::class, 'review/review_summary' => \Mage_Review_Model_Review_Summary::class, @@ -21366,14 +21318,14 @@ 'rule/mysql4_rule_collection' => \Mage_Rule_Model_Mysql4_Rule_Collection::class, 'rule/renderer_actions' => \Mage_Rule_Model_Renderer_Actions::class, 'rule/renderer_conditions' => \Mage_Rule_Model_Renderer_Conditions::class, - 'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class, 'rule/resource_abstract' => \Mage_Rule_Model_Resource_Abstract::class, - 'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class, + 'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class, 'rule/resource_rule' => \Mage_Rule_Model_Resource_Rule::class, - 'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, + 'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class, 'rule_resource/rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, - 'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, + 'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, 'rule_resource/rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, + 'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, 'rule/resource_rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class, 'rule_resource/rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class, 'rule/rule' => \Mage_Rule_Model_Rule::class, @@ -21402,24 +21354,24 @@ 'salesrule/resource_coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class, 'salesrule/resource_coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class, 'salesrule_resource/coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class, - 'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, 'salesrule_resource/report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, - 'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, + 'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, 'salesrule_resource/report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, + 'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, 'salesrule_resource/report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class, 'salesrule/resource_report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class, 'salesrule_resource/report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class, 'salesrule/resource_report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class, 'salesrule_resource/report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class, 'salesrule/resource_report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class, - 'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class, 'salesrule_resource/rule' => \Mage_SalesRule_Model_Resource_Rule::class, - 'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, + 'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class, 'salesrule_resource/rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, - 'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, + 'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, 'salesrule_resource/rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, - 'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, + 'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, 'salesrule/resource_rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, + 'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, 'salesrule_resource/rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class, 'salesrule/resource_rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class, 'salesrule_resource/rule_product_collection' => \Mage_SalesRule_Model_Resource_Rule_Product_Collection::class, @@ -21464,14 +21416,14 @@ 'sales/email_template' => \Mage_Sales_Model_Email_Template::class, 'sales/entity_order' => \Mage_Sales_Model_Entity_Order::class, 'sales_entity/order' => \Mage_Sales_Model_Entity_Order::class, - 'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class, 'sales_entity/order_address' => \Mage_Sales_Model_Entity_Order_Address::class, - 'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, + 'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class, 'sales/entity_order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, - 'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, + 'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, 'sales_entity/order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, - 'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, + 'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, 'sales_entity/order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, + 'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, 'sales/entity_order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class, 'sales_entity/order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class, 'sales/entity_order_attribute_backend_shipping' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Shipping::class, @@ -21480,22 +21432,22 @@ 'sales/entity_order_collection' => \Mage_Sales_Model_Entity_Order_Collection::class, 'sales_entity/order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class, 'sales/entity_order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class, - 'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, 'sales_entity/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, - 'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, + 'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, 'sales/entity_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, - 'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, + 'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, 'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, + 'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, 'sales/entity_order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class, 'sales_entity/order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class, 'sales/entity_order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class, 'sales_entity/order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class, 'sales_entity/order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class, 'sales/entity_order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class, - 'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, 'sales/entity_order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, - 'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, + 'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, 'sales_entity/order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, + 'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, 'sales/entity_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class, 'sales_entity/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class, 'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class, @@ -21506,28 +21458,28 @@ 'sales/entity_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class, 'sales/entity_order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class, 'sales_entity/order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class, - 'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, 'sales/entity_order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, + 'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, 'sales_entity/order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class, 'sales/entity_order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class, 'sales_entity/order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class, 'sales/entity_order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class, - 'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, 'sales/entity_order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, + 'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, 'sales/entity_order_item' => \Mage_Sales_Model_Entity_Order_Item::class, 'sales_entity/order_item' => \Mage_Sales_Model_Entity_Order_Item::class, 'sales/entity_order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class, 'sales_entity/order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class, - 'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, 'sales/entity_order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, + 'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, 'sales_entity/order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class, 'sales/entity_order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class, 'sales_entity/order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class, 'sales/entity_order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class, - 'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, 'sales_entity/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, - 'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, + 'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, 'sales/entity_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, + 'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, 'sales/entity_order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class, 'sales_entity/order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class, 'sales/entity_order_shipment_comment' => \Mage_Sales_Model_Entity_Order_Shipment_Comment::class, @@ -21536,66 +21488,66 @@ 'sales_entity/order_shipment_comment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Comment_Collection::class, 'sales/entity_order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class, 'sales_entity/order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class, - 'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, 'sales/entity_order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, - 'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, + 'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, 'sales_entity/order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, - 'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, + 'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, 'sales_entity/order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, - 'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, + 'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, 'sales_entity/order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, - 'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, + 'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, 'sales_entity/order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, + 'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, 'sales_entity/quote' => \Mage_Sales_Model_Entity_Quote::class, 'sales/entity_quote' => \Mage_Sales_Model_Entity_Quote::class, - 'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, 'sales_entity/quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, + 'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, 'sales_entity/quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class, 'sales/entity_quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class, - 'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, 'sales/entity_quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, - 'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, + 'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, 'sales/entity_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, - 'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, + 'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, 'sales_entity/quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, - 'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, + 'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, 'sales/entity_quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, + 'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, 'sales_entity/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales/entity_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales_entity/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class, 'sales/entity_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class, - 'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, 'sales_entity/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, - 'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, 'sales/entity_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/entity_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales_entity/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales/entity_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class, 'sales_entity/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class, 'sales/entity_quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class, 'sales_entity/quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class, - 'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, 'sales_entity/quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, - 'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, + 'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, 'sales/entity_quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, - 'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, + 'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, 'sales_entity/quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, + 'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, 'sales/entity_quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class, 'sales_entity/quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class, 'sales/entity_quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class, 'sales_entity/quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class, - 'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, 'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, - 'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, + 'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, 'sales/entity_quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, - 'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, + 'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, 'sales/entity_quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, + 'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, 'sales_entity/quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class, 'sales/entity_quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class, - 'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, 'sales_entity/sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, - 'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class, + 'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, 'sales_entity/setup' => \Mage_Sales_Model_Entity_Setup::class, + 'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class, 'sales/mysql4_abstract' => \Mage_Sales_Model_Mysql4_Abstract::class, 'sales/mysql4_billing_agreement' => \Mage_Sales_Model_Mysql4_Billing_Agreement::class, 'sales/mysql4_billing_agreement_collection' => \Mage_Sales_Model_Mysql4_Billing_Agreement_Collection::class, @@ -21790,48 +21742,48 @@ 'sales/recurring_profile' => \Mage_Sales_Model_Recurring_Profile::class, 'sales_resource/abstract' => \Mage_Sales_Model_Resource_Abstract::class, 'sales/resource_abstract' => \Mage_Sales_Model_Resource_Abstract::class, - 'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, 'sales_resource/billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, - 'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, + 'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, 'sales_resource/billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, - 'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, + 'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, 'sales/resource_collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, - 'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, + 'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, 'sales_resource/helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, - 'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class, + 'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, 'sales_resource/order' => \Mage_Sales_Model_Resource_Order::class, + 'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class, 'sales_resource/order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class, 'sales/resource_order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class, - 'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class, 'sales_resource/order_address' => \Mage_Sales_Model_Resource_Order_Address::class, + 'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class, 'sales/resource_order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class, 'sales_resource/order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class, 'sales/resource_order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class, 'sales_resource/order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class, 'sales/resource_order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class, 'sales_resource/order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class, - 'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, 'sales/resource_order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, + 'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, 'sales_resource/order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class, 'sales/resource_order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class, 'sales/resource_order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class, 'sales_resource/order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class, - 'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, 'sales/resource_order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, + 'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, 'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, 'sales/resource_order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, 'sales/resource_order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, 'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, - 'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, 'sales_resource/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, + 'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, 'sales/resource_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class, 'sales_resource/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class, - 'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, 'sales/resource_order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, - 'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, + 'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, 'sales_resource/order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, - 'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, + 'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, 'sales/resource_order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, + 'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, 'sales/resource_order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, 'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, 'sales_resource/order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class, @@ -21842,84 +21794,84 @@ 'sales/resource_order_grid_collection' => \Mage_Sales_Model_Resource_Order_Grid_Collection::class, 'sales/resource_order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class, 'sales_resource/order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class, - 'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, 'sales/resource_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, - 'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, + 'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, 'sales_resource/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, + 'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, 'sales_resource/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class, 'sales/resource_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class, 'sales/resource_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class, 'sales_resource/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class, 'sales/resource_order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class, 'sales_resource/order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class, - 'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, 'sales/resource_order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, + 'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, 'sales/resource_order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class, 'sales_resource/order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class, - 'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, 'sales/resource_order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, - 'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, + 'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, 'sales_resource/order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, + 'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, 'sales/resource_order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class, 'sales_resource/order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class, - 'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class, 'sales_resource/order_item' => \Mage_Sales_Model_Resource_Order_Item::class, + 'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class, 'sales/resource_order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class, 'sales_resource/order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class, - 'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, 'sales_resource/order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, + 'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, 'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, 'sales/resource_order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, - 'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, 'sales_resource/order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, - 'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, + 'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, 'sales_resource/order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, - 'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, + 'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, 'sales_resource/order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, - 'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, + 'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, 'sales/resource_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, + 'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, 'sales_resource/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class, 'sales/resource_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class, - 'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, 'sales/resource_order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, + 'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, 'sales/resource_order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, 'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, - 'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, 'sales/resource_order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, + 'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, 'sales_resource/order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class, 'sales/resource_order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class, - 'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, 'sales_resource/order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, - 'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, + 'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, 'sales_resource/order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, - 'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, + 'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, 'sales_resource/order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, + 'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, 'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, 'sales_resource/order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, 'sales_resource/order_status' => \Mage_Sales_Model_Resource_Order_Status::class, 'sales/resource_order_status' => \Mage_Sales_Model_Resource_Order_Status::class, 'sales_resource/order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class, 'sales/resource_order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class, - 'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, 'sales_resource/order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, - 'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, + 'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, 'sales_resource/order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, - 'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, + 'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, 'sales/resource_order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, - 'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, + 'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, 'sales_resource/order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, - 'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class, + 'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, 'sales/resource_quote' => \Mage_Sales_Model_Resource_Quote::class, + 'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class, 'sales_resource/quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class, 'sales/resource_quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class, 'sales/resource_quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class, 'sales_resource/quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class, 'sales/resource_quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class, 'sales_resource/quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class, - 'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, 'sales/resource_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, - 'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, + 'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, 'sales/resource_quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, + 'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, 'sales_resource/quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, 'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, 'sales_resource/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class, @@ -21928,82 +21880,82 @@ 'sales_resource/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class, 'sales/resource_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class, 'sales_resource/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class, - 'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/resource_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, - 'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, + 'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/resource_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, + 'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales_resource/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, 'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, - 'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, 'sales/resource_quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, + 'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, 'sales_resource/quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class, 'sales/resource_quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class, - 'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, 'sales/resource_quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, - 'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, + 'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, 'sales_resource/quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, - 'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, + 'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, 'sales_resource/quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, + 'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, 'sales_resource/quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class, 'sales/resource_quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class, - 'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, 'sales/resource_quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, + 'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, 'sales/resource_quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class, 'sales_resource/quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class, - 'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, 'sales/resource_quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, - 'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, + 'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, 'sales/resource_quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, - 'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, + 'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, 'sales_resource/quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, - 'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, + 'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, 'sales/resource_quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, - 'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, + 'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, 'sales/resource_recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, + 'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, 'sales/resource_recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class, 'sales_resource/recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class, - 'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class, 'sales/resource_report' => \Mage_Sales_Model_Resource_Report::class, + 'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class, 'sales/resource_report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class, 'sales_resource/report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class, - 'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, 'sales/resource_report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, - 'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, + 'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, 'sales/resource_report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, + 'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, 'sales_resource/report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, 'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, - 'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, 'sales_resource/report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, + 'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, 'sales/resource_report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class, 'sales_resource/report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class, 'sales_resource/report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class, 'sales/resource_report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class, 'sales/resource_report_order' => \Mage_Sales_Model_Resource_Report_Order::class, 'sales_resource/report_order' => \Mage_Sales_Model_Resource_Report_Order::class, - 'sales/resource_report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class, 'sales_resource/report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class, - 'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class, + 'sales/resource_report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class, 'sales/resource_report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class, + 'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class, 'sales_resource/report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class, 'sales/resource_report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class, - 'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, 'sales/resource_report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, - 'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, + 'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, 'sales_resource/report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, + 'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, 'sales_resource/report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class, 'sales/resource_report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class, 'sales_resource/report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class, 'sales/resource_report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class, - 'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, 'sales_resource/report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, + 'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, 'sales_resource/report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class, 'sales/resource_report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class, 'sales_resource/report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class, 'sales/resource_report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class, - 'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, 'sales/resource_sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, - 'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class, + 'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, 'sales/resource_setup' => \Mage_Sales_Model_Resource_Setup::class, + 'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class, 'sales/service_order' => \Mage_Sales_Model_Service_Order::class, 'sales/service_quote' => \Mage_Sales_Model_Service_Quote::class, 'sales/status_list' => \Mage_Sales_Model_Status_List::class, @@ -22013,8 +21965,8 @@ 'sendfriend/observer' => \Mage_Sendfriend_Model_Observer::class, 'sendfriend_resource/sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class, 'sendfriend/resource_sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class, - 'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, 'sendfriend/resource_sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, + 'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, 'sendfriend/resource_setup' => \Mage_Sendfriend_Model_Resource_Setup::class, 'sendfriend_resource/setup' => \Mage_Sendfriend_Model_Resource_Setup::class, 'sendfriend/sendfriend' => \Mage_Sendfriend_Model_Sendfriend::class, @@ -22054,16 +22006,16 @@ 'sitemap/observer' => \Mage_Sitemap_Model_Observer::class, 'sitemap_resource/catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class, 'sitemap/resource_catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class, - 'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, 'sitemap/resource_catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, + 'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, 'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, 'sitemap_resource/catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, 'sitemap_resource/cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, 'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, 'sitemap_resource/sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class, 'sitemap/resource_sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class, - 'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, 'sitemap_resource/sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, + 'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, 'sitemap/sitemap' => \Mage_Sitemap_Model_Sitemap::class, 'tag/api' => \Mage_Tag_Model_Api::class, 'tag/api_v2' => \Mage_Tag_Model_Api_V2::class, @@ -22076,21 +22028,21 @@ 'tag/mysql4_tag' => \Mage_Tag_Model_Mysql4_Tag::class, 'tag/mysql4_tag_collection' => \Mage_Tag_Model_Mysql4_Tag_Collection::class, 'tag/mysql4_tag_relation' => \Mage_Tag_Model_Mysql4_Tag_Relation::class, - 'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag/resource_customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag_resource/customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, - 'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, + 'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag_resource/indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, - 'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, + 'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, 'tag_resource/popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, + 'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, 'tag_resource/product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class, 'tag/resource_product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class, 'tag_resource/tag' => \Mage_Tag_Model_Resource_Tag::class, 'tag/resource_tag' => \Mage_Tag_Model_Resource_Tag::class, - 'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, 'tag_resource/tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, - 'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, + 'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, 'tag_resource/tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, + 'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, 'tag/session' => \Mage_Tag_Model_Session::class, 'tag/tag' => \Mage_Tag_Model_Tag::class, 'tag/tag_relation' => \Mage_Tag_Model_Tag_Relation::class, @@ -22129,16 +22081,16 @@ 'tax/resource_calculation_rate' => \Mage_Tax_Model_Resource_Calculation_Rate::class, 'tax/resource_calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class, 'tax_resource/calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class, - 'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, 'tax/resource_calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, - 'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, + 'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, 'tax/resource_calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, - 'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, + 'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, 'tax/resource_calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, - 'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, + 'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, 'tax_resource/calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, - 'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class, + 'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, 'tax/resource_class' => \Mage_Tax_Model_Resource_Class::class, + 'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class, 'tax/resource_class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class, 'tax_resource/class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class, 'tax_resource/report_collection' => \Mage_Tax_Model_Resource_Report_Collection::class, @@ -22149,10 +22101,10 @@ 'tax/resource_report_tax_createdat' => \Mage_Tax_Model_Resource_Report_Tax_Createdat::class, 'tax_resource/report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class, 'tax/resource_report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class, - 'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, 'tax/resource_report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, - 'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, + 'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, 'tax_resource/sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, + 'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, 'tax_resource/sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class, 'tax/resource_sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class, 'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class, @@ -22241,8 +22193,8 @@ 'weee/observer' => \Mage_Weee_Model_Observer::class, 'weee/resource_attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class, 'weee_resource/attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class, - 'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class, 'weee/resource_setup' => \Mage_Weee_Model_Resource_Setup::class, + 'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class, 'weee/resource_tax' => \Mage_Weee_Model_Resource_Tax::class, 'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class, 'weee/tax' => \Mage_Weee_Model_Tax::class, @@ -22254,12 +22206,12 @@ 'widget/mysql4_widget_instance' => \Mage_Widget_Model_Mysql4_Widget_Instance::class, 'widget/mysql4_widget_instance_collection' => \Mage_Widget_Model_Mysql4_Widget_Instance_Collection::class, 'widget/observer' => \Mage_Widget_Model_Observer::class, - 'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class, 'widget/resource_widget' => \Mage_Widget_Model_Resource_Widget::class, + 'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class, 'widget_resource/widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class, 'widget/resource_widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class, - 'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, 'widget_resource/widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, + 'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, 'widget/template_filter' => \Mage_Widget_Model_Template_Filter::class, 'widget/widget' => \Mage_Widget_Model_Widget::class, 'widget/widget_config' => \Mage_Widget_Model_Widget_Config::class, @@ -22276,14 +22228,14 @@ 'wishlist/mysql4_wishlist' => \Mage_Wishlist_Model_Mysql4_Wishlist::class, 'wishlist/mysql4_wishlist_collection' => \Mage_Wishlist_Model_Mysql4_Wishlist_Collection::class, 'wishlist/observer' => \Mage_Wishlist_Model_Observer::class, - 'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class, 'wishlist_resource/item' => \Mage_Wishlist_Model_Resource_Item::class, + 'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class, 'wishlist_resource/item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class, 'wishlist/resource_item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class, - 'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, 'wishlist/resource_item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, - 'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, + 'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, 'wishlist_resource/item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, + 'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, 'wishlist_resource/product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class, 'wishlist/resource_product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class, 'wishlist/resource_wishlist' => \Mage_Wishlist_Model_Resource_Wishlist::class, @@ -22292,7 +22244,6 @@ 'wishlist/resource_wishlist_collection' => \Mage_Wishlist_Model_Resource_Wishlist_Collection::class, 'wishlist/session' => \Mage_Wishlist_Model_Session::class, 'wishlist/wishlist' => \Mage_Wishlist_Model_Wishlist::class, - 'varien/autoload' => \Varien_Autoload::class, ]) ); override( \Mage_Shipping_Model_Carrier_Tablerate::_getModel(0), @@ -22302,11 +22253,10 @@ 'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class, 'adminnotification/mysql4_inbox_collection' => \Mage_AdminNotification_Model_Mysql4_Inbox_Collection::class, 'adminnotification/observer' => \Mage_AdminNotification_Model_Observer::class, - 'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, 'adminnotification/resource_inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, - 'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, + 'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, 'adminnotification/resource_inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, - 'adminnotification/survey' => \Mage_AdminNotification_Model_Survey::class, + 'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, 'admin/acl' => \Mage_Admin_Model_Acl::class, 'admin/acl_assert_ip' => \Mage_Admin_Model_Acl_Assert_Ip::class, 'admin/acl_assert_time' => \Mage_Admin_Model_Acl_Assert_Time::class, @@ -22335,38 +22285,38 @@ 'admin/redirectpolicy' => \Mage_Admin_Model_Redirectpolicy::class, 'admin/resource_acl' => \Mage_Admin_Model_Resource_Acl::class, 'admin_resource/acl' => \Mage_Admin_Model_Resource_Acl::class, - 'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, 'admin/resource_acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, + 'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, 'admin/resource_acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class, 'admin_resource/acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class, - 'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class, 'admin/resource_block' => \Mage_Admin_Model_Resource_Block::class, - 'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, + 'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class, 'admin/resource_block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, + 'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, 'admin_resource/permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class, 'admin/resource_permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class, 'admin/resource_role' => \Mage_Admin_Model_Resource_Role::class, 'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class, 'admin/resource_role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class, 'admin_resource/role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class, - 'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class, 'admin_resource/roles' => \Mage_Admin_Model_Resource_Roles::class, - 'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, + 'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class, 'admin_resource/roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, - 'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, + 'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, 'admin/resource_roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, + 'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, 'admin/resource_rules' => \Mage_Admin_Model_Resource_Rules::class, 'admin_resource/rules' => \Mage_Admin_Model_Resource_Rules::class, - 'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, 'admin_resource/rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, + 'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, 'admin_resource/user' => \Mage_Admin_Model_Resource_User::class, 'admin/resource_user' => \Mage_Admin_Model_Resource_User::class, 'admin/resource_user_collection' => \Mage_Admin_Model_Resource_User_Collection::class, 'admin_resource/user_collection' => \Mage_Admin_Model_Resource_User_Collection::class, - 'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class, 'admin_resource/variable' => \Mage_Admin_Model_Resource_Variable::class, - 'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, + 'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class, 'admin/resource_variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, + 'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, 'admin/role' => \Mage_Admin_Model_Role::class, 'admin/roles' => \Mage_Admin_Model_Roles::class, 'admin/rules' => \Mage_Admin_Model_Rules::class, @@ -22401,6 +22351,7 @@ 'adminhtml/system_config_backend_baseurl' => \Mage_Adminhtml_Model_System_Config_Backend_Baseurl::class, 'adminhtml/system_config_backend_cache' => \Mage_Adminhtml_Model_System_Config_Backend_Cache::class, 'adminhtml/system_config_backend_catalog_inventory_managestock' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock::class, + 'adminhtml/system_config_backend_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Separator::class, 'adminhtml/system_config_backend_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Type::class, 'adminhtml/system_config_backend_category' => \Mage_Adminhtml_Model_System_Config_Backend_Category::class, 'adminhtml/system_config_backend_cookie' => \Mage_Adminhtml_Model_System_Config_Backend_Cookie::class, @@ -22453,12 +22404,14 @@ 'adminhtml/system_config_source_catalog_listMode' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListMode::class, 'adminhtml/system_config_source_catalog_listPerPage' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListPerPage::class, 'adminhtml/system_config_source_catalog_listSort' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort::class, + 'adminhtml/system_config_source_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Separator::class, 'adminhtml/system_config_source_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Type::class, 'adminhtml/system_config_source_catalog_timeFormat' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_TimeFormat::class, 'adminhtml/system_config_source_category' => \Mage_Adminhtml_Model_System_Config_Source_Category::class, 'adminhtml/system_config_source_checktype' => \Mage_Adminhtml_Model_System_Config_Source_Checktype::class, 'adminhtml/system_config_source_cms_page' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Page::class, 'adminhtml/system_config_source_cms_wysiwyg_enabled' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Wysiwyg_Enabled::class, + 'adminhtml/system_config_source_cookie_samesite' => \Mage_Adminhtml_Model_System_Config_Source_Cookie_Samesite::class, 'adminhtml/system_config_source_country' => \Mage_Adminhtml_Model_System_Config_Source_Country::class, 'adminhtml/system_config_source_country_full' => \Mage_Adminhtml_Model_System_Config_Source_Country_Full::class, 'adminhtml/system_config_source_cron_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency::class, @@ -22485,6 +22438,7 @@ 'adminhtml/system_config_source_locale_timezone' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Timezone::class, 'adminhtml/system_config_source_locale_weekdaycodes' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdaycodes::class, 'adminhtml/system_config_source_locale_weekdays' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdays::class, + 'adminhtml/system_config_source_log_level' => \Mage_Adminhtml_Model_System_Config_Source_Log_Level::class, 'adminhtml/system_config_source_nooptreq' => \Mage_Adminhtml_Model_System_Config_Source_Nooptreq::class, 'adminhtml/system_config_source_notification_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Notification_Frequency::class, 'adminhtml/system_config_source_order_status' => \Mage_Adminhtml_Model_System_Config_Source_Order_Status::class, @@ -22508,7 +22462,6 @@ 'adminhtml/system_config_source_shipping_flatrate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Flatrate::class, 'adminhtml/system_config_source_shipping_tablerate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Tablerate::class, 'adminhtml/system_config_source_shipping_taxclass' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Taxclass::class, - 'adminhtml/system_config_source_startdateenddate' => \Mage_Adminhtml_Model_System_Config_Source_Startdateenddate::class, 'adminhtml/system_config_source_storage_media_database' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Database::class, 'adminhtml/system_config_source_storage_media_storage' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Storage::class, 'adminhtml/system_config_source_store' => \Mage_Adminhtml_Model_System_Config_Source_Store::class, @@ -22564,22 +22517,22 @@ 'api2_resource/acl_filter_attribute' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute::class, 'api2/resource_acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class, 'api2_resource/acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class, - 'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, 'api2_resource/acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, + 'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, 'api2/resource_acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class, 'api2_resource/acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class, 'api2_resource/acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class, 'api2/resource_acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class, 'api2/resource_acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class, 'api2_resource/acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class, - 'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class, 'api2/resource_setup' => \Mage_Api2_Model_Resource_Setup::class, + 'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class, 'api2/resource_validator' => \Mage_Api2_Model_Resource_Validator::class, 'api2_resource/validator' => \Mage_Api2_Model_Resource_Validator::class, 'api2/resource_validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class, 'api2_resource/validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class, - 'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, 'api2/resource_validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, + 'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, 'api2/response' => \Mage_Api2_Model_Response::class, 'api2/route_abstract' => \Mage_Api2_Model_Route_Abstract::class, 'api2/route_apiType' => \Mage_Api2_Model_Route_ApiType::class, @@ -22611,8 +22564,8 @@ 'api/mysql4_user_collection' => \Mage_Api_Model_Mysql4_User_Collection::class, 'api/resource_abstract' => \Mage_Api_Model_Resource_Abstract::class, 'api_resource/abstract' => \Mage_Api_Model_Resource_Abstract::class, - 'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class, 'api_resource/acl' => \Mage_Api_Model_Resource_Acl::class, + 'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class, 'api_resource/acl_role' => \Mage_Api_Model_Resource_Acl_Role::class, 'api/resource_acl_role' => \Mage_Api_Model_Resource_Acl_Role::class, 'api/resource_acl_role_collection' => \Mage_Api_Model_Resource_Acl_Role_Collection::class, @@ -22621,14 +22574,14 @@ 'api_resource/permissions_collection' => \Mage_Api_Model_Resource_Permissions_Collection::class, 'api_resource/role' => \Mage_Api_Model_Resource_Role::class, 'api/resource_role' => \Mage_Api_Model_Resource_Role::class, - 'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, 'api_resource/role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, + 'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, 'api/resource_roles' => \Mage_Api_Model_Resource_Roles::class, 'api_resource/roles' => \Mage_Api_Model_Resource_Roles::class, - 'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, 'api_resource/roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, - 'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, + 'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, 'api_resource/roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, + 'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, 'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class, 'api_resource/rules' => \Mage_Api_Model_Resource_Rules::class, 'api_resource/rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class, @@ -22659,15 +22612,6 @@ 'authorizenet/directpost_request' => \Mage_Authorizenet_Model_Directpost_Request::class, 'authorizenet/directpost_response' => \Mage_Authorizenet_Model_Directpost_Response::class, 'authorizenet/directpost_session' => \Mage_Authorizenet_Model_Directpost_Session::class, - 'backup/backup' => \Mage_Backup_Model_Backup::class, - 'backup/config_backend_cron' => \Mage_Backup_Model_Config_Backend_Cron::class, - 'backup/config_source_type' => \Mage_Backup_Model_Config_Source_Type::class, - 'backup/db' => \Mage_Backup_Model_Db::class, - 'backup/fs_collection' => \Mage_Backup_Model_Fs_Collection::class, - 'backup/mysql4_db' => \Mage_Backup_Model_Mysql4_Db::class, - 'backup/observer' => \Mage_Backup_Model_Observer::class, - 'backup/resource_db' => \Mage_Backup_Model_Resource_Db::class, - 'backup/resource_helper_mysql4' => \Mage_Backup_Model_Resource_Helper_Mysql4::class, 'bundle/catalogIndex_data_bundle' => \Mage_Bundle_Model_CatalogIndex_Data_Bundle::class, 'bundle/mysql4_bundle' => \Mage_Bundle_Model_Mysql4_Bundle::class, 'bundle/mysql4_indexer_price' => \Mage_Bundle_Model_Mysql4_Indexer_Price::class, @@ -22687,16 +22631,16 @@ 'bundle/resource_bundle' => \Mage_Bundle_Model_Resource_Bundle::class, 'bundle/resource_indexer_price' => \Mage_Bundle_Model_Resource_Indexer_Price::class, 'bundle_resource/indexer_price' => \Mage_Bundle_Model_Resource_Indexer_Price::class, - 'bundle/resource_indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class, 'bundle_resource/indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class, + 'bundle/resource_indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class, 'bundle/resource_option' => \Mage_Bundle_Model_Resource_Option::class, 'bundle_resource/option' => \Mage_Bundle_Model_Resource_Option::class, 'bundle/resource_option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class, 'bundle_resource/option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class, 'bundle_resource/price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, 'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, - 'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class, 'bundle_resource/selection' => \Mage_Bundle_Model_Resource_Selection::class, + 'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class, 'bundle_resource/selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class, 'bundle/resource_selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class, 'bundle/sales_order_pdf_items_abstract' => \Mage_Bundle_Model_Sales_Order_Pdf_Items_Abstract::class, @@ -22756,14 +22700,14 @@ 'catalogindex/resource_data_abstract' => \Mage_CatalogIndex_Model_Resource_Data_Abstract::class, 'catalogindex_resource/data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class, 'catalogindex/resource_data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class, - 'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, 'catalogindex_resource/data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, + 'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, 'catalogindex_resource/indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class, 'catalogindex/resource_indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class, 'catalogindex/resource_indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class, 'catalogindex_resource/indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class, - 'catalogindex_resource/indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class, 'catalogindex/resource_indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class, + 'catalogindex_resource/indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class, 'catalogindex_resource/indexer_minimalprice' => \Mage_CatalogIndex_Model_Resource_Indexer_Minimalprice::class, 'catalogindex/resource_indexer_minimalprice' => \Mage_CatalogIndex_Model_Resource_Indexer_Minimalprice::class, 'catalogindex/resource_indexer_price' => \Mage_CatalogIndex_Model_Resource_Indexer_Price::class, @@ -22789,20 +22733,20 @@ 'cataloginventory/mysql4_stock_item_collection' => \Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection::class, 'cataloginventory/mysql4_stock_status' => \Mage_CatalogInventory_Model_Mysql4_Stock_Status::class, 'cataloginventory/observer' => \Mage_CatalogInventory_Model_Observer::class, - 'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, 'cataloginventory_resource/indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, + 'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, 'cataloginventory/resource_indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class, 'cataloginventory_resource/indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class, - 'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, 'cataloginventory/resource_indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, + 'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, 'cataloginventory/resource_indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class, 'cataloginventory_resource/indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class, 'cataloginventory_resource/stock' => \Mage_CatalogInventory_Model_Resource_Stock::class, 'cataloginventory/resource_stock' => \Mage_CatalogInventory_Model_Resource_Stock::class, 'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, 'cataloginventory/resource_stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, - 'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, 'cataloginventory/resource_stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, + 'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, 'cataloginventory/resource_stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class, 'cataloginventory_resource/stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class, 'cataloginventory/source_backorders' => \Mage_CatalogInventory_Model_Source_Backorders::class, @@ -22823,10 +22767,10 @@ 'catalogrule/mysql4_rule_product_price' => \Mage_CatalogRule_Model_Mysql4_Rule_Product_Price::class, 'catalogrule/mysql4_rule_product_price_collection' => \Mage_CatalogRule_Model_Mysql4_Rule_Product_Price_Collection::class, 'catalogrule/observer' => \Mage_CatalogRule_Model_Observer::class, - 'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class, 'catalogrule/resource_rule' => \Mage_CatalogRule_Model_Resource_Rule::class, - 'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, + 'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class, 'catalogrule_resource/rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, + 'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, 'catalogrule_resource/rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class, 'catalogrule/resource_rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class, 'catalogrule_resource/rule_product_price_collection' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price_Collection::class, @@ -22855,24 +22799,24 @@ 'catalogsearch/query' => \Mage_CatalogSearch_Model_Query::class, 'catalogsearch_resource/advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class, 'catalogsearch/resource_advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class, - 'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, 'catalogsearch_resource/advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, + 'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, 'catalogsearch_resource/fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class, 'catalogsearch/resource_fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class, 'catalogsearch_resource/fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class, 'catalogsearch/resource_fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class, 'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, 'catalogsearch_resource/fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, - 'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, 'catalogsearch/resource_helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, - 'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, + 'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, 'catalogsearch_resource/indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, + 'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, 'catalogsearch_resource/query' => \Mage_CatalogSearch_Model_Resource_Query::class, 'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class, - 'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, 'catalogsearch_resource/query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, - 'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, + 'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, 'catalogsearch/resource_search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, + 'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, 'catalogsearch/session' => \Mage_CatalogSearch_Model_Session::class, 'catalogsearch/system_config_backend_sitemap' => \Mage_CatalogSearch_Model_System_Config_Backend_Sitemap::class, 'catalog/abstract' => \Mage_Catalog_Model_Abstract::class, @@ -23015,144 +22959,144 @@ 'catalog/product_website' => \Mage_Catalog_Model_Product_Website::class, 'catalog/resource_abstract' => \Mage_Catalog_Model_Resource_Abstract::class, 'catalog_resource/abstract' => \Mage_Catalog_Model_Resource_Abstract::class, - 'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class, 'catalog/resource_attribute' => \Mage_Catalog_Model_Resource_Attribute::class, - 'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class, + 'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class, 'catalog_resource/category' => \Mage_Catalog_Model_Resource_Category::class, + 'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class, 'catalog_resource/category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class, 'catalog/resource_category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class, - 'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, 'catalog/resource_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, - 'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, + 'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, 'catalog/resource_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, + 'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, 'catalog_resource/category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class, 'catalog/resource_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class, 'catalog_resource/category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class, 'catalog/resource_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class, 'catalog/resource_category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class, 'catalog_resource/category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class, - 'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, 'catalog_resource/category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, - 'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, + 'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, 'catalog/resource_category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, + 'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, 'catalog_resource/category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class, 'catalog/resource_category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class, 'catalog/resource_category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class, 'catalog_resource/category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class, - 'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, 'catalog_resource/collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, - 'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class, + 'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, 'catalog_resource/config' => \Mage_Catalog_Model_Resource_Config::class, - 'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, + 'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class, 'catalog/resource_eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, + 'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, 'catalog_resource/eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class, 'catalog/resource_eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class, - 'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, 'catalog_resource/eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, - 'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, + 'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, 'catalog/resource_eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, - 'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, + 'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, 'catalog_resource/eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, + 'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, 'catalog_resource/eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, - 'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, + 'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, 'catalog_resource/eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, + 'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, 'catalog/resource_eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class, 'catalog_resource/eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class, 'catalog/resource_eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class, 'catalog_resource/eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class, 'catalog/resource_eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class, 'catalog_resource/eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class, - 'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, 'catalog/resource_eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, - 'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, + 'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, 'catalog/resource_eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, + 'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, 'catalog/resource_eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class, 'catalog_resource/eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class, - 'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, 'catalog_resource/eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, + 'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, 'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, 'catalog_resource/eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, 'catalog_resource/eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class, 'catalog/resource_eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class, - 'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, 'catalog_resource/eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, - 'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, + 'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, 'catalog/resource_eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, - 'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, + 'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, 'catalog/resource_eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, - 'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, + 'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, 'catalog/resource_eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, + 'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, 'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, 'catalog_resource/eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, 'catalog_resource/eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, - 'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, 'catalog/resource_eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, + 'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class, 'catalog/resource_eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, + 'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, 'catalog/resource_eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class, 'catalog/resource_eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class, 'catalog_resource/eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class, 'catalog_resource/eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class, 'catalog/resource_eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class, - 'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, 'catalog_resource/eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, - 'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, + 'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, 'catalog_resource/eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, - 'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, + 'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, 'catalog_resource/eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, + 'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, 'catalog/resource_eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class, 'catalog/resource_eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class, 'catalog/resource_eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class, - 'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, 'catalog/resource_eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, - 'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, + 'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, 'catalog_resource/eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, + 'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, 'catalog_resource/eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class, 'catalog/resource_eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class, 'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, 'catalog/resource_eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, - 'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, 'catalog/resource_eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, + 'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, 'catalog/resource_eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class, 'catalog_resource/eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class, - 'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, 'catalog/resource_eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, + 'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, 'catalog_resource/eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class, 'catalog/resource_eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class, 'catalog_resource/eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class, 'catalog/resource_eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class, 'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, 'catalog/resource_eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, - 'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, 'catalog_resource/eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, - 'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, + 'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, 'catalog/resource_eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, - 'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, + 'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, 'catalog/resource_eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, - 'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, + 'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, 'catalog/resource_eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, + 'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, 'catalog/resource_eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class, 'catalog_resource/eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class, - 'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, 'catalog_resource/eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, - 'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, + 'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, 'catalog/resource_eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, - 'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, + 'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, 'catalog/resource_eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, + 'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, 'catalog_resource/eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, + 'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, 'catalog/resource_eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class, 'catalog_resource/eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class, 'catalog/resource_eav_mysql4_sendfriend' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend::class, @@ -23161,98 +23105,98 @@ 'catalog/resource_eav_mysql4_sendfriend_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection::class, 'catalog_resource/eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class, 'catalog/resource_eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class, - 'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, 'catalog/resource_eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, + 'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, 'catalog/resource_helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, 'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, 'catalog_resource/layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class, 'catalog/resource_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class, 'catalog/resource_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class, 'catalog_resource/layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class, - 'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, 'catalog/resource_layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, - 'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class, + 'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, 'catalog_resource/product' => \Mage_Catalog_Model_Resource_Product::class, + 'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class, 'catalog/resource_product_action' => \Mage_Catalog_Model_Resource_Product_Action::class, 'catalog_resource/product_action' => \Mage_Catalog_Model_Resource_Product_Action::class, - 'catalog_resource/product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class, 'catalog/resource_product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class, + 'catalog_resource/product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class, 'catalog/resource_product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class, 'catalog_resource/product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class, 'catalog/resource_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class, 'catalog_resource/product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class, - 'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, 'catalog/resource_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, + 'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, 'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, 'catalog_resource/product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, 'catalog/resource_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class, - 'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, 'catalog_resource/product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, + 'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, 'catalog/resource_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, 'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, - 'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, - 'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, + 'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, + 'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, 'catalog_resource/product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class, 'catalog/resource_product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class, - 'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, 'catalog/resource_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, + 'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, 'catalog/resource_product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class, 'catalog_resource/product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class, - 'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, 'catalog/resource_product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, + 'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, 'catalog/resource_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class, 'catalog_resource/product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class, - 'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, 'catalog_resource/product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, - 'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, + 'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, 'catalog/resource_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, + 'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, 'catalog/resource_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class, 'catalog_resource/product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class, - 'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, 'catalog_resource/product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, - 'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, + 'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, 'catalog_resource/product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, - 'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, + 'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, 'catalog_resource/product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, + 'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, 'catalog/resource_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class, 'catalog_resource/product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class, 'catalog_resource/product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class, 'catalog/resource_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class, - 'catalog/resource_product_link' => \Mage_Catalog_Model_Resource_Product_Link::class, 'catalog_resource/product_link' => \Mage_Catalog_Model_Resource_Product_Link::class, + 'catalog/resource_product_link' => \Mage_Catalog_Model_Resource_Product_Link::class, 'catalog/resource_product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class, 'catalog_resource/product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class, - 'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, 'catalog/resource_product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, - 'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, + 'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, 'catalog_resource/product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, - 'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, + 'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, 'catalog/resource_product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, - 'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, + 'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, 'catalog_resource/product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, - 'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, + 'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, 'catalog_resource/product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, + 'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, 'catalog_resource/product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class, 'catalog/resource_product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class, 'catalog_resource/product_status' => \Mage_Catalog_Model_Resource_Product_Status::class, 'catalog/resource_product_status' => \Mage_Catalog_Model_Resource_Product_Status::class, 'catalog_resource/product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class, 'catalog/resource_product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class, - 'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, 'catalog/resource_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, - 'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, + 'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, 'catalog_resource/product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, + 'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, 'catalog_resource/product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class, 'catalog/resource_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class, - 'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, 'catalog_resource/product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, + 'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, 'catalog/resource_setup' => \Mage_Catalog_Model_Resource_Setup::class, 'catalog_resource/setup' => \Mage_Catalog_Model_Resource_Setup::class, - 'catalog/resource_url' => \Mage_Catalog_Model_Resource_Url::class, 'catalog_resource/url' => \Mage_Catalog_Model_Resource_Url::class, + 'catalog/resource_url' => \Mage_Catalog_Model_Resource_Url::class, 'catalog/session' => \Mage_Catalog_Model_Session::class, 'catalog/system_config_backend_catalog_category_flat' => \Mage_Catalog_Model_System_Config_Backend_Catalog_Category_Flat::class, 'catalog/system_config_backend_catalog_product_flat' => \Mage_Catalog_Model_System_Config_Backend_Catalog_Product_Flat::class, @@ -23294,12 +23238,12 @@ 'checkout/observer' => \Mage_Checkout_Model_Observer::class, 'checkout_resource/agreement' => \Mage_Checkout_Model_Resource_Agreement::class, 'checkout/resource_agreement' => \Mage_Checkout_Model_Resource_Agreement::class, - 'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, 'checkout/resource_agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, - 'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class, + 'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, 'checkout_resource/cart' => \Mage_Checkout_Model_Resource_Cart::class, - 'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class, + 'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class, 'checkout/resource_setup' => \Mage_Checkout_Model_Resource_Setup::class, + 'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class, 'checkout/session' => \Mage_Checkout_Model_Session::class, 'checkout/type_abstract' => \Mage_Checkout_Model_Type_Abstract::class, 'checkout/type_multishipping' => \Mage_Checkout_Model_Type_Multishipping::class, @@ -23314,25 +23258,25 @@ 'cms/mysql4_page_service' => \Mage_Cms_Model_Mysql4_Page_Service::class, 'cms/observer' => \Mage_Cms_Model_Observer::class, 'cms/page' => \Mage_Cms_Model_Page::class, - 'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class, 'cms/resource_block' => \Mage_Cms_Model_Resource_Block::class, + 'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class, 'cms_resource/block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class, 'cms/resource_block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class, 'cms/resource_page' => \Mage_Cms_Model_Resource_Page::class, 'cms_resource/page' => \Mage_Cms_Model_Resource_Page::class, 'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, 'cms_resource/page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, - 'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class, 'cms/resource_page_service' => \Mage_Cms_Model_Resource_Page_Service::class, + 'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class, 'cms/template_filter' => \Mage_Cms_Model_Template_Filter::class, 'cms/wysiwyg_config' => \Mage_Cms_Model_Wysiwyg_Config::class, 'cms/wysiwyg_images_storage' => \Mage_Cms_Model_Wysiwyg_Images_Storage::class, 'cms/wysiwyg_images_storage_collection' => \Mage_Cms_Model_Wysiwyg_Images_Storage_Collection::class, 'configurableswatches/observer' => \Mage_ConfigurableSwatches_Model_Observer::class, - 'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, 'configurableswatches_resource/catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, - 'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, + 'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, 'configurableswatches_resource/catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, + 'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, 'configurableswatches_resource/catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class, 'configurableswatches/resource_catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class, 'configurableswatches/system_config_source_catalog_product_configattribute' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute::class, @@ -23439,152 +23383,152 @@ 'core/mysql4_website_collection' => \Mage_Core_Model_Mysql4_Website_Collection::class, 'core/observer' => \Mage_Core_Model_Observer::class, 'core/resource' => \Mage_Core_Model_Resource::class, + 'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, 'core_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, 'core/resource_abstract' => \Mage_Core_Model_Resource_Abstract::class, - 'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, + 'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class, 'core/resource_cache' => \Mage_Core_Model_Resource_Cache::class, 'core_resource/cache' => \Mage_Core_Model_Resource_Cache::class, - 'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class, 'core_resource/config' => \Mage_Core_Model_Resource_Config::class, 'payment_resource/config' => \Mage_Core_Model_Resource_Config::class, 'core/resource_config' => \Mage_Core_Model_Resource_Config::class, - 'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, 'core/resource_config_data' => \Mage_Core_Model_Resource_Config_Data::class, + 'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, 'payment_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, - 'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'core_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, + 'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, - 'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, - 'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, 'payment_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, + 'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, + 'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, 'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, - 'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, 'core/resource_db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, - 'core/resource_design' => \Mage_Core_Model_Resource_Design::class, + 'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, 'core_resource/design' => \Mage_Core_Model_Resource_Design::class, + 'core/resource_design' => \Mage_Core_Model_Resource_Design::class, 'payment_resource/design' => \Mage_Core_Model_Resource_Design::class, - 'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, - 'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, 'payment_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, - 'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, + 'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, + 'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, 'payment_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, 'core/resource_design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, - 'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, - 'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, + 'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, 'core/resource_email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, - 'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, - 'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, + 'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, + 'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, 'payment_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, - 'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, + 'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, + 'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, 'core/resource_email_template' => \Mage_Core_Model_Resource_Email_Template::class, + 'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, 'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, - 'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, 'core/resource_email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, + 'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, 'core_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, 'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, 'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, 'core_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, - 'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, - 'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, 'core_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, 'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, - 'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, 'payment_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, + 'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, + 'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, 'payment_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, 'core/resource_file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, - 'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, - 'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, 'core/resource_file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, + 'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, 'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, - 'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, 'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, + 'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, 'core/resource_file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, 'payment_resource/flag' => \Mage_Core_Model_Resource_Flag::class, - 'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class, 'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class, + 'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class, 'payment_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, - 'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, 'core_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, - 'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, + 'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, 'core/resource_helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, + 'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, 'core_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, - 'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, - 'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, 'core/resource_iterator' => \Mage_Core_Model_Resource_Iterator::class, - 'core/resource_language' => \Mage_Core_Model_Resource_Language::class, - 'core_resource/language' => \Mage_Core_Model_Resource_Language::class, + 'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, + 'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, 'payment_resource/language' => \Mage_Core_Model_Resource_Language::class, + 'core_resource/language' => \Mage_Core_Model_Resource_Language::class, + 'core/resource_language' => \Mage_Core_Model_Resource_Language::class, 'payment_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, - 'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, 'core/resource_language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, - 'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class, + 'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, 'core_resource/layout' => \Mage_Core_Model_Resource_Layout::class, 'core/resource_layout' => \Mage_Core_Model_Resource_Layout::class, - 'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class, + 'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class, 'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class, 'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class, + 'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class, + 'core/resource_session' => \Mage_Core_Model_Resource_Session::class, 'payment_resource/session' => \Mage_Core_Model_Resource_Session::class, 'core_resource/session' => \Mage_Core_Model_Resource_Session::class, - 'core/resource_session' => \Mage_Core_Model_Resource_Session::class, 'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class, 'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class, 'payment_resource/setup' => \Mage_Core_Model_Resource_Setup::class, - 'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core/resource_setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, - 'payment_resource/store' => \Mage_Core_Model_Resource_Store::class, - 'core_resource/store' => \Mage_Core_Model_Resource_Store::class, + 'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core/resource_store' => \Mage_Core_Model_Resource_Store::class, - 'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, + 'core_resource/store' => \Mage_Core_Model_Resource_Store::class, + 'payment_resource/store' => \Mage_Core_Model_Resource_Store::class, 'core/resource_store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, 'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, - 'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, + 'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, 'core/resource_store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'payment_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, - 'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, - 'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, + 'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'payment_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, - 'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, + 'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, + 'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, 'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class, + 'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, 'core_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, 'core_resource/translate' => \Mage_Core_Model_Resource_Translate::class, - 'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class, 'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class, - 'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, - 'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class, + 'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class, 'payment_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, - 'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class, + 'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, 'core/resource_type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, 'payment_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, - 'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'core/resource_type_db' => \Mage_Core_Model_Resource_Type_Db::class, + 'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, - 'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, - 'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, 'core_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, - 'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, - 'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, + 'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, 'payment_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, 'payment_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, - 'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, 'core_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, + 'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, 'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, 'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, 'payment_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, - 'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, - 'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'core_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, + 'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, + 'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'core_resource/variable' => \Mage_Core_Model_Resource_Variable::class, - 'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class, 'core/resource_variable' => \Mage_Core_Model_Resource_Variable::class, + 'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class, 'core/resource_variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, - 'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, 'core_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, - 'core_resource/website' => \Mage_Core_Model_Resource_Website::class, + 'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, 'payment_resource/website' => \Mage_Core_Model_Resource_Website::class, + 'core_resource/website' => \Mage_Core_Model_Resource_Website::class, 'core/resource_website' => \Mage_Core_Model_Resource_Website::class, - 'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core/resource_website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, + 'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core/session' => \Mage_Core_Model_Session::class, 'core/session_abstract' => \Mage_Core_Model_Session_Abstract::class, @@ -23614,10 +23558,10 @@ 'cron/mysql4_schedule' => \Mage_Cron_Model_Mysql4_Schedule::class, 'cron/mysql4_schedule_collection' => \Mage_Cron_Model_Mysql4_Schedule_Collection::class, 'cron/observer' => \Mage_Cron_Model_Observer::class, - 'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class, 'cron/resource_schedule' => \Mage_Cron_Model_Resource_Schedule::class, - 'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, + 'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class, 'cron/resource_schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, + 'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, 'cron/schedule' => \Mage_Cron_Model_Schedule::class, 'currencysymbol/observer' => \Mage_CurrencySymbol_Model_Observer::class, 'currencysymbol/system_currencysymbol' => \Mage_CurrencySymbol_Model_System_Currencysymbol::class, @@ -23694,14 +23638,14 @@ 'customer_resource/address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class, 'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, 'customer_resource/address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, - 'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, 'customer/resource_address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, - 'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, + 'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, 'customer/resource_address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, - 'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, + 'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, 'customer_resource/address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, - 'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, + 'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, 'customer_resource/address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, + 'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, 'customer/resource_attribute' => \Mage_Customer_Model_Resource_Attribute::class, 'customer_resource/attribute' => \Mage_Customer_Model_Resource_Attribute::class, 'customer_resource/attribute_collection' => \Mage_Customer_Model_Resource_Attribute_Collection::class, @@ -23710,20 +23654,20 @@ 'customer_resource/customer' => \Mage_Customer_Model_Resource_Customer::class, 'customer_resource/customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class, 'customer/resource_customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class, - 'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, 'customer/resource_flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, - 'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, + 'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, 'customer/resource_flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, - 'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, + 'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, 'customer/resource_form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, + 'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, 'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, 'customer/resource_form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, 'customer/resource_group' => \Mage_Customer_Model_Resource_Group::class, 'customer_resource/group' => \Mage_Customer_Model_Resource_Group::class, 'customer_resource/group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class, 'customer/resource_group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class, - 'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class, 'customer_resource/setup' => \Mage_Customer_Model_Resource_Setup::class, + 'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class, 'customer_resource/wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, 'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, 'customer/session' => \Mage_Customer_Model_Session::class, @@ -23777,10 +23721,10 @@ 'dataflow/mysql4_session' => \Mage_Dataflow_Model_Mysql4_Session::class, 'dataflow/profile' => \Mage_Dataflow_Model_Profile::class, 'dataflow/profile_history' => \Mage_Dataflow_Model_Profile_History::class, - 'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class, 'dataflow/resource_batch' => \Mage_Dataflow_Model_Resource_Batch::class, - 'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, + 'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class, 'dataflow/resource_batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, + 'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, 'dataflow/resource_batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class, 'dataflow_resource/batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class, 'dataflow_resource/batch_export' => \Mage_Dataflow_Model_Resource_Batch_Export::class, @@ -23795,12 +23739,12 @@ 'dataflow/resource_profile' => \Mage_Dataflow_Model_Resource_Profile::class, 'dataflow/resource_profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class, 'dataflow_resource/profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class, - 'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, 'dataflow_resource/profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, + 'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, 'dataflow_resource/profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class, 'dataflow/resource_profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class, - 'dataflow/resource_session' => \Mage_Dataflow_Model_Resource_Session::class, 'dataflow_resource/session' => \Mage_Dataflow_Model_Resource_Session::class, + 'dataflow/resource_session' => \Mage_Dataflow_Model_Resource_Session::class, 'dataflow/session' => \Mage_Dataflow_Model_Session::class, 'dataflow/session_adapter_http' => \Mage_Dataflow_Model_Session_Adapter_Http::class, 'dataflow/session_parser_csv' => \Mage_Dataflow_Model_Session_Parser_Csv::class, @@ -23830,18 +23774,18 @@ 'directory/resource_country' => \Mage_Directory_Model_Resource_Country::class, 'directory_resource/country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class, 'directory/resource_country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class, - 'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class, 'directory/resource_country_format' => \Mage_Directory_Model_Resource_Country_Format::class, + 'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class, 'directory_resource/country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class, 'directory/resource_country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class, 'directory_resource/currency' => \Mage_Directory_Model_Resource_Currency::class, 'directory/resource_currency' => \Mage_Directory_Model_Resource_Currency::class, - 'directory/resource_currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class, 'directory_resource/currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class, + 'directory/resource_currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class, 'directory/resource_region' => \Mage_Directory_Model_Resource_Region::class, 'directory_resource/region' => \Mage_Directory_Model_Resource_Region::class, - 'directory/resource_region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class, 'directory_resource/region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class, + 'directory/resource_region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class, 'downloadable/catalogIndex_data_downloadable' => \Mage_Downloadable_Model_CatalogIndex_Data_Downloadable::class, 'downloadable/link' => \Mage_Downloadable_Model_Link::class, 'downloadable/link_api' => \Mage_Downloadable_Model_Link_Api::class, @@ -23862,8 +23806,8 @@ 'downloadable/observer' => \Mage_Downloadable_Model_Observer::class, 'downloadable/product_price' => \Mage_Downloadable_Model_Product_Price::class, 'downloadable/product_type' => \Mage_Downloadable_Model_Product_Type::class, - 'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, 'downloadable_resource/indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, + 'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, 'downloadable/resource_link' => \Mage_Downloadable_Model_Resource_Link::class, 'downloadable_resource/link' => \Mage_Downloadable_Model_Resource_Link::class, 'downloadable/resource_link_collection' => \Mage_Downloadable_Model_Resource_Link_Collection::class, @@ -23872,14 +23816,14 @@ 'downloadable_resource/link_purchased' => \Mage_Downloadable_Model_Resource_Link_Purchased::class, 'downloadable/resource_link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class, 'downloadable_resource/link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class, - 'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, 'downloadable/resource_link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, - 'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, + 'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, 'downloadable/resource_link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, - 'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class, + 'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, 'downloadable/resource_sample' => \Mage_Downloadable_Model_Resource_Sample::class, - 'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, + 'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class, 'downloadable/resource_sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, + 'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, 'downloadable/sales_order_pdf_items_abstract' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Abstract::class, 'downloadable/sales_order_pdf_items_creditmemo' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Creditmemo::class, 'downloadable/sales_order_pdf_items_invoice' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Invoice::class, @@ -23961,8 +23905,8 @@ 'eav/mysql4_form_fieldset_collection' => \Mage_Eav_Model_Mysql4_Form_Fieldset_Collection::class, 'eav/mysql4_form_type' => \Mage_Eav_Model_Mysql4_Form_Type::class, 'eav/mysql4_form_type_collection' => \Mage_Eav_Model_Mysql4_Form_Type_Collection::class, - 'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class, 'eav_resource/attribute' => \Mage_Eav_Model_Resource_Attribute::class, + 'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class, 'eav_resource/attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class, 'eav/resource_attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class, 'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class, @@ -23979,28 +23923,28 @@ 'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class, 'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, 'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, - 'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, 'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, - 'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, + 'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, 'eav_resource/entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, + 'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, 'eav_resource/entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class, 'eav/resource_entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class, 'eav_resource/entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class, 'eav/resource_entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class, - 'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, 'eav_resource/entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, + 'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, 'eav/resource_form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class, 'eav_resource/form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class, - 'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, 'eav/resource_form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, + 'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, 'eav/resource_form_element' => \Mage_Eav_Model_Resource_Form_Element::class, 'eav_resource/form_element' => \Mage_Eav_Model_Resource_Form_Element::class, - 'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, 'eav_resource/form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, - 'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, + 'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, 'eav/resource_form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, - 'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, + 'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, 'eav_resource/form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, + 'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, 'eav/resource_form_type' => \Mage_Eav_Model_Resource_Form_Type::class, 'eav_resource/form_type' => \Mage_Eav_Model_Resource_Form_Type::class, 'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class, @@ -24016,12 +23960,12 @@ 'giftmessage/mysql4_message_collection' => \Mage_GiftMessage_Model_Mysql4_Message_Collection::class, 'giftmessage/mysql4_setup' => \Mage_GiftMessage_Model_Mysql4_Setup::class, 'giftmessage/observer' => \Mage_GiftMessage_Model_Observer::class, - 'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class, 'giftmessage/resource_message' => \Mage_GiftMessage_Model_Resource_Message::class, - 'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, + 'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class, 'giftmessage_resource/message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, - 'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class, + 'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, 'giftmessage_resource/setup' => \Mage_GiftMessage_Model_Resource_Setup::class, + 'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class, 'googleanalytics/observer' => \Mage_GoogleAnalytics_Model_Observer::class, 'googleanalytics/system_config_source_type' => \Mage_GoogleAnalytics_Model_System_Config_Source_Type::class, 'googlecheckout/payment' => \Mage_GoogleCheckout_Model_Payment::class, @@ -24057,8 +24001,8 @@ 'importexport/product_attribute_backend_urlkey' => \Mage_ImportExport_Model_Product_Attribute_Backend_Urlkey::class, 'importexport_resource/helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class, 'importexport/resource_helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class, - 'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, 'importexport_resource/import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, + 'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, 'importexport_resource/setup' => \Mage_ImportExport_Model_Resource_Setup::class, 'importexport/resource_setup' => \Mage_ImportExport_Model_Resource_Setup::class, 'importexport/source_export_entity' => \Mage_ImportExport_Model_Source_Export_Entity::class, @@ -24080,16 +24024,16 @@ 'index/process' => \Mage_Index_Model_Process::class, 'index_resource/abstract' => \Mage_Index_Model_Resource_Abstract::class, 'index/resource_abstract' => \Mage_Index_Model_Resource_Abstract::class, - 'index/resource_event' => \Mage_Index_Model_Resource_Event::class, 'index_resource/event' => \Mage_Index_Model_Resource_Event::class, + 'index/resource_event' => \Mage_Index_Model_Resource_Event::class, 'index/resource_event_collection' => \Mage_Index_Model_Resource_Event_Collection::class, 'index_resource/event_collection' => \Mage_Index_Model_Resource_Event_Collection::class, 'index/resource_helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class, 'index_resource/helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class, - 'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, 'index/resource_lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, - 'index_resource/process' => \Mage_Index_Model_Resource_Process::class, + 'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, 'index/resource_process' => \Mage_Index_Model_Resource_Process::class, + 'index_resource/process' => \Mage_Index_Model_Resource_Process::class, 'index/resource_process_collection' => \Mage_Index_Model_Resource_Process_Collection::class, 'index_resource/process_collection' => \Mage_Index_Model_Resource_Process_Collection::class, 'index/resource_setup' => \Mage_Index_Model_Resource_Setup::class, @@ -24122,22 +24066,22 @@ 'log/mysql4_visitor_online_collection' => \Mage_Log_Model_Mysql4_Visitor_Online_Collection::class, 'log_resource/aggregation' => \Mage_Log_Model_Resource_Aggregation::class, 'log/resource_aggregation' => \Mage_Log_Model_Resource_Aggregation::class, - 'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class, 'log/resource_customer' => \Mage_Log_Model_Resource_Customer::class, + 'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class, 'log/resource_log' => \Mage_Log_Model_Resource_Log::class, 'log_resource/log' => \Mage_Log_Model_Resource_Log::class, 'log_resource/visitor' => \Mage_Log_Model_Resource_Visitor::class, 'log/resource_visitor' => \Mage_Log_Model_Resource_Visitor::class, 'log_resource/visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class, 'log/resource_visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class, - 'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, 'log_resource/visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, - 'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, + 'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, 'log_resource/visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, + 'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, 'log/visitor' => \Mage_Log_Model_Visitor::class, 'log/visitor_online' => \Mage_Log_Model_Visitor_Online::class, - 'media_resource/image' => \Mage_Media_Model_File_Image::class, 'media/file_image' => \Mage_Media_Model_File_Image::class, + 'media_resource/image' => \Mage_Media_Model_File_Image::class, 'media/image' => \Mage_Media_Model_Image::class, 'newsletter/message' => \Mage_Newsletter_Model_Message::class, 'newsletter/mysql4_problem' => \Mage_Newsletter_Model_Mysql4_Problem::class, @@ -24155,14 +24099,14 @@ 'newsletter_resource/problem' => \Mage_Newsletter_Model_Resource_Problem::class, 'newsletter/resource_problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class, 'newsletter_resource/problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class, - 'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class, 'newsletter/resource_queue' => \Mage_Newsletter_Model_Resource_Queue::class, - 'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, + 'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class, 'newsletter/resource_queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, - 'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, + 'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, 'newsletter/resource_subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, - 'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, + 'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, 'newsletter/resource_subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, + 'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, 'newsletter_resource/template' => \Mage_Newsletter_Model_Resource_Template::class, 'newsletter/resource_template' => \Mage_Newsletter_Model_Resource_Template::class, 'newsletter_resource/template_collection' => \Mage_Newsletter_Model_Resource_Template_Collection::class, @@ -24175,20 +24119,20 @@ 'oauth/consumer_validator_keyLength' => \Mage_Oauth_Model_Consumer_Validator_KeyLength::class, 'oauth/nonce' => \Mage_Oauth_Model_Nonce::class, 'oauth/observer' => \Mage_Oauth_Model_Observer::class, - 'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class, 'oauth/resource_consumer' => \Mage_Oauth_Model_Resource_Consumer::class, + 'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class, 'oauth/resource_consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class, 'oauth_resource/consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class, 'oauth_resource/nonce' => \Mage_Oauth_Model_Resource_Nonce::class, 'oauth/resource_nonce' => \Mage_Oauth_Model_Resource_Nonce::class, 'oauth_resource/nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class, 'oauth/resource_nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class, - 'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class, 'oauth/resource_setup' => \Mage_Oauth_Model_Resource_Setup::class, + 'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class, 'oauth_resource/token' => \Mage_Oauth_Model_Resource_Token::class, 'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class, - 'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, + 'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth/server' => \Mage_Oauth_Model_Server::class, 'oauth/token' => \Mage_Oauth_Model_Token::class, 'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class, @@ -24205,8 +24149,8 @@ 'paygate/authorizenet_source_paymentAction' => \Mage_Paygate_Model_Authorizenet_Source_PaymentAction::class, 'paygate/mysql4_authorizenet_debug' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug::class, 'paygate/mysql4_authorizenet_debug_collection' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection::class, - 'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, 'paygate/resource_authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, + 'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, 'paygate_resource/authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class, 'paygate/resource_authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class, 'payment/billing_agreementAbstract' => \Mage_Payment_Model_Billing_AgreementAbstract::class, @@ -24269,14 +24213,14 @@ 'paypal/resource_cert' => \Mage_Paypal_Model_Resource_Cert::class, 'paypal_resource/payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class, 'paypal/resource_payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class, - 'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, 'paypal/resource_payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, + 'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, 'paypal/resource_report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class, 'paypal_resource/report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class, - 'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, 'paypal/resource_report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, - 'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, + 'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, 'paypal/resource_report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, + 'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, 'paypal/resource_setup' => \Mage_Paypal_Model_Resource_Setup::class, 'paypal_resource/setup' => \Mage_Paypal_Model_Resource_Setup::class, 'paypal/session' => \Mage_Paypal_Model_Session::class, @@ -24310,16 +24254,16 @@ 'poll/poll' => \Mage_Poll_Model_Poll::class, 'poll/poll_answer' => \Mage_Poll_Model_Poll_Answer::class, 'poll/poll_vote' => \Mage_Poll_Model_Poll_Vote::class, - 'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class, 'poll_resource/poll' => \Mage_Poll_Model_Resource_Poll::class, - 'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, + 'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class, 'poll/resource_poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, - 'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, + 'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, 'poll_resource/poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, - 'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, + 'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, 'poll_resource/poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, - 'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, + 'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, 'poll/resource_poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, + 'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, 'productalert/email' => \Mage_ProductAlert_Model_Email::class, 'productalert/mysql4_price' => \Mage_ProductAlert_Model_Mysql4_Price::class, 'productalert/mysql4_price_collection' => \Mage_ProductAlert_Model_Mysql4_Price_Collection::class, @@ -24329,20 +24273,20 @@ 'productalert/mysql4_stock_customer_collection' => \Mage_ProductAlert_Model_Mysql4_Stock_Customer_Collection::class, 'productalert/observer' => \Mage_ProductAlert_Model_Observer::class, 'productalert/price' => \Mage_ProductAlert_Model_Price::class, - 'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, 'productalert_resource/abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, - 'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class, + 'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, 'productalert_resource/price' => \Mage_ProductAlert_Model_Resource_Price::class, - 'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, + 'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class, 'productalert/resource_price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, - 'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, + 'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, 'productalert/resource_price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, - 'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class, + 'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, 'productalert/resource_stock' => \Mage_ProductAlert_Model_Resource_Stock::class, - 'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, + 'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class, 'productalert/resource_stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, - 'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, + 'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, 'productalert/resource_stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, + 'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, 'productalert/stock' => \Mage_ProductAlert_Model_Stock::class, 'rating/mysql4_rating' => \Mage_Rating_Model_Mysql4_Rating::class, 'rating/mysql4_rating_collection' => \Mage_Rating_Model_Mysql4_Rating_Collection::class, @@ -24356,20 +24300,20 @@ 'rating/rating_entity' => \Mage_Rating_Model_Rating_Entity::class, 'rating/rating_option' => \Mage_Rating_Model_Rating_Option::class, 'rating/rating_option_vote' => \Mage_Rating_Model_Rating_Option_Vote::class, - 'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class, 'rating/resource_rating' => \Mage_Rating_Model_Resource_Rating::class, + 'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class, 'rating_resource/rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class, 'rating/resource_rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class, 'rating/resource_rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class, 'rating_resource/rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class, - 'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, 'rating/resource_rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, - 'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, + 'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, 'rating_resource/rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, + 'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, 'rating_resource/rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class, 'rating/resource_rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class, - 'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, 'rating/resource_rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, + 'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, 'reports/config' => \Mage_Reports_Model_Config::class, 'reports/event' => \Mage_Reports_Model_Event::class, 'reports/event_observer' => \Mage_Reports_Model_Event_Observer::class, @@ -24415,6 +24359,7 @@ 'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class, 'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class, 'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class, + 'reports/observer' => \Mage_Reports_Model_Observer::class, 'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class, 'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class, 'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class, @@ -24423,52 +24368,52 @@ 'reports_resource/accounts_collection' => \Mage_Reports_Model_Resource_Accounts_Collection::class, 'reports/resource_coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class, 'reports_resource/coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class, - 'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, 'reports/resource_customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, - 'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, + 'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, 'reports/resource_customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, - 'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, + 'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, 'reports_resource/customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, - 'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, + 'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, 'reports/resource_entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, + 'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, 'reports_resource/event' => \Mage_Reports_Model_Resource_Event::class, 'reports/resource_event' => \Mage_Reports_Model_Resource_Event::class, - 'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, 'reports_resource/event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, - 'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class, + 'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, 'reports/resource_event_type' => \Mage_Reports_Model_Resource_Event_Type::class, - 'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, + 'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class, 'reports/resource_event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, - 'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, + 'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, 'reports_resource/helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, - 'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, + 'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, 'reports/resource_invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, - 'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, + 'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, 'reports_resource/order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, - 'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, + 'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, 'reports_resource/product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, + 'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, 'reports/resource_product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class, 'reports_resource/product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class, 'reports_resource/product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class, 'reports/resource_product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class, - 'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, 'reports/resource_product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, + 'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, 'reports_resource/product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class, 'reports/resource_product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class, - 'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, 'reports_resource/product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, + 'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, 'reports/resource_product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, 'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, 'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, 'reports_resource/product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, - 'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, 'reports/resource_product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, + 'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, 'reports_resource/product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class, 'reports/resource_product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class, - 'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, 'reports_resource/product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, - 'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, + 'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, 'reports_resource/product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, + 'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, 'reports/resource_quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, 'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, 'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class, @@ -24477,34 +24422,34 @@ 'reports_resource/report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class, 'reports/resource_report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class, 'reports_resource/report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class, - 'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, 'reports_resource/report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, + 'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, 'reports/resource_report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class, 'reports_resource/report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class, - 'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, 'reports/resource_report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, - 'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, + 'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, 'reports_resource/review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, - 'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, + 'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, 'reports_resource/review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, + 'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, 'reports_resource/review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class, 'reports/resource_review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class, 'reports_resource/shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class, 'reports/resource_shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class, - 'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, 'reports_resource/shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, + 'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, 'reports_resource/tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class, 'reports/resource_tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class, 'reports/resource_tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, 'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, 'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, 'reports/resource_tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, - 'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, 'reports/resource_tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, + 'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, 'reports_resource/wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class, 'reports/resource_wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class, - 'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, 'reports_resource/wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, + 'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, 'reports/session' => \Mage_Reports_Model_Session::class, 'reports/test' => \Mage_Reports_Model_Test::class, 'reports/totals' => \Mage_Reports_Model_Totals::class, @@ -24523,12 +24468,12 @@ 'review/resource_review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class, 'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class, 'review_resource/review_status' => \Mage_Review_Model_Resource_Review_Status::class, - 'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, 'review_resource/review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, + 'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, 'review/resource_review_summary' => \Mage_Review_Model_Resource_Review_Summary::class, 'review_resource/review_summary' => \Mage_Review_Model_Resource_Review_Summary::class, - 'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, 'review/resource_review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, + 'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, 'review/review' => \Mage_Review_Model_Review::class, 'review/review_status' => \Mage_Review_Model_Review_Status::class, 'review/review_summary' => \Mage_Review_Model_Review_Summary::class, @@ -24551,12 +24496,12 @@ 'rule/mysql4_rule_collection' => \Mage_Rule_Model_Mysql4_Rule_Collection::class, 'rule/renderer_actions' => \Mage_Rule_Model_Renderer_Actions::class, 'rule/renderer_conditions' => \Mage_Rule_Model_Renderer_Conditions::class, - 'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class, 'rule/resource_abstract' => \Mage_Rule_Model_Resource_Abstract::class, - 'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class, + 'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class, 'rule/resource_rule' => \Mage_Rule_Model_Resource_Rule::class, - 'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, + 'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class, 'rule_resource/rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, + 'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, 'rule_resource/rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, 'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, 'rule/resource_rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class, @@ -24583,28 +24528,28 @@ 'salesrule/quote_nominal_discount' => \Mage_SalesRule_Model_Quote_Nominal_Discount::class, 'salesrule_resource/coupon' => \Mage_SalesRule_Model_Resource_Coupon::class, 'salesrule/resource_coupon' => \Mage_SalesRule_Model_Resource_Coupon::class, - 'salesrule_resource/coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class, 'salesrule/resource_coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class, + 'salesrule_resource/coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class, 'salesrule/resource_coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class, 'salesrule_resource/coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class, - 'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, 'salesrule_resource/report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, - 'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, + 'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, 'salesrule_resource/report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, + 'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, 'salesrule_resource/report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class, 'salesrule/resource_report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class, 'salesrule_resource/report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class, 'salesrule/resource_report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class, 'salesrule_resource/report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class, 'salesrule/resource_report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class, - 'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class, 'salesrule_resource/rule' => \Mage_SalesRule_Model_Resource_Rule::class, - 'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, + 'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class, 'salesrule_resource/rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, - 'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, + 'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, 'salesrule_resource/rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, - 'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, + 'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, 'salesrule/resource_rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, + 'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, 'salesrule_resource/rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class, 'salesrule/resource_rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class, 'salesrule/resource_rule_product_collection' => \Mage_SalesRule_Model_Resource_Rule_Product_Collection::class, @@ -24649,14 +24594,14 @@ 'sales/email_template' => \Mage_Sales_Model_Email_Template::class, 'sales/entity_order' => \Mage_Sales_Model_Entity_Order::class, 'sales_entity/order' => \Mage_Sales_Model_Entity_Order::class, - 'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class, 'sales_entity/order_address' => \Mage_Sales_Model_Entity_Order_Address::class, - 'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, + 'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class, 'sales/entity_order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, - 'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, + 'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, 'sales_entity/order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, - 'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, + 'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, 'sales_entity/order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, + 'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, 'sales_entity/order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class, 'sales/entity_order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class, 'sales/entity_order_attribute_backend_shipping' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Shipping::class, @@ -24665,54 +24610,54 @@ 'sales/entity_order_collection' => \Mage_Sales_Model_Entity_Order_Collection::class, 'sales_entity/order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class, 'sales/entity_order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class, - 'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, 'sales_entity/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, - 'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, + 'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, 'sales/entity_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, - 'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, + 'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, 'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, + 'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, 'sales/entity_order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class, 'sales_entity/order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class, 'sales/entity_order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class, 'sales_entity/order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class, 'sales_entity/order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class, 'sales/entity_order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class, - 'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, 'sales/entity_order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, - 'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, + 'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, 'sales_entity/order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, + 'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, 'sales/entity_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class, 'sales_entity/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class, - 'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class, 'sales/entity_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class, + 'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class, 'sales/entity_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Order::class, 'sales_entity/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Order::class, 'sales_entity/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class, 'sales/entity_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class, 'sales/entity_order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class, 'sales_entity/order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class, - 'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, 'sales/entity_order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, + 'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, 'sales_entity/order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class, 'sales/entity_order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class, 'sales_entity/order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class, 'sales/entity_order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class, - 'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, 'sales/entity_order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, + 'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, 'sales/entity_order_item' => \Mage_Sales_Model_Entity_Order_Item::class, 'sales_entity/order_item' => \Mage_Sales_Model_Entity_Order_Item::class, 'sales/entity_order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class, 'sales_entity/order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class, - 'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, 'sales/entity_order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, + 'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, 'sales_entity/order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class, 'sales/entity_order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class, 'sales/entity_order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class, 'sales_entity/order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class, - 'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, 'sales_entity/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, - 'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, + 'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, 'sales/entity_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, + 'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, 'sales/entity_order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class, 'sales_entity/order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class, 'sales/entity_order_shipment_comment' => \Mage_Sales_Model_Entity_Order_Shipment_Comment::class, @@ -24721,66 +24666,66 @@ 'sales_entity/order_shipment_comment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Comment_Collection::class, 'sales_entity/order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class, 'sales/entity_order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class, - 'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, 'sales/entity_order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, - 'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, + 'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, 'sales_entity/order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, - 'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, + 'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, 'sales_entity/order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, - 'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, + 'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, 'sales_entity/order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, - 'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, + 'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, 'sales_entity/order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, + 'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, 'sales_entity/quote' => \Mage_Sales_Model_Entity_Quote::class, 'sales/entity_quote' => \Mage_Sales_Model_Entity_Quote::class, - 'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, 'sales_entity/quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, + 'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, 'sales_entity/quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class, 'sales/entity_quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class, - 'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, 'sales/entity_quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, - 'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, + 'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, 'sales/entity_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, - 'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, + 'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, 'sales_entity/quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, - 'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, + 'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, 'sales/entity_quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, + 'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, 'sales_entity/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales/entity_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales_entity/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class, 'sales/entity_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class, - 'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, 'sales_entity/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, - 'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, 'sales/entity_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/entity_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales_entity/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales/entity_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class, 'sales_entity/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class, 'sales_entity/quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class, 'sales/entity_quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class, - 'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, 'sales_entity/quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, - 'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, + 'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, 'sales/entity_quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, - 'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, + 'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, 'sales_entity/quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, + 'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, 'sales/entity_quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class, 'sales_entity/quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class, 'sales/entity_quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class, 'sales_entity/quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class, - 'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, 'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, - 'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, + 'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, 'sales/entity_quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, - 'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, + 'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, 'sales/entity_quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, + 'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, 'sales_entity/quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class, 'sales/entity_quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class, - 'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, 'sales_entity/sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, - 'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class, + 'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, 'sales_entity/setup' => \Mage_Sales_Model_Entity_Setup::class, + 'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class, 'sales/mysql4_abstract' => \Mage_Sales_Model_Mysql4_Abstract::class, 'sales/mysql4_billing_agreement' => \Mage_Sales_Model_Mysql4_Billing_Agreement::class, 'sales/mysql4_billing_agreement_collection' => \Mage_Sales_Model_Mysql4_Billing_Agreement_Collection::class, @@ -24975,50 +24920,50 @@ 'sales/recurring_profile' => \Mage_Sales_Model_Recurring_Profile::class, 'sales_resource/abstract' => \Mage_Sales_Model_Resource_Abstract::class, 'sales/resource_abstract' => \Mage_Sales_Model_Resource_Abstract::class, - 'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, 'sales_resource/billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, - 'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, + 'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, 'sales_resource/billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, + 'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, 'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, 'sales/resource_collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, 'sales_resource/helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, 'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, - 'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class, 'sales_resource/order' => \Mage_Sales_Model_Resource_Order::class, + 'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class, 'sales_resource/order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class, 'sales/resource_order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class, - 'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class, 'sales_resource/order_address' => \Mage_Sales_Model_Resource_Order_Address::class, + 'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class, 'sales/resource_order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class, 'sales_resource/order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class, 'sales/resource_order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class, 'sales_resource/order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class, 'sales/resource_order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class, 'sales_resource/order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class, - 'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, 'sales/resource_order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, + 'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, 'sales_resource/order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class, 'sales/resource_order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class, 'sales/resource_order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class, 'sales_resource/order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class, - 'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, 'sales/resource_order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, - 'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, + 'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, 'sales/resource_order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, - 'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, + 'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, 'sales/resource_order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, - 'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, + 'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, 'sales_resource/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, + 'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, 'sales/resource_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class, 'sales_resource/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class, - 'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, 'sales/resource_order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, - 'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, + 'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, 'sales_resource/order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, + 'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, 'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, 'sales/resource_order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, - 'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, 'sales/resource_order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, + 'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, 'sales_resource/order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class, 'sales/resource_order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class, 'sales_resource/order_creditmemo_item_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item_Collection::class, @@ -25027,138 +24972,138 @@ 'sales/resource_order_grid_collection' => \Mage_Sales_Model_Resource_Order_Grid_Collection::class, 'sales/resource_order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class, 'sales_resource/order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class, - 'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, 'sales/resource_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, - 'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, + 'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, 'sales_resource/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, + 'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, 'sales_resource/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class, 'sales/resource_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class, 'sales/resource_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class, 'sales_resource/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class, 'sales/resource_order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class, 'sales_resource/order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class, - 'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, 'sales/resource_order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, + 'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, 'sales/resource_order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class, 'sales_resource/order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class, - 'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, 'sales/resource_order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, - 'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, + 'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, 'sales_resource/order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, + 'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, 'sales/resource_order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class, 'sales_resource/order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class, - 'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class, 'sales_resource/order_item' => \Mage_Sales_Model_Resource_Order_Item::class, + 'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class, 'sales/resource_order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class, 'sales_resource/order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class, - 'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, 'sales_resource/order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, - 'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, + 'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, 'sales/resource_order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, + 'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, 'sales_resource/order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, 'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, - 'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, 'sales_resource/order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, - 'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, + 'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, 'sales_resource/order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, - 'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, + 'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, 'sales/resource_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, + 'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, 'sales_resource/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class, 'sales/resource_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class, 'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, 'sales/resource_order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, - 'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, 'sales/resource_order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, - 'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, + 'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, 'sales/resource_order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, + 'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, 'sales_resource/order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class, 'sales/resource_order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class, - 'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, 'sales_resource/order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, - 'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, + 'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, 'sales_resource/order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, - 'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, + 'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, 'sales_resource/order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, - 'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, + 'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, 'sales_resource/order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, + 'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, 'sales_resource/order_status' => \Mage_Sales_Model_Resource_Order_Status::class, 'sales/resource_order_status' => \Mage_Sales_Model_Resource_Order_Status::class, 'sales_resource/order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class, 'sales/resource_order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class, - 'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, 'sales_resource/order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, - 'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, + 'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, 'sales_resource/order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, - 'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, + 'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, 'sales/resource_order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, - 'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, + 'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, 'sales_resource/order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, - 'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class, + 'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, 'sales/resource_quote' => \Mage_Sales_Model_Resource_Quote::class, + 'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class, 'sales_resource/quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class, 'sales/resource_quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class, 'sales/resource_quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class, 'sales_resource/quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class, 'sales/resource_quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class, 'sales_resource/quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class, - 'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, 'sales/resource_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, + 'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, 'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, 'sales/resource_quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, - 'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, 'sales_resource/quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, + 'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, 'sales_resource/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales/resource_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales/resource_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class, 'sales_resource/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class, 'sales/resource_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class, 'sales_resource/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class, - 'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/resource_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, 'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales/resource_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, - 'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, 'sales_resource/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, - 'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, + 'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, 'sales/resource_quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, + 'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, 'sales_resource/quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class, 'sales/resource_quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class, - 'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, 'sales/resource_quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, - 'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, + 'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, 'sales_resource/quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, - 'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, + 'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, 'sales_resource/quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, + 'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, 'sales_resource/quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class, 'sales/resource_quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class, - 'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, 'sales/resource_quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, + 'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, 'sales/resource_quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class, 'sales_resource/quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class, - 'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, 'sales/resource_quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, - 'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, + 'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, 'sales/resource_quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, - 'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, + 'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, 'sales_resource/quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, - 'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, + 'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, 'sales/resource_quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, - 'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, + 'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, 'sales/resource_recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, + 'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, 'sales/resource_recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class, 'sales_resource/recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class, - 'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class, 'sales/resource_report' => \Mage_Sales_Model_Resource_Report::class, + 'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class, 'sales/resource_report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class, 'sales_resource/report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class, - 'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, 'sales/resource_report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, + 'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, 'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, 'sales/resource_report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, - 'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, 'sales_resource/report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, - 'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, + 'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, 'sales_resource/report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, + 'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, 'sales/resource_report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class, 'sales_resource/report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class, 'sales_resource/report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class, @@ -25171,24 +25116,24 @@ 'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class, 'sales_resource/report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class, 'sales/resource_report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class, - 'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, 'sales/resource_report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, - 'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, + 'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, 'sales_resource/report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, + 'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, 'sales_resource/report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class, 'sales/resource_report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class, 'sales_resource/report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class, 'sales/resource_report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class, - 'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, 'sales_resource/report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, + 'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, 'sales_resource/report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class, 'sales/resource_report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class, 'sales_resource/report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class, 'sales/resource_report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class, - 'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, 'sales/resource_sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, - 'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class, + 'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, 'sales/resource_setup' => \Mage_Sales_Model_Resource_Setup::class, + 'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class, 'sales/service_order' => \Mage_Sales_Model_Service_Order::class, 'sales/service_quote' => \Mage_Sales_Model_Service_Quote::class, 'sales/status_list' => \Mage_Sales_Model_Status_List::class, @@ -25198,8 +25143,8 @@ 'sendfriend/observer' => \Mage_Sendfriend_Model_Observer::class, 'sendfriend_resource/sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class, 'sendfriend/resource_sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class, - 'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, 'sendfriend/resource_sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, + 'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, 'sendfriend/resource_setup' => \Mage_Sendfriend_Model_Resource_Setup::class, 'sendfriend_resource/setup' => \Mage_Sendfriend_Model_Resource_Setup::class, 'sendfriend/sendfriend' => \Mage_Sendfriend_Model_Sendfriend::class, @@ -25218,8 +25163,8 @@ 'shipping/rate_result_abstract' => \Mage_Shipping_Model_Rate_Result_Abstract::class, 'shipping/rate_result_error' => \Mage_Shipping_Model_Rate_Result_Error::class, 'shipping/rate_result_method' => \Mage_Shipping_Model_Rate_Result_Method::class, - 'shipping/resource_carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class, 'shipping_resource/carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class, + 'shipping/resource_carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class, 'shipping/resource_carrier_tablerate_collection' => \Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection::class, 'shipping_resource/carrier_tablerate_collection' => \Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection::class, 'shipping/shipment_request' => \Mage_Shipping_Model_Shipment_Request::class, @@ -25239,16 +25184,16 @@ 'sitemap/observer' => \Mage_Sitemap_Model_Observer::class, 'sitemap_resource/catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class, 'sitemap/resource_catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class, - 'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, 'sitemap/resource_catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, - 'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, + 'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, 'sitemap_resource/catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, - 'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, + 'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, 'sitemap_resource/cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, + 'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, 'sitemap_resource/sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class, 'sitemap/resource_sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class, - 'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, 'sitemap_resource/sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, + 'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, 'sitemap/sitemap' => \Mage_Sitemap_Model_Sitemap::class, 'tag/api' => \Mage_Tag_Model_Api::class, 'tag/api_v2' => \Mage_Tag_Model_Api_V2::class, @@ -25261,21 +25206,21 @@ 'tag/mysql4_tag' => \Mage_Tag_Model_Mysql4_Tag::class, 'tag/mysql4_tag_collection' => \Mage_Tag_Model_Mysql4_Tag_Collection::class, 'tag/mysql4_tag_relation' => \Mage_Tag_Model_Mysql4_Tag_Relation::class, - 'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag/resource_customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag_resource/customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, - 'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, + 'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag_resource/indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, - 'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, + 'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, 'tag_resource/popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, + 'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, 'tag_resource/product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class, 'tag/resource_product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class, 'tag_resource/tag' => \Mage_Tag_Model_Resource_Tag::class, 'tag/resource_tag' => \Mage_Tag_Model_Resource_Tag::class, - 'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, 'tag_resource/tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, - 'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, + 'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, 'tag_resource/tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, + 'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, 'tag/session' => \Mage_Tag_Model_Session::class, 'tag/tag' => \Mage_Tag_Model_Tag::class, 'tag/tag_relation' => \Mage_Tag_Model_Tag_Relation::class, @@ -25314,16 +25259,16 @@ 'tax/resource_calculation_rate' => \Mage_Tax_Model_Resource_Calculation_Rate::class, 'tax/resource_calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class, 'tax_resource/calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class, - 'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, 'tax/resource_calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, - 'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, + 'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, 'tax/resource_calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, - 'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, + 'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, 'tax/resource_calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, - 'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, + 'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, 'tax_resource/calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, - 'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class, + 'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, 'tax/resource_class' => \Mage_Tax_Model_Resource_Class::class, + 'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class, 'tax/resource_class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class, 'tax_resource/class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class, 'tax_resource/report_collection' => \Mage_Tax_Model_Resource_Report_Collection::class, @@ -25334,16 +25279,16 @@ 'tax/resource_report_tax_createdat' => \Mage_Tax_Model_Resource_Report_Tax_Createdat::class, 'tax_resource/report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class, 'tax/resource_report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class, - 'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, 'tax/resource_report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, - 'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, + 'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, 'tax_resource/sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, + 'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, 'tax_resource/sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class, 'tax/resource_sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class, - 'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class, 'tax/resource_sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class, - 'tax_resource/sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class, + 'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class, 'tax/resource_sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class, + 'tax_resource/sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class, 'tax/resource_setup' => \Mage_Tax_Model_Resource_Setup::class, 'tax_resource/setup' => \Mage_Tax_Model_Resource_Setup::class, 'tax/sales_order_tax' => \Mage_Tax_Model_Sales_Order_Tax::class, @@ -25426,10 +25371,10 @@ 'weee/observer' => \Mage_Weee_Model_Observer::class, 'weee/resource_attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class, 'weee_resource/attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class, - 'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class, 'weee/resource_setup' => \Mage_Weee_Model_Resource_Setup::class, - 'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class, + 'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class, 'weee/resource_tax' => \Mage_Weee_Model_Resource_Tax::class, + 'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class, 'weee/tax' => \Mage_Weee_Model_Tax::class, 'weee/total_creditmemo_weee' => \Mage_Weee_Model_Total_Creditmemo_Weee::class, 'weee/total_invoice_weee' => \Mage_Weee_Model_Total_Invoice_Weee::class, @@ -25439,12 +25384,12 @@ 'widget/mysql4_widget_instance' => \Mage_Widget_Model_Mysql4_Widget_Instance::class, 'widget/mysql4_widget_instance_collection' => \Mage_Widget_Model_Mysql4_Widget_Instance_Collection::class, 'widget/observer' => \Mage_Widget_Model_Observer::class, - 'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class, 'widget/resource_widget' => \Mage_Widget_Model_Resource_Widget::class, + 'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class, 'widget_resource/widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class, 'widget/resource_widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class, - 'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, 'widget_resource/widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, + 'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, 'widget/template_filter' => \Mage_Widget_Model_Template_Filter::class, 'widget/widget' => \Mage_Widget_Model_Widget::class, 'widget/widget_config' => \Mage_Widget_Model_Widget_Config::class, @@ -25461,14 +25406,14 @@ 'wishlist/mysql4_wishlist' => \Mage_Wishlist_Model_Mysql4_Wishlist::class, 'wishlist/mysql4_wishlist_collection' => \Mage_Wishlist_Model_Mysql4_Wishlist_Collection::class, 'wishlist/observer' => \Mage_Wishlist_Model_Observer::class, - 'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class, 'wishlist_resource/item' => \Mage_Wishlist_Model_Resource_Item::class, + 'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class, 'wishlist_resource/item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class, 'wishlist/resource_item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class, 'wishlist/resource_item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, 'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, - 'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, 'wishlist_resource/item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, + 'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, 'wishlist_resource/product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class, 'wishlist/resource_product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class, 'wishlist/resource_wishlist' => \Mage_Wishlist_Model_Resource_Wishlist::class, @@ -25477,7 +25422,6 @@ 'wishlist/resource_wishlist_collection' => \Mage_Wishlist_Model_Resource_Wishlist_Collection::class, 'wishlist/session' => \Mage_Wishlist_Model_Session::class, 'wishlist/wishlist' => \Mage_Wishlist_Model_Wishlist::class, - 'varien/autoload' => \Varien_Autoload::class, ]) ); override( \Mage_Wishlist_Helper_Data::_getSingletonModel(0), @@ -25487,11 +25431,10 @@ 'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class, 'adminnotification/mysql4_inbox_collection' => \Mage_AdminNotification_Model_Mysql4_Inbox_Collection::class, 'adminnotification/observer' => \Mage_AdminNotification_Model_Observer::class, - 'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, 'adminnotification/resource_inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, - 'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, + 'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class, 'adminnotification/resource_inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, - 'adminnotification/survey' => \Mage_AdminNotification_Model_Survey::class, + 'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class, 'admin/acl' => \Mage_Admin_Model_Acl::class, 'admin/acl_assert_ip' => \Mage_Admin_Model_Acl_Assert_Ip::class, 'admin/acl_assert_time' => \Mage_Admin_Model_Acl_Assert_Time::class, @@ -25520,38 +25463,38 @@ 'admin/redirectpolicy' => \Mage_Admin_Model_Redirectpolicy::class, 'admin/resource_acl' => \Mage_Admin_Model_Resource_Acl::class, 'admin_resource/acl' => \Mage_Admin_Model_Resource_Acl::class, - 'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, 'admin/resource_acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, + 'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class, 'admin/resource_acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class, 'admin_resource/acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class, - 'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class, 'admin/resource_block' => \Mage_Admin_Model_Resource_Block::class, - 'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, + 'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class, 'admin/resource_block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, + 'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class, 'admin_resource/permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class, 'admin/resource_permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class, - 'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class, 'admin/resource_role' => \Mage_Admin_Model_Resource_Role::class, + 'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class, 'admin/resource_role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class, 'admin_resource/role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class, - 'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class, 'admin_resource/roles' => \Mage_Admin_Model_Resource_Roles::class, - 'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, + 'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class, 'admin_resource/roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, - 'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, + 'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class, 'admin/resource_roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, + 'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class, 'admin/resource_rules' => \Mage_Admin_Model_Resource_Rules::class, 'admin_resource/rules' => \Mage_Admin_Model_Resource_Rules::class, 'admin_resource/rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, 'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class, - 'admin_resource/user' => \Mage_Admin_Model_Resource_User::class, 'admin/resource_user' => \Mage_Admin_Model_Resource_User::class, + 'admin_resource/user' => \Mage_Admin_Model_Resource_User::class, 'admin/resource_user_collection' => \Mage_Admin_Model_Resource_User_Collection::class, 'admin_resource/user_collection' => \Mage_Admin_Model_Resource_User_Collection::class, - 'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class, 'admin_resource/variable' => \Mage_Admin_Model_Resource_Variable::class, - 'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, + 'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class, 'admin/resource_variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, + 'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class, 'admin/role' => \Mage_Admin_Model_Role::class, 'admin/roles' => \Mage_Admin_Model_Roles::class, 'admin/rules' => \Mage_Admin_Model_Rules::class, @@ -25586,6 +25529,7 @@ 'adminhtml/system_config_backend_baseurl' => \Mage_Adminhtml_Model_System_Config_Backend_Baseurl::class, 'adminhtml/system_config_backend_cache' => \Mage_Adminhtml_Model_System_Config_Backend_Cache::class, 'adminhtml/system_config_backend_catalog_inventory_managestock' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock::class, + 'adminhtml/system_config_backend_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Separator::class, 'adminhtml/system_config_backend_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Type::class, 'adminhtml/system_config_backend_category' => \Mage_Adminhtml_Model_System_Config_Backend_Category::class, 'adminhtml/system_config_backend_cookie' => \Mage_Adminhtml_Model_System_Config_Backend_Cookie::class, @@ -25638,12 +25582,14 @@ 'adminhtml/system_config_source_catalog_listMode' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListMode::class, 'adminhtml/system_config_source_catalog_listPerPage' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListPerPage::class, 'adminhtml/system_config_source_catalog_listSort' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort::class, + 'adminhtml/system_config_source_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Separator::class, 'adminhtml/system_config_source_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Type::class, 'adminhtml/system_config_source_catalog_timeFormat' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_TimeFormat::class, 'adminhtml/system_config_source_category' => \Mage_Adminhtml_Model_System_Config_Source_Category::class, 'adminhtml/system_config_source_checktype' => \Mage_Adminhtml_Model_System_Config_Source_Checktype::class, 'adminhtml/system_config_source_cms_page' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Page::class, 'adminhtml/system_config_source_cms_wysiwyg_enabled' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Wysiwyg_Enabled::class, + 'adminhtml/system_config_source_cookie_samesite' => \Mage_Adminhtml_Model_System_Config_Source_Cookie_Samesite::class, 'adminhtml/system_config_source_country' => \Mage_Adminhtml_Model_System_Config_Source_Country::class, 'adminhtml/system_config_source_country_full' => \Mage_Adminhtml_Model_System_Config_Source_Country_Full::class, 'adminhtml/system_config_source_cron_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency::class, @@ -25670,6 +25616,7 @@ 'adminhtml/system_config_source_locale_timezone' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Timezone::class, 'adminhtml/system_config_source_locale_weekdaycodes' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdaycodes::class, 'adminhtml/system_config_source_locale_weekdays' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdays::class, + 'adminhtml/system_config_source_log_level' => \Mage_Adminhtml_Model_System_Config_Source_Log_Level::class, 'adminhtml/system_config_source_nooptreq' => \Mage_Adminhtml_Model_System_Config_Source_Nooptreq::class, 'adminhtml/system_config_source_notification_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Notification_Frequency::class, 'adminhtml/system_config_source_order_status' => \Mage_Adminhtml_Model_System_Config_Source_Order_Status::class, @@ -25693,7 +25640,6 @@ 'adminhtml/system_config_source_shipping_flatrate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Flatrate::class, 'adminhtml/system_config_source_shipping_tablerate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Tablerate::class, 'adminhtml/system_config_source_shipping_taxclass' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Taxclass::class, - 'adminhtml/system_config_source_startdateenddate' => \Mage_Adminhtml_Model_System_Config_Source_Startdateenddate::class, 'adminhtml/system_config_source_storage_media_database' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Database::class, 'adminhtml/system_config_source_storage_media_storage' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Storage::class, 'adminhtml/system_config_source_store' => \Mage_Adminhtml_Model_System_Config_Source_Store::class, @@ -25749,22 +25695,22 @@ 'api2_resource/acl_filter_attribute' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute::class, 'api2/resource_acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class, 'api2_resource/acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class, - 'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, 'api2_resource/acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, + 'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class, 'api2/resource_acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class, 'api2_resource/acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class, 'api2_resource/acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class, 'api2/resource_acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class, 'api2/resource_acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class, 'api2_resource/acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class, - 'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class, 'api2/resource_setup' => \Mage_Api2_Model_Resource_Setup::class, + 'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class, 'api2/resource_validator' => \Mage_Api2_Model_Resource_Validator::class, 'api2_resource/validator' => \Mage_Api2_Model_Resource_Validator::class, 'api2/resource_validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class, 'api2_resource/validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class, - 'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, 'api2/resource_validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, + 'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class, 'api2/response' => \Mage_Api2_Model_Response::class, 'api2/route_abstract' => \Mage_Api2_Model_Route_Abstract::class, 'api2/route_apiType' => \Mage_Api2_Model_Route_ApiType::class, @@ -25796,8 +25742,8 @@ 'api/mysql4_user_collection' => \Mage_Api_Model_Mysql4_User_Collection::class, 'api/resource_abstract' => \Mage_Api_Model_Resource_Abstract::class, 'api_resource/abstract' => \Mage_Api_Model_Resource_Abstract::class, - 'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class, 'api_resource/acl' => \Mage_Api_Model_Resource_Acl::class, + 'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class, 'api_resource/acl_role' => \Mage_Api_Model_Resource_Acl_Role::class, 'api/resource_acl_role' => \Mage_Api_Model_Resource_Acl_Role::class, 'api/resource_acl_role_collection' => \Mage_Api_Model_Resource_Acl_Role_Collection::class, @@ -25806,18 +25752,18 @@ 'api_resource/permissions_collection' => \Mage_Api_Model_Resource_Permissions_Collection::class, 'api_resource/role' => \Mage_Api_Model_Resource_Role::class, 'api/resource_role' => \Mage_Api_Model_Resource_Role::class, - 'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, 'api_resource/role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, + 'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class, 'api/resource_roles' => \Mage_Api_Model_Resource_Roles::class, 'api_resource/roles' => \Mage_Api_Model_Resource_Roles::class, - 'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, 'api_resource/roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, - 'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, + 'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class, 'api_resource/roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, - 'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class, + 'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class, 'api_resource/rules' => \Mage_Api_Model_Resource_Rules::class, - 'api/resource_rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class, + 'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class, 'api_resource/rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class, + 'api/resource_rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class, 'api/resource_user' => \Mage_Api_Model_Resource_User::class, 'api_resource/user' => \Mage_Api_Model_Resource_User::class, 'api/resource_user_collection' => \Mage_Api_Model_Resource_User_Collection::class, @@ -25844,15 +25790,6 @@ 'authorizenet/directpost_request' => \Mage_Authorizenet_Model_Directpost_Request::class, 'authorizenet/directpost_response' => \Mage_Authorizenet_Model_Directpost_Response::class, 'authorizenet/directpost_session' => \Mage_Authorizenet_Model_Directpost_Session::class, - 'backup/backup' => \Mage_Backup_Model_Backup::class, - 'backup/config_backend_cron' => \Mage_Backup_Model_Config_Backend_Cron::class, - 'backup/config_source_type' => \Mage_Backup_Model_Config_Source_Type::class, - 'backup/db' => \Mage_Backup_Model_Db::class, - 'backup/fs_collection' => \Mage_Backup_Model_Fs_Collection::class, - 'backup/mysql4_db' => \Mage_Backup_Model_Mysql4_Db::class, - 'backup/observer' => \Mage_Backup_Model_Observer::class, - 'backup/resource_db' => \Mage_Backup_Model_Resource_Db::class, - 'backup/resource_helper_mysql4' => \Mage_Backup_Model_Resource_Helper_Mysql4::class, 'bundle/catalogIndex_data_bundle' => \Mage_Bundle_Model_CatalogIndex_Data_Bundle::class, 'bundle/mysql4_bundle' => \Mage_Bundle_Model_Mysql4_Bundle::class, 'bundle/mysql4_indexer_price' => \Mage_Bundle_Model_Mysql4_Indexer_Price::class, @@ -25878,10 +25815,10 @@ 'bundle_resource/option' => \Mage_Bundle_Model_Resource_Option::class, 'bundle/resource_option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class, 'bundle_resource/option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class, - 'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, 'bundle_resource/price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, - 'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class, + 'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class, 'bundle_resource/selection' => \Mage_Bundle_Model_Resource_Selection::class, + 'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class, 'bundle_resource/selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class, 'bundle/resource_selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class, 'bundle/sales_order_pdf_items_abstract' => \Mage_Bundle_Model_Sales_Order_Pdf_Items_Abstract::class, @@ -25897,8 +25834,8 @@ 'captcha/config_form_frontend' => \Mage_Captcha_Model_Config_Form_Frontend::class, 'captcha/config_mode' => \Mage_Captcha_Model_Config_Mode::class, 'captcha/observer' => \Mage_Captcha_Model_Observer::class, - 'captcha_resource/log' => \Mage_Captcha_Model_Resource_Log::class, 'captcha/resource_log' => \Mage_Captcha_Model_Resource_Log::class, + 'captcha_resource/log' => \Mage_Captcha_Model_Resource_Log::class, 'captcha/zend' => \Mage_Captcha_Model_Zend::class, 'catalogindex/aggregation' => \Mage_CatalogIndex_Model_Aggregation::class, 'catalogindex/attribute' => \Mage_CatalogIndex_Model_Attribute::class, @@ -25941,8 +25878,8 @@ 'catalogindex/resource_data_abstract' => \Mage_CatalogIndex_Model_Resource_Data_Abstract::class, 'catalogindex_resource/data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class, 'catalogindex/resource_data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class, - 'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, 'catalogindex_resource/data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, + 'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class, 'catalogindex_resource/indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class, 'catalogindex/resource_indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class, 'catalogindex/resource_indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class, @@ -25974,20 +25911,20 @@ 'cataloginventory/mysql4_stock_item_collection' => \Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection::class, 'cataloginventory/mysql4_stock_status' => \Mage_CatalogInventory_Model_Mysql4_Stock_Status::class, 'cataloginventory/observer' => \Mage_CatalogInventory_Model_Observer::class, - 'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, 'cataloginventory_resource/indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, + 'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class, 'cataloginventory/resource_indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class, 'cataloginventory_resource/indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class, - 'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, 'cataloginventory/resource_indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, + 'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class, 'cataloginventory/resource_indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class, 'cataloginventory_resource/indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class, 'cataloginventory_resource/stock' => \Mage_CatalogInventory_Model_Resource_Stock::class, 'cataloginventory/resource_stock' => \Mage_CatalogInventory_Model_Resource_Stock::class, - 'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, 'cataloginventory/resource_stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, - 'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, + 'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class, 'cataloginventory/resource_stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, + 'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class, 'cataloginventory/resource_stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class, 'cataloginventory_resource/stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class, 'cataloginventory/source_backorders' => \Mage_CatalogInventory_Model_Source_Backorders::class, @@ -26010,8 +25947,8 @@ 'catalogrule/observer' => \Mage_CatalogRule_Model_Observer::class, 'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class, 'catalogrule/resource_rule' => \Mage_CatalogRule_Model_Resource_Rule::class, - 'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, 'catalogrule_resource/rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, + 'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class, 'catalogrule_resource/rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class, 'catalogrule/resource_rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class, 'catalogrule_resource/rule_product_price_collection' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price_Collection::class, @@ -26040,24 +25977,24 @@ 'catalogsearch/query' => \Mage_CatalogSearch_Model_Query::class, 'catalogsearch_resource/advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class, 'catalogsearch/resource_advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class, - 'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, 'catalogsearch_resource/advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, + 'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class, 'catalogsearch_resource/fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class, 'catalogsearch/resource_fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class, 'catalogsearch_resource/fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class, 'catalogsearch/resource_fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class, - 'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, 'catalogsearch_resource/fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, - 'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, + 'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class, 'catalogsearch/resource_helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, - 'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, + 'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class, 'catalogsearch_resource/indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, - 'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class, + 'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class, 'catalogsearch_resource/query' => \Mage_CatalogSearch_Model_Resource_Query::class, - 'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, + 'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class, 'catalogsearch_resource/query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, - 'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, + 'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class, 'catalogsearch/resource_search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, + 'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class, 'catalogsearch/session' => \Mage_CatalogSearch_Model_Session::class, 'catalogsearch/system_config_backend_sitemap' => \Mage_CatalogSearch_Model_System_Config_Backend_Sitemap::class, 'catalog/abstract' => \Mage_Catalog_Model_Abstract::class, @@ -26200,144 +26137,144 @@ 'catalog/product_website' => \Mage_Catalog_Model_Product_Website::class, 'catalog/resource_abstract' => \Mage_Catalog_Model_Resource_Abstract::class, 'catalog_resource/abstract' => \Mage_Catalog_Model_Resource_Abstract::class, - 'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class, 'catalog/resource_attribute' => \Mage_Catalog_Model_Resource_Attribute::class, - 'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class, + 'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class, 'catalog_resource/category' => \Mage_Catalog_Model_Resource_Category::class, + 'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class, 'catalog_resource/category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class, 'catalog/resource_category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class, - 'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, 'catalog/resource_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, - 'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, + 'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class, 'catalog/resource_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, + 'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class, 'catalog_resource/category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class, 'catalog/resource_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class, 'catalog_resource/category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class, 'catalog/resource_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class, 'catalog/resource_category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class, 'catalog_resource/category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class, - 'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, 'catalog_resource/category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, - 'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, + 'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class, 'catalog/resource_category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, + 'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class, 'catalog_resource/category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class, 'catalog/resource_category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class, 'catalog/resource_category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class, 'catalog_resource/category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class, - 'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, 'catalog_resource/collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, + 'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class, 'catalog_resource/config' => \Mage_Catalog_Model_Resource_Config::class, 'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class, - 'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, 'catalog/resource_eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, + 'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class, 'catalog_resource/eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class, 'catalog/resource_eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class, 'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, 'catalog_resource/eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class, - 'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, 'catalog/resource_eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, - 'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, + 'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class, 'catalog_resource/eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, + 'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class, 'catalog_resource/eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, - 'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, + 'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class, 'catalog_resource/eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, + 'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class, 'catalog/resource_eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class, 'catalog_resource/eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class, 'catalog/resource_eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class, 'catalog_resource/eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class, 'catalog/resource_eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class, 'catalog_resource/eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class, - 'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, 'catalog/resource_eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, + 'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class, 'catalog/resource_eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, 'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class, 'catalog/resource_eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class, 'catalog_resource/eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class, - 'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, 'catalog_resource/eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, - 'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, + 'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class, 'catalog_resource/eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, + 'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class, 'catalog_resource/eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class, 'catalog/resource_eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class, - 'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, 'catalog_resource/eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, + 'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class, 'catalog/resource_eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, 'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class, - 'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, 'catalog/resource_eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, - 'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, + 'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class, 'catalog/resource_eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, - 'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, + 'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class, 'catalog_resource/eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, + 'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class, 'catalog_resource/eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, - 'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class, 'catalog_resource/eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, + 'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class, 'catalog/resource_eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class, 'catalog/resource_eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, 'catalog_resource/eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, + 'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class, 'catalog/resource_eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class, 'catalog/resource_eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class, 'catalog_resource/eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class, 'catalog_resource/eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class, 'catalog/resource_eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class, - 'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, 'catalog_resource/eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, - 'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, + 'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class, 'catalog_resource/eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, - 'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, + 'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class, 'catalog_resource/eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, + 'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class, 'catalog/resource_eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class, 'catalog/resource_eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class, 'catalog/resource_eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class, 'catalog_resource/eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class, - 'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, 'catalog/resource_eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, - 'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, + 'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class, 'catalog_resource/eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, + 'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class, 'catalog_resource/eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class, 'catalog/resource_eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class, - 'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, 'catalog/resource_eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, - 'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, + 'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class, 'catalog/resource_eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, + 'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class, 'catalog/resource_eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class, 'catalog_resource/eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class, - 'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, 'catalog/resource_eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, + 'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class, 'catalog_resource/eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class, 'catalog/resource_eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class, 'catalog_resource/eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class, 'catalog/resource_eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class, - 'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, 'catalog/resource_eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, - 'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, + 'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class, 'catalog_resource/eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, - 'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, + 'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class, 'catalog/resource_eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, + 'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class, 'catalog/resource_eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, 'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class, - 'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, 'catalog/resource_eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, + 'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class, 'catalog/resource_eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class, 'catalog_resource/eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class, - 'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, 'catalog_resource/eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, - 'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, + 'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class, 'catalog/resource_eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, - 'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, + 'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class, 'catalog/resource_eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, - 'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, + 'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class, 'catalog_resource/eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, + 'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class, 'catalog/resource_eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class, 'catalog_resource/eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class, 'catalog/resource_eav_mysql4_sendfriend' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend::class, @@ -26346,16 +26283,16 @@ 'catalog/resource_eav_mysql4_sendfriend_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection::class, 'catalog_resource/eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class, 'catalog/resource_eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class, - 'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, 'catalog/resource_eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, - 'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, + 'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class, 'catalog/resource_helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, + 'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class, 'catalog_resource/layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class, 'catalog/resource_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class, 'catalog/resource_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class, 'catalog_resource/layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class, - 'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, 'catalog/resource_layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, + 'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class, 'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class, 'catalog_resource/product' => \Mage_Catalog_Model_Resource_Product::class, 'catalog/resource_product_action' => \Mage_Catalog_Model_Resource_Product_Action::class, @@ -26366,42 +26303,42 @@ 'catalog_resource/product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class, 'catalog/resource_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class, 'catalog_resource/product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class, - 'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, 'catalog/resource_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, - 'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, + 'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class, 'catalog_resource/product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, + 'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class, 'catalog/resource_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class, 'catalog_resource/product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class, - 'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, 'catalog_resource/product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, - 'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, + 'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class, 'catalog/resource_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, - 'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, + 'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class, 'catalog_resource/product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, - 'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, + 'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class, 'catalog_resource/product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, + 'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class, 'catalog_resource/product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class, 'catalog/resource_product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class, - 'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, 'catalog/resource_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, + 'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class, 'catalog/resource_product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class, 'catalog_resource/product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class, - 'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, 'catalog/resource_product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, + 'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class, 'catalog/resource_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class, 'catalog_resource/product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class, - 'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, 'catalog_resource/product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, - 'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, + 'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class, 'catalog/resource_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, + 'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class, 'catalog/resource_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class, 'catalog_resource/product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class, - 'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, 'catalog_resource/product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, + 'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class, 'catalog_resource/product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, 'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class, - 'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, 'catalog_resource/product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, + 'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class, 'catalog/resource_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class, 'catalog_resource/product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class, 'catalog_resource/product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class, @@ -26412,12 +26349,12 @@ 'catalog_resource/product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class, 'catalog/resource_product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, 'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class, - 'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, 'catalog_resource/product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, - 'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, + 'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class, 'catalog/resource_product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, - 'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, + 'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class, 'catalog_resource/product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, + 'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class, 'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, 'catalog_resource/product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class, 'catalog_resource/product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class, @@ -26426,14 +26363,14 @@ 'catalog/resource_product_status' => \Mage_Catalog_Model_Resource_Product_Status::class, 'catalog_resource/product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class, 'catalog/resource_product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class, - 'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, 'catalog/resource_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, - 'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, + 'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class, 'catalog_resource/product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, + 'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class, 'catalog_resource/product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class, 'catalog/resource_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class, - 'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, 'catalog_resource/product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, + 'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class, 'catalog/resource_setup' => \Mage_Catalog_Model_Resource_Setup::class, 'catalog_resource/setup' => \Mage_Catalog_Model_Resource_Setup::class, 'catalog_resource/url' => \Mage_Catalog_Model_Resource_Url::class, @@ -26479,12 +26416,12 @@ 'checkout/observer' => \Mage_Checkout_Model_Observer::class, 'checkout_resource/agreement' => \Mage_Checkout_Model_Resource_Agreement::class, 'checkout/resource_agreement' => \Mage_Checkout_Model_Resource_Agreement::class, - 'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, 'checkout/resource_agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, - 'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class, + 'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class, 'checkout_resource/cart' => \Mage_Checkout_Model_Resource_Cart::class, - 'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class, + 'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class, 'checkout/resource_setup' => \Mage_Checkout_Model_Resource_Setup::class, + 'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class, 'checkout/session' => \Mage_Checkout_Model_Session::class, 'checkout/type_abstract' => \Mage_Checkout_Model_Type_Abstract::class, 'checkout/type_multishipping' => \Mage_Checkout_Model_Type_Multishipping::class, @@ -26499,25 +26436,25 @@ 'cms/mysql4_page_service' => \Mage_Cms_Model_Mysql4_Page_Service::class, 'cms/observer' => \Mage_Cms_Model_Observer::class, 'cms/page' => \Mage_Cms_Model_Page::class, - 'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class, 'cms/resource_block' => \Mage_Cms_Model_Resource_Block::class, + 'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class, 'cms_resource/block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class, 'cms/resource_block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class, 'cms/resource_page' => \Mage_Cms_Model_Resource_Page::class, 'cms_resource/page' => \Mage_Cms_Model_Resource_Page::class, - 'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, 'cms_resource/page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, - 'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class, + 'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class, 'cms/resource_page_service' => \Mage_Cms_Model_Resource_Page_Service::class, + 'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class, 'cms/template_filter' => \Mage_Cms_Model_Template_Filter::class, 'cms/wysiwyg_config' => \Mage_Cms_Model_Wysiwyg_Config::class, 'cms/wysiwyg_images_storage' => \Mage_Cms_Model_Wysiwyg_Images_Storage::class, 'cms/wysiwyg_images_storage_collection' => \Mage_Cms_Model_Wysiwyg_Images_Storage_Collection::class, 'configurableswatches/observer' => \Mage_ConfigurableSwatches_Model_Observer::class, - 'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, 'configurableswatches_resource/catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, - 'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, + 'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class, 'configurableswatches_resource/catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, + 'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class, 'configurableswatches_resource/catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class, 'configurableswatches/resource_catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class, 'configurableswatches/system_config_source_catalog_product_configattribute' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute::class, @@ -26624,152 +26561,152 @@ 'core/mysql4_website_collection' => \Mage_Core_Model_Mysql4_Website_Collection::class, 'core/observer' => \Mage_Core_Model_Observer::class, 'core/resource' => \Mage_Core_Model_Resource::class, + 'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, 'core_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, 'core/resource_abstract' => \Mage_Core_Model_Resource_Abstract::class, - 'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class, + 'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class, 'core/resource_cache' => \Mage_Core_Model_Resource_Cache::class, 'core_resource/cache' => \Mage_Core_Model_Resource_Cache::class, - 'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class, + 'core/resource_config' => \Mage_Core_Model_Resource_Config::class, 'core_resource/config' => \Mage_Core_Model_Resource_Config::class, 'payment_resource/config' => \Mage_Core_Model_Resource_Config::class, - 'core/resource_config' => \Mage_Core_Model_Resource_Config::class, - 'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, 'core/resource_config_data' => \Mage_Core_Model_Resource_Config_Data::class, + 'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, 'payment_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class, - 'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'core_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, - 'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, - 'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, + 'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class, 'payment_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, - 'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, + 'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, + 'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class, 'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, 'core/resource_db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, - 'core/resource_design' => \Mage_Core_Model_Resource_Design::class, + 'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class, 'core_resource/design' => \Mage_Core_Model_Resource_Design::class, + 'core/resource_design' => \Mage_Core_Model_Resource_Design::class, 'payment_resource/design' => \Mage_Core_Model_Resource_Design::class, 'payment_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, - 'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, 'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, - 'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, + 'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class, 'payment_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, 'core/resource_design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, + 'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class, 'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, 'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, 'core/resource_email_queue' => \Mage_Core_Model_Resource_Email_Queue::class, - 'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, - 'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, 'payment_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, - 'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, + 'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, + 'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class, 'core/resource_email_template' => \Mage_Core_Model_Resource_Email_Template::class, 'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, - 'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, + 'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class, 'core/resource_email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, + 'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, 'core_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class, - 'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, - 'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, 'core_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, - 'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, - 'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, + 'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class, 'core_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class, + 'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, 'payment_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, 'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, - 'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class, + 'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, 'payment_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, 'core/resource_file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, - 'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class, + 'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, 'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, 'core/resource_file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, - 'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class, - 'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, - 'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, 'core/resource_file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, - 'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class, + 'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, + 'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class, 'payment_resource/flag' => \Mage_Core_Model_Resource_Flag::class, + 'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class, 'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class, 'payment_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, - 'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, 'core_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, - 'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, + 'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class, 'core/resource_helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, + 'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, 'core_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class, 'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, 'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class, 'core/resource_iterator' => \Mage_Core_Model_Resource_Iterator::class, 'payment_resource/language' => \Mage_Core_Model_Resource_Language::class, - 'core/resource_language' => \Mage_Core_Model_Resource_Language::class, 'core_resource/language' => \Mage_Core_Model_Resource_Language::class, + 'core/resource_language' => \Mage_Core_Model_Resource_Language::class, 'payment_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, - 'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, 'core/resource_language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, - 'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class, + 'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class, 'core_resource/layout' => \Mage_Core_Model_Resource_Layout::class, 'core/resource_layout' => \Mage_Core_Model_Resource_Layout::class, + 'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class, 'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class, - 'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class, 'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class, + 'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class, 'core/resource_session' => \Mage_Core_Model_Resource_Session::class, - 'core_resource/session' => \Mage_Core_Model_Resource_Session::class, 'payment_resource/session' => \Mage_Core_Model_Resource_Session::class, + 'core_resource/session' => \Mage_Core_Model_Resource_Session::class, 'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class, 'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class, 'payment_resource/setup' => \Mage_Core_Model_Resource_Setup::class, - 'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core/resource_setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'core_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, + 'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class, 'payment_resource/store' => \Mage_Core_Model_Resource_Store::class, 'core_resource/store' => \Mage_Core_Model_Resource_Store::class, 'core/resource_store' => \Mage_Core_Model_Resource_Store::class, - 'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, 'core/resource_store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, + 'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, 'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class, - 'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'core/resource_store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'payment_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, - 'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, - 'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, + 'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class, 'payment_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, - 'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, - 'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class, + 'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, + 'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class, 'core_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, - 'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class, + 'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class, + 'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class, 'core_resource/translate' => \Mage_Core_Model_Resource_Translate::class, + 'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class, 'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class, - 'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, - 'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class, 'payment_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, - 'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class, + 'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class, 'core/resource_type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, 'payment_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class, + 'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'core/resource_type_db' => \Mage_Core_Model_Resource_Type_Db::class, - 'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class, 'core_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, 'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, 'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class, - 'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, - 'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, 'payment_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, + 'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class, 'payment_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, - 'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, 'core_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, - 'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, - 'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, + 'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class, 'payment_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, + 'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, + 'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class, 'core_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class, 'core_resource/variable' => \Mage_Core_Model_Resource_Variable::class, - 'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class, 'core/resource_variable' => \Mage_Core_Model_Resource_Variable::class, + 'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class, 'core/resource_variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, - 'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, 'core_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, + 'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class, + 'core/resource_website' => \Mage_Core_Model_Resource_Website::class, 'core_resource/website' => \Mage_Core_Model_Resource_Website::class, 'payment_resource/website' => \Mage_Core_Model_Resource_Website::class, - 'core/resource_website' => \Mage_Core_Model_Resource_Website::class, - 'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core/resource_website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, + 'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class, 'core/session' => \Mage_Core_Model_Session::class, 'core/session_abstract' => \Mage_Core_Model_Session_Abstract::class, @@ -26799,10 +26736,10 @@ 'cron/mysql4_schedule' => \Mage_Cron_Model_Mysql4_Schedule::class, 'cron/mysql4_schedule_collection' => \Mage_Cron_Model_Mysql4_Schedule_Collection::class, 'cron/observer' => \Mage_Cron_Model_Observer::class, - 'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class, 'cron/resource_schedule' => \Mage_Cron_Model_Resource_Schedule::class, - 'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, + 'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class, 'cron/resource_schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, + 'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class, 'cron/schedule' => \Mage_Cron_Model_Schedule::class, 'currencysymbol/observer' => \Mage_CurrencySymbol_Model_Observer::class, 'currencysymbol/system_currencysymbol' => \Mage_CurrencySymbol_Model_System_Currencysymbol::class, @@ -26877,16 +26814,16 @@ 'customer_resource/address' => \Mage_Customer_Model_Resource_Address::class, 'customer/resource_address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class, 'customer_resource/address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class, - 'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, 'customer_resource/address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, - 'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, + 'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class, 'customer/resource_address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, - 'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, + 'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class, 'customer/resource_address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, - 'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, + 'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class, 'customer_resource/address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, - 'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, + 'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class, 'customer_resource/address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, + 'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class, 'customer/resource_attribute' => \Mage_Customer_Model_Resource_Attribute::class, 'customer_resource/attribute' => \Mage_Customer_Model_Resource_Attribute::class, 'customer_resource/attribute_collection' => \Mage_Customer_Model_Resource_Attribute_Collection::class, @@ -26895,22 +26832,22 @@ 'customer_resource/customer' => \Mage_Customer_Model_Resource_Customer::class, 'customer_resource/customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class, 'customer/resource_customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class, - 'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, 'customer/resource_flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, - 'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, + 'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class, 'customer/resource_flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, - 'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, + 'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class, 'customer/resource_form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, - 'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, + 'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class, 'customer/resource_form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, + 'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class, 'customer/resource_group' => \Mage_Customer_Model_Resource_Group::class, 'customer_resource/group' => \Mage_Customer_Model_Resource_Group::class, 'customer_resource/group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class, 'customer/resource_group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class, - 'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class, 'customer_resource/setup' => \Mage_Customer_Model_Resource_Setup::class, - 'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, + 'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class, 'customer_resource/wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, + 'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class, 'customer/session' => \Mage_Customer_Model_Session::class, 'dataflow/batch' => \Mage_Dataflow_Model_Batch::class, 'dataflow/batch_abstract' => \Mage_Dataflow_Model_Batch_Abstract::class, @@ -26962,10 +26899,10 @@ 'dataflow/mysql4_session' => \Mage_Dataflow_Model_Mysql4_Session::class, 'dataflow/profile' => \Mage_Dataflow_Model_Profile::class, 'dataflow/profile_history' => \Mage_Dataflow_Model_Profile_History::class, - 'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class, 'dataflow/resource_batch' => \Mage_Dataflow_Model_Resource_Batch::class, - 'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, + 'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class, 'dataflow/resource_batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, + 'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class, 'dataflow/resource_batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class, 'dataflow_resource/batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class, 'dataflow_resource/batch_export' => \Mage_Dataflow_Model_Resource_Batch_Export::class, @@ -26976,12 +26913,12 @@ 'dataflow/resource_import' => \Mage_Dataflow_Model_Resource_Import::class, 'dataflow_resource/import_collection' => \Mage_Dataflow_Model_Resource_Import_Collection::class, 'dataflow/resource_import_collection' => \Mage_Dataflow_Model_Resource_Import_Collection::class, - 'dataflow_resource/profile' => \Mage_Dataflow_Model_Resource_Profile::class, 'dataflow/resource_profile' => \Mage_Dataflow_Model_Resource_Profile::class, + 'dataflow_resource/profile' => \Mage_Dataflow_Model_Resource_Profile::class, 'dataflow/resource_profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class, 'dataflow_resource/profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class, - 'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, 'dataflow_resource/profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, + 'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class, 'dataflow_resource/profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class, 'dataflow/resource_profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class, 'dataflow_resource/session' => \Mage_Dataflow_Model_Resource_Session::class, @@ -27015,8 +26952,8 @@ 'directory/resource_country' => \Mage_Directory_Model_Resource_Country::class, 'directory_resource/country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class, 'directory/resource_country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class, - 'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class, 'directory/resource_country_format' => \Mage_Directory_Model_Resource_Country_Format::class, + 'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class, 'directory_resource/country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class, 'directory/resource_country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class, 'directory_resource/currency' => \Mage_Directory_Model_Resource_Currency::class, @@ -27047,8 +26984,8 @@ 'downloadable/observer' => \Mage_Downloadable_Model_Observer::class, 'downloadable/product_price' => \Mage_Downloadable_Model_Product_Price::class, 'downloadable/product_type' => \Mage_Downloadable_Model_Product_Type::class, - 'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, 'downloadable_resource/indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, + 'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class, 'downloadable/resource_link' => \Mage_Downloadable_Model_Resource_Link::class, 'downloadable_resource/link' => \Mage_Downloadable_Model_Resource_Link::class, 'downloadable/resource_link_collection' => \Mage_Downloadable_Model_Resource_Link_Collection::class, @@ -27057,12 +26994,12 @@ 'downloadable_resource/link_purchased' => \Mage_Downloadable_Model_Resource_Link_Purchased::class, 'downloadable/resource_link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class, 'downloadable_resource/link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class, - 'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, 'downloadable/resource_link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, + 'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class, 'downloadable/resource_link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, 'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class, - 'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class, 'downloadable/resource_sample' => \Mage_Downloadable_Model_Resource_Sample::class, + 'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class, 'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, 'downloadable/resource_sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class, 'downloadable/sales_order_pdf_items_abstract' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Abstract::class, @@ -27150,46 +27087,46 @@ 'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class, 'eav_resource/attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class, 'eav/resource_attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class, - 'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class, 'eav_resource/config' => \Mage_Eav_Model_Resource_Config::class, + 'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class, 'eav/resource_entity_attribute' => \Mage_Eav_Model_Resource_Entity_Attribute::class, 'eav_resource/entity_attribute' => \Mage_Eav_Model_Resource_Entity_Attribute::class, 'eav_resource/entity_attribute_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Collection::class, 'eav/resource_entity_attribute_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Collection::class, 'eav_resource/entity_attribute_group' => \Mage_Eav_Model_Resource_Entity_Attribute_Group::class, 'eav/resource_entity_attribute_group' => \Mage_Eav_Model_Resource_Entity_Attribute_Group::class, - 'eav/resource_entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class, 'eav_resource/entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class, + 'eav/resource_entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class, 'eav/resource_entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class, 'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class, - 'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, 'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, - 'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, + 'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class, 'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, - 'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, + 'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class, 'eav_resource/entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, + 'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class, 'eav_resource/entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class, 'eav/resource_entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class, 'eav_resource/entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class, 'eav/resource_entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class, - 'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, 'eav_resource/entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, + 'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class, 'eav/resource_form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class, 'eav_resource/form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class, - 'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, 'eav/resource_form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, + 'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class, 'eav/resource_form_element' => \Mage_Eav_Model_Resource_Form_Element::class, 'eav_resource/form_element' => \Mage_Eav_Model_Resource_Form_Element::class, - 'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, 'eav_resource/form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, - 'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, + 'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class, 'eav/resource_form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, + 'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class, 'eav_resource/form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, 'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class, 'eav/resource_form_type' => \Mage_Eav_Model_Resource_Form_Type::class, 'eav_resource/form_type' => \Mage_Eav_Model_Resource_Form_Type::class, - 'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class, 'eav_resource/form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class, + 'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class, 'eav_resource/helper_mysql4' => \Mage_Eav_Model_Resource_Helper_Mysql4::class, 'eav/resource_helper_mysql4' => \Mage_Eav_Model_Resource_Helper_Mysql4::class, 'giftmessage/api' => \Mage_GiftMessage_Model_Api::class, @@ -27201,12 +27138,12 @@ 'giftmessage/mysql4_message_collection' => \Mage_GiftMessage_Model_Mysql4_Message_Collection::class, 'giftmessage/mysql4_setup' => \Mage_GiftMessage_Model_Mysql4_Setup::class, 'giftmessage/observer' => \Mage_GiftMessage_Model_Observer::class, - 'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class, 'giftmessage/resource_message' => \Mage_GiftMessage_Model_Resource_Message::class, - 'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, + 'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class, 'giftmessage_resource/message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, - 'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class, + 'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class, 'giftmessage_resource/setup' => \Mage_GiftMessage_Model_Resource_Setup::class, + 'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class, 'googleanalytics/observer' => \Mage_GoogleAnalytics_Model_Observer::class, 'googleanalytics/system_config_source_type' => \Mage_GoogleAnalytics_Model_System_Config_Source_Type::class, 'googlecheckout/payment' => \Mage_GoogleCheckout_Model_Payment::class, @@ -27242,8 +27179,8 @@ 'importexport/product_attribute_backend_urlkey' => \Mage_ImportExport_Model_Product_Attribute_Backend_Urlkey::class, 'importexport_resource/helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class, 'importexport/resource_helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class, - 'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, 'importexport_resource/import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, + 'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class, 'importexport_resource/setup' => \Mage_ImportExport_Model_Resource_Setup::class, 'importexport/resource_setup' => \Mage_ImportExport_Model_Resource_Setup::class, 'importexport/source_export_entity' => \Mage_ImportExport_Model_Source_Export_Entity::class, @@ -27265,16 +27202,16 @@ 'index/process' => \Mage_Index_Model_Process::class, 'index_resource/abstract' => \Mage_Index_Model_Resource_Abstract::class, 'index/resource_abstract' => \Mage_Index_Model_Resource_Abstract::class, - 'index/resource_event' => \Mage_Index_Model_Resource_Event::class, 'index_resource/event' => \Mage_Index_Model_Resource_Event::class, + 'index/resource_event' => \Mage_Index_Model_Resource_Event::class, 'index/resource_event_collection' => \Mage_Index_Model_Resource_Event_Collection::class, 'index_resource/event_collection' => \Mage_Index_Model_Resource_Event_Collection::class, 'index/resource_helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class, 'index_resource/helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class, - 'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, 'index/resource_lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, - 'index_resource/process' => \Mage_Index_Model_Resource_Process::class, + 'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class, 'index/resource_process' => \Mage_Index_Model_Resource_Process::class, + 'index_resource/process' => \Mage_Index_Model_Resource_Process::class, 'index/resource_process_collection' => \Mage_Index_Model_Resource_Process_Collection::class, 'index_resource/process_collection' => \Mage_Index_Model_Resource_Process_Collection::class, 'index/resource_setup' => \Mage_Index_Model_Resource_Setup::class, @@ -27307,22 +27244,22 @@ 'log/mysql4_visitor_online_collection' => \Mage_Log_Model_Mysql4_Visitor_Online_Collection::class, 'log_resource/aggregation' => \Mage_Log_Model_Resource_Aggregation::class, 'log/resource_aggregation' => \Mage_Log_Model_Resource_Aggregation::class, - 'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class, 'log/resource_customer' => \Mage_Log_Model_Resource_Customer::class, + 'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class, 'log/resource_log' => \Mage_Log_Model_Resource_Log::class, 'log_resource/log' => \Mage_Log_Model_Resource_Log::class, 'log_resource/visitor' => \Mage_Log_Model_Resource_Visitor::class, 'log/resource_visitor' => \Mage_Log_Model_Resource_Visitor::class, 'log_resource/visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class, 'log/resource_visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class, - 'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, 'log_resource/visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, - 'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, + 'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class, 'log_resource/visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, + 'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class, 'log/visitor' => \Mage_Log_Model_Visitor::class, 'log/visitor_online' => \Mage_Log_Model_Visitor_Online::class, - 'media_resource/image' => \Mage_Media_Model_File_Image::class, 'media/file_image' => \Mage_Media_Model_File_Image::class, + 'media_resource/image' => \Mage_Media_Model_File_Image::class, 'media/image' => \Mage_Media_Model_Image::class, 'newsletter/message' => \Mage_Newsletter_Model_Message::class, 'newsletter/mysql4_problem' => \Mage_Newsletter_Model_Mysql4_Problem::class, @@ -27340,14 +27277,14 @@ 'newsletter_resource/problem' => \Mage_Newsletter_Model_Resource_Problem::class, 'newsletter/resource_problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class, 'newsletter_resource/problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class, - 'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class, 'newsletter/resource_queue' => \Mage_Newsletter_Model_Resource_Queue::class, - 'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, + 'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class, 'newsletter/resource_queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, - 'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, + 'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class, 'newsletter/resource_subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, - 'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, + 'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class, 'newsletter/resource_subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, + 'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class, 'newsletter_resource/template' => \Mage_Newsletter_Model_Resource_Template::class, 'newsletter/resource_template' => \Mage_Newsletter_Model_Resource_Template::class, 'newsletter_resource/template_collection' => \Mage_Newsletter_Model_Resource_Template_Collection::class, @@ -27360,20 +27297,20 @@ 'oauth/consumer_validator_keyLength' => \Mage_Oauth_Model_Consumer_Validator_KeyLength::class, 'oauth/nonce' => \Mage_Oauth_Model_Nonce::class, 'oauth/observer' => \Mage_Oauth_Model_Observer::class, - 'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class, 'oauth/resource_consumer' => \Mage_Oauth_Model_Resource_Consumer::class, + 'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class, 'oauth/resource_consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class, 'oauth_resource/consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class, 'oauth_resource/nonce' => \Mage_Oauth_Model_Resource_Nonce::class, 'oauth/resource_nonce' => \Mage_Oauth_Model_Resource_Nonce::class, 'oauth_resource/nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class, 'oauth/resource_nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class, - 'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class, 'oauth/resource_setup' => \Mage_Oauth_Model_Resource_Setup::class, - 'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class, + 'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class, 'oauth_resource/token' => \Mage_Oauth_Model_Resource_Token::class, - 'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, + 'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class, 'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, + 'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class, 'oauth/server' => \Mage_Oauth_Model_Server::class, 'oauth/token' => \Mage_Oauth_Model_Token::class, 'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class, @@ -27390,8 +27327,8 @@ 'paygate/authorizenet_source_paymentAction' => \Mage_Paygate_Model_Authorizenet_Source_PaymentAction::class, 'paygate/mysql4_authorizenet_debug' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug::class, 'paygate/mysql4_authorizenet_debug_collection' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection::class, - 'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, 'paygate/resource_authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, + 'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class, 'paygate_resource/authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class, 'paygate/resource_authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class, 'payment/billing_agreementAbstract' => \Mage_Payment_Model_Billing_AgreementAbstract::class, @@ -27454,12 +27391,12 @@ 'paypal/resource_cert' => \Mage_Paypal_Model_Resource_Cert::class, 'paypal_resource/payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class, 'paypal/resource_payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class, - 'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, 'paypal/resource_payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, + 'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class, 'paypal/resource_report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class, 'paypal_resource/report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class, - 'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, 'paypal/resource_report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, + 'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class, 'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, 'paypal/resource_report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class, 'paypal/resource_setup' => \Mage_Paypal_Model_Resource_Setup::class, @@ -27484,8 +27421,8 @@ 'persistent/observer' => \Mage_Persistent_Model_Observer::class, 'persistent/observer_session' => \Mage_Persistent_Model_Observer_Session::class, 'persistent/persistent_config' => \Mage_Persistent_Model_Persistent_Config::class, - 'persistent/resource_session' => \Mage_Persistent_Model_Resource_Session::class, 'persistent_resource/session' => \Mage_Persistent_Model_Resource_Session::class, + 'persistent/resource_session' => \Mage_Persistent_Model_Resource_Session::class, 'persistent/session' => \Mage_Persistent_Model_Session::class, 'poll/mysql4_poll' => \Mage_Poll_Model_Mysql4_Poll::class, 'poll/mysql4_poll_answer' => \Mage_Poll_Model_Mysql4_Poll_Answer::class, @@ -27495,16 +27432,16 @@ 'poll/poll' => \Mage_Poll_Model_Poll::class, 'poll/poll_answer' => \Mage_Poll_Model_Poll_Answer::class, 'poll/poll_vote' => \Mage_Poll_Model_Poll_Vote::class, - 'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class, 'poll_resource/poll' => \Mage_Poll_Model_Resource_Poll::class, + 'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class, 'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, 'poll/resource_poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class, - 'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, 'poll_resource/poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, - 'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, + 'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class, 'poll_resource/poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, - 'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, + 'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class, 'poll/resource_poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, + 'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class, 'productalert/email' => \Mage_ProductAlert_Model_Email::class, 'productalert/mysql4_price' => \Mage_ProductAlert_Model_Mysql4_Price::class, 'productalert/mysql4_price_collection' => \Mage_ProductAlert_Model_Mysql4_Price_Collection::class, @@ -27514,20 +27451,20 @@ 'productalert/mysql4_stock_customer_collection' => \Mage_ProductAlert_Model_Mysql4_Stock_Customer_Collection::class, 'productalert/observer' => \Mage_ProductAlert_Model_Observer::class, 'productalert/price' => \Mage_ProductAlert_Model_Price::class, - 'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, 'productalert_resource/abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, - 'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class, + 'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class, 'productalert_resource/price' => \Mage_ProductAlert_Model_Resource_Price::class, - 'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, + 'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class, 'productalert/resource_price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, - 'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, + 'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class, 'productalert/resource_price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, + 'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class, 'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class, 'productalert/resource_stock' => \Mage_ProductAlert_Model_Resource_Stock::class, - 'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, 'productalert/resource_stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, - 'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, + 'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class, 'productalert/resource_stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, + 'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class, 'productalert/stock' => \Mage_ProductAlert_Model_Stock::class, 'rating/mysql4_rating' => \Mage_Rating_Model_Mysql4_Rating::class, 'rating/mysql4_rating_collection' => \Mage_Rating_Model_Mysql4_Rating_Collection::class, @@ -27541,20 +27478,20 @@ 'rating/rating_entity' => \Mage_Rating_Model_Rating_Entity::class, 'rating/rating_option' => \Mage_Rating_Model_Rating_Option::class, 'rating/rating_option_vote' => \Mage_Rating_Model_Rating_Option_Vote::class, - 'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class, 'rating/resource_rating' => \Mage_Rating_Model_Resource_Rating::class, + 'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class, 'rating_resource/rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class, 'rating/resource_rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class, 'rating/resource_rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class, 'rating_resource/rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class, - 'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, 'rating/resource_rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, - 'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, + 'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class, 'rating_resource/rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, + 'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class, 'rating_resource/rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class, 'rating/resource_rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class, - 'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, 'rating/resource_rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, + 'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class, 'reports/config' => \Mage_Reports_Model_Config::class, 'reports/event' => \Mage_Reports_Model_Event::class, 'reports/event_observer' => \Mage_Reports_Model_Event_Observer::class, @@ -27600,6 +27537,7 @@ 'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class, 'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class, 'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class, + 'reports/observer' => \Mage_Reports_Model_Observer::class, 'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class, 'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class, 'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class, @@ -27608,88 +27546,88 @@ 'reports_resource/accounts_collection' => \Mage_Reports_Model_Resource_Accounts_Collection::class, 'reports/resource_coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class, 'reports_resource/coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class, - 'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, 'reports/resource_customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, - 'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, + 'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class, 'reports/resource_customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, - 'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, + 'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class, 'reports_resource/customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, - 'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, + 'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class, 'reports/resource_entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, + 'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class, 'reports_resource/event' => \Mage_Reports_Model_Resource_Event::class, 'reports/resource_event' => \Mage_Reports_Model_Resource_Event::class, 'reports_resource/event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, 'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class, 'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class, 'reports/resource_event_type' => \Mage_Reports_Model_Resource_Event_Type::class, - 'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, 'reports/resource_event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, - 'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, + 'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class, 'reports_resource/helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, - 'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, + 'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class, 'reports/resource_invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, - 'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, + 'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class, 'reports_resource/order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, - 'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, + 'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class, 'reports_resource/product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, + 'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class, 'reports/resource_product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class, 'reports_resource/product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class, 'reports_resource/product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class, 'reports/resource_product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class, - 'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, 'reports/resource_product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, + 'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class, 'reports_resource/product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class, 'reports/resource_product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class, - 'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, 'reports_resource/product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, - 'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, + 'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class, 'reports/resource_product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, - 'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, + 'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class, 'reports_resource/product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, - 'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, + 'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class, 'reports/resource_product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, + 'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class, 'reports_resource/product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class, 'reports/resource_product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class, - 'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, 'reports_resource/product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, - 'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, + 'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class, 'reports_resource/product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, - 'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, + 'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class, 'reports/resource_quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, - 'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class, + 'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class, 'reports_resource/refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class, + 'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class, 'reports/resource_report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class, 'reports_resource/report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class, 'reports/resource_report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class, 'reports_resource/report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class, - 'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, 'reports_resource/report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, + 'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class, 'reports/resource_report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class, 'reports_resource/report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class, - 'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, 'reports/resource_report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, + 'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class, 'reports_resource/review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, 'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class, - 'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, 'reports_resource/review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, + 'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class, 'reports_resource/review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class, 'reports/resource_review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class, 'reports_resource/shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class, 'reports/resource_shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class, - 'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, 'reports_resource/shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, + 'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class, 'reports_resource/tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class, 'reports/resource_tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class, - 'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, 'reports/resource_tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, - 'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, + 'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class, 'reports/resource_tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, - 'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, + 'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class, 'reports/resource_tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, + 'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class, 'reports_resource/wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class, 'reports/resource_wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class, - 'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, 'reports_resource/wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, + 'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class, 'reports/session' => \Mage_Reports_Model_Session::class, 'reports/test' => \Mage_Reports_Model_Test::class, 'reports/totals' => \Mage_Reports_Model_Totals::class, @@ -27706,14 +27644,14 @@ 'review/resource_review_collection' => \Mage_Review_Model_Resource_Review_Collection::class, 'review_resource/review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class, 'review/resource_review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class, - 'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class, 'review_resource/review_status' => \Mage_Review_Model_Resource_Review_Status::class, - 'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, + 'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class, 'review_resource/review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, + 'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class, 'review/resource_review_summary' => \Mage_Review_Model_Resource_Review_Summary::class, 'review_resource/review_summary' => \Mage_Review_Model_Resource_Review_Summary::class, - 'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, 'review/resource_review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, + 'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class, 'review/review' => \Mage_Review_Model_Review::class, 'review/review_status' => \Mage_Review_Model_Review_Status::class, 'review/review_summary' => \Mage_Review_Model_Review_Summary::class, @@ -27736,14 +27674,14 @@ 'rule/mysql4_rule_collection' => \Mage_Rule_Model_Mysql4_Rule_Collection::class, 'rule/renderer_actions' => \Mage_Rule_Model_Renderer_Actions::class, 'rule/renderer_conditions' => \Mage_Rule_Model_Renderer_Conditions::class, - 'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class, 'rule/resource_abstract' => \Mage_Rule_Model_Resource_Abstract::class, - 'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class, + 'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class, 'rule/resource_rule' => \Mage_Rule_Model_Resource_Rule::class, - 'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, + 'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class, 'rule_resource/rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, - 'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, + 'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class, 'rule_resource/rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, + 'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class, 'rule/resource_rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class, 'rule_resource/rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class, 'rule/rule' => \Mage_Rule_Model_Rule::class, @@ -27772,24 +27710,24 @@ 'salesrule/resource_coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class, 'salesrule/resource_coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class, 'salesrule_resource/coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class, - 'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, 'salesrule_resource/report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, - 'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, + 'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class, 'salesrule_resource/report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, + 'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class, 'salesrule_resource/report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class, 'salesrule/resource_report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class, 'salesrule_resource/report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class, 'salesrule/resource_report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class, 'salesrule_resource/report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class, 'salesrule/resource_report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class, - 'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class, 'salesrule_resource/rule' => \Mage_SalesRule_Model_Resource_Rule::class, - 'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, + 'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class, 'salesrule_resource/rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, - 'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, + 'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class, 'salesrule_resource/rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, - 'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, + 'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class, 'salesrule/resource_rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, + 'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class, 'salesrule_resource/rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class, 'salesrule/resource_rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class, 'salesrule_resource/rule_product_collection' => \Mage_SalesRule_Model_Resource_Rule_Product_Collection::class, @@ -27834,14 +27772,14 @@ 'sales/email_template' => \Mage_Sales_Model_Email_Template::class, 'sales/entity_order' => \Mage_Sales_Model_Entity_Order::class, 'sales_entity/order' => \Mage_Sales_Model_Entity_Order::class, - 'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class, 'sales_entity/order_address' => \Mage_Sales_Model_Entity_Order_Address::class, - 'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, + 'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class, 'sales/entity_order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, - 'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, + 'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class, 'sales_entity/order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, - 'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, + 'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class, 'sales_entity/order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, + 'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class, 'sales/entity_order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class, 'sales_entity/order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class, 'sales/entity_order_attribute_backend_shipping' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Shipping::class, @@ -27850,22 +27788,22 @@ 'sales/entity_order_collection' => \Mage_Sales_Model_Entity_Order_Collection::class, 'sales_entity/order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class, 'sales/entity_order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class, - 'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, 'sales_entity/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, - 'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, + 'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class, 'sales/entity_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, - 'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, + 'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class, 'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, + 'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class, 'sales/entity_order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class, 'sales_entity/order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class, 'sales/entity_order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class, 'sales_entity/order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class, 'sales_entity/order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class, 'sales/entity_order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class, - 'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, 'sales/entity_order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, - 'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, + 'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class, 'sales_entity/order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, + 'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class, 'sales/entity_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class, 'sales_entity/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class, 'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class, @@ -27876,28 +27814,28 @@ 'sales/entity_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class, 'sales/entity_order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class, 'sales_entity/order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class, - 'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, 'sales/entity_order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, + 'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class, 'sales_entity/order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class, 'sales/entity_order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class, 'sales_entity/order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class, 'sales/entity_order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class, - 'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, 'sales/entity_order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, + 'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class, 'sales/entity_order_item' => \Mage_Sales_Model_Entity_Order_Item::class, 'sales_entity/order_item' => \Mage_Sales_Model_Entity_Order_Item::class, 'sales/entity_order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class, 'sales_entity/order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class, - 'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, 'sales/entity_order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, + 'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class, 'sales_entity/order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class, 'sales/entity_order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class, 'sales_entity/order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class, 'sales/entity_order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class, - 'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, 'sales_entity/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, - 'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, + 'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class, 'sales/entity_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, + 'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class, 'sales/entity_order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class, 'sales_entity/order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class, 'sales/entity_order_shipment_comment' => \Mage_Sales_Model_Entity_Order_Shipment_Comment::class, @@ -27906,66 +27844,66 @@ 'sales_entity/order_shipment_comment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Comment_Collection::class, 'sales/entity_order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class, 'sales_entity/order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class, - 'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, 'sales/entity_order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, - 'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, + 'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class, 'sales_entity/order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, - 'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, + 'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class, 'sales_entity/order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, - 'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, + 'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class, 'sales_entity/order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, - 'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, + 'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class, 'sales_entity/order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, + 'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class, 'sales_entity/quote' => \Mage_Sales_Model_Entity_Quote::class, 'sales/entity_quote' => \Mage_Sales_Model_Entity_Quote::class, - 'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, 'sales_entity/quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, + 'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class, 'sales_entity/quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class, 'sales/entity_quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class, - 'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, 'sales/entity_quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, - 'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, + 'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class, 'sales/entity_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, - 'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, + 'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class, 'sales_entity/quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, - 'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, + 'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class, 'sales/entity_quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, + 'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class, 'sales_entity/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales/entity_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class, 'sales_entity/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class, 'sales/entity_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class, - 'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, 'sales_entity/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, - 'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class, 'sales/entity_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, + 'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/entity_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales_entity/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales/entity_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class, 'sales_entity/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class, 'sales/entity_quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class, 'sales_entity/quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class, - 'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, 'sales_entity/quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, - 'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, + 'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class, 'sales/entity_quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, - 'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, + 'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class, 'sales_entity/quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, + 'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class, 'sales/entity_quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class, 'sales_entity/quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class, 'sales/entity_quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class, 'sales_entity/quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class, - 'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, 'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, - 'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, + 'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class, 'sales/entity_quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, - 'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, + 'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class, 'sales/entity_quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, + 'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class, 'sales_entity/quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class, 'sales/entity_quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class, - 'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, 'sales_entity/sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, - 'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class, + 'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class, 'sales_entity/setup' => \Mage_Sales_Model_Entity_Setup::class, + 'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class, 'sales/mysql4_abstract' => \Mage_Sales_Model_Mysql4_Abstract::class, 'sales/mysql4_billing_agreement' => \Mage_Sales_Model_Mysql4_Billing_Agreement::class, 'sales/mysql4_billing_agreement_collection' => \Mage_Sales_Model_Mysql4_Billing_Agreement_Collection::class, @@ -28160,48 +28098,48 @@ 'sales/recurring_profile' => \Mage_Sales_Model_Recurring_Profile::class, 'sales_resource/abstract' => \Mage_Sales_Model_Resource_Abstract::class, 'sales/resource_abstract' => \Mage_Sales_Model_Resource_Abstract::class, - 'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, 'sales_resource/billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, - 'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, + 'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class, 'sales_resource/billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, - 'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, + 'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class, 'sales/resource_collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, - 'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, + 'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class, 'sales_resource/helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, - 'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class, + 'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class, 'sales_resource/order' => \Mage_Sales_Model_Resource_Order::class, + 'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class, 'sales_resource/order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class, 'sales/resource_order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class, - 'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class, 'sales_resource/order_address' => \Mage_Sales_Model_Resource_Order_Address::class, + 'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class, 'sales/resource_order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class, 'sales_resource/order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class, 'sales/resource_order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class, 'sales_resource/order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class, 'sales/resource_order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class, 'sales_resource/order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class, - 'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, 'sales/resource_order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, + 'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class, 'sales_resource/order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class, 'sales/resource_order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class, 'sales/resource_order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class, 'sales_resource/order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class, - 'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, 'sales/resource_order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, + 'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class, 'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, 'sales/resource_order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class, 'sales/resource_order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, 'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class, - 'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, 'sales_resource/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, + 'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class, 'sales/resource_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class, 'sales_resource/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class, - 'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, 'sales/resource_order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, - 'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, + 'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class, 'sales_resource/order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, - 'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, + 'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class, 'sales/resource_order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, + 'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class, 'sales/resource_order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, 'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class, 'sales_resource/order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class, @@ -28212,84 +28150,84 @@ 'sales/resource_order_grid_collection' => \Mage_Sales_Model_Resource_Order_Grid_Collection::class, 'sales/resource_order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class, 'sales_resource/order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class, - 'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, 'sales/resource_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, - 'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, + 'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class, 'sales_resource/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, + 'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class, 'sales_resource/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class, 'sales/resource_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class, 'sales/resource_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class, 'sales_resource/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class, 'sales/resource_order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class, 'sales_resource/order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class, - 'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, 'sales/resource_order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, + 'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class, 'sales/resource_order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class, 'sales_resource/order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class, - 'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, 'sales/resource_order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, - 'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, + 'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class, 'sales_resource/order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, + 'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class, 'sales/resource_order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class, 'sales_resource/order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class, - 'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class, 'sales_resource/order_item' => \Mage_Sales_Model_Resource_Order_Item::class, + 'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class, 'sales/resource_order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class, 'sales_resource/order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class, - 'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, 'sales_resource/order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, + 'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class, 'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, 'sales/resource_order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class, - 'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, 'sales_resource/order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, - 'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, + 'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class, 'sales_resource/order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, - 'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, + 'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class, 'sales_resource/order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, - 'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, + 'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class, 'sales/resource_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, + 'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class, 'sales_resource/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class, 'sales/resource_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class, - 'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, 'sales/resource_order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, + 'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class, 'sales/resource_order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, 'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class, - 'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, 'sales/resource_order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, + 'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class, 'sales_resource/order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class, 'sales/resource_order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class, - 'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, 'sales_resource/order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, - 'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, + 'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class, 'sales_resource/order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, - 'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, + 'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class, 'sales_resource/order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, + 'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class, 'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, 'sales_resource/order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class, 'sales_resource/order_status' => \Mage_Sales_Model_Resource_Order_Status::class, 'sales/resource_order_status' => \Mage_Sales_Model_Resource_Order_Status::class, 'sales_resource/order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class, 'sales/resource_order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class, - 'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, 'sales_resource/order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, - 'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, + 'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class, 'sales_resource/order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, - 'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, + 'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class, 'sales/resource_order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, - 'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, + 'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class, 'sales_resource/order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, - 'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class, + 'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class, 'sales/resource_quote' => \Mage_Sales_Model_Resource_Quote::class, + 'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class, 'sales_resource/quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class, 'sales/resource_quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class, 'sales/resource_quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class, 'sales_resource/quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class, 'sales/resource_quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class, 'sales_resource/quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class, - 'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, 'sales/resource_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, - 'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, + 'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class, 'sales/resource_quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, + 'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class, 'sales_resource/quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, 'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class, 'sales_resource/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class, @@ -28298,82 +28236,82 @@ 'sales_resource/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class, 'sales/resource_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class, 'sales_resource/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class, - 'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/resource_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, - 'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, + 'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class, 'sales/resource_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, + 'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class, 'sales_resource/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, 'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class, - 'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, 'sales/resource_quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, + 'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class, 'sales_resource/quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class, 'sales/resource_quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class, - 'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, 'sales/resource_quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, - 'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, + 'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class, 'sales_resource/quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, - 'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, + 'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class, 'sales_resource/quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, + 'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class, 'sales_resource/quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class, 'sales/resource_quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class, - 'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, 'sales/resource_quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, + 'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class, 'sales/resource_quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class, 'sales_resource/quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class, - 'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, 'sales/resource_quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, - 'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, + 'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class, 'sales/resource_quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, - 'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, + 'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class, 'sales_resource/quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, - 'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, + 'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class, 'sales/resource_quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, - 'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, + 'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class, 'sales/resource_recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, + 'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class, 'sales/resource_recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class, 'sales_resource/recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class, - 'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class, 'sales/resource_report' => \Mage_Sales_Model_Resource_Report::class, + 'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class, 'sales/resource_report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class, 'sales_resource/report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class, - 'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, 'sales/resource_report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, - 'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, + 'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class, 'sales/resource_report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, + 'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class, 'sales_resource/report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, 'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class, - 'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, 'sales_resource/report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, + 'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class, 'sales/resource_report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class, 'sales_resource/report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class, 'sales_resource/report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class, 'sales/resource_report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class, 'sales/resource_report_order' => \Mage_Sales_Model_Resource_Report_Order::class, 'sales_resource/report_order' => \Mage_Sales_Model_Resource_Report_Order::class, - 'sales/resource_report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class, 'sales_resource/report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class, - 'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class, + 'sales/resource_report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class, 'sales/resource_report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class, + 'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class, 'sales_resource/report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class, 'sales/resource_report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class, - 'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, 'sales/resource_report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, - 'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, + 'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class, 'sales_resource/report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, + 'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class, 'sales_resource/report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class, 'sales/resource_report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class, 'sales_resource/report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class, 'sales/resource_report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class, - 'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, 'sales_resource/report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, + 'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class, 'sales_resource/report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class, 'sales/resource_report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class, 'sales_resource/report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class, 'sales/resource_report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class, - 'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, 'sales/resource_sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, - 'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class, + 'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class, 'sales/resource_setup' => \Mage_Sales_Model_Resource_Setup::class, + 'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class, 'sales/service_order' => \Mage_Sales_Model_Service_Order::class, 'sales/service_quote' => \Mage_Sales_Model_Service_Quote::class, 'sales/status_list' => \Mage_Sales_Model_Status_List::class, @@ -28383,8 +28321,8 @@ 'sendfriend/observer' => \Mage_Sendfriend_Model_Observer::class, 'sendfriend_resource/sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class, 'sendfriend/resource_sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class, - 'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, 'sendfriend/resource_sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, + 'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class, 'sendfriend/resource_setup' => \Mage_Sendfriend_Model_Resource_Setup::class, 'sendfriend_resource/setup' => \Mage_Sendfriend_Model_Resource_Setup::class, 'sendfriend/sendfriend' => \Mage_Sendfriend_Model_Sendfriend::class, @@ -28424,16 +28362,16 @@ 'sitemap/observer' => \Mage_Sitemap_Model_Observer::class, 'sitemap_resource/catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class, 'sitemap/resource_catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class, - 'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, 'sitemap/resource_catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, + 'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class, 'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, 'sitemap_resource/catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class, 'sitemap_resource/cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, 'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class, 'sitemap_resource/sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class, 'sitemap/resource_sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class, - 'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, 'sitemap_resource/sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, + 'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class, 'sitemap/sitemap' => \Mage_Sitemap_Model_Sitemap::class, 'tag/api' => \Mage_Tag_Model_Api::class, 'tag/api_v2' => \Mage_Tag_Model_Api_V2::class, @@ -28446,21 +28384,21 @@ 'tag/mysql4_tag' => \Mage_Tag_Model_Mysql4_Tag::class, 'tag/mysql4_tag_collection' => \Mage_Tag_Model_Mysql4_Tag_Collection::class, 'tag/mysql4_tag_relation' => \Mage_Tag_Model_Mysql4_Tag_Relation::class, - 'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag/resource_customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag_resource/customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, - 'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, + 'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class, 'tag_resource/indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, - 'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, + 'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class, 'tag_resource/popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, + 'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class, 'tag_resource/product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class, 'tag/resource_product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class, 'tag_resource/tag' => \Mage_Tag_Model_Resource_Tag::class, 'tag/resource_tag' => \Mage_Tag_Model_Resource_Tag::class, - 'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, 'tag_resource/tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, - 'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, + 'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class, 'tag_resource/tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, + 'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class, 'tag/session' => \Mage_Tag_Model_Session::class, 'tag/tag' => \Mage_Tag_Model_Tag::class, 'tag/tag_relation' => \Mage_Tag_Model_Tag_Relation::class, @@ -28499,16 +28437,16 @@ 'tax/resource_calculation_rate' => \Mage_Tax_Model_Resource_Calculation_Rate::class, 'tax/resource_calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class, 'tax_resource/calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class, - 'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, 'tax/resource_calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, - 'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, + 'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class, 'tax/resource_calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, - 'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, + 'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class, 'tax/resource_calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, - 'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, + 'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class, 'tax_resource/calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, - 'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class, + 'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class, 'tax/resource_class' => \Mage_Tax_Model_Resource_Class::class, + 'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class, 'tax/resource_class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class, 'tax_resource/class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class, 'tax_resource/report_collection' => \Mage_Tax_Model_Resource_Report_Collection::class, @@ -28519,10 +28457,10 @@ 'tax/resource_report_tax_createdat' => \Mage_Tax_Model_Resource_Report_Tax_Createdat::class, 'tax_resource/report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class, 'tax/resource_report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class, - 'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, 'tax/resource_report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, - 'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, + 'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class, 'tax_resource/sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, + 'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class, 'tax_resource/sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class, 'tax/resource_sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class, 'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class, @@ -28611,8 +28549,8 @@ 'weee/observer' => \Mage_Weee_Model_Observer::class, 'weee/resource_attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class, 'weee_resource/attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class, - 'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class, 'weee/resource_setup' => \Mage_Weee_Model_Resource_Setup::class, + 'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class, 'weee/resource_tax' => \Mage_Weee_Model_Resource_Tax::class, 'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class, 'weee/tax' => \Mage_Weee_Model_Tax::class, @@ -28624,12 +28562,12 @@ 'widget/mysql4_widget_instance' => \Mage_Widget_Model_Mysql4_Widget_Instance::class, 'widget/mysql4_widget_instance_collection' => \Mage_Widget_Model_Mysql4_Widget_Instance_Collection::class, 'widget/observer' => \Mage_Widget_Model_Observer::class, - 'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class, 'widget/resource_widget' => \Mage_Widget_Model_Resource_Widget::class, + 'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class, 'widget_resource/widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class, 'widget/resource_widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class, - 'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, 'widget_resource/widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, + 'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class, 'widget/template_filter' => \Mage_Widget_Model_Template_Filter::class, 'widget/widget' => \Mage_Widget_Model_Widget::class, 'widget/widget_config' => \Mage_Widget_Model_Widget_Config::class, @@ -28646,14 +28584,14 @@ 'wishlist/mysql4_wishlist' => \Mage_Wishlist_Model_Mysql4_Wishlist::class, 'wishlist/mysql4_wishlist_collection' => \Mage_Wishlist_Model_Mysql4_Wishlist_Collection::class, 'wishlist/observer' => \Mage_Wishlist_Model_Observer::class, - 'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class, 'wishlist_resource/item' => \Mage_Wishlist_Model_Resource_Item::class, + 'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class, 'wishlist_resource/item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class, 'wishlist/resource_item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class, - 'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, 'wishlist/resource_item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, - 'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, + 'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class, 'wishlist_resource/item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, + 'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class, 'wishlist_resource/product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class, 'wishlist/resource_product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class, 'wishlist/resource_wishlist' => \Mage_Wishlist_Model_Resource_Wishlist::class, @@ -28662,7 +28600,6 @@ 'wishlist/resource_wishlist_collection' => \Mage_Wishlist_Model_Resource_Wishlist_Collection::class, 'wishlist/session' => \Mage_Wishlist_Model_Session::class, 'wishlist/wishlist' => \Mage_Wishlist_Model_Wishlist::class, - 'varien/autoload' => \Varien_Autoload::class, ]) ); } \ No newline at end of file From d91170be3e1858c82c8f31cab5adf435333b8f87 Mon Sep 17 00:00:00 2001 From: Mohamed ELIDRISSI <67818913+elidrissidev@users.noreply.github.com> Date: Wed, 13 Jul 2022 16:29:44 +0100 Subject: [PATCH 24/61] Fix "Variable might not be defined" PHPStan error (#2316) --- .../Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php index 275cedb538b..20241b46276 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php @@ -55,9 +55,10 @@ protected function _create(array $data) ->save(); try { + $oldStore = Mage::getDesign()->getStore(); + $oldArea = Mage::getDesign()->getArea(); + if ($notifyCustomer && $comment) { - $oldStore = Mage::getDesign()->getStore(); - $oldArea = Mage::getDesign()->getArea(); Mage::getDesign()->setStore($order->getStoreId()); Mage::getDesign()->setArea('frontend'); } From 79ecbe8f170be5713a9ad33fabdb33672d42cec9 Mon Sep 17 00:00:00 2001 From: ADDISON <8360474+ADDISON74@users.noreply.github.com> Date: Fri, 15 Jul 2022 00:00:05 +0300 Subject: [PATCH 25/61] Add missing translations for auto cache flushing config (#2308) * Update system.xml * Update Mage_Core.csv * Update Mage_Core.csv * Update system.xml * Update system.xml * Update Mage_Core.csv * Update system.xml * Update system.xml * Update Mage_Core.csv * Update system.xml * Update Mage_Core.csv --- app/code/core/Mage/Core/etc/system.xml | 12 ++++++------ app/locale/en_US/Mage_Core.csv | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/code/core/Mage/Core/etc/system.xml b/app/code/core/Mage/Core/etc/system.xml index e9e571fe010..55c63457a33 100644 --- a/app/code/core/Mage/Core/etc/system.xml +++ b/app/code/core/Mage/Core/etc/system.xml @@ -61,20 +61,20 @@ - - - 10000 + + + 1000 1 0 0 - - + + 1 1 0 0 - Use 0 0 30 2 0 to never run cron, the recommended setting is 30 3 * * 6 + The default value is "30 2 * * *". An empty value disables automatic cache flushing. diff --git a/app/locale/en_US/Mage_Core.csv b/app/locale/en_US/Mage_Core.csv index a35c19c2b06..aa662f367ac 100644 --- a/app/locale/en_US/Mage_Core.csv +++ b/app/locale/en_US/Mage_Core.csv @@ -14,6 +14,7 @@ "Admin User Emails","Admin User Emails" "Admin routing compatibility mode for extensions","Admin routing compatibility mode for extensions" "Advanced","Advanced" +"Advanced Cache Settings","Advanced Cache Settings" "After selecting a new media storage location, press the Synchronize button to transfer all media to that location. Media will not be available in the new location until the synchronization process is complete.","After selecting a new media storage location, press the Synchronize button @@ -73,6 +74,7 @@ "Create Store View","Create Store View" "Create Website","Create Website" "Credit card number does not match credit card type.","Credit card number does not match credit card type." +"Cron Expression for Cache Flushing","Cron Expression for Cache Flushing" "Current Package Name","Current Package Name" "Custom Admin Path","Custom Admin Path" "Custom Admin URL","Custom Admin URL" @@ -409,6 +411,7 @@ "Use Secure URLs in Frontend","Use Secure URLs in Frontend" "Use Web Server Rewrites","Use Web Server Rewrites" "VAT Number","VAT Number" +"The default value is ""30 2 * * *"". An empty value disables automatic cache flushing.","The default value is ""30 2 * * *"". An empty value disables automatic cache flushing." "Validate HTTP_USER_AGENT","Validate HTTP_USER_AGENT" "Validate HTTP_VIA","Validate HTTP_VIA" "Validate HTTP_X_FORWARDED_FOR","Validate HTTP_X_FORWARDED_FOR" From 0d997174c676cdb154162bd945f75bb37bb0b2b2 Mon Sep 17 00:00:00 2001 From: luigifab <31816829+luigifab@users.noreply.github.com> Date: Fri, 15 Jul 2022 16:41:21 +0200 Subject: [PATCH 26/61] Allow to rename api.php for better security (#2132) --- README.md | 23 +++++++++++++++++++ app/code/core/Mage/Api/Helper/Data.php | 2 +- .../core/Mage/Api2/Model/Route/ApiType.php | 3 ++- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e29676fe213..51e3e33a983 100644 --- a/README.md +++ b/README.md @@ -72,6 +72,29 @@ git add -A && git commit [More Information](http://openmage.github.io/magento-lts/install.html) +## Secure your installation + +Don't use common paths like /admin for OpenMage Backend URL. Don't use the path in _robots.txt_ and keep it secret. You can change it from Backend (System / Configuration / Admin / Admin Base Url) or by editing _app/etc/local.xml_: + +```xml + + + + + + + + + + + +``` + +Don't use common file names like api.php for OpenMage API URLs to prevent attacks. Don't use the new file name in _robots.txt_ and keep it secret with your partners. After renaming the file you must update the webserver configuration as follows: + +* Apache .htaccess: `RewriteRule ^api/rest api.php?type=rest [QSA,L]` +* Nginx: `rewrite ^/api/(\w+).*$ /api.php?type=$1 last;` + ## Changes Most important changes will be listed here, all other changes since `19.4.0` can be found in diff --git a/app/code/core/Mage/Api/Helper/Data.php b/app/code/core/Mage/Api/Helper/Data.php index 1cd45da5565..057c74973e9 100644 --- a/app/code/core/Mage/Api/Helper/Data.php +++ b/app/code/core/Mage/Api/Helper/Data.php @@ -380,7 +380,7 @@ public function getServiceUrl($routePath = null, $routeParams = null, $htmlSpeci $uri = Zend_Uri_Http::fromString($url); $uri->setHost($request->getHttpHost()); if (!$urlModel->getRouteFrontName()) { - $uri->setPath('/' . trim($request->getBasePath() . '/api.php', '/')); + $uri->setPath('/' . trim($request->getBasePath() . '/' . basename(getenv('SCRIPT_FILENAME')), '/')); } else { $uri->setPath($request->getBaseUrl() . $request->getPathInfo()); } diff --git a/app/code/core/Mage/Api2/Model/Route/ApiType.php b/app/code/core/Mage/Api2/Model/Route/ApiType.php index 194cce60208..2e595206494 100644 --- a/app/code/core/Mage/Api2/Model/Route/ApiType.php +++ b/app/code/core/Mage/Api2/Model/Route/ApiType.php @@ -35,6 +35,7 @@ class Mage_Api2_Model_Route_ApiType extends Mage_Api2_Model_Route_Abstract imple { /** * API url template with API type variable + * @deprecated */ const API_ROUTE = 'api/:api_type'; @@ -56,6 +57,6 @@ public function __construct( Zend_Translate $translator = null, $locale = null ) { - parent::__construct(array(Mage_Api2_Model_Route_Abstract::PARAM_ROUTE => self::API_ROUTE)); + parent::__construct(array(Mage_Api2_Model_Route_Abstract::PARAM_ROUTE => str_replace('.php', '', basename(getenv('SCRIPT_FILENAME'))) . '/:api_type')); } } From 84b65c35b054e67c8838c7767a6e1812b3e81bf3 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 15 Jul 2022 21:13:49 +0200 Subject: [PATCH 27/61] Removed Mage_PageCache module (#2258) --- .github/phpstan.neon | 1 - README.md | 1 + .../Block/Adminhtml/Cache/Additional.php | 55 -------- app/code/core/Mage/PageCache/Helper/Data.php | 122 ----------------- .../PageCache/Model/Control/Interface.php | 42 ------ .../Mage/PageCache/Model/Control/Zend.php | 47 ------- .../core/Mage/PageCache/Model/Observer.php | 97 ------------- .../Model/System/Config/Source/Controls.php | 52 ------- .../Adminhtml/PageCacheController.php | 80 ----------- .../core/Mage/PageCache/etc/adminhtml.xml | 41 ------ app/code/core/Mage/PageCache/etc/config.xml | 127 ------------------ app/code/core/Mage/PageCache/etc/system.xml | 72 ---------- .../default/default/layout/pagecache.xml | 35 ----- .../template/pagecache/cache/additional.phtml | 39 ------ .../base/default/layout/pagecache.xml | 35 ----- .../default/template/pagecache/cookie.phtml | 36 ----- app/etc/modules/Mage_PageCache.xml | 38 ------ app/locale/en_US/Mage_PageCache.csv | 12 -- 18 files changed, 1 insertion(+), 931 deletions(-) delete mode 100644 app/code/core/Mage/PageCache/Block/Adminhtml/Cache/Additional.php delete mode 100644 app/code/core/Mage/PageCache/Helper/Data.php delete mode 100644 app/code/core/Mage/PageCache/Model/Control/Interface.php delete mode 100644 app/code/core/Mage/PageCache/Model/Control/Zend.php delete mode 100644 app/code/core/Mage/PageCache/Model/Observer.php delete mode 100644 app/code/core/Mage/PageCache/Model/System/Config/Source/Controls.php delete mode 100644 app/code/core/Mage/PageCache/controllers/Adminhtml/PageCacheController.php delete mode 100644 app/code/core/Mage/PageCache/etc/adminhtml.xml delete mode 100644 app/code/core/Mage/PageCache/etc/config.xml delete mode 100644 app/code/core/Mage/PageCache/etc/system.xml delete mode 100644 app/design/adminhtml/default/default/layout/pagecache.xml delete mode 100644 app/design/adminhtml/default/default/template/pagecache/cache/additional.phtml delete mode 100644 app/design/frontend/base/default/layout/pagecache.xml delete mode 100644 app/design/frontend/base/default/template/pagecache/cookie.phtml delete mode 100644 app/etc/modules/Mage_PageCache.xml delete mode 100644 app/locale/en_US/Mage_PageCache.csv diff --git a/.github/phpstan.neon b/.github/phpstan.neon index c6dd2eaed7d..cc2e2ab76b8 100644 --- a/.github/phpstan.neon +++ b/.github/phpstan.neon @@ -43,7 +43,6 @@ parameters: - %currentWorkingDirectory%/app/code/core/Mage/Newsletter - %currentWorkingDirectory%/app/code/core/Mage/Oauth - %currentWorkingDirectory%/app/code/core/Mage/Page - - %currentWorkingDirectory%/app/code/core/Mage/PageCache - %currentWorkingDirectory%/app/code/core/Mage/Paygate - %currentWorkingDirectory%/app/code/core/Mage/Payment - %currentWorkingDirectory%/app/code/core/Mage/Paypal diff --git a/README.md b/README.md index 772042be952..19506283a78 100644 --- a/README.md +++ b/README.md @@ -93,6 +93,7 @@ Do not use 20.x.x if you need IE support. - possibility to disable global search in backend #1532 - reduce needless saves by avoiding setting `_hasDataChanges` flag #2066 - removed support for `global/sales/old_fields_map` defined in XML #921 +- removed Mage_PageCache module #2258 - removed lib/flex containing unused ActionScript "file uploader" files #2271 For full list of changes, you can [compare tags](https://github.com/OpenMage/magento-lts/compare/1.9.4.x...20.0). diff --git a/app/code/core/Mage/PageCache/Block/Adminhtml/Cache/Additional.php b/app/code/core/Mage/PageCache/Block/Adminhtml/Cache/Additional.php deleted file mode 100644 index d2438e1bd2e..00000000000 --- a/app/code/core/Mage/PageCache/Block/Adminhtml/Cache/Additional.php +++ /dev/null @@ -1,55 +0,0 @@ - - */ -class Mage_PageCache_Block_Adminhtml_Cache_Additional extends Mage_Adminhtml_Block_Template -{ - /** - * Get clean cache url - * - * @return string - */ - public function getCleanExternalCacheUrl() - { - return $this->getUrl('*/pageCache/clean'); - } - - /** - * Check if block can be displayed - * - * @return bool - */ - public function canShowButton() - { - return Mage::helper('pagecache')->isEnabled() && Mage::getSingleton('admin/session')->isAllowed('page_cache'); - } -} diff --git a/app/code/core/Mage/PageCache/Helper/Data.php b/app/code/core/Mage/PageCache/Helper/Data.php deleted file mode 100644 index 384c5c0885e..00000000000 --- a/app/code/core/Mage/PageCache/Helper/Data.php +++ /dev/null @@ -1,122 +0,0 @@ - - */ -class Mage_PageCache_Helper_Data extends Mage_Core_Helper_Abstract -{ - /** - * Pathes to external cache config options - */ - const XML_PATH_EXTERNAL_CACHE_ENABLED = 'system/external_page_cache/enabled'; - const XML_PATH_EXTERNAL_CACHE_LIFETIME = 'system/external_page_cache/cookie_lifetime'; - const XML_PATH_EXTERNAL_CACHE_CONTROL = 'system/external_page_cache/control'; - - /** - * Path to external cache controls - */ - const XML_PATH_EXTERNAL_CACHE_CONTROLS = 'global/external_cache/controls'; - - /** - * Cookie name for disabling external caching - * - * @var string - */ - const NO_CACHE_COOKIE = 'external_no_cache'; - - /** - * Check whether external cache is enabled - * - * @return bool - */ - public function isEnabled() - { - return (bool)Mage::getStoreConfig(self::XML_PATH_EXTERNAL_CACHE_ENABLED); - } - - /** - * Return all available external cache controls - * - * @return array - */ - public function getCacheControls() - { - $controls = Mage::app()->getConfig()->getNode(self::XML_PATH_EXTERNAL_CACHE_CONTROLS); - return $controls->asCanonicalArray(); - } - - /** - * Initialize proper external cache control model - * - * @throws Mage_Core_Exception - * @return Mage_PageCache_Model_Control_Interface - */ - public function getCacheControlInstance() - { - $usedControl = Mage::getStoreConfig(self::XML_PATH_EXTERNAL_CACHE_CONTROL); - if ($usedControl) { - foreach ($this->getCacheControls() as $control => $info) { - if ($control == $usedControl && !empty($info['class'])) { - return Mage::getSingleton($info['class']); - } - } - } - Mage::throwException($this->__('Failed to load external cache control')); - } - - /** - * Disable caching on external storage side by setting special cookie - * - * @return void - */ - public function setNoCacheCookie() - { - $cookie = Mage::getSingleton('core/cookie'); - $lifetime = Mage::getStoreConfig(self::XML_PATH_EXTERNAL_CACHE_LIFETIME); - $noCache = $cookie->get(self::NO_CACHE_COOKIE); - - if ($noCache) { - $cookie->renew(self::NO_CACHE_COOKIE, $lifetime); - } else { - $cookie->set(self::NO_CACHE_COOKIE, 1, $lifetime); - } - } - - /** - * Returns a lifetime of cookie for external cache - * - * @return string Time in seconds - */ - public function getNoCacheCookieLifetime() - { - return Mage::getStoreConfig(self::XML_PATH_EXTERNAL_CACHE_LIFETIME); - } -} diff --git a/app/code/core/Mage/PageCache/Model/Control/Interface.php b/app/code/core/Mage/PageCache/Model/Control/Interface.php deleted file mode 100644 index 7b2a2568cf3..00000000000 --- a/app/code/core/Mage/PageCache/Model/Control/Interface.php +++ /dev/null @@ -1,42 +0,0 @@ - - */ -interface Mage_PageCache_Model_Control_Interface -{ - /** - * Clean external cache - * - * @return void - */ - public function clean(); -} diff --git a/app/code/core/Mage/PageCache/Model/Control/Zend.php b/app/code/core/Mage/PageCache/Model/Control/Zend.php deleted file mode 100644 index 0b02f9f3549..00000000000 --- a/app/code/core/Mage/PageCache/Model/Control/Zend.php +++ /dev/null @@ -1,47 +0,0 @@ - - */ -class Mage_PageCache_Model_Control_Zend implements Mage_PageCache_Model_Control_Interface -{ - /** - * Clean zend server page cache - * - * @return void - */ - public function clean() - { - if (extension_loaded('Zend Page Cache') && function_exists('page_cache_remove_all_cached_contents')) { - page_cache_remove_all_cached_contents(); - } - } -} diff --git a/app/code/core/Mage/PageCache/Model/Observer.php b/app/code/core/Mage/PageCache/Model/Observer.php deleted file mode 100644 index b4bd1b0090e..00000000000 --- a/app/code/core/Mage/PageCache/Model/Observer.php +++ /dev/null @@ -1,97 +0,0 @@ - - */ -class Mage_PageCache_Model_Observer -{ - const XML_NODE_ALLOWED_CACHE = 'frontend/cache/allowed_requests'; - - /** - * Check if full page cache is enabled - * - * @return bool - */ - public function isCacheEnabled() - { - return Mage::helper('pagecache')->isEnabled(); - } - - /** - * Check when cache should be disabled - * - * @param Varien_Event_Observer $observer - * @return $this - */ - public function processPreDispatch(Varien_Event_Observer $observer) - { - if (!$this->isCacheEnabled()) { - return $this; - } - /** @var Mage_Core_Controller_Front_Action $action */ - $action = $observer->getEvent()->getControllerAction(); - $request = $action->getRequest(); - $needCaching = true; - - if ($request->isPost()) { - $needCaching = false; - } - - $configuration = Mage::getConfig()->getNode(self::XML_NODE_ALLOWED_CACHE); - - if (!$configuration) { - $needCaching = false; - } - - $configuration = $configuration->asArray(); - $module = $request->getModuleName(); - $controller = $request->getControllerName(); - $action = $request->getActionName(); - - if (!isset($configuration[$module])) { - $needCaching = false; - } - - if (isset($configuration[$module]['controller']) && $configuration[$module]['controller'] != $controller) { - $needCaching = false; - } - - if (isset($configuration[$module]['action']) && $configuration[$module]['action'] != $action) { - $needCaching = false; - } - - if (!$needCaching) { - Mage::helper('pagecache')->setNoCacheCookie(); - } - - return $this; - } -} diff --git a/app/code/core/Mage/PageCache/Model/System/Config/Source/Controls.php b/app/code/core/Mage/PageCache/Model/System/Config/Source/Controls.php deleted file mode 100644 index c8d75363e6c..00000000000 --- a/app/code/core/Mage/PageCache/Model/System/Config/Source/Controls.php +++ /dev/null @@ -1,52 +0,0 @@ - - */ -class Mage_PageCache_Model_System_Config_Source_Controls -{ - /** - * Return array of external cache controls for using as options - * - * @return array - */ - public function toOptionArray() - { - $options = array(); - foreach (Mage::helper('pagecache')->getCacheControls() as $code => $type) { - $options[] = array( - 'value' => $code, - 'label' => $type['label'] - ); - } - return $options; - } -} diff --git a/app/code/core/Mage/PageCache/controllers/Adminhtml/PageCacheController.php b/app/code/core/Mage/PageCache/controllers/Adminhtml/PageCacheController.php deleted file mode 100644 index 3276f4977a3..00000000000 --- a/app/code/core/Mage/PageCache/controllers/Adminhtml/PageCacheController.php +++ /dev/null @@ -1,80 +0,0 @@ - - */ -class Mage_PageCache_Adminhtml_PageCacheController extends Mage_Adminhtml_Controller_Action -{ - /** - * Retrieve session model - * - * @return Mage_Adminhtml_Model_Session - */ - protected function _getSession() - { - return Mage::getSingleton('adminhtml/session'); - } - - /** - * Clean external cache action - * - * @return void - */ - public function cleanAction() - { - try { - if (Mage::helper('pagecache')->isEnabled()) { - Mage::helper('pagecache')->getCacheControlInstance()->clean(); - $this->_getSession()->addSuccess( - Mage::helper('pagecache')->__('The external full page cache has been cleaned.') - ); - } - } catch (Mage_Core_Exception $e) { - $this->_getSession()->addError($e->getMessage()); - } catch (Exception $e) { - $this->_getSession()->addException( - $e, - Mage::helper('pagecache')->__('An error occurred while clearing the external full page cache.') - ); - } - $this->_redirect('*/cache/index'); - } - - /** - * Check current user permission on resource and privilege - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('page_cache'); - } -} diff --git a/app/code/core/Mage/PageCache/etc/adminhtml.xml b/app/code/core/Mage/PageCache/etc/adminhtml.xml deleted file mode 100644 index d23f8fd07eb..00000000000 --- a/app/code/core/Mage/PageCache/etc/adminhtml.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - External Page Cache - 0 - - - - - - diff --git a/app/code/core/Mage/PageCache/etc/config.xml b/app/code/core/Mage/PageCache/etc/config.xml deleted file mode 100644 index 16e6eac5529..00000000000 --- a/app/code/core/Mage/PageCache/etc/config.xml +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - 1.6.0.0 - - - - - - Mage_PageCache_Model - - - - - Mage_PageCache_Helper - - - - - Mage_PageCache_Block - - - - - - - pagecache/control_zend - - - - - - - - - pagecache.xml - - - - - - - - Mage_PageCache.csv - - - - - - - - - - pagecache.xml - - - - - - - - pagecache/observer - processPreDispatch - - - - - - - - - - - - - - - - - - - - - - Mage_PageCache_Adminhtml - - - - - - - - - 0 - zend_page_cache - 3600 - - - - diff --git a/app/code/core/Mage/PageCache/etc/system.xml b/app/code/core/Mage/PageCache/etc/system.xml deleted file mode 100644 index 4fe75a1a031..00000000000 --- a/app/code/core/Mage/PageCache/etc/system.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - 1 - 1 - 1 - 500 - - - - select - adminhtml/system_config_source_yesno - 1 - 1 - 0 - 0 - - - - 5 - 1 - 0 - 0 - 1 - If empty, default value will be used. - - - - select - pagecache/system_config_source_controls - 10 - 1 - 0 - 0 - 1 - - - - - - - diff --git a/app/design/adminhtml/default/default/layout/pagecache.xml b/app/design/adminhtml/default/default/layout/pagecache.xml deleted file mode 100644 index 003792008c4..00000000000 --- a/app/design/adminhtml/default/default/layout/pagecache.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - diff --git a/app/design/adminhtml/default/default/template/pagecache/cache/additional.phtml b/app/design/adminhtml/default/default/template/pagecache/cache/additional.phtml deleted file mode 100644 index 49286e8d04d..00000000000 --- a/app/design/adminhtml/default/default/template/pagecache/cache/additional.phtml +++ /dev/null @@ -1,39 +0,0 @@ - - -canShowButton()): ?> - - - - - -
    - - - __('External full page cache.')?> -
    - diff --git a/app/design/frontend/base/default/layout/pagecache.xml b/app/design/frontend/base/default/layout/pagecache.xml deleted file mode 100644 index daf58a2fd4c..00000000000 --- a/app/design/frontend/base/default/layout/pagecache.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - diff --git a/app/design/frontend/base/default/template/pagecache/cookie.phtml b/app/design/frontend/base/default/template/pagecache/cookie.phtml deleted file mode 100644 index 1711ff03649..00000000000 --- a/app/design/frontend/base/default/template/pagecache/cookie.phtml +++ /dev/null @@ -1,36 +0,0 @@ - - - diff --git a/app/etc/modules/Mage_PageCache.xml b/app/etc/modules/Mage_PageCache.xml deleted file mode 100644 index c2d7ad6a002..00000000000 --- a/app/etc/modules/Mage_PageCache.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - true - core - - - - - - diff --git a/app/locale/en_US/Mage_PageCache.csv b/app/locale/en_US/Mage_PageCache.csv deleted file mode 100644 index 8cf0a18b013..00000000000 --- a/app/locale/en_US/Mage_PageCache.csv +++ /dev/null @@ -1,12 +0,0 @@ -"An error occurred while clearing the external full page cache.","An error occurred while clearing the external full page cache." -"Cookie Lifetime (seconds)","Cookie Lifetime (seconds)" -"Enable External Cache","Enable External Cache" -"External Cache Control","External Cache Control" -"External Full Page Cache Settings","External Full Page Cache Settings" -"External Page Cache","External Page Cache" -"External full page cache.","External full page cache." -"Failed to load external cache control","Failed to load external cache control" -"Flush External Page Cache","Flush External Page Cache" -"If empty, default value will be used.","If empty, default value will be used." -"The external full page cache has been cleaned.","The external full page cache has been cleaned." -"Zend Full Page Cache","Zend Full Page Cache" From 31c801835d66a0eb8c3816dc2a6ca1a1852b83c3 Mon Sep 17 00:00:00 2001 From: Caprico <2081806+Caprico85@users.noreply.github.com> Date: Sat, 16 Jul 2022 12:05:24 +0200 Subject: [PATCH 28/61] Fix phpdoc for saveAttribute() (#2320) --- .github/phpstan-baseline.neon | 5 ----- app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/phpstan-baseline.neon b/.github/phpstan-baseline.neon index 7557d4c7334..7c65d44ed5c 100644 --- a/.github/phpstan-baseline.neon +++ b/.github/phpstan-baseline.neon @@ -7010,11 +7010,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Sales/Model/Recurring/Profile.php - - - message: "#^Variable \\$attribute in empty\\(\\) always exists and is not falsy\\.$#" - count: 1 - path: ../app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php - - message: "#^Cannot call method updateOnRelatedRecordChanged\\(\\) on Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#" count: 1 diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php b/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php index a900475dd05..aa12fdf504c 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php @@ -323,7 +323,7 @@ protected function _afterSaveAttribute(Mage_Core_Model_Abstract $object, $attrib * Perform actions after object save * * @param Mage_Core_Model_Abstract $object - * @param string $attribute + * @param string|string[]|Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @return $this */ public function saveAttribute(Mage_Core_Model_Abstract $object, $attribute) From 153e1710ddcab6f4f5d838faa0ff1e1658110ae5 Mon Sep 17 00:00:00 2001 From: ADDISON <8360474+ADDISON74@users.noreply.github.com> Date: Sun, 17 Jul 2022 13:34:24 +0300 Subject: [PATCH 29/61] Small changes in root files (#2324) --- cron.sh | 2 +- index.php.sample | 62 ------------------------------------------------ 2 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 index.php.sample diff --git a/cron.sh b/cron.sh index 3b8d705f143..5918d5974e9 100755 --- a/cron.sh +++ b/cron.sh @@ -41,7 +41,7 @@ PHP_BIN=`which php` # absolute path to magento installation INSTALLDIR=`echo $0 | sed 's/cron\.sh//g'` -# prepend the intallation path if not given an absolute path +# prepend the installation path if not given an absolute path if [ "$INSTALLDIR" != "" -a "`expr index $CRONSCRIPT /`" != "1" ];then if ! ps auxwww | grep "$INSTALLDIR$CRONSCRIPT$MODE" | grep -v grep 1>/dev/null 2>/dev/null ; then $PHP_BIN $INSTALLDIR$CRONSCRIPT$MODE & diff --git a/index.php.sample b/index.php.sample deleted file mode 100644 index 2da615f0878..00000000000 --- a/index.php.sample +++ /dev/null @@ -1,62 +0,0 @@ -

    Whoops, it looks like you have an invalid PHP version.

    OpenMage supports PHP 7.0.0 or newer. Find out how to install OpenMage using PHP-CGI as a work-around.

    '; - exit; -} - -require 'app/bootstrap.php'; - -/** - * Compilation includes configuration file - */ -$compilerConfig = 'includes/config.php'; -if (file_exists($compilerConfig)) { - include $compilerConfig; -} - -$mageFilename = 'app/Mage.php'; - -if (!file_exists($mageFilename)) { - if (is_dir('downloader')) { - header("Location: downloader"); - } else { - echo $mageFilename." was not found"; - } - exit; -} - -require_once $mageFilename; - -#Varien_Profiler::enable(); - -umask(0); - -$mageRunCode = isset($_SERVER['MAGE_RUN_CODE']) ? $_SERVER['MAGE_RUN_CODE'] : ''; -$mageRunType = isset($_SERVER['MAGE_RUN_TYPE']) ? $_SERVER['MAGE_RUN_TYPE'] : 'store'; - -Mage::run($mageRunCode, $mageRunType); From 33dfa269fa60d56f4d7af19a393179e3ae927fab Mon Sep 17 00:00:00 2001 From: luigifab <31816829+luigifab@users.noreply.github.com> Date: Sun, 17 Jul 2022 13:12:29 +0200 Subject: [PATCH 30/61] Add basic text for Ukraine (#2074) --- README.md | 2 ++ .../default/default/template/notification/toolbar.phtml | 6 ++++++ skin/adminhtml/default/default/boxes.css | 1 + skin/adminhtml/default/default/images/flag-ua.svg | 4 ++++ 4 files changed, 13 insertions(+) create mode 100644 skin/adminhtml/default/default/images/flag-ua.svg diff --git a/README.md b/README.md index 51e3e33a983..6fa5c54cfeb 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,8 @@ Unit Tests workflow badge

    + Stop russian war. **Free Ukraine!** ([Read more](https://en.wikipedia.org/wiki/2022_Russian_invasion_of_Ukraine)) + # Magento - Long Term Support This repository is the home of an **unofficial** community-driven project. It's goal is to be a dependable alternative diff --git a/app/design/adminhtml/default/default/template/notification/toolbar.phtml b/app/design/adminhtml/default/default/template/notification/toolbar.phtml index b523dc6aa90..cf072655de3 100644 --- a/app/design/adminhtml/default/default/template/notification/toolbar.phtml +++ b/app/design/adminhtml/default/default/template/notification/toolbar.phtml @@ -24,6 +24,12 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> + +
    + Stop russian war. Free Ukraine! + __('Read details') ?> +
    + + + + From 92a3b4fc0bd7c6b434a90c91ae6ceb42184206ae Mon Sep 17 00:00:00 2001 From: Kevin Jakob Date: Wed, 20 Jul 2022 22:15:21 +0200 Subject: [PATCH 31/61] Access registry directly in several Mage factory methods (#2319) * refactor: Accessed _registry directly in several Mage factory methods. Direct access is possible because null is no possibility due to executed code prior. This avoids additional isset checks being unnecessary. * refactor: small code formatting adjustments * refactor: Utilized null coalescing operator. * fix: Try so solve PHPStan complaint due to changed return type of Mage::getSingleton(). * fix: Solved rest of PHPStan complaints due to changed return type of Mage::getSingleton(). Added explanation to type hints as well. * fix: Reverted automatically replaced short list syntax due to php 7.0 compatibility. * Revert "fix: Solved rest of PHPStan complaints due to changed return type of Mage::getSingleton()." This reverts commit c9d165c454b4077b0fde14f8559cef83d9e8ccba. * Revert "fix: Try so solve PHPStan complaint due to changed return type of Mage::getSingleton()." This reverts commit fc9901c8b12ca67b54ae626119bcae911795db52. * fix: Reverted return type of getSingleton to original state. --- app/Mage.php | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/app/Mage.php b/app/Mage.php index 89184317b46..6eefc1b7b49 100644 --- a/app/Mage.php +++ b/app/Mage.php @@ -305,10 +305,7 @@ public static function unregister($key) */ public static function registry($key) { - if (isset(self::$_registry[$key])) { - return self::$_registry[$key]; - } - return null; + return self::$_registry[$key] ?? null; } /** @@ -529,13 +526,13 @@ public static function getModel($modelClass = '', $arguments = array()) * @param array $arguments * @return Mage_Core_Model_Abstract */ - public static function getSingleton($modelClass='', array $arguments=array()) + public static function getSingleton($modelClass = '', array $arguments=array()) { - $registryKey = '_singleton/'.$modelClass; + $registryKey = '_singleton/' . $modelClass; if (!isset(self::$_registry[$registryKey])) { self::register($registryKey, self::getModel($modelClass, $arguments)); } - return self::registry($registryKey); + return self::$_registry[$registryKey]; } /** @@ -573,11 +570,11 @@ public static function getControllerInstance($class, $request, $response, array */ public static function getResourceSingleton($modelClass = '', array $arguments = array()) { - $registryKey = '_resource_singleton/'.$modelClass; + $registryKey = '_resource_singleton/' . $modelClass; if (!isset(self::$_registry[$registryKey])) { self::register($registryKey, self::getResourceModel($modelClass, $arguments)); } - return self::registry($registryKey); + return self::$_registry[$registryKey]; } /** @@ -605,7 +602,7 @@ public static function helper($name) $helperClass = self::getConfig()->getHelperClassName($name); self::register($registryKey, new $helperClass); } - return self::registry($registryKey); + return self::$_registry[$registryKey]; } /** @@ -621,8 +618,7 @@ public static function getResourceHelper($moduleName) $helperClass = self::getConfig()->getResourceHelper($moduleName); self::register($registryKey, $helperClass); } - - return self::registry($registryKey); + return self::$_registry[$registryKey]; } /** From 646a48095f7ce72fd4bfa7183d39e6c0a8571588 Mon Sep 17 00:00:00 2001 From: Andrea Zambon Date: Thu, 21 Jul 2022 14:11:54 +0200 Subject: [PATCH 32/61] Fixed a notice with "session validator data" in onepage checkout (#2318) --- app/code/core/Mage/Checkout/Model/Type/Onepage.php | 2 +- app/code/core/Mage/Core/Model/Session/Abstract/Varien.php | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/code/core/Mage/Checkout/Model/Type/Onepage.php b/app/code/core/Mage/Checkout/Model/Type/Onepage.php index f601ae5a44d..64f321ea6e0 100644 --- a/app/code/core/Mage/Checkout/Model/Type/Onepage.php +++ b/app/code/core/Mage/Checkout/Model/Type/Onepage.php @@ -730,7 +730,7 @@ protected function _prepareNewCustomerQuote() Mage::helper('core')->copyFieldset('checkout_onepage_quote', 'to_customer', $quote, $customer); $customer->setPassword($customer->decryptPassword($quote->getPasswordHash())); - $passwordCreatedTime = $this->_checkoutSession->getData('_session_validator_data')['session_expire_timestamp'] + $passwordCreatedTime = $this->_checkoutSession->getSessionValidatorData()['session_expire_timestamp'] - Mage::getSingleton('core/cookie')->getLifetime(); $customer->setPasswordCreatedAt($passwordCreatedTime); $quote->setCustomer($customer) diff --git a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php index 3a199baa6b6..a8e708d6a8f 100644 --- a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php +++ b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php @@ -570,6 +570,14 @@ public function getValidatorData() return $parts; } + + /** + * @return array + */ + public function getSessionValidatorData() + { + return $_SESSION[self::VALIDATOR_KEY]; + } /** * Regenerate session Id From 78e6cefac7acfcbfcf10f7a68d26eb1dfdd111a2 Mon Sep 17 00:00:00 2001 From: Mohamed ELIDRISSI <67818913+elidrissidev@users.noreply.github.com> Date: Fri, 22 Jul 2022 12:14:07 +0100 Subject: [PATCH 33/61] Add vendor folder to gitignore (#2334) --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index fd407433177..79f65067046 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ /var/* !/var/.htaccess + +/vendor From cc320ebc08c2a6cb0f7e346914df3c35bd2432ca Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Sat, 23 Jul 2022 14:37:56 +0200 Subject: [PATCH 34/61] Fix for modphp8 (#2329) * fix for modphp8 * fix for modphp8 --- media/.htaccess | 2 +- skin/.htaccess | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media/.htaccess b/media/.htaccess index c0893376aa6..2ca3c32b8f8 100644 --- a/media/.htaccess +++ b/media/.htaccess @@ -7,7 +7,7 @@ Options All -Indexes php_flag engine 0     - + php_flag engine 0 diff --git a/skin/.htaccess b/skin/.htaccess index f691fb1412d..2f80a8c9c73 100644 --- a/skin/.htaccess +++ b/skin/.htaccess @@ -5,7 +5,7 @@ php_flag engine 0 - + php_flag engine 0 From 6fecb8b2e0e5945b1cf271495d45d65f1ddd3287 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Sat, 23 Jul 2022 14:40:22 +0200 Subject: [PATCH 35/61] Fix for modphp8 (#2328) --- js/.htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/.htaccess b/js/.htaccess index a934423ee31..35b5647f5c6 100644 --- a/js/.htaccess +++ b/js/.htaccess @@ -5,7 +5,7 @@ php_flag engine 0 - + php_flag engine 0 From e1741e5c759d6e9c9f18bdbbb2171337d3cd6e8a Mon Sep 17 00:00:00 2001 From: matteorossi-thespacesm <61690145+matteorossi-thespacesm@users.noreply.github.com> Date: Tue, 26 Jul 2022 09:02:43 +0200 Subject: [PATCH 36/61] Fixed call to undefined method Mage_Catalog_Model_Resource_Category_Flat::getProductsPosition() (#2338) --- .../Catalog/Model/Resource/Category/Flat.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php index 80c74e00a22..fbeefd1fe8b 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php @@ -1229,6 +1229,23 @@ public function getProductCount($category) return (int) $this->_getReadAdapter()->fetchOne($select); } + /** + * Get positions of associated to category products + * + * @param Mage_Catalog_Model_Category $category + * @return array + */ + public function getProductsPosition($category) + { + $select = $this->_getReadAdapter()->select() + ->from( + $this->getTable('catalog/category_product'), + array('product_id', 'position')) + ->where('category_id = :category_id'); + $bind = array('category_id' => (int)$category->getId()); + return $this->_getReadAdapter()->fetchPairs($select, $bind); + } + /** * Return parent categories of category * From 6eaea9960810e894def3b3d0935f1f5f85b3cb69 Mon Sep 17 00:00:00 2001 From: Justin Beaty <51970393+justinbeaty@users.noreply.github.com> Date: Tue, 26 Jul 2022 03:57:55 -0700 Subject: [PATCH 37/61] Added Mage_Catalog_Model_Resource_Abstract::getAttributeRawText() method (#2312) --- .../Mage/Catalog/Model/Resource/Abstract.php | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/app/code/core/Mage/Catalog/Model/Resource/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Abstract.php index e568d91ef2b..d22a67b1a44 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Abstract.php @@ -699,6 +699,45 @@ public function getAttributeRawValue($entityId, $attribute, $store) return $attributesData ? $attributesData : false; } + /** + * Retrieve attribute's raw value from DB using its source model if available. + * + * @param int $entityId + * @param int|string|array $attribute atrribute's ids or codes + * @param int|Mage_Core_Model_Store $store + * @return bool|string|array + */ + public function getAttributeRawText($entityId, $attribute, $store) + { + if (!$entityId || empty($attribute)) { + return false; + } + + if ($store instanceof Mage_Core_Model_Store) { + $store = $store->getId(); + } + + $store = (int)$store; + $attribute = is_array($attribute) ? $attribute : [$attribute]; + $value = $this->getAttributeRawValue($entityId, $attribute, $store); + + if (!$value) { + return false; + } + + // Ensure we have an associative array of attribute => values + $values = is_array($value) ? $value : array_combine($attribute, [$value]); + + foreach ($values as $_attribute => &$_value) { + $_attribute = (clone $this->getAttribute($_attribute))->setStoreId($store); + if ($_attribute->getSourceModel() || $_attribute->getFrontendInput() === 'select' || $_attribute->getFrontendInput() === 'multiselect') { + $_value = $_attribute->getSource()->getOptionText($_value); + } + } + + return count($values) === 1 ? reset($values) : $values; + } + /** * Reset firstly loaded attributes * From 39425d9772785df374bd1bfc730e751654e5642e Mon Sep 17 00:00:00 2001 From: sv3n Date: Tue, 26 Jul 2022 22:33:34 +0200 Subject: [PATCH 38/61] Added VScode, PhpStorm files and ddev config.yaml (#2343) --- .gitignore | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.gitignore b/.gitignore index 79f65067046..6bdbef1cb4c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,21 @@ +# Visual Studio Code +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +!.vscode/*.code-snippets + +# Local History for Visual Studio Code +.history/ + +# Built Visual Studio Code Extensions +*.vsix + +# PhpStorm +.idea + +# Openmage config /app/etc/local.xml # Add a base setup for running unit Tests with code coverage and send them to SonarCloud @@ -29,4 +47,8 @@ /var/* !/var/.htaccess +# composer /vendor + +# ddev +.ddev/config.yaml From 1ae890b8066416e3f65f5a36a2936410d31edc97 Mon Sep 17 00:00:00 2001 From: sv3n Date: Wed, 27 Jul 2022 13:07:51 +0200 Subject: [PATCH 39/61] Removed docker-dde sample (#2346) --- dev/docker-dde/README.md | 42 ------------- dev/docker-dde/config/.env.sample | 38 ------------ dev/docker-dde/config/openmage.conf | 5 -- dev/docker-dde/init-dev-environment.sh | 85 -------------------------- 4 files changed, 170 deletions(-) delete mode 100644 dev/docker-dde/README.md delete mode 100644 dev/docker-dde/config/.env.sample delete mode 100644 dev/docker-dde/config/openmage.conf delete mode 100755 dev/docker-dde/init-dev-environment.sh diff --git a/dev/docker-dde/README.md b/dev/docker-dde/README.md deleted file mode 100644 index 12d98d483e6..00000000000 --- a/dev/docker-dde/README.md +++ /dev/null @@ -1,42 +0,0 @@ -# OpenMage Docker-Dev-Environment - -## Prerequisites -- Install [Docker](https://docs.docker.com/get-docker/) and [Docker Compose](https://docs.docker.com/compose/install/) -- Install [DDE](https://github.com/sandstein/docker-dev-environment) -- Port 80 on your host must be unused - -## Install - -### Docker containers -- copy `dev/docker-dde/config/.env-sample` to `.env` and adjust it to load all containers you need -- __Note:__ when changing the php version you need to modify virtual host file too - -### Apache VHOST - -- copy `dev/docker-dde/config/openmage.conf` to `/config/apache-24/conf.d` - -If you have successfully installed DDE start your containers with - -```bash -$ dde-start -``` - -### Initial setup -To install OpenMage run - -```bash -$ dde-cli dev/docker-dde/init-dev-environment.sh -``` - -### Final steps -- install with or w/o sample data -- set your admin credentials -- open [http://openmage.localhost](openmage.localhost) - -#### Recommendation - -- add `mailhog` to `.env` -- use a [SMTP-extension](https://github.com/aschroder/Magento-SMTP-Pro-Email-Extension]) - - host: mailhog - - port: 1025 -- check you mails at [http://mailhog.localhost](mailhog.localhost) \ No newline at end of file diff --git a/dev/docker-dde/config/.env.sample b/dev/docker-dde/config/.env.sample deleted file mode 100644 index ea7a3761cd9..00000000000 --- a/dev/docker-dde/config/.env.sample +++ /dev/null @@ -1,38 +0,0 @@ -#################################################################### -# -# Put this document as .env in the root directory of your project -# and modify the variables. Additional variables will be set for -# your docker dev environment commands -# -#################################################################### - -# -# which path has to be appended to /var/www/vhosts in order -# to reach the project root. So if your current project is -# located at ~/workspace/ and your workpace is directly -# linked into docker-dev-environment then is your choice -# -# eg. PROJECT_ROOT=magento1/openmage -# -PROJECT_ROOT= -# -# which containers should be started -# use comma separated list -# used by docker-start -# -# eg. DOCKER_CONTAINER=apache-24,mysql-80,mailhog -# -DOCKER_CONTAINER= -# -# which phpversion is used in project -# -# e.g. PHP_FMP_CONTAINER=php-fpm-74 -# -PHP_FPM_CONTAINER= -# -# which container is used to execute the php commands -# used by e.g. bin/docker-composer -# -# eg. PHP_CLI_CONTAINER=php-cli-74 -# -PHP_CLI_CONTAINER= diff --git a/dev/docker-dde/config/openmage.conf b/dev/docker-dde/config/openmage.conf deleted file mode 100644 index 7eae5e335ed..00000000000 --- a/dev/docker-dde/config/openmage.conf +++ /dev/null @@ -1,5 +0,0 @@ - - ServerName openmage.localhost - DocumentRoot "${WORKSPACE}/magento1/openmage" - USE PHP74 "${WORKSPACE}/magento1/openmage" - diff --git a/dev/docker-dde/init-dev-environment.sh b/dev/docker-dde/init-dev-environment.sh deleted file mode 100755 index 0066b6db913..00000000000 --- a/dev/docker-dde/init-dev-environment.sh +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/bash - -# -# docker settings which can be modified if desired -# -DB_SCHEMA=openmage - -# -# docker settings which should not be altered -# -DB_HOST=mysql-80 -PROJECT_DIR=$(realpath "$(dirname "$0")"/../..) - -# -# init database -# -echo "Initialising database" -echo "CREATE SCHEMA IF NOT EXISTS \`${DB_SCHEMA}\` DEFAULT CHARACTER SET utf8;" | mysql -u root -h ${DB_HOST} - -# -# install dependencies -# -echo "Installing dependencies" -cd "${PROJECT_DIR}" || exit -composer install --prefer-source - -read -r -p "Install sample data? [y/N]" INSTALL_SAMPLE_DATA -INSTALL_SAMPLE_DATA=${INSTALL_SAMPLE_DATA,,} # to lower -if [[ $INSTALL_SAMPLE_DATA =~ ^(yes|y) ]]; then - if [[ ! -d "${PROJECT_DIR}/backups" ]]; then - echo "Creating backup directory" - mkdir -p "${PROJECT_DIR}/backups" - fi - cd "${PROJECT_DIR}/backups" || exit - if [[ ! -f "${PROJECT_DIR}/backups/magento-sample-data-1.9.2.4.zip" ]]; then - echo "Downloading sample data" - wget https://github.com/sreichel/magento-1-compressed-sample-data/raw/master/magento-sample-data-1.9.2.4.zip - fi - echo "Uncompress sample data" - unzip magento-sample-data-1.9.2.4.zip; - echo "Copy sample data" - cp -r magento-sample-data-1.9.2.4/* "${PROJECT_DIR}/"; - echo "Import sample data" - mysql -u root -h ${DB_HOST} ${DB_SCHEMA} < "${PROJECT_DIR}/backups/magento-sample-data-1.9.2.4/magento_sample_data_for_1.9.2.4.sql" - echo "Remove sample data" - rm -rf magento-sample-data-1.9.2.4; -fi - -cd "${PROJECT_DIR}" || exit -read -r -p "Admin user [admin]:" ADMIN_USER -ADMIN_USER=${ADMIN_USER:-admin} -read -r -p "Admin firstname [John]:" ADMIN_FIRSTNAME -ADMIN_FIRSTNAME=${ADMIN_FIRSTNAME:-John} -read -r -p "Admin lastname [Doe]:" ADMIN_LASTNAME -ADMIN_LASTNAME=${ADMIN_FIRSTNAME:-Doe} -read -r -p "Admin email [admin@example.com]:" ADMIN_EMAIL -ADMIN_EMAIL=${ADMIN_EMAIL:-admin@example.com} -read -r -p "Admin password [password123password123]:" ADMIN_PASSWORD -ADMIN_PASSWORD=${ADMIN_PASSWORD:-password123password123} - -php -f install.php -- \ - --license_agreement_accepted 'yes' \ - --locale 'de_DE' \ - --timezone 'Europe/Berlin' \ - --db_host ${DB_HOST} \ - --db_name ${DB_SCHEMA} \ - --db_user 'root' \ - --db_pass '' \ - --db_prefix '' \ - --url 'http://openmage.localhost/' \ - --use_rewrites 'yes' \ - --use_secure 'no' \ - --secure_base_url '' \ - --use_secure_admin 'no' \ - --admin_username "${ADMIN_USER}" \ - --admin_lastname "${ADMIN_LASTNAME}" \ - --admin_firstname "${ADMIN_FIRSTNAME}" \ - --admin_email "${ADMIN_EMAIL}" \ - --admin_password "${ADMIN_PASSWORD}" \ - --session_save 'files' \ - --admin_frontname 'admin' \ - --backend_frontname 'admin' \ - --default_currency 'EUR' \ - --skip_url_validation 'yes' - From 1699468f62ab2881014dadf68938d64de6a270b5 Mon Sep 17 00:00:00 2001 From: sv3n Date: Sat, 30 Jul 2022 11:40:34 +0200 Subject: [PATCH 40/61] Removed dead code (#2339) * Removed dead code * phpstan fix * Add logging to empty try/catch --- .github/phpstan-baseline.neon | 5 -- .../core/Mage/Admin/Model/Resource/Acl.php | 20 +----- .../Mage/AdminNotification/Model/Feed.php | 4 -- .../core/Mage/Adminhtml/Block/Cache/Grid.php | 21 +------ .../Block/Catalog/Category/Edit/Form.php | 2 +- .../Block/Catalog/Category/Tab/General.php | 10 --- .../Product/Attribute/Edit/Tab/Front.php | 14 ++--- .../Product/Edit/Tab/Options/Option.php | 4 -- .../Product/Edit/Tabs/Configurable.php | 24 ++----- .../Block/Customer/Edit/Tab/Account.php | 8 --- .../Adminhtml/Block/Customer/Online/Grid.php | 1 - .../Adminhtml/Block/Notification/Grid.php | 2 - .../core/Mage/Adminhtml/Block/Page/Menu.php | 3 - .../Sales/Order/Shipment/Create/Form.php | 8 --- .../Mage/Adminhtml/Block/Sales/Order/View.php | 25 -------- .../Mage/Adminhtml/Block/Tag/Grid/All.php | 5 +- .../Adminhtml/Block/Tag/Grid/Customers.php | 39 +----------- app/code/core/Mage/Adminhtml/Helper/Data.php | 6 +- .../System/Config/Backend/Seo/Product.php | 6 -- .../System/Config/Source/Order/Status.php | 1 - .../Config/Source/Payment/Allowedmethods.php | 15 ----- .../controllers/Api/UserController.php | 2 - .../Catalog/CategoryController.php | 1 - .../controllers/Catalog/ProductController.php | 25 -------- .../Permissions/UserController.php | 2 - .../System/Convert/GuiController.php | 15 ----- app/code/core/Mage/Api/Model/Resource/Acl.php | 20 +----- app/code/core/Mage/Api/Model/Session.php | 2 +- .../Mage/Api/Model/Wsdl/Config/Element.php | 11 ---- .../Mage/Authorizenet/Model/Directpost.php | 4 +- .../Catalog/Block/Product/List/Crosssell.php | 1 - .../Catalog/Block/Product/List/Related.php | 1 - .../Catalog/Block/Product/List/Upsell.php | 1 - .../Catalog/Block/Product/View/Attributes.php | 1 - .../Catalog/Block/Seo/Sitemap/Tree/Pager.php | 11 ---- app/code/core/Mage/Catalog/Model/Category.php | 17 ----- .../Catalog/Model/Convert/Parser/Product.php | 4 -- app/code/core/Mage/Catalog/Model/Layer.php | 3 - app/code/core/Mage/Catalog/Model/Product.php | 5 -- .../core/Mage/Catalog/Model/Product/Image.php | 8 --- .../Catalog/Model/Resource/Category/Flat.php | 1 - .../catalog_setup/data-install-1.6.0.0.php | 4 -- .../core/Mage/CatalogIndex/Model/Indexer.php | 6 -- .../CatalogIndex/Model/Resource/Attribute.php | 6 -- .../core/Mage/CatalogSearch/Block/Result.php | 2 - .../Mage/CatalogSearch/Model/Advanced.php | 1 - .../Block/Cart/Item/Renderer/Grouped.php | 2 - .../Mage/Checkout/Model/Cart/Customer/Api.php | 12 +--- app/code/core/Mage/Core/Helper/Url.php | 2 - app/code/core/Mage/Core/Model/Config.php | 1 - .../core/Mage/Core/Model/Design/Package.php | 2 - .../Model/File/Validator/AvailablePath.php | 1 - .../core/Mage/Core/Model/Layout/Update.php | 63 ------------------- .../Core/Model/Resource/Helper/Mysql4.php | 12 +--- .../core/Mage/Customer/Block/Widget/Dob.php | 1 + .../Model/Convert/Adapter/Customer.php | 5 -- .../Model/Convert/Parser/Customer.php | 18 ------ .../Dataflow/Model/Convert/Parser/Csv.php | 31 --------- .../Model/Convert/Parser/Xml/Excel.php | 61 ------------------ .../Model/Convert/Profile/Abstract.php | 4 -- app/code/core/Mage/Dataflow/Model/Profile.php | 20 +----- .../Catalog/Product/Edit/Tab/Downloadable.php | 21 ------- .../Mage/Eav/Model/Convert/Adapter/Entity.php | 2 - .../core/Mage/Eav/Model/Entity/Abstract.php | 4 -- .../core/Mage/Payment/Model/Method/Cc.php | 6 -- app/code/core/Mage/Paypal/Model/Api/Nvp.php | 1 - .../core/Mage/Paypal/Model/Api/Standard.php | 1 - app/code/core/Mage/Paypal/Model/Config.php | 5 +- app/code/core/Mage/Paypal/Model/Ipn.php | 3 - .../core/Mage/Rating/Model/Rating/Option.php | 5 -- .../Model/Resource/Rating/Collection.php | 4 +- .../Rating/Option/Vote/Collection.php | 4 +- .../Mage/Rule/Model/Condition/Abstract.php | 7 --- .../Sales/Block/Recurring/Profile/View.php | 7 --- .../Mage/Sales/Model/Order/Creditmemo.php | 8 --- app/code/core/Mage/Sales/Model/Order/Item.php | 1 - .../Mage/Sales/Model/Order/Pdf/Abstract.php | 2 - app/code/core/Mage/Sales/Model/Quote/Item.php | 11 +--- .../Recurring/ProfileController.php | 18 ------ .../Rule/Condition/Product/Subselect.php | 5 -- .../Tag/Model/Entity/Customer/Collection.php | 9 --- .../core/Mage/Tax/Block/Sales/Order/Tax.php | 7 --- .../Tax/Model/Sales/Total/Quote/Discount.php | 1 - .../Tax/Model/Sales/Total/Quote/Subtotal.php | 7 --- .../core/Mage/Weee/Model/Total/Quote/Weee.php | 8 --- 85 files changed, 33 insertions(+), 726 deletions(-) diff --git a/.github/phpstan-baseline.neon b/.github/phpstan-baseline.neon index 7c65d44ed5c..0d28d4672d9 100644 --- a/.github/phpstan-baseline.neon +++ b/.github/phpstan-baseline.neon @@ -1495,11 +1495,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Helper/Dashboard/Abstract.php - - - message: "#^Method Mage_Adminhtml_Helper_Data\\:\\:prepareFilterString\\(\\) has invalid return type data\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Helper/Data.php - - message: "#^Method Mage_Adminhtml_Model_Config\\:\\:getSection\\(\\) should return Varien_Simplexml_Element but return statement is missing\\.$#" count: 1 diff --git a/app/code/core/Mage/Admin/Model/Resource/Acl.php b/app/code/core/Mage/Admin/Model/Resource/Acl.php index 14f8290d5c4..71175b717e7 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Acl.php +++ b/app/code/core/Mage/Admin/Model/Resource/Acl.php @@ -145,26 +145,8 @@ public function loadRules(Mage_Admin_Model_Acl $acl, array $rulesArr) $acl->deny($role, $resource, $privileges, $assert); } } catch (Exception $e) { - //$m = $e->getMessage(); - //if ( eregi("^Resource '(.*)' not found", $m) ) { - // Deleting non existent resource rule from rules table - //$cond = $this->_write->quoteInto('resource_id = ?', $resource); - //$this->_write->delete(Mage::getSingleton('core/resource')->getTableName('admin/rule'), $cond); - //} else { - //TODO: We need to log such exceptions to somewhere like a system/errors.log - //} + Mage::logException($e); } - /* - switch ($rule['permission']) { - case Mage_Admin_Model_Acl::RULE_PERM_ALLOW: - $acl->allow($role, $resource, $privileges, $assert); - break; - - case Mage_Admin_Model_Acl::RULE_PERM_DENY: - $acl->deny($role, $resource, $privileges, $assert); - break; - } - */ } return $this; } diff --git a/app/code/core/Mage/AdminNotification/Model/Feed.php b/app/code/core/Mage/AdminNotification/Model/Feed.php index 7f861fd1b19..5b82673dceb 100644 --- a/app/code/core/Mage/AdminNotification/Model/Feed.php +++ b/app/code/core/Mage/AdminNotification/Model/Feed.php @@ -131,7 +131,6 @@ public function getFrequency() public function getLastUpdate() { return Mage::app()->loadCache('admin_notifications_lastcheck'); -// return Mage::getStoreConfig(self::XML_LAST_UPDATE_PATH); } /** @@ -142,9 +141,6 @@ public function getLastUpdate() public function setLastUpdate() { Mage::app()->saveCache(time(), 'admin_notifications_lastcheck'); -// $config = Mage::getModel('core/config'); -// /* @var $config Mage_Core_Model_Config */ -// $config->saveConfig(self::XML_LAST_UPDATE_PATH, time()); return $this; } diff --git a/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php b/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php index 0bd86a24b4f..a4d1cfc475f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php @@ -101,24 +101,6 @@ protected function _prepareColumns() 'frame_callback' => array($this, 'decorateStatus') )); -// $this->addColumn('action', -// array( -// 'header' => $this->__('Action'), -// 'width' => '100', -// 'type' => 'action', -// 'getter' => 'getId', -// 'actions' => array( -// array( -// 'caption' => $this->__('Refresh'), -// 'url' => array('base'=> '*/*/refresh'), -// 'field' => 'type' -// ), -// ), -// 'filter' => false, -// 'sortable' => false, -// 'is_system' => true, -// )); - return parent::_prepareColumns(); } @@ -145,12 +127,11 @@ public function decorateStatus($value, $row, $column, $isExport) /** * Get row edit url * - * @return string + * @return false */ public function getRowUrl($row) { return false; - //return $this->getUrl('*/*/edit', array('type'=>$row->getId())); } /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php index 19670fc77c2..5d2c9a45497 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php @@ -98,7 +98,7 @@ public function getStoreConfigurationUrl() { $storeId = (int) $this->getRequest()->getParam('store'); $params = array(); -// $params = array('section'=>'catalog'); + if ($storeId) { $store = Mage::app()->getStore($storeId); $params['website'] = $store->getWebsite()->getCode(); diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php index 5fa6d8d2c82..c2fca275d66 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php @@ -60,16 +60,6 @@ public function _prepareLayout() $fieldset = $form->addFieldset('base_fieldset', array('legend'=>Mage::helper('catalog')->__('General Information'))); if (!$this->getCategory()->getId()) { -// $fieldset->addField('path', 'select', array( -// 'name' => 'path', -// 'label' => Mage::helper('catalog')->__('Parent Category'), -// 'value' => base64_decode($this->getRequest()->getParam('parent')), -// 'values'=> $this->_getParentCategoryOptions(), -// //'required' => true, -// //'class' => 'required-entry' -// ), -// 'name' -// ); $parentId = $this->getRequest()->getParam('parent'); if (!$parentId) { $parentId = Mage_Catalog_Model_Category::TREE_ROOT_ID; diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php index 3ac6975a6c9..33e6c3c1ed4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php @@ -87,14 +87,12 @@ protected function _prepareForm() ), )); -// if ($model->getIsUserDefined() || !$model->getId()) { - $fieldset->addField('is_visible_on_front', 'select', array( - 'name' => 'is_visible_on_front', - 'label' => Mage::helper('catalog')->__('Visible on Catalog Pages on Front-end'), - 'title' => Mage::helper('catalog')->__('Visible on Catalog Pages on Front-end'), - 'values' => $yesno, - )); -// } + $fieldset->addField('is_visible_on_front', 'select', array( + 'name' => 'is_visible_on_front', + 'label' => Mage::helper('catalog')->__('Visible on Catalog Pages on Front-end'), + 'title' => Mage::helper('catalog')->__('Visible on Catalog Pages on Front-end'), + 'values' => $yesno, + )); $form->setValues($model->getData()); diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php index 1cc766bbd27..5975b5b4022 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php @@ -216,7 +216,6 @@ public function getTemplatesHtml() public function getOptionValues() { $optionsArr = array_reverse($this->getProduct()->getOptions(), true); -// $optionsArr = $this->getProduct()->getOptions(); if (!$this->_values) { $showPrice = $this->getCanReadPrice(); @@ -245,9 +244,6 @@ public function getOptionValues() } if ($option->getGroupByType() == Mage_Catalog_Model_Product_Option::OPTION_GROUP_SELECT) { - -// $valuesArr = array_reverse($option->getValues(), true); - $i = 0; $itemCount = 0; foreach ($option->getValues() as $_value) { diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php index e9a8e585ee2..6350182a790 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php @@ -35,26 +35,12 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tabs_Configurable extends Mage_A { protected function _prepareLayout() { -// $product = $this->getProduct(); + $this->addTab('super_settings', array( + 'label' => Mage::helper('catalog')->__('Configurable Product Settings'), + 'content' => $this->getLayout()->createBlock('adminhtml/catalog_product_edit_tab_super_settings')->toHtml(), + 'active' => true + )); -// if (!($superAttributes = $product->getTypeInstance()->getUsedProductAttributeIds())) { - $this->addTab('super_settings', array( - 'label' => Mage::helper('catalog')->__('Configurable Product Settings'), - 'content' => $this->getLayout()->createBlock('adminhtml/catalog_product_edit_tab_super_settings')->toHtml(), - 'active' => true - )); - -// } else { -// parent::_prepareLayout(); -// -// $this->addTab('configurable', array( -// 'label' => Mage::helper('catalog')->__('Associated Products'), -// 'content' => $this->getLayout()->createBlock('adminhtml/catalog_product_edit_tab_super_config', 'admin.super.config.product') -// ->setProductId($this->getRequest()->getParam('id')) -// ->toHtml(), -// )); -// $this->bindShadowTabs('configurable', 'customer_options'); -// } return $this; } } diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php index 40e26e89a9b..70c484f0de3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php @@ -116,14 +116,6 @@ function(v, elem){ $renderer = $this->getLayout()->createBlock('adminhtml/store_switcher_form_renderer_fieldset_element'); $form->getElement('website_id')->setRenderer($renderer); -// if (Mage::app()->isSingleStoreMode()) { -// $fieldset->removeField('website_id'); -// $fieldset->addField('website_id', 'hidden', array( -// 'name' => 'website_id' -// )); -// $customer->setWebsiteId(Mage::app()->getStore(true)->getWebsiteId()); -// } - $customerStoreId = null; if ($customer->getId()) { $customerStoreId = Mage::app()->getWebsite($customer->getWebsiteId())->getDefaultStore()->getId(); diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php index 0878dba5f1b..09519dcb3d8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php @@ -141,7 +141,6 @@ protected function _prepareColumns() 'header' => Mage::helper('customer')->__('Type'), 'type' => 'options', 'options' => $typeOptions, -// 'renderer' => 'adminhtml/customer_online_grid_renderer_type', 'index' => 'visitor_type' )); diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php b/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php index 7e2a4cf962d..639c2136d96 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php @@ -109,8 +109,6 @@ protected function _prepareMassaction() 'confirm' => Mage::helper('adminnotification')->__('Are you sure?') )); -// $this->getColumn('massaction')->setWidth('30px'); - return $this; } diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Menu.php b/app/code/core/Mage/Adminhtml/Block/Page/Menu.php index 057004a45b9..2f505529a78 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Menu.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Menu.php @@ -114,9 +114,6 @@ protected function _getHelperValue(Varien_Simplexml_Element $child) if (isset($childAttributes['module'])) { $helperName = (string)$childAttributes['module']; } -// if (isset($childAttributes['translate'])) { -// $titleNodeName = (string)$childAttributes['translate']; -// } return Mage::helper($helperName)->__((string)$child->$titleNodeName); } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php index 27ca31c16be..d1cb1599fa3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php @@ -66,10 +66,6 @@ public function getShipment() protected function _prepareLayout() { -// $infoBlock = $this->getLayout()->createBlock('adminhtml/sales_order_view_info') -// ->setOrder($this->getShipment()->getOrder()); -// $this->setChild('order_info', $infoBlock); - $this->setChild( 'items', $this->getLayout()->createBlock('adminhtml/sales_order_shipment_create_items') @@ -78,11 +74,7 @@ protected function _prepareLayout() 'tracking', $this->getLayout()->createBlock('adminhtml/sales_order_shipment_create_tracking') ); -// $paymentInfoBlock = $this->getLayout()->createBlock('adminhtml/sales_order_payment') -// ->setPayment($this->getShipment()->getOrder()->getPayment()); -// $this->setChild('payment_info', $paymentInfoBlock); -// return parent::_prepareLayout(); return $this; } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php index 8afdbaef14b..26765117c2c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php @@ -325,29 +325,4 @@ public function getHeaderHtml() { return '

    ' . $this->escapeHtml($this->getHeaderText()) . '

    '; } -// -// /** -// * Return URL for accept payment action -// * -// * @return string -// */ -// public function getAcceptPaymentUrl() -// { -// return $this->getUrl('*/*/reviewPayment', array('action' => 'accept')); -// } -// -// /** -// * Return URL for deny payment action -// * -// * @return string -// */ -// public function getDenyPaymentUrl() -// { -// return $this->getUrl('*/*/reviewPayment', array('action' => 'deny')); -// } -// -// public function getPaymentReviewUpdateUrl() -// { -// return $this->getUrl('*/*/reviewPaymentUpdate'); -// } } diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/All.php b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/All.php index 5e84a48d8d8..95aa2330645 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/All.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/All.php @@ -42,10 +42,7 @@ public function __construct() protected function _prepareCollection() { - $collection = Mage::getResourceModel('tag/tag_collection') -// ->addStoreFilter(Mage::app()->getStore()->getId()) - ->addStoresVisibility() - ; + $collection = Mage::getResourceModel('tag/tag_collection')->addStoresVisibility(); $this->setCollection($collection); return parent::_prepareCollection(); } diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Customers.php b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Customers.php index 801b4910682..a30e58d5828 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Customers.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Customers.php @@ -39,16 +39,7 @@ protected function _prepareCollection() $collection = Mage::getResourceModel('tag_customer/collection') ->addAttributeToSelect('firstname') ->addAttributeToSelect('middlename') - ->addAttributeToSelect('lastname') -// ->addAttributeToSelect('email') -// ->addAttributeToSelect('created_at') -// ->joinAttribute('billing_postcode', 'customer_address/postcode', 'default_billing') -// ->joinAttribute('billing_city', 'customer_address/city', 'default_billing') -// ->joinAttribute('billing_telephone', 'customer_address/telephone', 'default_billing') -// ->joinAttribute('billing_country_id', 'customer_address/country_id', 'default_billing') -// ->joinField('billing_country_name', 'directory/country_name', 'name', -// 'country_id=billing_country_id', array('language_code'=>'en')) - ; + ->addAttributeToSelect('lastname'); if ($productId = $this->getRequest()->getParam('product_id')) { $collection->addProductFilter($productId); @@ -83,32 +74,6 @@ protected function _prepareColumns() 'header' => Mage::helper('tag')->__('Last Name'), 'index' => 'lastname', )); -// $this->addColumn('email', array( -// 'header' =>Mage::helper('tag')->__('Email'), -// 'align' =>'center', -// 'index' =>'email' -// )); -// $this->addColumn('Telephone', array( -// 'header' =>Mage::helper('tag')->__('Telephone'), -// 'align' =>'center', -// 'index' =>'billing_telephone' -// )); -// $this->addColumn('billing_postcode', array( -// 'header' =>Mage::helper('tag')->__('ZIP/Post Code'), -// 'index' =>'billing_postcode', -// )); -// $this->addColumn('billing_country_name', array( -// 'header' =>Mage::helper('tag')->__('Country'), -// #'filter' => 'adminhtml/customer_grid_filter_country', -// 'index' =>'billing_country_name', -// )); -// $this->addColumn('customer_since', array( -// 'header' =>Mage::helper('tag')->__('Customer Since'), -// 'type' => 'date', -// 'align' => 'center', -// #'format' => 'Y.m.d', -// 'index' =>'created_at', -// )); $this->addColumn('tags', array( 'header' => Mage::helper('tag')->__('Tags'), 'index' => 'tags', @@ -132,8 +97,6 @@ protected function _prepareColumns() ->setColumnFilter('middlename') ->setColumnFilter('lastname'); -// $this->addExportType('*/*/exportCsv', Mage::helper('tag')->__('CSV')); -// $this->addExportType('*/*/exportXml', Mage::helper('tag')->__('XML')); return parent::_prepareColumns(); } diff --git a/app/code/core/Mage/Adminhtml/Helper/Data.php b/app/code/core/Mage/Adminhtml/Helper/Data.php index f6c3620ce1f..b69777bc7e3 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Data.php +++ b/app/code/core/Mage/Adminhtml/Helper/Data.php @@ -113,10 +113,6 @@ public static function getUrl($route='', $params=array()) return Mage::getModel('adminhtml/url')->getUrl($route, $params); } -// public function getCurrentUserId() -// { -// return Mage::getSingleton('admin/session')->getUser()->getId(); -// } public function getCurrentUserId() { if (Mage::getSingleton('admin/session')->getUser()) { @@ -129,7 +125,7 @@ public function getCurrentUserId() * Decode filter string * * @param string $filterString - * @return data + * @return array */ public function prepareFilterString($filterString) { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Seo/Product.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Seo/Product.php index 71bbf0b6bdd..39b55b08b8f 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Seo/Product.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Seo/Product.php @@ -34,12 +34,6 @@ class Mage_Adminhtml_Model_System_Config_Backend_Seo_Product extends Mage_Core_M */ protected function _afterSave() { - /** - * Index model responsible for rewrites index - */ -// if ($this->isValueChanged()) { -// Mage::getSingleton('catalog/url')->refreshRewrites(); -// } return $this; } } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.php index 1b49e7259d1..1e7b153657f 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.php @@ -32,7 +32,6 @@ class Mage_Adminhtml_Model_System_Config_Source_Order_Status // set null to enable all possible protected $_stateStatuses = array( Mage_Sales_Model_Order::STATE_NEW, -// Mage_Sales_Model_Order::STATE_PENDING_PAYMENT, Mage_Sales_Model_Order::STATE_PROCESSING, Mage_Sales_Model_Order::STATE_COMPLETE, Mage_Sales_Model_Order::STATE_CLOSED, diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allowedmethods.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allowedmethods.php index d7320d0dcfa..16289696f5e 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allowedmethods.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allowedmethods.php @@ -31,19 +31,4 @@ protected function _getPaymentMethods() { return Mage::getSingleton('payment/config')->getActiveMethods(); } - -// public function toOptionArray() -// { -// $methods = array(array('value'=>'', 'label'=>'')); -// $payments = Mage::getSingleton('payment/config')->getActiveMethods(); -// foreach ($payments as $paymentCode=>$paymentModel) { -// $paymentTitle = Mage::getStoreConfig('payment/'.$paymentCode.'/title'); -// $methods[$paymentCode] = array( -// 'label' => $paymentTitle, -// 'value' => $paymentCode, -// ); -// } -// -// return $methods; -// } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php index 150d865fba8..a6c14f412e6 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php @@ -154,8 +154,6 @@ public function saveAction() try { $model->save(); if ( $uRoles = $this->getRequest()->getParam('roles', false) ) { - /*parse_str($uRoles, $uRoles); - $uRoles = array_keys($uRoles);*/ if (count($uRoles) === 1) { $model->setRoleIds($uRoles) ->setRoleUserId($model->getUserId()) diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php index 34dee0d26ef..28e21ba0bd9 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php @@ -176,7 +176,6 @@ public function editAction() ->setLastViewedStore($this->getRequest()->getParam('store')); Mage::getSingleton('admin/session') ->setLastEditedCategory($category->getId()); -// $this->_initLayoutMessages('adminhtml/session'); $this->loadLayout(); $eventResponse = new Varien_Object(array( diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php index 71b2a5e1acd..c95bd7cec43 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php @@ -533,19 +533,6 @@ public function validateAction() ->setMaxValue($product->getCustomDesignTo()); $product->validate(); - /** - * @todo implement full validation process with errors returning which are ignoring now - */ -// if (is_array($errors = $product->validate())) { -// foreach ($errors as $code => $error) { -// if ($error === true) { -// Mage::throwException(Mage::helper('catalog')->__('Attribute "%s" is invalid.', $product->getResource()->getAttribute($code)->getFrontend()->getLabel())); -// } -// else { -// Mage::throwException($error); -// } -// } -// } } catch (Mage_Eav_Model_Entity_Attribute_Exception $e) { $response->setError(true); @@ -1092,18 +1079,6 @@ public function quickCreateAction() } try { - /** - * @todo implement full validation process with errors returning which are ignoring now - */ -// if (is_array($errors = $product->validate())) { -// $strErrors = array(); -// foreach($errors as $code=>$error) { -// $codeLabel = $product->getResource()->getAttribute($code)->getFrontend()->getLabel(); -// $strErrors[] = ($error === true)? Mage::helper('catalog')->__('Value for "%s" is invalid.', $codeLabel) : Mage::helper('catalog')->__('Value for "%s" is invalid: %s', $codeLabel, $error); -// } -// Mage::throwException('data_invalid', implode("\n", $strErrors)); -// } - $product->validate(); $product->save(); $result['product_id'] = $product->getId(); diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php index dc8b4d1787c..a60740138a2 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php @@ -156,8 +156,6 @@ public function saveAction() Mage::getModel('admin/user')->sendAdminNotification($model); } if ( $uRoles = $this->getRequest()->getParam('roles', false) ) { - /*parse_str($uRoles, $uRoles); - $uRoles = array_keys($uRoles);*/ if (count($uRoles) === 1) { $model->setRoleIds($uRoles) ->setRoleUserId($model->getUserId()) diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php b/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php index 0acc6c7ea66..302a0e32ad7 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php @@ -134,21 +134,6 @@ public function downloadAction() protected function _isAllowed() { -// switch ($this->getRequest()->getActionName()) { -// case 'index': -// $aclResource = 'admin/system/convert/gui'; -// break; -// case 'grid': -// $aclResource = 'admin/system/convert/gui'; -// break; -// case 'run': -// $aclResource = 'admin/system/convert/gui/run'; -// break; -// default: -// $aclResource = 'admin/system/convert/gui/edit'; -// break; -// } - return Mage::getSingleton('admin/session')->isAllowed('admin/system/convert/gui'); } } diff --git a/app/code/core/Mage/Api/Model/Resource/Acl.php b/app/code/core/Mage/Api/Model/Resource/Acl.php index 13fe43a074f..09c4bab8d11 100644 --- a/app/code/core/Mage/Api/Model/Resource/Acl.php +++ b/app/code/core/Mage/Api/Model/Resource/Acl.php @@ -132,26 +132,8 @@ public function loadRules(Mage_Api_Model_Acl $acl, array $rulesArr) $acl->deny($role, $resource, $privileges, $assert); } } catch (Exception $e) { - //$m = $e->getMessage(); - //if ( eregi("^Resource '(.*)' not found", $m) ) { - // Deleting non existent resource rule from rules table - //$cond = $this->_write->quoteInto('resource_id = ?', $resource); - //$this->_write->delete(Mage::getSingleton('core/resource')->getTableName('admin/rule'), $cond); - //} else { - //TODO: We need to log such exceptions to somewhere like a system/errors.log - //} + Mage::logException($e); } - /* - switch ($rule['api_permission']) { - case Mage_Api_Model_Acl::RULE_PERM_ALLOW: - $acl->allow($role, $resource, $privileges, $assert); - break; - - case Mage_Api_Model_Acl::RULE_PERM_DENY: - $acl->deny($role, $resource, $privileges, $assert); - break; - } - */ } return $this; } diff --git a/app/code/core/Mage/Api/Model/Session.php b/app/code/core/Mage/Api/Model/Session.php index da626458091..0ec929ee1e9 100644 --- a/app/code/core/Mage/Api/Model/Session.php +++ b/app/code/core/Mage/Api/Model/Session.php @@ -47,7 +47,6 @@ class Mage_Api_Model_Session extends Mage_Core_Model_Session_Abstract */ public function start($sessionName = null) { -// parent::start($sessionName=null); $this->_currentSessId = md5(time() . uniqid('', true) . $sessionName); $this->sessionIds[] = $this->getSessionId(); return $this; @@ -178,6 +177,7 @@ public function isAllowed($resource, $privilege = null) return true; } } catch (Exception $e) { + Mage::logException($e); } try { diff --git a/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php b/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php index b6ceb4e50d3..e97eb722279 100644 --- a/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php +++ b/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php @@ -85,7 +85,6 @@ public function extendChild($source, $overwrite = false, $elmNamespace = '') return $this; } if ($overwrite) { -// unset($this->$sourceName); unset($elm); } else { return $this; @@ -241,16 +240,6 @@ public function getElementByName($source, $elmNamespace = '') if ($child->getName() == $sourceName) { $elm = true; foreach ($extendElmAttributes as $namespace => $attributes) { - /** - * if count of attributes of extend element is 0 in $namespace, - * and current element has attributes in $namespace - different elements - */ -// if (!count($attributes) && count($this->getAttributes($child, $namespace))) { -// foreach ($this->getAttributes($child, $namespace) as $attribute) { -// $elm = false; -// break; -// } -// } foreach ($attributes as $key => $value) { if (is_null($child->getAttribute($key, $namespace)) || $child->getAttribute($key, $namespace) != $value) { $elm = false; diff --git a/app/code/core/Mage/Authorizenet/Model/Directpost.php b/app/code/core/Mage/Authorizenet/Model/Directpost.php index 349a3e72a96..9f89d9cfd0e 100644 --- a/app/code/core/Mage/Authorizenet/Model/Directpost.php +++ b/app/code/core/Mage/Authorizenet/Model/Directpost.php @@ -581,7 +581,9 @@ protected function _authOrder(Mage_Sales_Model_Order $order) ->load($order->getQuoteId()) ->setIsActive(false) ->save(); - } catch (Exception $e) {} // do not cancel order if we couldn't send email + } catch (Exception $e) { + Mage::logException($e); // do not cancel order if we couldn't send email + } } /** diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php b/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php index 2aef554f3e2..aa840b41cea 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php @@ -64,7 +64,6 @@ protected function _prepareData() ->setPositionOrder() ->addStoreFilter(); -// Mage::getSingleton('catalog/product_status')->addSaleableFilterToCollection($this->_itemCollection); Mage::getSingleton('catalog/product_visibility')->addVisibleInCatalogFilterToCollection($this->_itemCollection); $this->_itemCollection->load(); diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Related.php b/app/code/core/Mage/Catalog/Block/Product/List/Related.php index 0753618d01f..23d83d4d0f2 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Related.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Related.php @@ -64,7 +64,6 @@ protected function _prepareData() ); $this->_addProductAttributesAndPrices($this->_itemCollection); } -// Mage::getSingleton('catalog/product_status')->addSaleableFilterToCollection($this->_itemCollection); Mage::getSingleton('catalog/product_visibility')->addVisibleInCatalogFilterToCollection($this->_itemCollection); $this->_itemCollection->load(); diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php b/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php index e88b910333f..caf6a6cd431 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php @@ -68,7 +68,6 @@ protected function _prepareData() $this->_addProductAttributesAndPrices($this->_itemCollection); } -// Mage::getSingleton('catalog/product_status')->addSaleableFilterToCollection($this->_itemCollection); Mage::getSingleton('catalog/product_visibility')->addVisibleInCatalogFilterToCollection($this->_itemCollection); if ($this->getItemLimit('upsell') > 0) { diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php b/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php index ba0941f459b..ddc208b678e 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php @@ -60,7 +60,6 @@ public function getAdditionalData(array $excludeAttr = array()) $product = $this->getProduct(); $attributes = $product->getAttributes(); foreach ($attributes as $attribute) { -// if ($attribute->getIsVisibleOnFront() && $attribute->getIsUserDefined() && !in_array($attribute->getAttributeCode(), $excludeAttr)) { if ($attribute->getIsVisibleOnFront() && !in_array($attribute->getAttributeCode(), $excludeAttr)) { $value = $attribute->getFrontend()->getValue($product); diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php index 50de595c1e9..58dab99bdaa 100644 --- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php +++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php @@ -63,11 +63,6 @@ public function getCurrentPage($displacement = 0) public function getLimit() { $limits = $this->getAvailableLimit(); -// if ($limit = $this->getRequest()->getParam($this->getLimitVarName())) { -// if (isset($limits[$limit])) { -// return $limit; -// } -// } $limits = array_keys($limits); return $limits[0]; } @@ -79,12 +74,6 @@ public function getLimit() public function setCollection($collection) { $this->_collection = $collection; -// ->setCurPage($this->getCurrentPage()); - // If not int - then not limit -// if ((int) $this->getLimit()) { -// $this->_collection->setPageSize($this->getLimit()); -// } - return $this; } diff --git a/app/code/core/Mage/Catalog/Model/Category.php b/app/code/core/Mage/Catalog/Model/Category.php index 3fdf7a1f987..c3cc5a1bbcd 100644 --- a/app/code/core/Mage/Catalog/Model/Category.php +++ b/app/code/core/Mage/Catalog/Model/Category.php @@ -669,23 +669,6 @@ public function getAllChildren($asArray = false) } else { return implode(',', $children); } - -// $this->getTreeModelInstance()->load(); -// $children = $this->getTreeModelInstance()->getChildren($this->getId()); -// -// $myId = array($this->getId()); -// if (is_array($children)) { -// $children = array_merge($myId, $children); -// } -// else { -// $children = $myId; -// } -// if ($asArray) { -// return $children; -// } -// else { -// return implode(',', $children); -// } } /** diff --git a/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php b/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php index d0f371ba488..6c8a710214a 100644 --- a/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php +++ b/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php @@ -349,10 +349,6 @@ public function parse() $inventoryFields[$row['sku']][$field] = $value; } continue; -// $this->addException( -// Mage::helper('catalog')->__('Unknown attribute: %s.', $field), -// Mage_Dataflow_Model_Convert_Exception::ERROR -// ); } if ($attribute->usesSource()) { $source = $attribute->getSource(); diff --git a/app/code/core/Mage/Catalog/Model/Layer.php b/app/code/core/Mage/Catalog/Model/Layer.php index 87e94029b02..182a0b8b738 100644 --- a/app/code/core/Mage/Catalog/Model/Layer.php +++ b/app/code/core/Mage/Catalog/Model/Layer.php @@ -214,9 +214,6 @@ public function getCurrentStore() */ public function getFilterableAttributes() { -// $entity = Mage::getSingleton('eav/config') -// ->getEntityType('catalog_product'); - $setIds = $this->_getSetIds(); if (!$setIds) { return array(); diff --git a/app/code/core/Mage/Catalog/Model/Product.php b/app/code/core/Mage/Catalog/Model/Product.php index 12dca553d72..a5772d811a6 100644 --- a/app/code/core/Mage/Catalog/Model/Product.php +++ b/app/code/core/Mage/Catalog/Model/Product.php @@ -415,11 +415,6 @@ public function getUrlModel() */ public function validate() { -// $this->getAttributes(); -// Mage::dispatchEvent($this->_eventPrefix.'_validate_before', array($this->_eventObject=>$this)); -// $result = $this->_getResource()->validate($this); -// Mage::dispatchEvent($this->_eventPrefix.'_validate_after', array($this->_eventObject=>$this)); -// return $result; Mage::dispatchEvent($this->_eventPrefix.'_validate_before', array($this->_eventObject=>$this)); $this->_getResource()->validate($this); Mage::dispatchEvent($this->_eventPrefix.'_validate_after', array($this->_eventObject=>$this)); diff --git a/app/code/core/Mage/Catalog/Model/Product/Image.php b/app/code/core/Mage/Catalog/Model/Product/Image.php index d45721747b3..969fca0cd5c 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Image.php +++ b/app/code/core/Mage/Catalog/Model/Product/Image.php @@ -243,10 +243,6 @@ public function setSize($size) */ protected function _checkMemory($file = null) { -// print '$this->_getMemoryLimit() = '.$this->_getMemoryLimit(); -// print '$this->_getMemoryUsage() = '.$this->_getMemoryUsage(); -// print '$this->_getNeedMemoryForBaseFile() = '.$this->_getNeedMemoryForBaseFile(); - return $this->_getMemoryLimit() > ($this->_getMemoryUsage() + $this->_getNeedMemoryForFile($file)) || $this->_getMemoryLimit() == -1; } @@ -459,10 +455,6 @@ public function setImageProcessor($processor) public function getImageProcessor() { if (!$this->_processor) { -// var_dump($this->_checkMemory()); -// if (!$this->_checkMemory()) { -// $this->_baseFile = null; -// } $this->_processor = new Varien_Image($this->getBaseFile()); } $this->_processor->keepAspectRatio($this->_keepAspectRatio); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php index fbeefd1fe8b..a62f8ccfe62 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php @@ -1144,7 +1144,6 @@ public function moveold($categoryId, $prevParentId, $parentId) $prevParent = null; $parent = null; $_tmpCategory = null; -// $this->_move($categoryId, $prevParentPath, $parentPath); return $this; } diff --git a/app/code/core/Mage/Catalog/data/catalog_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Catalog/data/catalog_setup/data-install-1.6.0.0.php index b5e9ffc88eb..e9d5d7a9eba 100644 --- a/app/code/core/Mage/Catalog/data/catalog_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Catalog/data/catalog_setup/data-install-1.6.0.0.php @@ -88,10 +88,6 @@ 'group' => 'design', 'sort' => 10 ), -// 'custom_design_apply' => array( -// 'group' => 'design', -// 'sort' => 20 -// ), 'custom_design_from' => array( 'group' => 'design', 'sort' => 30 diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer.php b/app/code/core/Mage/CatalogIndex/Model/Indexer.php index d7d1ab75312..a1f12fd69b7 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer.php @@ -220,12 +220,6 @@ public function plainReindex($products = null, $attributes = null, $stores = nul */ $websites = array(); $attributeCodes = $priceAttributeCodes = array(); -// $status = Mage_Catalog_Model_Product_Status::STATUS_ENABLED; -// $visibility = array( -// Mage_Catalog_Model_Product_Visibility::VISIBILITY_BOTH, -// Mage_Catalog_Model_Product_Visibility::VISIBILITY_IN_CATALOG, -// Mage_Catalog_Model_Product_Visibility::VISIBILITY_IN_SEARCH, -// ); /** * Prepare stores and websites information diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Attribute.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Attribute.php index cc1ae1a2c93..98f1dc4bb1f 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Attribute.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Attribute.php @@ -90,7 +90,6 @@ public function getCount($attribute, $entitySelect) ->group('index.value'); $select = $select->__toString(); -// $alias = $this->_getReadAdapter()->quoteTableAs($this->getMainTable(), 'index'); $result = $this->_getReadAdapter()->fetchAll($select); $counts = array(); @@ -113,11 +112,6 @@ public function applyFilterToCollection($collection, $attribute, $value) /** * Will be used after SQL review */ -// if ($collection->isEnabledFlat()) { -// $collection->getSelect()->where("e.{$attribute->getAttributeCode()}=?", $value); -// return $this; -// } - $alias = 'attr_index_'.$attribute->getId(); $collection->getSelect()->join( array($alias => $this->getMainTable()), diff --git a/app/code/core/Mage/CatalogSearch/Block/Result.php b/app/code/core/Mage/CatalogSearch/Block/Result.php index 4a6017dca6f..20c08d94af8 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Result.php +++ b/app/code/core/Mage/CatalogSearch/Block/Result.php @@ -146,8 +146,6 @@ public function setListModes() */ public function setListCollection() { -// $this->getListBlock() -// ->setCollection($this->_getProductCollection()); return $this; } diff --git a/app/code/core/Mage/CatalogSearch/Model/Advanced.php b/app/code/core/Mage/CatalogSearch/Model/Advanced.php index c89dc09eea0..73e59b2ae72 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Advanced.php +++ b/app/code/core/Mage/CatalogSearch/Model/Advanced.php @@ -251,7 +251,6 @@ protected function _addSearchCriteria($attribute, $value) } if (strlen($value['from']) > 0 && strlen($value['to']) > 0) { - // - $value = sprintf( '%s - %s', ($currencyModel ? $from : $value['from']), diff --git a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php index 0b08021b7b5..974e3c2224c 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php @@ -80,10 +80,8 @@ protected function _toHtml() /** @var Mage_Checkout_Block_Cart_Item_Renderer $renderer */ $renderer = $this->getRenderedBlock()->getItemRenderer($this->getItem()->getRealProductType()); $renderer->setItem($this->getItem()); -// $renderer->overrideProductUrl($this->getProductUrl()); $renderer->overrideProductThumbnail($this->getProductThumbnail()); $rendererHtml = $renderer->toHtml(); -// $renderer->overrideProductUrl(null); $renderer->overrideProductThumbnail(null); return $rendererHtml; } diff --git a/app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php b/app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php index a1bd870d0bb..e0257105923 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php @@ -114,16 +114,8 @@ public function setAddresses($quoteId, $customerAddressData, $store = null) } foreach ($customerAddressData as $addressItem) { -// switch($addressItem['mode']) { -// case self::ADDRESS_BILLING: - /** @var Mage_Sales_Model_Quote_Address $address */ - $address = Mage::getModel("sales/quote_address"); -// break; -// case self::ADDRESS_SHIPPING: -// /** @var $address Mage_Sales_Model_Quote_Address */ -// $address = Mage::getModel("sales/quote_address"); -// break; -// } + /** @var Mage_Sales_Model_Quote_Address $address */ + $address = Mage::getModel("sales/quote_address"); $addressMode = $addressItem['mode']; unset($addressItem['mode']); diff --git a/app/code/core/Mage/Core/Helper/Url.php b/app/code/core/Mage/Core/Helper/Url.php index e74e9c2cc1d..25cd1d70d6f 100644 --- a/app/code/core/Mage/Core/Helper/Url.php +++ b/app/code/core/Mage/Core/Helper/Url.php @@ -52,7 +52,6 @@ public function getCurrentUrl() } $url = $request->getScheme() . '://' . $request->getHttpHost() . $port . $request->getServer('REQUEST_URI'); return $this->escapeUrl($url); -// return $this->_getUrl('*/*/*', array('_current' => true, '_use_rewrite' => true)); } /** @@ -122,7 +121,6 @@ public function addRequestParam($url, $param) } if (is_array($value)) { - // $key[]=$value1&$key[]=$value2 ... $arrQueryParams[] = $key . '[]=' . implode('&' . $key . '[]=', $value); } elseif (is_null($value)) { $arrQueryParams[] = $key; diff --git a/app/code/core/Mage/Core/Model/Config.php b/app/code/core/Mage/Core/Model/Config.php index 914396f1120..d1b81e2bc90 100644 --- a/app/code/core/Mage/Core/Model/Config.php +++ b/app/code/core/Mage/Core/Model/Config.php @@ -404,7 +404,6 @@ protected function _canUseLocalModules() if (true === $disableLocalModules) { set_include_path( - // excluded '/app/code/local' BP . DS . 'app' . DS . 'code' . DS . 'community' . PS . BP . DS . 'app' . DS . 'code' . DS . 'core' . PS . BP . DS . 'lib' . PS . diff --git a/app/code/core/Mage/Core/Model/Design/Package.php b/app/code/core/Mage/Core/Model/Design/Package.php index 8bc0e2a56e0..20dd83fe24a 100644 --- a/app/code/core/Mage/Core/Model/Design/Package.php +++ b/app/code/core/Mage/Core/Model/Design/Package.php @@ -280,8 +280,6 @@ public function getTheme($type) if (empty($this->_theme[$type])) { $this->_theme[$type] = self::DEFAULT_THEME; } - - // "locale", "layout", "template" } } diff --git a/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php b/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php index 01e50c128c9..5bf4cf08a61 100644 --- a/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php +++ b/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php @@ -305,7 +305,6 @@ protected function _isValidByPaths($valuePathInfo, $paths, $protected) $reg = str_replace('.', '\.', $reg); $reg = str_replace('*\\', '||', $reg); $reg = str_replace('*/', '||', $reg); - //$reg = str_replace('*', '||', $reg); $reg = str_replace(DS, '[\\' . DS . ']', $reg); $reg = str_replace('?', '([^\\' . DS . ']+)', $reg); $reg = str_replace('||', '(.*[\\' . DS . '])?', $reg); diff --git a/app/code/core/Mage/Core/Model/Layout/Update.php b/app/code/core/Mage/Core/Model/Layout/Update.php index 78b596456c7..f2b8f92ea48 100644 --- a/app/code/core/Mage/Core/Model/Layout/Update.php +++ b/app/code/core/Mage/Core/Model/Layout/Update.php @@ -308,10 +308,6 @@ public function merge($handle) if (Mage::app()->isInstalled()) { $this->fetchDbLayoutUpdates($handle); } -// if (!$this->fetchPackageLayoutUpdates($handle) -// && !$this->fetchDbLayoutUpdates($handle)) { -// #$this->removeHandle($handle); -// } return $this; } @@ -343,64 +339,6 @@ public function fetchFileLayoutUpdates() } } - - -// $elementClass = $this->getElementClass(); -// -// $design = Mage::getSingleton('core/design_package'); -// $area = $design->getArea(); -// $storeId = Mage::app()->getStore()->getId(); -// $cacheKey = 'LAYOUT_'.$area.'_STORE'.$storeId.'_'.$design->getPackageName().'_'.$design->getTheme('layout'); -//#echo "TEST:".$cacheKey; -// $cacheTags = array('layout'); -// -// if (Mage::app()->useCache('layout') && ($layoutStr = Mage::app()->loadCache($cacheKey))) { -// $this->_packageLayout = simplexml_load_string($layoutStr, $elementClass); -// } -// -// if (empty($layoutStr)) { -// $updatesRoot = Mage::app()->getConfig()->getNode($area.'/layout/updates'); -// Mage::dispatchEvent('core_layout_update_updates_get_after', array('updates' => $updatesRoot)); -// $updateFiles = array(); -// foreach ($updatesRoot->children() as $updateNode) { -// if ($updateNode->file) { -// $module = $updateNode->getAttribute('module'); -// if ($module && Mage::getStoreConfigFlag('advanced/modules_disable_output/' . $module)) { -// continue; -// } -// $updateFiles[] = (string)$updateNode->file; -// } -// } -// -// // custom local layout updates file - load always last -// $updateFiles[] = 'local.xml'; -// -// $layoutStr = ''; -// #$layoutXml = new $elementClass(''); -// foreach ($updateFiles as $file) { -// $filename = $design->getLayoutFilename($file); -// if (!is_readable($filename)) { -// continue; -// } -// $fileStr = file_get_contents($filename); -// $fileStr = str_replace($this->_subst['from'], $this->_subst['to'], $fileStr); -// $fileXml = simplexml_load_string($fileStr, $elementClass); -// if (!$fileXml instanceof SimpleXMLElement) { -// continue; -// } -// $layoutStr .= $fileXml->innerXml(); -// -// #$layoutXml->appendChild($fileXml); -// } -// $layoutXml = simplexml_load_string(''.$layoutStr.'', $elementClass); -// -// $this->_packageLayout = $layoutXml; -// -// if (Mage::app()->useCache('layout')) { -// Mage::app()->saveCache($this->_packageLayout->asXml(), $cacheKey, $cacheTags, null); -// } -// } - return $this; } @@ -418,7 +356,6 @@ public function fetchPackageLayoutUpdates($handle) } /** @var Varien_Simplexml_Element $updateXml */ foreach ($this->_packageLayout->$handle as $updateXml) { -#echo ''; $this->fetchRecursiveUpdates($updateXml); $this->addUpdate($updateXml->innerXml()); } diff --git a/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php index 92d25929432..87d526e2ff4 100644 --- a/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php +++ b/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php @@ -234,15 +234,8 @@ protected function _prepareHaving(Varien_Db_Select $select, $autoReset = false) protected function _assembleLimit($query, $limitCount, $limitOffset, $columnList = array()) { if ($limitCount !== null) { - $limitCount = intval($limitCount); - if ($limitCount <= 0) { -// throw new Exception("LIMIT argument count={$limitCount} is not valid"); - } - + $limitCount = intval($limitCount); $limitOffset = intval($limitOffset); - if ($limitOffset < 0) { -// throw new Exception("LIMIT argument offset={$limitOffset} is not valid"); - } if ($limitOffset + $limitCount != $limitOffset + 1) { $columns = array(); @@ -302,9 +295,6 @@ public function prepareColumnsList(Varien_Db_Select $select, $groupByCondition = } } -// $select->reset(Zend_Db_Select::COLUMNS); -// $select->setPart(Zend_Db_Select::COLUMNS, array_values($preparedColumns)); - return $preparedColumns; } diff --git a/app/code/core/Mage/Customer/Block/Widget/Dob.php b/app/code/core/Mage/Customer/Block/Widget/Dob.php index 5a20bdc3a34..b394125fd9d 100644 --- a/app/code/core/Mage/Customer/Block/Widget/Dob.php +++ b/app/code/core/Mage/Customer/Block/Widget/Dob.php @@ -72,6 +72,7 @@ public function setDate($date) $dateTime = new DateTime($date); $this->setTime($dateTime); } catch (Exception $e) { + Mage::logException($e); } } diff --git a/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php b/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php index 5037ac02c59..ff30c0a64aa 100644 --- a/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php +++ b/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php @@ -408,13 +408,8 @@ public function save() if (!$model->getId()) { $new = true; $model->save(); - #Mage::getResourceSingleton('catalog_entity/convert')->addProductToStore($model->getId(), 0); } if (!$new || 0!==$storeId) { -// if (0!==$storeId) { -// Mage::getResourceSingleton('catalog_entity/convert')->addProductToStore($model->getId(), $storeId); -// } - $model->save(); } $i++; diff --git a/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php b/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php index 8ec5d7df160..9f19140c965 100644 --- a/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php +++ b/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php @@ -474,13 +474,6 @@ public function parse() } $this->setPosition('Line: '.($i+1).', email: '.$row['email']); - // try to get entity_id by sku if not set - /* - if (empty($row['entity_id'])) { - $row['entity_id'] = $this->getResource()->getProductIdBySku($row['email']); - } - */ - // if attribute_set not set use default if (empty($row['attribute_set'])) { $row['attribute_set'] = 'Default'; @@ -501,22 +494,11 @@ public function parse() $this->addException(Mage::helper('customer')->__('Missing firstname, skipping the record.'), Varien_Convert_Exception::ERROR); continue; } - //$this->setPosition('Line: '.($i+1).', Firstname: '.$row['firstname']); if (empty($row['lastname'])) { $this->addException(Mage::helper('customer')->__('Missing lastname, skipping the record.'), Varien_Convert_Exception::ERROR); continue; } - //$this->setPosition('Line: '.($i+1).', Lastname: '.$row['lastname']); - - /* - // get product type_id, if not throw error - $row['type_id'] = $this->getProductTypeId($row['type']); - if (!$row['type_id']) { - $this->addException(Mage::helper('catalog')->__("Invalid product type specified, skipping the record."), Varien_Convert_Exception::ERROR); - continue; - } - */ // get store ids $storeIds = $this->getStoreIds(isset($row['store']) ? $row['store'] : $this->getVar('store')); diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php index 13c77d22e99..7a76c0612e4 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php @@ -129,37 +129,6 @@ public function parse() //$adapter->$adapterMethod(); return $this; - -// // fix for field mapping -// if ($mapfields = $this->getProfile()->getDataflowProfile()) { -// $this->_mapfields = array_values($mapfields['gui_data']['map'][$mapfields['entity_type']]['db']); -// } // end -// -// if (!$this->getVar('fieldnames') && !$this->_mapfields) { -// $this->addException('Please define field mapping', Mage_Dataflow_Model_Convert_Exception::FATAL); -// return; -// } -// -// if ($this->getVar('adapter') && $this->getVar('method')) { -// $adapter = Mage::getModel($this->getVar('adapter')); -// } -// -// $i = 0; -// while (($line = fgetcsv($fh, null, $fDel, $fEnc)) !== FALSE) { -// $row = $this->parseRow($i, $line); -// -// if (!$this->getVar('fieldnames') && $i == 0 && $row) { -// $i = 1; -// } -// -// if ($row) { -// $loadMethod = $this->getVar('method'); -// $adapter->$loadMethod(compact('i', 'row')); -// } -// $i++; -// } -// -// return $this; } public function parseRow($i, $line) diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php index 1dc657bf408..2552e88cb22 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php @@ -163,12 +163,9 @@ public function parse() ->setAdapter($adapterName) ->save(); -// $adapter->$adapterMethod(); - return $this; $dom = new DOMDocument(); -// $dom->loadXML($this->getData()); if (Mage::app()->getRequest()->getParam('files')) { $path = Mage::app()->getConfig()->getTempVarDir().'/import/'; $file = $path.urldecode(Mage::app()->getRequest()->getParam('files')); @@ -396,64 +393,6 @@ public function unparse() $io->close(); return $this; - -// if ($wsName = $this->getVar('single_sheet')) { -// $data = array($wsName => $this->getData()); -// } else { -// $data = $this->getData(); -// } -// -// $this->validateDataGrid(); -// -// $xml = '<'.'?xml version="1.0"?'.'><'.'?mso-application progid="Excel.Sheet"?'.'>' -// .'' -// .'' -// .'' -// .''; -// -// if (is_array($data)) { -// foreach ($data as $wsName=>$wsData) { -// if (!is_array($wsData)) { -// continue; -// } -// $fields = $this->getGridFields($wsData); -// -// $xml .= ''; -// if ($this->getVar('fieldnames')) { -// $xml .= ''; -// foreach ($fields as $fieldName) { -// $xml .= ''.$fieldName.''; -// } -// $xml .= ''; -// } -// foreach ($wsData as $i=>$row) { -// if (!is_array($row)) { -// continue; -// } -// $xml .= ''; -// foreach ($fields as $fieldName) { -// $data = isset($row[$fieldName]) ? $row[$fieldName] : ''; -// $xml .= ''.$data.''; -// } -// $xml .= ''; -// } -// $xml .= '
    '; -// } -// } -// -// $xml .= ''; -// -// $this->setData($xml); -// -// return $this; } /** diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php index adc32991c22..21bff22ff7e 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php @@ -122,10 +122,6 @@ public function importXml(Varien_Simplexml_Element $profileNode) public function run() { -// print '
    ';
-//        print_r($this->_dataflow_profile);
-//        print '
    '; - if (!$this->_actions) { $e = new Mage_Dataflow_Model_Convert_Exception("Could not find any actions for this profile"); $e->setLevel(Mage_Dataflow_Model_Convert_Exception::FATAL); diff --git a/app/code/core/Mage/Dataflow/Model/Profile.php b/app/code/core/Mage/Dataflow/Model/Profile.php index 5976c8400e1..4b95895f0de 100644 --- a/app/code/core/Mage/Dataflow/Model/Profile.php +++ b/app/code/core/Mage/Dataflow/Model/Profile.php @@ -295,10 +295,6 @@ public function run() echo $e; } -// if ($batch) { -// $batch->delete(); -// } - $this->setExceptions($profile->getExceptions()); return $this; } @@ -310,13 +306,8 @@ public function _parseGuiData() $p = $this->getGuiData(); if ($this->getDataTransfer()==='interactive') { -// $p['file']['type'] = 'file'; -// $p['file']['filename'] = $p['interactive']['filename']; -// $p['file']['path'] = 'var/export'; - $interactiveXml = '' . $nl; - #$interactiveXml .= ' '.$nl; $interactiveXml .= ''; $fileXml = ''; @@ -419,16 +410,7 @@ public function _parseGuiData() ); if ($import) { -// if ($this->getDataTransfer()==='interactive') { - $parseFileXmlInter .= ' getStoreId() . ']]>' . $nl; -// } else { -// $parseDataXml = '' . $nl; -// $parseDataXml = ' getStoreId() . ']]>' . $nl; -// $parseDataXml .= ''.$nl.$nl; -// } -// $parseDataXml = ''.$nl; -// $parseDataXml .= ' getStoreId().']]>'.$nl; -// $parseDataXml .= ''.$nl.$nl; + $parseFileXmlInter .= ' getStoreId() . ']]>' . $nl; } else { $parseDataXml = '' . $nl; $parseDataXml .= ' getStoreId() . ']]>' . $nl; diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php index 898a53a8679..03822d5510d 100644 --- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php +++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php @@ -50,30 +50,9 @@ class Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable ex public function __construct() { parent::__construct(); -// $this->setSkipGenerateContent(true); $this->setTemplate('downloadable/product/edit/downloadable.phtml'); } - /** - * Get tab URL - * - * @return string - */ -// public function getTabUrl() -// { -// return $this->getUrl('downloadable/product_edit/form', array('_current' => true)); -// } - - /** - * Get tab class - * - * @return string - */ -// public function getTabClass() -// { -// return 'ajax'; -// } - /** * Check is readonly block * diff --git a/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php b/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php index ccf8090c3c5..167e83e89b4 100644 --- a/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php +++ b/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php @@ -277,7 +277,6 @@ public function load() if (isset($this->_joinAttr) && is_array($this->_joinAttr)) { foreach ($this->_joinAttr as $val) { -// print_r($val); $collection->joinAttribute( $val['alias'], $val['attribute'], @@ -299,7 +298,6 @@ public function load() $joinFields = $this->_joinField; if (isset($joinFields) && is_array($joinFields)) { foreach ($joinFields as $field) { -// print_r($field); $collection->joinField( $field['alias'], $field['attribute'], diff --git a/app/code/core/Mage/Eav/Model/Entity/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Abstract.php index ef13577c988..2453f3d6b40 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Abstract.php @@ -769,10 +769,6 @@ public function getValueTablePrefix() $prefix = (string)$this->getEntityType()->getValueTablePrefix(); if (!empty($prefix)) { $this->_valueTablePrefix = $prefix; - /** - * entity type prefix include DB table name prefix - */ - //Mage::getSingleton('core/resource')->getTableName($prefix); } else { $this->_valueTablePrefix = $this->getEntityTable(); } diff --git a/app/code/core/Mage/Payment/Model/Method/Cc.php b/app/code/core/Mage/Payment/Model/Method/Cc.php index f02c7a4769e..2228b50282b 100644 --- a/app/code/core/Mage/Payment/Model/Method/Cc.php +++ b/app/code/core/Mage/Payment/Model/Method/Cc.php @@ -111,12 +111,6 @@ public function validate() . '|8[2-8]\d{12})|6(4[4-9]\d{13}|5\d{14}))$/'; $ccTypeRegExpList = array( //Solo, Switch or Maestro. International safe - /* - // Maestro / Solo - 'SS' => '/^((6759[0-9]{12})|(6334|6767[0-9]{12})|(6334|6767[0-9]{14,15})' - . '|(5018|5020|5038|6304|6759|6761|6763[0-9]{12,19})|(49[013][1356][0-9]{12})' - . '|(633[34][0-9]{12})|(633110[0-9]{10})|(564182[0-9]{10}))([0-9]{2,3})?$/', - */ // Solo only 'SO' => '/(^(6334)[5-9](\d{11}$|\d{13,14}$))|(^(6767)(\d{12}$|\d{14,15}$))/', // Visa diff --git a/app/code/core/Mage/Paypal/Model/Api/Nvp.php b/app/code/core/Mage/Paypal/Model/Api/Nvp.php index 0a3a6e56aed..b08abcb4aca 100644 --- a/app/code/core/Mage/Paypal/Model/Api/Nvp.php +++ b/app/code/core/Mage/Paypal/Model/Api/Nvp.php @@ -200,7 +200,6 @@ class Mage_Paypal_Model_Api_Nvp extends Mage_Paypal_Model_Api_Abstract 'TAXAMT' => '_filterAmount', 'INITAMT' => '_filterAmount', 'CREDITCARDTYPE' => '_filterCcType', -// 'PROFILESTARTDATE' => '_filterToPaypalDate', 'AUTOBILLAMT' => '_filterBillFailedLater', 'BILLINGPERIOD' => '_filterPeriodUnit', 'TRIALBILLINGPERIOD' => '_filterPeriodUnit', diff --git a/app/code/core/Mage/Paypal/Model/Api/Standard.php b/app/code/core/Mage/Paypal/Model/Api/Standard.php index c93ed67912d..1f2049453b1 100644 --- a/app/code/core/Mage/Paypal/Model/Api/Standard.php +++ b/app/code/core/Mage/Paypal/Model/Api/Standard.php @@ -56,7 +56,6 @@ class Mage_Paypal_Model_Api_Standard extends Mage_Paypal_Model_Api_Abstract 'cpp_headerback_color' => 'hdrbackcolor', 'cpp_headerborder_color' => 'hdrbordercolor', 'cpp_payflow_color' => 'payflowcolor', -// 'cs' => '', // TODO 'lc' => 'locale', ); protected $_exportToRequestFilters = array( diff --git a/app/code/core/Mage/Paypal/Model/Config.php b/app/code/core/Mage/Paypal/Model/Config.php index 77fd60432d8..72221b212f7 100644 --- a/app/code/core/Mage/Paypal/Model/Config.php +++ b/app/code/core/Mage/Paypal/Model/Config.php @@ -1413,10 +1413,7 @@ public function isWppApiAvailabe() public function getWpsPaymentDeliveryMethods() { return array( - self::WPS_TRANSPORT_IPN => Mage::helper('adminhtml')->__('IPN (Instant Payment Notification) Only'), - // not supported yet: -// self::WPS_TRANSPORT_PDT => Mage::helper('adminhtml')->__('PDT (Payment Data Transfer) Only'), -// self::WPS_TRANSPORT_IPN_PDT => Mage::helper('adminhtml')->__('Both IPN and PDT'), + self::WPS_TRANSPORT_IPN => Mage::helper('adminhtml')->__('IPN (Instant Payment Notification) Only'), ); } diff --git a/app/code/core/Mage/Paypal/Model/Ipn.php b/app/code/core/Mage/Paypal/Model/Ipn.php index 0d322a1a34d..430146e84e3 100644 --- a/app/code/core/Mage/Paypal/Model/Ipn.php +++ b/app/code/core/Mage/Paypal/Model/Ipn.php @@ -417,9 +417,6 @@ protected function _processRecurringProfile() throw new Exception("Cannot handle payment status '{$paymentStatus}'."); } } catch (Mage_Core_Exception $e) { -// TODO: add to payment profile comments -// $comment = $this->_createIpnComment(Mage::helper('paypal')->__('Note: %s', $e->getMessage()), true); -// $comment->save(); throw $e; } } diff --git a/app/code/core/Mage/Rating/Model/Rating/Option.php b/app/code/core/Mage/Rating/Model/Rating/Option.php index d0e7c52fc8f..2cdd95aa1fb 100644 --- a/app/code/core/Mage/Rating/Model/Rating/Option.php +++ b/app/code/core/Mage/Rating/Model/Rating/Option.php @@ -78,9 +78,4 @@ public function setId($id) $this->setOptionId($id); return $this; } - -// public function getId() -// { -// return $this->getOptionId(); -// } } diff --git a/app/code/core/Mage/Rating/Model/Resource/Rating/Collection.php b/app/code/core/Mage/Rating/Model/Resource/Rating/Collection.php index f00f73d091a..272936e6a26 100644 --- a/app/code/core/Mage/Rating/Model/Resource/Rating/Collection.php +++ b/app/code/core/Mage/Rating/Model/Resource/Rating/Collection.php @@ -116,9 +116,7 @@ public function setStoreFilter($storeId) array('store'=>$this->getTable('rating_store')), 'main_table.rating_id = store.rating_id', array() - ) - // ->group('main_table.rating_id') - ; + ); $this->_isStoreJoined = true; } $inCond = $adapter->prepareSqlCondition('store.store_id', array( diff --git a/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote/Collection.php b/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote/Collection.php index 63d4bead2aa..6a0dd0539a2 100644 --- a/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote/Collection.php +++ b/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote/Collection.php @@ -131,9 +131,7 @@ public function addRatingInfo($storeId = null) ->join( array('store' => $this->getTable('rating_store')), 'main_table.rating_id = store.rating_id AND ' . $condition - ) -// ->group('main_table.vote_id') - ; + ); return $this; } diff --git a/app/code/core/Mage/Rule/Model/Condition/Abstract.php b/app/code/core/Mage/Rule/Model/Condition/Abstract.php index a92cec454b1..5ced0e5daa3 100644 --- a/app/code/core/Mage/Rule/Model/Condition/Abstract.php +++ b/app/code/core/Mage/Rule/Model/Condition/Abstract.php @@ -214,9 +214,6 @@ public function loadArray($arr) $this->setValue(isset($arr['value']) ? $arr['value'] : false); $this->setIsValueParsed(isset($arr['is_value_parsed']) ? $arr['is_value_parsed'] : false); -// $this->loadAttributeOptions(); -// $this->loadOperatorOptions(); -// $this->loadValueOptions(); return $this; } @@ -324,10 +321,6 @@ public function getOperatorName() */ public function loadValueOptions() { -// $this->setValueOption(array( -// true => Mage::helper('rule')->__('TRUE'), -// false => Mage::helper('rule')->__('FALSE'), -// )); $this->setValueOption(array()); return $this; } diff --git a/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php b/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php index 2cc08c78695..98765dc3671 100644 --- a/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php +++ b/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php @@ -98,13 +98,6 @@ public function prepareReferenceInfo() 'value' => $this->_profile->renderData($key), )); } -// $shippingDesctiption = $this->_profile->getInfoValue('order_info', 'shipping_description'); -// if ($shippingDesctiption) { -// $this->_addInfo(array( -// 'label' => $this->__('Shipping Method'), -// 'value' => $shippingDesctiption, -// )); -// } } /** diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo.php index f6743a80d14..dc957cd94dc 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo.php @@ -670,18 +670,10 @@ public function getStateName($stateId = null) */ public function setShippingAmount($amount) { - // base shipping amount calculated in total model -// $amount = $this->getStore()->roundPrice($amount); -// $this->setData('base_shipping_amount', $amount); -// -// $amount = $this->getStore()->roundPrice( -// $amount*$this->getOrder()->getStoreToOrderRate() -// ); $this->setData('shipping_amount', $amount); return $this; } - /** * @param float $amount * @return $this diff --git a/app/code/core/Mage/Sales/Model/Order/Item.php b/app/code/core/Mage/Sales/Model/Order/Item.php index 94f58b74a43..35caa82a1c2 100644 --- a/app/code/core/Mage/Sales/Model/Order/Item.php +++ b/app/code/core/Mage/Sales/Model/Order/Item.php @@ -581,7 +581,6 @@ public static function getStatuses() { if (is_null(self::$_statuses)) { self::$_statuses = array( - //self::STATUS_PENDING => Mage::helper('sales')->__('Pending'), self::STATUS_PENDING => Mage::helper('sales')->__('Ordered'), self::STATUS_SHIPPED => Mage::helper('sales')->__('Shipped'), self::STATUS_INVOICED => Mage::helper('sales')->__('Invoiced'), diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php index e0e509be772..3fb01241559 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php @@ -462,11 +462,9 @@ protected function insertOrder(&$page, $obj, $putOrderId = true) $page->setLineWidth(0.5); $page->drawRectangle(285, $yShipments, 510, $yShipments - 10); $page->drawLine(400, $yShipments, 400, $yShipments - 10); - //$page->drawLine(510, $yShipments, 510, $yShipments - 10); $this->_setFontRegular($page, 9); $page->setFillColor(new Zend_Pdf_Color_GrayScale(0)); - //$page->drawText(Mage::helper('sales')->__('Carrier'), 290, $yShipments - 7 , 'UTF-8'); $page->drawText(Mage::helper('sales')->__('Title'), 290, $yShipments - 7, 'UTF-8'); $page->drawText(Mage::helper('sales')->__('Number'), 410, $yShipments - 7, 'UTF-8'); diff --git a/app/code/core/Mage/Sales/Model/Quote/Item.php b/app/code/core/Mage/Sales/Model/Quote/Item.php index 0dd0c6a7759..e6ae5e7bae6 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Item.php +++ b/app/code/core/Mage/Sales/Model/Quote/Item.php @@ -437,12 +437,6 @@ public function setProduct($product) 'quote_item' => $this )); - -// if ($options = $product->getCustomOptions()) { -// foreach ($options as $option) { -// $this->addOption($option); -// } -// } return $this; } @@ -642,8 +636,9 @@ public function getOptionsByCode() /** * Add option to item * - * @param Mage_Sales_Model_Quote_Item_Option|Varien_Object $option - * @return $this + * @param Mage_Sales_Model_Quote_Item_Option|Varien_Object|array $option + * @return $this + * @throws Mage_Core_Exception */ public function addOption($option) { diff --git a/app/code/core/Mage/Sales/controllers/Recurring/ProfileController.php b/app/code/core/Mage/Sales/controllers/Recurring/ProfileController.php index c224021d49a..218e629e143 100644 --- a/app/code/core/Mage/Sales/controllers/Recurring/ProfileController.php +++ b/app/code/core/Mage/Sales/controllers/Recurring/ProfileController.php @@ -70,15 +70,6 @@ public function viewAction() $this->_viewAction(); } - /** - * Profile history view - */ -// TODO: implement -// public function historyAction() -// { -// $this->_viewAction(); -// } - /** * Profile related orders view */ @@ -87,15 +78,6 @@ public function ordersAction() $this->_viewAction(); } - /** - * Profile payment gateway info view - */ -// TODO: implement -// public function vendorAction() -// { -// $this->_viewAction(); -// } - /** * Attempt to set profile state */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php index 54e6349e3d8..840bbb0f934 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php @@ -136,10 +136,6 @@ public function validate(Varien_Object $object) return false; } -// $value = $this->getValue(); -// $aggregatorArr = explode('/', $this->getAggregator()); -// $this->setValue((int)$aggregatorArr[0])->setAggregator($aggregatorArr[1]); - $attr = $this->getAttribute(); $total = 0; foreach ($object->getQuote()->getAllVisibleItems() as $item) { @@ -147,7 +143,6 @@ public function validate(Varien_Object $object) $total += $item->getData($attr); } } -// $this->setAggregator(join('/', $aggregatorArr))->setValue($value); return $this->validateAttribute($total); } diff --git a/app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php b/app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php index b28cf7a16c4..95e5d97ee3a 100644 --- a/app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php +++ b/app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php @@ -42,15 +42,6 @@ public function __construct() parent::__construct(); $this->_tagTable = $resource->getTableName('tag/tag'); $this->_tagRelTable = $resource->getTableName('tag/tag_relation'); - -// $this->joinField('tag_total_used', $this->_tagRelTable, 'count(_table_tag_total_used.tag_relations_id)', 'entity_val_id=entity_id', array('entity_id' => '2')); -// $this->getSelect()->group('tag_tag_id'); -// echo $this->getSelect(); -// $this->_productTable = $resource->getTableName('catalog/product'); -// $this->_select->from(array('p' => $this->_productTable)) -// ->join(array('tr' => $this->_tagRelTable), 'tr.entity_val_id=p.product_id and tr.entity_id=1', array('total_used' => 'count(tr.tag_relations_id)')) -// ->group('p.product_id', 'tr.tag_id') -// ; } /** diff --git a/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php b/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php index 7ab8bfd4ad0..ef0b13a2161 100644 --- a/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php +++ b/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php @@ -261,13 +261,6 @@ protected function _initShipping() protected function _initDiscount() { -// $store = $this->getStore(); -// $parent = $this->getParentBlock(); -// if ($this->_config->displaySales) { -// -// } elseif ($this->_config->displaySales) { -// -// } } /** diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Discount.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Discount.php index b4d19ae321b..04485788dd8 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Discount.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Discount.php @@ -37,6 +37,5 @@ class Mage_Tax_Model_Sales_Total_Quote_Discount extends Mage_Sales_Model_Quote_A */ public function collect(Mage_Sales_Model_Quote_Address $address) { -// echo 'discount'; } } diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php index ce871377b60..d3694bbd08e 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php @@ -801,7 +801,6 @@ protected function _getAddressTaxRequest($address) * * @param Mage_Sales_Model_Quote_Address $address * @param Mage_Sales_Model_Quote_Item_Abstract $item - * * @return Mage_Tax_Model_Sales_Total_Quote_Subtotal */ protected function _addSubtotalAmount(Mage_Sales_Model_Quote_Address $address, $item) @@ -833,15 +832,10 @@ protected function _addSubtotalAmount(Mage_Sales_Model_Quote_Address $address, $ * @deprecated after 1.4.1 * * @param Mage_Sales_Model_Quote_Item_Abstract $item - * * @return Mage_Tax_Model_Sales_Total_Quote_Subtotal */ protected function _resetItemPriceInclTax(Mage_Sales_Model_Quote_Item_Abstract $item) { -// $item->setPriceInclTax(null); -// $item->setBasePriceInclTax(null); -// $item->setRowTotalInclTax(null); -// $item->setBaseRowTotalInclTax(null); return $this; } @@ -850,7 +844,6 @@ protected function _resetItemPriceInclTax(Mage_Sales_Model_Quote_Item_Abstract $ * @deprecated after 1.4.0.1 * * @param Mage_Sales_Model_Quote_Address $address - * * @return Mage_Tax_Model_Sales_Total_Quote_Subtotal */ protected function _processShippingAmount($address) diff --git a/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php b/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php index 00df4358bf8..a1c3fdde5cb 100644 --- a/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php +++ b/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php @@ -494,10 +494,6 @@ protected function _processItem(Mage_Sales_Model_Quote_Address $address, $item, $item->setBaseWeeeTaxDisposition($item->getBaseWeeeTaxDisposition() + $baseOneDisposition); $item->setWeeeTaxRowDisposition($item->getWeeeTaxRowDisposition() + $disposition); $item->setBaseWeeeTaxRowDisposition($item->getBaseWeeeTaxRowDisposition() + $baseDisposition); - -// $item->setTaxBeforeDiscount($item->getTaxBeforeDiscount() + $disposition); -// $item->setBaseTaxBeforeDiscount($item->getBaseTaxBeforeDiscount() + $baseDisposition); - $address->setTaxAmount($address->getTaxAmount() + $disposition); $address->setBaseTaxAmount($address->getBaseTaxAmount() + $baseDisposition); @@ -527,15 +523,11 @@ protected function _processItem(Mage_Sales_Model_Quote_Address $address, $item, if ($this->_helper->includeInSubtotal($store)) { $address->setSubtotal($address->getSubtotal() + $rowValue); $address->setBaseSubtotal($address->getBaseSubtotal() + $baseRowValue); - -// $address->setSubtotalWithDiscount($address->getSubtotalWithDiscount() + $rowValue); -// $address->setBaseSubtotalWithDiscount($address->getBaseSubtotalWithDiscount() + $baseRowValue); } else { $address->setTaxAmount($address->getTaxAmount() + $rowValue); $address->setBaseTaxAmount($address->getBaseTaxAmount() + $baseRowValue); } - $productTaxes[] = array( 'title' => $title, 'base_amount' => $baseValue, From ee055592609c46423c005e2dd9f48bd79c3bec3d Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Mon, 1 Aug 2022 10:20:06 +0200 Subject: [PATCH 41/61] Cosmetic fix in Mage_Sales_Model_Order_Payment (#2350) --- app/code/core/Mage/Sales/Model/Order/Payment.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/core/Mage/Sales/Model/Order/Payment.php b/app/code/core/Mage/Sales/Model/Order/Payment.php index f4b8601e314..55b9aeee432 100644 --- a/app/code/core/Mage/Sales/Model/Order/Payment.php +++ b/app/code/core/Mage/Sales/Model/Order/Payment.php @@ -779,7 +779,7 @@ public function refund($creditmemo) $message = $this->hasMessage() ? $this->getMessage() : Mage::helper('sales')->__('Refunded amount of %s offline.', $this->_formatPrice($baseAmountToRefund)); } - $message = $message = $this->_prependMessage($message); + $message = $this->_prependMessage($message); $message = $this->_appendTransactionToMessage($transaction, $message); $order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, true, $message); From 9f9e234547aae23d5150fcd1a34f7297c52b6f54 Mon Sep 17 00:00:00 2001 From: sv3n Date: Tue, 2 Aug 2022 15:29:07 +0200 Subject: [PATCH 42/61] Use constant for _isAllowed() check (#2342) --- .github/phpstan-baseline.neon | 35 ----------- .../Adminhtml/Block/Notification/Window.php | 4 +- .../core/Mage/Adminhtml/Controller/Action.php | 15 ++++- .../Adminhtml/Controller/Sales/Creditmemo.php | 17 ++--- .../Adminhtml/Controller/Sales/Invoice.php | 19 +++--- .../Adminhtml/Controller/Sales/Shipment.php | 19 +++--- .../Adminhtml/controllers/AjaxController.php | 2 +- .../controllers/Api/RoleController.php | 14 ++--- .../controllers/Api/UserController.php | 17 +++-- .../Adminhtml/controllers/CacheController.php | 16 ++--- .../Catalog/Category/WidgetController.php | 16 ++--- .../Catalog/CategoryController.php | 18 +++--- .../Product/Action/AttributeController.php | 12 ++-- .../Catalog/Product/AttributeController.php | 11 ++-- .../Catalog/Product/DatafeedsController.php | 5 +- .../Catalog/Product/GalleryController.php | 11 ++-- .../Catalog/Product/GroupController.php | 11 ++-- .../Catalog/Product/ReviewController.php | 7 ++- .../Catalog/Product/SetController.php | 14 ++--- .../Catalog/Product/WidgetController.php | 16 ++--- .../controllers/Catalog/ProductController.php | 22 +++---- .../controllers/Catalog/SearchController.php | 14 ++--- .../controllers/CatalogController.php | 11 ++-- .../Checkout/AgreementController.php | 13 ++-- .../Cms/Block/WidgetController.php | 16 ++--- .../controllers/Cms/BlockController.php | 18 +++--- .../controllers/Cms/Page/WidgetController.php | 18 ++---- .../controllers/Cms/PageController.php | 9 +-- .../Cms/Wysiwyg/ImagesController.php | 21 +++---- .../controllers/Cms/WysiwygController.php | 16 ++--- .../Cart/Product/Composite/CartController.php | 16 ++--- .../controllers/Customer/ConfigController.php | 11 ++-- .../controllers/Customer/GroupController.php | 15 ++--- .../controllers/Customer/OnlineController.php | 11 ++-- .../System/Config/ValidatevatController.php | 16 ++--- .../Product/Composite/WishlistController.php | 16 ++--- .../controllers/CustomerController.php | 13 ++-- .../controllers/DashboardController.php | 14 ++--- .../Adminhtml/controllers/IndexController.php | 2 +- .../Adminhtml/controllers/JsonController.php | 4 +- .../controllers/Media/EditorController.php | 12 ++-- .../controllers/Media/UploaderController.php | 10 +-- .../Newsletter/ProblemController.php | 11 ++-- .../Newsletter/QueueController.php | 11 ++-- .../Newsletter/SubscriberController.php | 10 +-- .../Newsletter/TemplateController.php | 2 +- .../controllers/NotificationController.php | 13 ++-- .../Permissions/BlockController.php | 18 +++--- .../Permissions/RoleController.php | 17 ++--- .../Permissions/UserController.php | 17 +++-- .../Permissions/VariableController.php | 21 +++---- .../controllers/Poll/AnswerController.php | 12 ++-- .../Adminhtml/controllers/PollController.php | 11 ++-- .../controllers/Promo/CatalogController.php | 13 ++-- .../controllers/Promo/QuoteController.php | 19 +++--- .../controllers/Promo/WidgetController.php | 12 ++-- .../Adminhtml/controllers/PromoController.php | 11 ++-- .../controllers/RatingController.php | 13 ++-- .../controllers/Report/CustomerController.php | 7 +-- .../controllers/Report/ProductController.php | 20 +----- .../controllers/Report/ReviewController.php | 6 +- .../controllers/Report/SalesController.php | 11 +--- .../controllers/Report/ShopcartController.php | 7 +-- .../Report/StatisticsController.php | 15 ++--- .../controllers/Report/TagController.php | 11 ++-- .../controllers/ReportController.php | 62 +------------------ .../controllers/Rss/CatalogController.php | 4 +- .../controllers/Rss/OrderController.php | 15 ++--- .../Sales/Billing/AgreementController.php | 11 +--- .../Sales/Order/CreateController.php | 4 +- .../Sales/Order/EditController.php | 16 ++--- .../Sales/Order/StatusController.php | 17 ++--- .../Order/View/GiftmessageController.php | 18 ++---- .../controllers/Sales/OrderController.php | 6 +- .../Sales/Recurring/ProfileController.php | 20 +++--- .../Sales/TransactionsController.php | 5 +- .../Adminhtml/controllers/SalesController.php | 11 ++-- .../controllers/SitemapController.php | 18 +++--- .../controllers/System/AccountController.php | 11 ++-- .../controllers/System/BackupController.php | 6 +- .../controllers/System/CacheController.php | 11 ++-- .../Config/System/StorageController.php | 16 ++--- .../controllers/System/ConfigController.php | 18 +++--- .../System/Convert/GuiController.php | 11 ++-- .../System/Convert/ProfileController.php | 15 ++--- .../controllers/System/CurrencyController.php | 11 ++-- .../controllers/System/DesignController.php | 14 ++--- .../System/Email/TemplateController.php | 18 +++--- .../controllers/System/StoreController.php | 19 +++--- .../controllers/System/VariableController.php | 22 ++----- .../controllers/SystemController.php | 11 ++-- .../Adminhtml/controllers/TagController.php | 6 +- .../Tax/Class/CustomerController.php | 20 ++---- .../Tax/Class/ProductController.php | 23 +++---- .../controllers/Tax/ClassController.php | 4 +- .../controllers/Tax/RateController.php | 7 +-- .../controllers/Tax/RuleController.php | 18 +++--- .../Adminhtml/controllers/TaxController.php | 2 +- .../controllers/UrlrewriteController.php | 16 ++--- .../Adminhtml/Api2/AttributeController.php | 18 +++--- .../Adminhtml/Api2/RoleController.php | 6 +- .../Adminhtml/Bundle/SelectionController.php | 15 ++--- .../Adminhtml/RefreshController.php | 2 - .../Adminhtml/Centinel/IndexController.php | 18 +++--- .../System/CurrencysymbolController.php | 16 ++--- .../Adminhtml/Downloadable/FileController.php | 15 ++--- .../controllers/FileController.php | 2 +- .../controllers/Product/EditController.php | 2 +- .../Adminhtml/ExportController.php | 16 ++--- .../Adminhtml/ImportController.php | 16 ++--- .../Adminhtml/ProcessController.php | 16 ++--- .../Adminhtml/Oauth/Admin/TokenController.php | 4 +- .../Adminhtml/Oauth/AuthorizeController.php | 2 +- .../Oauth/AuthorizedTokensController.php | 4 +- .../Adminhtml/Oauth/ConsumerController.php | 4 +- .../Adminhtml/PageCacheController.php | 16 ++--- .../Authorizenet/PaymentController.php | 15 ++--- .../Adminhtml/Paypal/ReportsController.php | 6 +- .../Rss/controllers/CatalogController.php | 2 +- .../Mage/Rss/controllers/OrderController.php | 2 +- .../Adminhtml/Widget/InstanceController.php | 18 +++--- .../Adminhtml/WidgetController.php | 16 ++--- 122 files changed, 618 insertions(+), 964 deletions(-) diff --git a/.github/phpstan-baseline.neon b/.github/phpstan-baseline.neon index 0d28d4672d9..b9793e3ee90 100644 --- a/.github/phpstan-baseline.neon +++ b/.github/phpstan-baseline.neon @@ -510,11 +510,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Notification/Window.php - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$resourcePath$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Notification/Window.php - - message: "#^Method Mage_Adminhtml_Block_Page\\:\\:getLang\\(\\) has invalid return type unknown\\.$#" count: 1 @@ -1660,26 +1655,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php - - - message: "#^Call to method _saveSessionCurrentPath\\(\\) on an unknown class Mage_Adminhtml_Cms_Page_Wysiwyg_ImagesController\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php - - - - message: "#^Call to method loadLayout\\(\\) on an unknown class Mage_Adminhtml_Cms_Page_Wysiwyg_ImagesController\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php - - - - message: "#^Method Mage_Adminhtml_Cms_Wysiwyg_ImagesController\\:\\:_initAction\\(\\) has invalid return type Mage_Adminhtml_Cms_Page_Wysiwyg_ImagesController\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php - - - - message: "#^Method Mage_Adminhtml_Cms_Wysiwyg_ImagesController\\:\\:_saveSessionCurrentPath\\(\\) has invalid return type Mage_Adminhtml_Cms_Page_Wysiwyg_ImagesController\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php - - message: "#^Method Mage_Adminhtml_CustomerController\\:\\:cartAction\\(\\) should return string but return statement is missing\\.$#" count: 1 @@ -1695,11 +1670,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/controllers/IndexController.php - - - message: "#^Method Mage_Adminhtml_JsonController\\:\\:countryRegionAction\\(\\) should return string but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/JsonController.php - - message: "#^Variable \\$id in isset\\(\\) always exists and is not nullable\\.$#" count: 1 @@ -2490,11 +2460,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Captcha/controllers/Adminhtml/RefreshController.php - - - message: "#^Method Mage_Captcha_Adminhtml_RefreshController\\:\\:refreshAction\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Captcha/controllers/Adminhtml/RefreshController.php - - message: "#^Call to an undefined method Mage_Captcha_Model_Interface\\:\\:getImgSrc\\(\\)\\.$#" count: 1 diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Window.php b/app/code/core/Mage/Adminhtml/Block/Notification/Window.php index 7bfa2cd2115..7fe7fc5f24e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Window.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Window.php @@ -168,7 +168,6 @@ public function getSeverityText() /** * Check if current block allowed in ACL * - * @param string $resourcePath * @return bool */ protected function _isAllowed() @@ -176,8 +175,7 @@ protected function _isAllowed() if (!is_null($this->_aclResourcePath)) { return Mage::getSingleton('admin/session') ->isAllowed('admin/system/adminnotification/show_toolbar'); - } - else { + } else { return true; } } diff --git a/app/code/core/Mage/Adminhtml/Controller/Action.php b/app/code/core/Mage/Adminhtml/Controller/Action.php index c208b79c175..80a4658e7aa 100644 --- a/app/code/core/Mage/Adminhtml/Controller/Action.php +++ b/app/code/core/Mage/Adminhtml/Controller/Action.php @@ -43,6 +43,12 @@ class Mage_Adminhtml_Controller_Action extends Mage_Core_Controller_Varien_Actio */ const SESSION_NAMESPACE = 'adminhtml'; + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'admin'; + /** * Array of actions which can be processed without secret key validation * @@ -76,9 +82,14 @@ class Mage_Adminhtml_Controller_Action extends Mage_Core_Controller_Varien_Actio */ protected $_sessionNamespace = self::SESSION_NAMESPACE; + /** + * Check current user permission on resource and privilege + * + * @return bool + */ protected function _isAllowed() { - return Mage::getSingleton('admin/session')->isAllowed('admin'); + return Mage::getSingleton('admin/session')->isAllowed(static::ADMIN_RESOURCE); } /** @@ -143,7 +154,7 @@ protected function _addJs(Mage_Core_Block_Abstract $block) } /** - * Controller predispatch method + * Controller pre-dispatch method * * @return $this */ diff --git a/app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php b/app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php index 41715a19837..0186185b60e 100644 --- a/app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php +++ b/app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php @@ -31,6 +31,12 @@ */ class Mage_Adminhtml_Controller_Sales_Creditmemo extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'sales/creditmemo'; + /** * Additional initialization * @@ -99,7 +105,8 @@ public function emailAction() } } - public function pdfcreditmemosAction(){ + public function pdfcreditmemosAction() + { $creditmemosIds = $this->getRequest()->getPost('creditmemo_ids'); if (!empty($creditmemosIds)) { $invoices = Mage::getResourceModel('sales/order_creditmemo_collection') @@ -123,14 +130,8 @@ public function printAction() $this->_prepareDownloadResponse('creditmemo'.Mage::getSingleton('core/date')->date('Y-m-d_H-i-s'). '.pdf', $pdf->render(), 'application/pdf'); } - } - else { + } else { $this->_forward('noRoute'); } } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('sales/creditmemo'); - } } diff --git a/app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php b/app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php index 080af164fa3..4cb131f90dd 100644 --- a/app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php +++ b/app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php @@ -31,9 +31,14 @@ */ class Mage_Adminhtml_Controller_Sales_Invoice extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'sales/invoice'; + /** * Additional initialization - * */ protected function _construct() { @@ -120,13 +125,13 @@ public function printAction() $this->_prepareDownloadResponse('invoice'.Mage::getSingleton('core/date')->date('Y-m-d_H-i-s'). '.pdf', $pdf->render(), 'application/pdf'); } - } - else { + } else { $this->_forward('noRoute'); } } - public function pdfinvoicesAction(){ + public function pdfinvoicesAction() + { $invoicesIds = $this->getRequest()->getPost('invoice_ids'); if (!empty($invoicesIds)) { $invoices = Mage::getResourceModel('sales/order_invoice_collection') @@ -140,10 +145,4 @@ public function pdfinvoicesAction(){ } $this->_redirect('*/*/'); } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('sales/invoice'); - } - } diff --git a/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php b/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php index a0b2708ec5d..f07d22e0549 100644 --- a/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php +++ b/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php @@ -31,9 +31,14 @@ */ class Mage_Adminhtml_Controller_Sales_Shipment extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'sales/shipment'; + /** * Additional initialization - * */ protected function _construct() { @@ -78,7 +83,8 @@ public function viewAction() } } - public function pdfshipmentsAction(){ + public function pdfshipmentsAction() + { $shipmentIds = $this->getRequest()->getPost('shipment_ids'); if (!empty($shipmentIds)) { $shipments = Mage::getResourceModel('sales/order_shipment_collection') @@ -92,7 +98,6 @@ public function pdfshipmentsAction(){ $this->_redirect('*/*/'); } - public function printAction() { /** @see Mage_Adminhtml_Sales_Order_InvoiceController */ @@ -101,14 +106,8 @@ public function printAction() $pdf = Mage::getModel('sales/order_pdf_shipment')->getPdf(array($shipment)); $this->_prepareDownloadResponse('packingslip'.Mage::getSingleton('core/date')->date('Y-m-d_H-i-s').'.pdf', $pdf->render(), 'application/pdf'); } - } - else { + } else { $this->_forward('noRoute'); } } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('sales/shipment'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/AjaxController.php b/app/code/core/Mage/Adminhtml/controllers/AjaxController.php index 5068942a1de..a01ee7ff59d 100644 --- a/app/code/core/Mage/Adminhtml/controllers/AjaxController.php +++ b/app/code/core/Mage/Adminhtml/controllers/AjaxController.php @@ -56,7 +56,7 @@ public function translateAction() /** * Check is allowed access to action * - * @return bool + * @return true */ protected function _isAllowed() { diff --git a/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php b/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php index d257be97ff2..e5fca47a3e5 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php @@ -34,7 +34,13 @@ class Mage_Adminhtml_Api_RoleController extends Mage_Adminhtml_Controller_Action { /** - * Controller predispatch method + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'system/api/roles'; + + /** + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ @@ -205,7 +211,6 @@ public function saveRoleAction() Mage::getSingleton('adminhtml/session')->addError($this->__('An error occurred while saving this role.')); } - //$this->getResponse()->setRedirect($this->getUrl("*/*/editrole/rid/$rid")); $this->_redirect('*/*/editrole', array('rid' => $rid)); return; } @@ -241,9 +246,4 @@ protected function _addUserToRole($userId, $roleId) return true; } } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/api/roles'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php index a6c14f412e6..b2c74c98f10 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php @@ -26,7 +26,13 @@ class Mage_Adminhtml_Api_UserController extends Mage_Adminhtml_Controller_Action { /** - * Controller predispatch method + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'system/api/users'; + + /** + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ @@ -233,13 +239,6 @@ public function roleGridAction() $this->getResponse() ->setBody($this->getLayout() ->createBlock('adminhtml/api_user_grid') - ->toHtml() - ); + ->toHtml()); } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/api/users'); - } - } diff --git a/app/code/core/Mage/Adminhtml/controllers/CacheController.php b/app/code/core/Mage/Adminhtml/controllers/CacheController.php index 68426f70355..92fd301c575 100644 --- a/app/code/core/Mage/Adminhtml/controllers/CacheController.php +++ b/app/code/core/Mage/Adminhtml/controllers/CacheController.php @@ -26,6 +26,12 @@ class Mage_Adminhtml_CacheController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'system/cache'; + /** * Retrieve session model * @@ -206,14 +212,4 @@ public function cleanSwatchesAction() } $this->_redirect('*/*'); } - - /** - * Check if cache management is allowed - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/cache'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php index 68a861d8ac7..bb82ecdc607 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php @@ -34,6 +34,12 @@ */ class Mage_Adminhtml_Catalog_Category_WidgetController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'cms/widget_instance'; + /** * Chooser Source action */ @@ -69,14 +75,4 @@ protected function _getCategoryTreeBlock() 'use_massaction' => $this->getRequest()->getParam('use_massaction', false) )); } - - /** - * Check is allowed access to action - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('cms/widget_instance'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php index 28e21ba0bd9..13568a23b95 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php @@ -33,6 +33,12 @@ */ class Mage_Adminhtml_Catalog_CategoryController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'catalog/categories'; + /** * Initialize requested category and put it into registry. * Root category can be returned, if inappropriate store/category is specified @@ -500,17 +506,7 @@ public function refreshPathAction() } /** - * Check if admin has permissions to visit related pages - * - * @return boolean - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('catalog/categories'); - } - - /** - * Controller predispatch method + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php index f438bee523e..5a418c81491 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php @@ -34,6 +34,11 @@ */ class Mage_Adminhtml_Catalog_Product_Action_AttributeController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'catalog/update_attributes'; protected function _construct() { @@ -222,7 +227,7 @@ protected function _validateProducts() } /** - * Rertive data manipulation helper + * Retrieve data manipulation helper * * @return Mage_Adminhtml_Helper_Catalog_Product_Edit_Action_Attribute */ @@ -231,11 +236,6 @@ protected function _getHelper() return Mage::helper('adminhtml/catalog_product_edit_action_attribute'); } - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('catalog/update_attributes'); - } - /** * Attributes validation action * diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php index b686b4d6fd2..ab797eb4d01 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php @@ -38,6 +38,12 @@ class Mage_Adminhtml_Catalog_Product_AttributeController extends Mage_Adminhtml_ protected $_entityTypeId; /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'catalog/attributes/attributes'; + +/** * List of tags from setting */ const XML_PATH_ALLOWED_TAGS = 'system/catalog/frontend/allowed_html_tags_list'; @@ -371,9 +377,4 @@ public function deleteAction() Mage::helper('catalog')->__('Unable to find an attribute to delete.')); $this->_redirect('*/*/'); } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('catalog/attributes/attributes'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php index 2cfa5e6e996..6dfd1711eba 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php @@ -24,19 +24,16 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ - class Mage_Adminhtml_Catalog_DatafeedsController extends Mage_Adminhtml_Controller_Action { - public function indexAction() { - } /** * Check is allowed access to action * - * @return bool + * @return true */ protected function _isAllowed() { diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php index 289b5add5e9..2138fe1892d 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php @@ -33,6 +33,12 @@ */ class Mage_Adminhtml_Catalog_Product_GalleryController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'catalog/products'; + public function uploadAction() { try { @@ -80,9 +86,4 @@ public function uploadAction() $this->getResponse()->setBody(Mage::helper('core')->jsonEncode($result)); } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('catalog/products'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php index 4122ff5b0c2..02d378f060f 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php @@ -29,6 +29,12 @@ */ class Mage_Adminhtml_Catalog_Product_GroupController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'catalog/products'; + public function saveAction() { $model = Mage::getModel('eav/entity_attribute_group'); @@ -46,9 +52,4 @@ public function saveAction() } } } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('catalog/products'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php index d23b72b0113..862b8058a9e 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php @@ -42,7 +42,7 @@ class Mage_Adminhtml_Catalog_Product_ReviewController extends Mage_Adminhtml_Con protected $_publicActions = array('edit'); /** - * Controller predispatch method + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ @@ -376,16 +376,17 @@ public function ratingItemsAction() ); } + /** + * @inheritDoc + */ protected function _isAllowed() { $action = strtolower($this->getRequest()->getActionName()); switch ($action) { case 'pending': return Mage::getSingleton('admin/session')->isAllowed('catalog/reviews_ratings/reviews/pending'); - break; default: return Mage::getSingleton('admin/session')->isAllowed('catalog/reviews_ratings/reviews/all'); - break; } } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php index bac04cafd07..42ed739d1c6 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php @@ -31,9 +31,14 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Catalog_Product_SetController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'catalog/attributes/sets'; + public function indexAction() { $this->_title($this->__('Catalog')) @@ -209,7 +214,7 @@ public function deleteAction() } /** - * Controller predispatch method + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ @@ -229,11 +234,6 @@ protected function _setTypeId() Mage::getModel('catalog/product')->getResource()->getTypeId()); } - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('catalog/attributes/sets'); - } - /** * Retrieve catalog product entity type id * diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php index e062d15a089..14d52e6aaed 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php @@ -34,6 +34,12 @@ */ class Mage_Adminhtml_Catalog_Product_WidgetController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'cms/widget_instance'; + /** * Chooser Source action * @@ -74,14 +80,4 @@ public function chooserAction() $this->getResponse()->setBody($html); } - - /** - * Check is allowed access to action - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('cms/widget_instance'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php index c95bd7cec43..ee46128ffbd 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php @@ -33,6 +33,12 @@ */ class Mage_Adminhtml_Catalog_ProductController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'catalog/products'; + /** * The greatest value which could be stored in CatalogInventory Qty field */ @@ -46,7 +52,7 @@ class Mage_Adminhtml_Catalog_ProductController extends Mage_Adminhtml_Controller protected $_publicActions = array('edit'); /** - * Controller predispatch method + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ @@ -588,9 +594,7 @@ protected function _initProductSave() /** * Create Permanent Redirect for old URL key */ - if ($product->getId() && isset($productData['url_key_create_redirect'])) - // && $product->getOrigData('url_key') != $product->getData('url_key') - { + if ($product->getId() && isset($productData['url_key_create_redirect'])) { $product->setData('save_rewrites_history', (bool)$productData['url_key_create_redirect']); } @@ -1103,16 +1107,6 @@ public function quickCreateAction() $this->getResponse()->setBody(Mage::helper('core')->jsonEncode($result)); } - /** - * Check for is allowed - * - * @return boolean - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('catalog/products'); - } - /** * Show item update result from updateAction * in Wishlist and Cart controllers. diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php index 759aad5555f..37159a50948 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php @@ -24,9 +24,14 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ - class Mage_Adminhtml_Catalog_SearchController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'catalog/search'; + protected function _initAction() { $this->loadLayout() @@ -192,7 +197,7 @@ public function massDeleteAction() } /** - * Controller predispatch method + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ @@ -201,9 +206,4 @@ public function preDispatch() $this->_setForcedFormKeyActions('delete', 'massDelete'); return parent::preDispatch(); } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('catalog/search'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/CatalogController.php b/app/code/core/Mage/Adminhtml/controllers/CatalogController.php index a1f6ab5adc9..9f0bf2e0157 100644 --- a/app/code/core/Mage/Adminhtml/controllers/CatalogController.php +++ b/app/code/core/Mage/Adminhtml/controllers/CatalogController.php @@ -33,6 +33,12 @@ */ class Mage_Adminhtml_CatalogController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'catalog'; + public function indexAction() { $this->loadLayout(); @@ -42,9 +48,4 @@ public function indexAction() $this->_addContent($this->getLayout()->createBlock('adminhtml/catalog')); $this->renderLayout(); } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('catalog'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php b/app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php index c9cee4e7bbd..7bf345cad43 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php @@ -34,7 +34,13 @@ class Mage_Adminhtml_Checkout_AgreementController extends Mage_Adminhtml_Controller_Action { /** - * Controller predispatch method + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'sales/checkoutagreement'; + + /** + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ @@ -161,9 +167,4 @@ protected function _initAction() ; return $this; } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('sales/checkoutagreement'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php index 66328f6bf60..3a3d75a60a7 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php @@ -34,6 +34,12 @@ */ class Mage_Adminhtml_Cms_Block_WidgetController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'cms/widget_instance'; + /** * Chooser Source action */ @@ -45,14 +51,4 @@ public function chooserAction() )); $this->getResponse()->setBody($pagesGrid->toHtml()); } - - /** - * Check is allowed access to action - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('cms/widget_instance'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php index 3a9343b605c..639b98121f1 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php @@ -35,7 +35,13 @@ class Mage_Adminhtml_Cms_BlockController extends Mage_Adminhtml_Controller_Action { /** - * Controller predispatch method + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'cms/block'; + + /** + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ @@ -203,14 +209,4 @@ public function deleteAction() // go to grid $this->_redirect('*/*/'); } - - /** - * Check the permission to run it - * - * @return boolean - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('cms/block'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php index 06cd6afc098..e3fcc4a1a68 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php @@ -24,7 +24,6 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ - /** * Controller for CMS Page Link Widget plugin * @@ -34,6 +33,12 @@ */ class Mage_Adminhtml_Cms_Page_WidgetController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'cms/widget_instance'; + /** * Chooser Source action */ @@ -45,15 +50,4 @@ public function chooserAction() )); $this->getResponse()->setBody($pagesGrid->toHtml()); } - - /** - * Check is allowed access to action - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('cms/widget_instance'); - } - } diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php index 7aa9dea0db8..ae35cecdcde 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php @@ -217,7 +217,7 @@ public function deleteAction() } /** - * Controller predispatch method + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ @@ -228,9 +228,7 @@ public function preDispatch() } /** - * Check the permission to run it - * - * @return boolean + * @inheritDoc */ protected function _isAllowed() { @@ -239,13 +237,10 @@ protected function _isAllowed() case 'new': case 'save': return Mage::getSingleton('admin/session')->isAllowed('cms/page/save'); - break; case 'delete': return Mage::getSingleton('admin/session')->isAllowed('cms/page/delete'); - break; default: return Mage::getSingleton('admin/session')->isAllowed('cms/page'); - break; } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php index 5f47078ba62..08941a3e58c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php @@ -33,10 +33,16 @@ */ class Mage_Adminhtml_Cms_Wysiwyg_ImagesController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'cms/media_gallery'; + /** * Init storage * - * @return Mage_Adminhtml_Cms_Page_Wysiwyg_ImagesController + * @return $this */ protected function _initAction() { @@ -155,7 +161,6 @@ public function uploadAction() $result = array('error' => $e->getMessage(), 'errorcode' => $e->getCode()); } $this->getResponse()->setBody(Mage::helper('core')->jsonEncode($result)); - } /** @@ -215,7 +220,7 @@ public function getStorage() /** * Save current path in session * - * @return Mage_Adminhtml_Cms_Page_Wysiwyg_ImagesController + * @return $this */ protected function _saveSessionCurrentPath() { @@ -226,14 +231,4 @@ protected function _saveSessionCurrentPath() } return $this; } - - /** - * Check current user permission on resource and privilege - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('cms/media_gallery'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php index 81a9761acf8..743ee323100 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php @@ -33,6 +33,12 @@ */ class Mage_Adminhtml_Cms_WysiwygController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'cms'; + /** * Template directives callback * @@ -60,14 +66,4 @@ public function directiveAction() $this->getResponse()->setBody(ob_get_contents()); ob_end_clean(); } - - /** - * Check the permission to run it - * - * @return boolean - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('cms'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/Cart/Product/Composite/CartController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/Cart/Product/Composite/CartController.php index 5dfd0db8d61..acc8b2ea44f 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/Cart/Product/Composite/CartController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/Cart/Product/Composite/CartController.php @@ -33,6 +33,12 @@ */ class Mage_Adminhtml_Customer_Cart_Product_Composite_CartController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'customer/manage'; + /** * Customer we're working with * @@ -149,14 +155,4 @@ public function updateAction() return $this; } - - /** - * Check the permission to Manage Customers - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('customer/manage'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php index 36224d5000f..911f238f97b 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php @@ -33,6 +33,12 @@ */ class Mage_Adminhtml_Customer_ConfigController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'customer/config'; + public function indexAction() { $this->loadLayout(); @@ -47,9 +53,4 @@ public function indexAction() $this->renderLayout(); } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('customer/config'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php index 13a1f7a5959..0d83139b63d 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php @@ -34,7 +34,13 @@ class Mage_Adminhtml_Customer_GroupController extends Mage_Adminhtml_Controller_Action { /** - * Controller predispatch method + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'customer/group'; + + /** + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ @@ -53,8 +59,8 @@ protected function _initGroup() if (!is_null($groupId)) { Mage::registry('current_group')->load($groupId); } - } + /** * Customer groups list. */ @@ -163,9 +169,4 @@ public function deleteAction() $this->_redirect('*/customer_group'); } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('customer/group'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php index 26557d7371c..a290bc3b784 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php @@ -23,8 +23,14 @@ * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ + class Mage_Adminhtml_Customer_OnlineController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'customer/online'; public function indexAction() { @@ -46,9 +52,4 @@ public function indexAction() $this->renderLayout(); } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('customer/online'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/System/Config/ValidatevatController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/System/Config/ValidatevatController.php index 9d573d7cd0b..5ad9c53e616 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/System/Config/ValidatevatController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/System/Config/ValidatevatController.php @@ -33,6 +33,12 @@ */ class Mage_Adminhtml_Customer_System_Config_ValidatevatController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'system/config'; + /** * Perform customer VAT ID validation * @@ -88,14 +94,4 @@ public function validateAdvancedAction() )); $this->getResponse()->setBody($body); } - - /** - * Check is allowed access to action - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/config'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php index bdcfc18bdcd..b32f85ba638 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php @@ -34,6 +34,12 @@ class Mage_Adminhtml_Customer_Wishlist_Product_Composite_WishlistController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'customer/manage'; + /** * Wishlist we're working with * @@ -135,14 +141,4 @@ public function updateAction() return false; } - - /** - * Check the permission to Manage Customers - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('customer/manage'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php index 710d09c0e68..a3cf234ffb8 100644 --- a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php +++ b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php @@ -34,7 +34,13 @@ class Mage_Adminhtml_CustomerController extends Mage_Adminhtml_Controller_Action { /** - * Controller predispatch method + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'customer/manage'; + + /** + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ @@ -855,11 +861,6 @@ public function viewfileAction() exit(); } - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('customer/manage'); - } - /** * Filtering posted data. Converting localized data if needed * diff --git a/app/code/core/Mage/Adminhtml/controllers/DashboardController.php b/app/code/core/Mage/Adminhtml/controllers/DashboardController.php index c070f1fe9ac..02dfccecf5c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/DashboardController.php +++ b/app/code/core/Mage/Adminhtml/controllers/DashboardController.php @@ -33,6 +33,12 @@ */ class Mage_Adminhtml_DashboardController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'dashboard'; + public function indexAction() { $this->_title($this->__('Dashboard')); @@ -45,7 +51,6 @@ public function indexAction() /** * Gets most viewed products list - * */ public function productsViewedAction() { @@ -55,7 +60,6 @@ public function productsViewedAction() /** * Gets latest customers list - * */ public function customersNewestAction() { @@ -65,7 +69,6 @@ public function customersNewestAction() /** * Gets the list of most active customers - * */ public function customersMostAction() { @@ -108,9 +111,4 @@ public function tunnelAction() } } } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('dashboard'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/IndexController.php b/app/code/core/Mage/Adminhtml/controllers/IndexController.php index a3538af2519..e6eb5876b2a 100644 --- a/app/code/core/Mage/Adminhtml/controllers/IndexController.php +++ b/app/code/core/Mage/Adminhtml/controllers/IndexController.php @@ -402,7 +402,7 @@ protected function _validateResetPasswordLinkToken($userId, $resetPasswordLinkTo /** * Check if user has permissions to access this controller * - * @return boolean + * @return true */ protected function _isAllowed() { diff --git a/app/code/core/Mage/Adminhtml/controllers/JsonController.php b/app/code/core/Mage/Adminhtml/controllers/JsonController.php index 633031c4d23..86d8816a06b 100644 --- a/app/code/core/Mage/Adminhtml/controllers/JsonController.php +++ b/app/code/core/Mage/Adminhtml/controllers/JsonController.php @@ -35,8 +35,6 @@ class Mage_Adminhtml_JsonController extends Mage_Adminhtml_Controller_Action { /** * Return JSON-encoded array of country regions - * - * @return string */ public function countryRegionAction() { @@ -60,7 +58,7 @@ public function countryRegionAction() /** * Check is allowed access to action * - * @return bool + * @return true */ protected function _isAllowed() { diff --git a/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php b/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php index 75f85a07ba9..fdeaa2b8fe2 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php @@ -24,7 +24,6 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ - /** * Media library editor controller * @@ -34,6 +33,12 @@ */ class Mage_Adminhtml_Media_EditorController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'media'; + public function indexAction() { $this->loadLayout(); @@ -42,9 +47,4 @@ public function indexAction() ); $this->renderLayout(); } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('media'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php b/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php index 6cc2507dd7b..086ef500e38 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php @@ -33,6 +33,11 @@ */ class Mage_Adminhtml_Media_UploaderController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'media'; public function uploadAction() { @@ -47,9 +52,4 @@ public function indexAction() ); $this->renderLayout(); } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('media'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php index 306b3ccc5c1..840dac02189 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php @@ -33,6 +33,12 @@ */ class Mage_Adminhtml_Newsletter_ProblemController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'newsletter/problem'; + public function indexAction() { $this->_title($this->__('Newsletter'))->_title($this->__('Newsletter Problems')); @@ -96,9 +102,4 @@ public function gridAction() $grid = $this->getLayout()->createBlock('adminhtml/newsletter_problem_grid'); $this->getResponse()->setBody($grid->toHtml()); } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('newsletter/problem'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php index 1c46751c141..ef5b6193324 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php @@ -33,6 +33,12 @@ */ class Mage_Adminhtml_Newsletter_QueueController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'newsletter/queue'; + /** * Queue list action */ @@ -274,9 +280,4 @@ public function saveAction() } } } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('newsletter/queue'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php index 8fc4e744a60..605cf225995 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php @@ -33,6 +33,11 @@ */ class Mage_Adminhtml_Newsletter_SubscriberController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'newsletter/subscriber'; public function indexAction() { @@ -149,9 +154,4 @@ public function massDeleteAction() $this->_redirect('*/*/index'); } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('newsletter/subscriber'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php index 5e555f2fb73..56c5c602149 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php @@ -251,7 +251,7 @@ public function previewAction () } /** - * Controller predispatch method + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ diff --git a/app/code/core/Mage/Adminhtml/controllers/NotificationController.php b/app/code/core/Mage/Adminhtml/controllers/NotificationController.php index 43a2f370493..46cac04d34b 100644 --- a/app/code/core/Mage/Adminhtml/controllers/NotificationController.php +++ b/app/code/core/Mage/Adminhtml/controllers/NotificationController.php @@ -158,23 +158,20 @@ public function massRemoveAction() $this->_redirectReferer(); } + /** + * @inheritDoc + */ protected function _isAllowed() { $action = strtolower($this->getRequest()->getActionName()); switch ($action) { - case 'markasread': - $acl = 'system/adminnotification/mark_as_read'; - break; - case 'massmarkasread': + case 'markasread': $acl = 'system/adminnotification/mark_as_read'; break; - case 'remove': - $acl = 'system/adminnotification/remove'; - break; - case 'massremove': + case 'remove': $acl = 'system/adminnotification/remove'; break; diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php index 7d8352c55dd..63f042016cf 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php @@ -33,6 +33,12 @@ */ class Mage_Adminhtml_Permissions_BlockController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'system/acl/blocks'; + /** * @return $this */ @@ -205,7 +211,7 @@ public function blockGridAction() } /** - * Controller predispatch method + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ @@ -214,14 +220,4 @@ public function preDispatch() $this->_setForcedFormKeyActions('delete'); return parent::preDispatch(); } - - /** - * Check permissions before allow edit list of blocks - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/acl/blocks'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php index 2b3fcd1ad89..b203b4a3684 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php @@ -33,9 +33,14 @@ */ class Mage_Adminhtml_Permissions_RoleController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'system/acl/roles'; /** - * Controller predispatch method + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ @@ -316,16 +321,6 @@ protected function _addUserToRole($userId, $roleId) } } - /** - * Acl checking - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/acl/roles'); - } - /** * Action to refresh role-rule relations. * This method will make sure the rendered ACL resource tree checkboxes match the actual ACL permissions. diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php index a60740138a2..ec75f597c58 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php @@ -26,7 +26,13 @@ class Mage_Adminhtml_Permissions_UserController extends Mage_Adminhtml_Controller_Action { /** - * Controller predispatch method + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'system/acl/users'; + + /** + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ @@ -247,13 +253,6 @@ public function roleGridAction() $this->getResponse() ->setBody($this->getLayout() ->createBlock('adminhtml/permissions_user_grid') - ->toHtml() - ); + ->toHtml()); } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/acl/users'); - } - } diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php index 0849a27a646..f383516b17f 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php @@ -33,6 +33,12 @@ */ class Mage_Adminhtml_Permissions_VariableController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'system/acl/variables'; + /** * @return $this */ @@ -198,18 +204,7 @@ public function variableGridAction() { $this->getResponse() ->setBody($this->getLayout() - ->createBlock('adminhtml/permissions_variable_grid') - ->toHtml() - ); - } - - /** - * Check permissions before allow edit list of config variables - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/acl/variables'); + ->createBlock('adminhtml/permissions_variable_grid') + ->toHtml()); } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php b/app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php index dd590386855..50b8397eb0b 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php @@ -34,6 +34,12 @@ class Mage_Adminhtml_Poll_AnswerController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'cms/poll'; + public function editAction() { $this->loadLayout(); @@ -122,10 +128,4 @@ public function jsonDeleteAction() } $this->getResponse()->setBody( $response->toJson() ); } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('cms/poll'); - } - } diff --git a/app/code/core/Mage/Adminhtml/controllers/PollController.php b/app/code/core/Mage/Adminhtml/controllers/PollController.php index f64711402e4..0a61f164899 100644 --- a/app/code/core/Mage/Adminhtml/controllers/PollController.php +++ b/app/code/core/Mage/Adminhtml/controllers/PollController.php @@ -33,6 +33,11 @@ */ class Mage_Adminhtml_PollController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'cms/poll'; public function indexAction() { @@ -208,10 +213,4 @@ public function validateAction() } $this->getResponse()->setBody($response->toJson()); } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('cms/poll'); - } - } diff --git a/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php index fa5e94a3a6a..eafb77c9588 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php @@ -33,6 +33,12 @@ */ class Mage_Adminhtml_Promo_CatalogController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'promo/catalog'; + /** * Dirty rules notice message * @@ -41,7 +47,7 @@ class Mage_Adminhtml_Promo_CatalogController extends Mage_Adminhtml_Controller_A protected $_dirtyRulesNoticeMessage; /** - * Controller predispatch method + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ @@ -336,11 +342,6 @@ public function addToAlersAction() { } - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('promo/catalog'); - } - /** * Set dirty rules notice message * diff --git a/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php index 68b50b1ca38..15201cb6559 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php @@ -24,15 +24,19 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ - class Mage_Adminhtml_Promo_QuoteController extends Mage_Adminhtml_Controller_Action { /** - * Controller predispatch method + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'promo/quote'; + + /** + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ - public function preDispatch() { $this->_setForcedFormKeyActions('delete'); @@ -446,13 +450,4 @@ public function chooserAction() )); $this->getResponse()->setBody($chooserBlock->toHtml()); } - - /** - * Returns result of current user permission check on resource and privilege - * @return boolean - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('promo/quote'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php index e8ddeb7ea14..9c38dfc9c49 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php @@ -24,9 +24,14 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ - class Mage_Adminhtml_Promo_WidgetController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'promo/catalog'; + /** * Prepare block for chooser * @@ -78,11 +83,6 @@ public function chooserAction() } } - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('promo/catalog'); - } - /** * Get tree node (Ajax version) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/PromoController.php b/app/code/core/Mage/Adminhtml/controllers/PromoController.php index 5081f15c46d..6307bc63d38 100644 --- a/app/code/core/Mage/Adminhtml/controllers/PromoController.php +++ b/app/code/core/Mage/Adminhtml/controllers/PromoController.php @@ -33,6 +33,11 @@ */ class Mage_Adminhtml_PromoController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'promo'; public function indexAction() { @@ -41,10 +46,4 @@ public function indexAction() $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Promotions'), Mage::helper('adminhtml')->__('Promo')); $this->renderLayout(); } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('promo'); - } - } diff --git a/app/code/core/Mage/Adminhtml/controllers/RatingController.php b/app/code/core/Mage/Adminhtml/controllers/RatingController.php index 388b1340fcf..b7e1f1c09d5 100644 --- a/app/code/core/Mage/Adminhtml/controllers/RatingController.php +++ b/app/code/core/Mage/Adminhtml/controllers/RatingController.php @@ -31,9 +31,14 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_RatingController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'catalog/reviews_ratings/ratings'; + public function indexAction() { $this->_initEnityId(); @@ -153,10 +158,4 @@ protected function _initEnityId() Mage::register('entityId', Mage::getModel('rating/rating_entity')->getIdByCode('product')); } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('catalog/reviews_ratings/ratings'); - } - } diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php index 04e4b80bacc..aedd00b4b64 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php @@ -159,22 +159,21 @@ public function exportTotalsExcelAction() $this->_prepareDownloadResponse($fileName, $content); } + /** + * @inheritDoc + */ protected function _isAllowed() { $action = strtolower($this->getRequest()->getActionName()); switch ($action) { case 'accounts': return Mage::getSingleton('admin/session')->isAllowed('report/customers/accounts'); - break; case 'orders': return Mage::getSingleton('admin/session')->isAllowed('report/customers/orders'); - break; case 'totals': return Mage::getSingleton('admin/session')->isAllowed('report/customers/totals'); - break; default: return Mage::getSingleton('admin/session')->isAllowed('report/customers'); - break; } } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php index f853e423659..f4406f740b1 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php @@ -78,7 +78,6 @@ public function exportOrderedExcelAction() /** * Sold Products Report Action - * */ public function soldAction() { @@ -95,7 +94,6 @@ public function soldAction() /** * Export Sold Products report to CSV format action - * */ public function exportSoldCsvAction() { @@ -109,7 +107,6 @@ public function exportSoldCsvAction() /** * Export Sold Products report to XML format action - * */ public function exportSoldExcelAction() { @@ -123,7 +120,6 @@ public function exportSoldExcelAction() /** * Most viewed products - * */ public function viewedAction() { @@ -148,7 +144,6 @@ public function viewedAction() /** * Export products most viewed report to CSV format - * */ public function exportViewedCsvAction() { @@ -160,7 +155,6 @@ public function exportViewedCsvAction() /** * Export products most viewed report to XML format - * */ public function exportViewedExcelAction() { @@ -172,7 +166,6 @@ public function exportViewedExcelAction() /** * Low stock action - * */ public function lowstockAction() { @@ -189,7 +182,6 @@ public function lowstockAction() /** * Export low stock products report to CSV format - * */ public function exportLowstockCsvAction() { @@ -203,7 +195,6 @@ public function exportLowstockCsvAction() /** * Export low stock products report to XML format - * */ public function exportLowstockExcelAction() { @@ -217,7 +208,6 @@ public function exportLowstockExcelAction() /** * Downloads action - * */ public function downloadsAction() { @@ -234,7 +224,6 @@ public function downloadsAction() /** * Export products downloads report to CSV format - * */ public function exportDownloadsCsvAction() { @@ -248,7 +237,6 @@ public function exportDownloadsCsvAction() /** * Export products downloads report to XLS format - * */ public function exportDownloadsExcelAction() { @@ -261,9 +249,7 @@ public function exportDownloadsExcelAction() } /** - * Check is allowed for report - * - * @return bool + * @inheritDoc */ protected function _isAllowed() { @@ -271,16 +257,12 @@ protected function _isAllowed() switch ($action) { case 'viewed': return Mage::getSingleton('admin/session')->isAllowed('report/products/viewed'); - break; case 'sold': return Mage::getSingleton('admin/session')->isAllowed('report/products/sold'); - break; case 'lowstock': return Mage::getSingleton('admin/session')->isAllowed('report/products/lowstock'); - break; default: return Mage::getSingleton('admin/session')->isAllowed('report/products'); - break; } } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php b/app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php index f6338e1af12..82978e8a46c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php @@ -158,19 +158,19 @@ public function exportProductDetailExcelAction() $this->_prepareDownloadResponse($fileName, $content); } + /** + * @inheritDoc + */ protected function _isAllowed() { $action = strtolower($this->getRequest()->getActionName()); switch ($action) { case 'customer': return Mage::getSingleton('admin/session')->isAllowed('report/review/customer'); - break; case 'product': return Mage::getSingleton('admin/session')->isAllowed('report/review/product'); - break; default: return Mage::getSingleton('admin/session')->isAllowed('report/review'); - break; } } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php b/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php index 102c72f1afa..d6caa67393c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php @@ -387,34 +387,29 @@ public function refreshStatisticsAction() return $this->_forward('index', 'report_statistics'); } + /** + * @inheritDoc + */ protected function _isAllowed() { $action = strtolower($this->getRequest()->getActionName()); switch ($action) { case 'sales': return $this->_getSession()->isAllowed('report/salesroot/sales'); - break; case 'tax': return $this->_getSession()->isAllowed('report/salesroot/tax'); - break; case 'shipping': return $this->_getSession()->isAllowed('report/salesroot/shipping'); - break; case 'invoiced': return $this->_getSession()->isAllowed('report/salesroot/invoiced'); - break; case 'refunded': return $this->_getSession()->isAllowed('report/salesroot/refunded'); - break; case 'coupons': return $this->_getSession()->isAllowed('report/salesroot/coupons'); - break; case 'bestsellers': return $this->_getSession()->isAllowed('report/products/bestsellers'); - break; default: return $this->_getSession()->isAllowed('report/salesroot'); - break; } } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php b/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php index dcc5fdf0d57..529a44d581d 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php @@ -153,22 +153,21 @@ public function exportAbandonedExcelAction() $this->_prepareDownloadResponse($fileName, $content); } + /** + * @inheritDoc + */ protected function _isAllowed() { $action = strtolower($this->getRequest()->getActionName()); switch ($action) { case 'customer': return Mage::getSingleton('admin/session')->isAllowed('report/shopcart/customer'); - break; case 'product': return Mage::getSingleton('admin/session')->isAllowed('report/shopcart/product'); - break; case 'abandoned': return Mage::getSingleton('admin/session')->isAllowed('report/shopcart/abandoned'); - break; default: return Mage::getSingleton('admin/session')->isAllowed('report/shopcart'); - break; } } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php b/app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php index dbd27a8a0fe..5a788f00e93 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php @@ -33,6 +33,12 @@ */ class Mage_Adminhtml_Report_StatisticsController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'report/statistics'; + /** * Admin session model * @@ -119,7 +125,7 @@ protected function _getCollectionNames() /** * Refresh statistics for last 25 hours * - * @return Mage_Adminhtml_Report_SalesController + * @return $this */ public function refreshRecentAction() { @@ -149,7 +155,7 @@ public function refreshRecentAction() /** * Refresh statistics for all period * - * @return Mage_Adminhtml_Report_SalesController + * @return $this */ public function refreshLifetimeAction() { @@ -185,11 +191,6 @@ public function indexAction() ->renderLayout(); } - protected function _isAllowed() - { - return $this->_getSession()->isAllowed('report/statistics'); - } - /** * Retrieve admin session model * diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php b/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php index 6a1167a022e..b38984ea122 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php @@ -280,25 +280,22 @@ public function exportTagDetailExcelAction() $this->_prepareDownloadResponse($fileName, $content); } + /** + * @inheritDoc + */ protected function _isAllowed() { $action = strtolower($this->getRequest()->getActionName()); switch ($action) { case 'customer': return Mage::getSingleton('admin/session')->isAllowed('report/tags/customer'); - break; - case 'product': - return Mage::getSingleton('admin/session')->isAllowed('report/tags/product'); - break; case 'productall': + case 'product': return Mage::getSingleton('admin/session')->isAllowed('report/tags/product'); - break; case 'popular': return Mage::getSingleton('admin/session')->isAllowed('report/tags/popular'); - break; default: return Mage::getSingleton('admin/session')->isAllowed('report/tags'); - break; } } } diff --git a/app/code/core/Mage/Adminhtml/controllers/ReportController.php b/app/code/core/Mage/Adminhtml/controllers/ReportController.php index 9eb58cbb0af..57b4d3e55a9 100644 --- a/app/code/core/Mage/Adminhtml/controllers/ReportController.php +++ b/app/code/core/Mage/Adminhtml/controllers/ReportController.php @@ -40,41 +40,6 @@ public function _initAction() return $this; } - -/* - public function wishlistAction() - { - $this->_initAction() - ->_setActiveMenu('report/wishlist') - ->_addBreadcrumb(Mage::helper('adminhtml')->__('Wishlist Report'), Mage::helper('adminhtml')->__('Wishlist Report')) - ->_addContent($this->getLayout()->createBlock('adminhtml/report_wishlist')) - ->renderLayout(); - } - - /** - * Export wishlist report grid to CSV format - * / - public function exportWishlistCsvAction() - { - $fileName = 'wishlist.csv'; - $content = $this->getLayout()->createBlock('adminhtml/report_wishlist_grid') - ->getCsvFile(); - - $this->_prepareDownloadResponse($fileName, $content); - } - - /** - * Export wishlist report to Excel XML format - * / - public function exportWishlistExcelAction() - { - $fileName = 'wishlist.xml'; - $content = $this->getLayout()->createBlock('adminhtml/report_wishlist_grid') - ->getExcelFile($fileName); - - $this->_prepareDownloadResponse($fileName, $content); - } -*/ public function searchAction() { $this->_title($this->__('Reports'))->_title($this->__('Search Terms')); @@ -111,39 +76,18 @@ public function exportSearchExcelAction() $this->_prepareDownloadResponse($fileName, $content); } -/* - public function ordersAction() - { - $this->_initAction() - ->_setActiveMenu('report/orders') - ->_addBreadcrumb(Mage::helper('adminhtml')->__('Recent Orders'), Mage::helper('adminhtml')->__('Recent Orders')) - ->renderLayout(); - } - - public function totalsAction() - { - $this->_initAction() - ->_setActiveMenu('report/totals') - ->_addBreadcrumb(Mage::helper('adminhtml')->__('Order Totals'), Mage::helper('adminhtml')->__('Order Totals')) - ->renderLayout(); - } -*/ + /** + * @inheritDoc + */ protected function _isAllowed() { $action = strtolower($this->getRequest()->getActionName()); switch ($action) { case 'search': return Mage::getSingleton('admin/session')->isAllowed('report/search'); - break; - /* - case 'customers': - return Mage::getSingleton('admin/session')->isAllowed('report/shopcart'); - break; - */ default: return Mage::getSingleton('admin/session')->isAllowed('report'); - break; } } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php b/app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php index d53396df3c0..198322e6c34 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php @@ -35,9 +35,7 @@ class Mage_Adminhtml_Rss_CatalogController extends Mage_Adminhtml_Controller_Rss_Abstract { /** - * Check is allowed access to action - * - * @return bool + * @inheritDoc */ protected function _isAllowed() { diff --git a/app/code/core/Mage/Adminhtml/controllers/Rss/OrderController.php b/app/code/core/Mage/Adminhtml/controllers/Rss/OrderController.php index 194c783589a..eb276497299 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Rss/OrderController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Rss/OrderController.php @@ -34,6 +34,11 @@ class Mage_Adminhtml_Rss_OrderController extends Mage_Adminhtml_Controller_Rss_Abstract { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'sales/order/actions/view'; public function newAction() { @@ -42,14 +47,4 @@ public function newAction() $this->renderLayout(); } } - - /** - * Check is allowed access to action - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/view'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Billing/AgreementController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Billing/AgreementController.php index 0471011a636..6b4f542e6c9 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Billing/AgreementController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Billing/AgreementController.php @@ -197,26 +197,21 @@ protected function _getSession() } /** - * Check currently called action by permissions for current user - * - * @return bool + * @inheritDoc */ protected function _isAllowed() { $action = strtolower($this->getRequest()->getActionName()); switch ($action) { case 'index': - case 'grid' : - case 'view' : + case 'grid': + case 'view': return Mage::getSingleton('admin/session')->isAllowed('sales/billing_agreement/actions/view'); - break; case 'cancel': case 'delete': return Mage::getSingleton('admin/session')->isAllowed('sales/billing_agreement/actions/manage'); - break; default: return Mage::getSingleton('admin/session')->isAllowed('sales/billing_agreement'); - break; } } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php index d79eb6b3b2d..4d7f5e16c3b 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php @@ -543,9 +543,7 @@ public function saveAction() } /** - * Acl check for admin - * - * @return bool + * @inheritDoc */ protected function _isAllowed() { diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php index da122dbbe08..0b1ec2c9940 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php @@ -34,6 +34,12 @@ */ class Mage_Adminhtml_Sales_Order_EditController extends Mage_Adminhtml_Sales_Order_CreateController { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'sales/order/actions/edit'; + /** * Start edit order initialization */ @@ -73,14 +79,4 @@ public function indexAction() ->_setActiveMenu('sales/order') ->renderLayout(); } - - /** - * Acl check for admin - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/edit'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php index 4c969b9808f..fa4726cfc0c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php @@ -33,9 +33,14 @@ */ class Mage_Adminhtml_Sales_Order_StatusController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'system/order_statuses'; + /** * Additional initialization - * */ protected function _construct() { @@ -233,14 +238,4 @@ public function unassignAction() } $this->_redirect('*/*/'); } - - /** - * Check current user permission on resource and privilege - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/order_statuses'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php index 4c1985cce11..10ce3d2a1d7 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php @@ -34,9 +34,14 @@ */ class Mage_Adminhtml_Sales_Order_View_GiftmessageController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'sales/order'; + /** * Additional initialization - * */ protected function _construct() { @@ -75,15 +80,4 @@ protected function _getGiftmessageSaveModel() { return Mage::getSingleton('adminhtml/giftmessage_save'); } - - /** - * Acl check for admin - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('sales/order'); - } - } diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php index baaf3239059..73a128153a0 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php @@ -655,9 +655,7 @@ public function voidPaymentAction() } /** - * Acl check for admin - * - * @return bool + * @inheritDoc */ protected function _isAllowed() { @@ -782,7 +780,7 @@ public function addressSaveAction() } /** - * Controller predispatch method + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Recurring/ProfileController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Recurring/ProfileController.php index a5f62c17f6d..50129aba9c3 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Recurring/ProfileController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Recurring/ProfileController.php @@ -31,10 +31,16 @@ */ class Mage_Adminhtml_Sales_Recurring_ProfileController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'sales/recurring_profile'; + /** * Recurring profiles list * - * @return void + * @return $this */ public function indexAction() { @@ -173,7 +179,7 @@ public function customerGridAction() /** * Initialize customer by ID specified in request * - * @return Mage_Adminhtml_Sales_Billing_AgreementController + * @return $this */ protected function _initCustomer() { @@ -202,14 +208,4 @@ protected function _initProfile() Mage::register('current_recurring_profile', $profile); return $profile; } - - /** - * Check is allowed access to action - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('sales/recurring_profile'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php index 8d6e5d3fce1..0d1ab3445b0 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php @@ -125,8 +125,7 @@ public function fetchAction() } /** - * Check currently called action by permissions for current user - * + * @inheritDoc */ protected function _isAllowed() { @@ -134,10 +133,8 @@ protected function _isAllowed() switch ($action) { case 'fetch': return Mage::getSingleton('admin/session')->isAllowed('sales/transactions/fetch'); - break; default: return Mage::getSingleton('admin/session')->isAllowed('sales/transactions'); - break; } } } diff --git a/app/code/core/Mage/Adminhtml/controllers/SalesController.php b/app/code/core/Mage/Adminhtml/controllers/SalesController.php index 9f0374e7af7..102b65020f3 100644 --- a/app/code/core/Mage/Adminhtml/controllers/SalesController.php +++ b/app/code/core/Mage/Adminhtml/controllers/SalesController.php @@ -33,6 +33,12 @@ */ class Mage_Adminhtml_SalesController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'sales'; + /** * Additional initialization * @@ -54,9 +60,4 @@ public function indexAction() $this->_addBreadcrumb($this->__('Orders'), $this->__('Orders')); $this->renderLayout(); } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('sales'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/SitemapController.php b/app/code/core/Mage/Adminhtml/controllers/SitemapController.php index e1a6160903f..898a4eb0d6b 100644 --- a/app/code/core/Mage/Adminhtml/controllers/SitemapController.php +++ b/app/code/core/Mage/Adminhtml/controllers/SitemapController.php @@ -33,13 +33,19 @@ */ class Mage_Adminhtml_SitemapController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'catalog/sitemap'; + /** * Maximum sitemap name length */ const MAXIMUM_SITEMAP_NAME_LENGTH = 32; /** - * Controller predispatch method + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ @@ -301,14 +307,4 @@ public function generateAction() // go to grid $this->_redirect('*/*/'); } - - /** - * Check the permission to run it - * - * @return boolean - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('catalog/sitemap'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php b/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php index f9817a99a90..bb1a4cf6bf8 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php @@ -34,6 +34,12 @@ class Mage_Adminhtml_System_AccountController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'system/myaccount'; + public function indexAction() { $this->_title($this->__('System'))->_title($this->__('My Account')); @@ -95,9 +101,4 @@ public function saveAction() } $this->getResponse()->setRedirect($this->getUrl("*/*/")); } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/myaccount'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php b/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php index 6ab8c45189f..3e1c8e58c62 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php @@ -34,7 +34,7 @@ class Mage_Adminhtml_System_BackupController extends Mage_Adminhtml_Controller_Action { /** - * Controller predispatch method + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ @@ -363,9 +363,7 @@ public function massDeleteAction() } /** - * Check Permissions for all actions - * - * @return bool + * @inheritDoc */ protected function _isAllowed() { diff --git a/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php b/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php index 71b8ab3c65e..daced178b84 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php @@ -33,6 +33,12 @@ */ class Mage_Adminhtml_System_CacheController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'system/cache'; + /** * Retrieve session model * @@ -333,9 +339,4 @@ public function refreshLayeredNavigationAction() $this->_redirect('*/*'); } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/cache'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php b/app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php index bbbdec4e9bf..970f48a4a8e 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php @@ -33,6 +33,12 @@ */ class Mage_Adminhtml_System_Config_System_StorageController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'system/config'; + /** * Return file storage singleton * @@ -180,14 +186,4 @@ public function statusAction() $result = Mage::helper('core')->jsonEncode($result); Mage::app()->getResponse()->setBody($result); } - - /** - * Check is allowed access to action - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/config'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php b/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php index 697409e6671..693ac942a1c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php @@ -33,6 +33,12 @@ */ class Mage_Adminhtml_System_ConfigController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'system/config'; + /** * Whether current section is allowed * @@ -41,7 +47,7 @@ class Mage_Adminhtml_System_ConfigController extends Mage_Adminhtml_Controller_A protected $_isSectionAllowedFlag = true; /** - * Controller predispatch method + * Controller pre-dispatch method * Check if current section is found and is allowed * * @return $this @@ -256,16 +262,6 @@ public function exportTableratesAction() $this->_prepareDownloadResponse($fileName, $content); } - /** - * Check is allow modify system configuration - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/config'); - } - /** * Check if specified section allowed in ACL * diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php b/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php index 302a0e32ad7..4ff4eda8e6e 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php @@ -35,6 +35,12 @@ */ class Mage_Adminhtml_System_Convert_GuiController extends Mage_Adminhtml_System_Convert_ProfileController { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'admin/system/convert/gui'; + /** * Profiles list action */ @@ -131,9 +137,4 @@ public function downloadAction() $this->_initProfile(); $profile = Mage::registry('current_convert_profile'); } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('admin/system/convert/gui'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php b/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php index d4796f9254d..490f58362ec 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php @@ -33,6 +33,12 @@ */ class Mage_Adminhtml_System_Convert_ProfileController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'admin/system/convert/profiles'; + protected function _initProfile($idFieldName = 'id') { $this->_title($this->__('System')) @@ -302,17 +308,12 @@ public function batchFinishAction() /** * Customer orders grid - * */ - public function historyAction() { + public function historyAction() + { $this->_initProfile(); $this->getResponse()->setBody( $this->getLayout()->createBlock('adminhtml/system_convert_profile_edit_tab_history')->toHtml() ); } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('admin/system/convert/profiles'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php b/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php index ecd09a747aa..1150ceddaa1 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php @@ -33,6 +33,12 @@ */ class Mage_Adminhtml_System_CurrencyController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'system/currency/rates'; + /** * Init currency by currency code from request * @@ -119,9 +125,4 @@ public function saveRatesAction() $this->_redirect('*/*/'); } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/currency/rates'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php b/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php index 671c6f4b0cb..c14a346f550 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php @@ -24,11 +24,16 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ - class Mage_Adminhtml_System_DesignController extends Mage_Adminhtml_Controller_Action { /** - * Controller predispatch method + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'system/design'; + + /** + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ @@ -137,9 +142,4 @@ public function deleteAction() } $this->getResponse()->setRedirect($this->getUrl('*/*/')); } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/design'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php b/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php index f177d9a5388..3a4df726492 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php @@ -33,6 +33,12 @@ */ class Mage_Adminhtml_System_Email_TemplateController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'system/email_template'; + /** * Index action */ @@ -230,7 +236,7 @@ public function defaultTemplateAction() } /** - * Controller predispatch method + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ @@ -263,14 +269,4 @@ protected function _initTemplate($idFieldName = 'template_id') } return $model; } - - /** - * Check permissions - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/email_template'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php b/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php index 684f38e23c2..be650828fd8 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php @@ -33,11 +33,17 @@ */ class Mage_Adminhtml_System_StoreController extends Mage_Adminhtml_Controller_Action { - /** - * Controller predispatch method - * - * @return Mage_Adminhtml_Controller_Action + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() */ + const ADMIN_RESOURCE = 'system/store'; + + /** + * Controller pre-dispatch method + * + * @return Mage_Adminhtml_Controller_Action + */ public function preDispatch() { $this->_setForcedFormKeyActions(array('deleteWebsitePost', 'deleteGroupPost', 'deleteStorePost')); @@ -456,11 +462,6 @@ public function deleteStorePostAction() $this->_redirect('*/*/editStore', array('store_id' => $itemId)); } - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/store'); - } - /** * Backup database * diff --git a/app/code/core/Mage/Adminhtml/controllers/System/VariableController.php b/app/code/core/Mage/Adminhtml/controllers/System/VariableController.php index 4eb5e7ed649..d5106732d39 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/VariableController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/VariableController.php @@ -33,6 +33,12 @@ */ class Mage_Adminhtml_System_VariableController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'system/variable'; + /** * Initialize Layout and set breadcrumbs * @@ -69,7 +75,6 @@ protected function _initVariable() /** * Index Action - * */ public function indexAction() { @@ -82,7 +87,6 @@ public function indexAction() /** * New Action (forward to edit action) - * */ public function newAction() { @@ -91,7 +95,6 @@ public function newAction() /** * Edit Action - * */ public function editAction() { @@ -109,7 +112,6 @@ public function editAction() /** * Validate Action - * */ public function validateAction() { @@ -128,7 +130,6 @@ public function validateAction() /** * Save Action - * */ public function saveAction() { @@ -161,7 +162,6 @@ public function saveAction() /** * Delete Action - * */ public function deleteAction() { @@ -193,14 +193,4 @@ public function wysiwygPluginAction() $variables = array($storeContactVariabls, $customVariables); $this->getResponse()->setBody(Zend_Json::encode($variables)); } - - /** - * Check current user permission - * - * @return boolean - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/variable'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/SystemController.php b/app/code/core/Mage/Adminhtml/controllers/SystemController.php index 1715e17c7a6..f3e43bf71b1 100644 --- a/app/code/core/Mage/Adminhtml/controllers/SystemController.php +++ b/app/code/core/Mage/Adminhtml/controllers/SystemController.php @@ -33,6 +33,12 @@ */ class Mage_Adminhtml_SystemController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'system'; + public function indexAction() { $this->loadLayout(); @@ -49,9 +55,4 @@ public function setStoreAction() } $this->_redirectReferer(); } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/TagController.php b/app/code/core/Mage/Adminhtml/controllers/TagController.php index 07b2870b088..23792546900 100644 --- a/app/code/core/Mage/Adminhtml/controllers/TagController.php +++ b/app/code/core/Mage/Adminhtml/controllers/TagController.php @@ -340,8 +340,7 @@ public function massStatusAction() } /** - * Check currently called action by permissions for current user - * + * @inheritDoc */ protected function _isAllowed() { @@ -349,13 +348,10 @@ protected function _isAllowed() switch ($action) { case 'pending': return Mage::getSingleton('admin/session')->isAllowed('catalog/tag/pending'); - break; case 'all': return Mage::getSingleton('admin/session')->isAllowed('catalog/tag/all'); - break; default: return Mage::getSingleton('admin/session')->isAllowed('catalog/tag'); - break; } } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php index dd18a77a8b1..e2a7ccfda82 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php @@ -31,12 +31,16 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Tax_Class_CustomerController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'sales/tax/classes_customer'; + /** * grid view - * */ public function indexAction() { @@ -55,7 +59,6 @@ public function indexAction() /** * new class action - * */ public function newAction() { @@ -64,7 +67,6 @@ public function newAction() /** * edit class action - * */ public function editAction() { @@ -174,14 +176,4 @@ protected function _initAction() ; return $this; } - - /** - * Check current user permission on resource and privilege - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('sales/tax/classes_customer'); - } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php index 28d88f937a1..ad280d6611c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php @@ -33,9 +33,14 @@ */ class Mage_Adminhtml_Tax_Class_ProductController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'sales/tax/classes_product'; + /** * view grid - * */ public function indexAction() { @@ -53,7 +58,6 @@ public function indexAction() /** * new class action - * */ public function newAction() { @@ -62,7 +66,6 @@ public function newAction() /** * edit class action - * */ public function editAction() { @@ -107,7 +110,6 @@ public function editAction() /** * delete class action - * */ public function deleteAction() { @@ -161,7 +163,7 @@ public function deleteAction() /** * Initialize action * - * @return Mage_Adminhtml_Controller_Action + * @return $this */ protected function _initAction() { @@ -173,15 +175,4 @@ protected function _initAction() ; return $this; } - - /** - * Check current user permission on resource and privilege - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('sales/tax/classes_product'); - } - } diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php index 2f7b0e6c1f1..8902ec730c6 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php @@ -91,9 +91,7 @@ protected function _initAction() } /** - * Check current user permission on resource and privilege - * - * @return bool + * @inheritDoc */ protected function _isAllowed() { diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php index 3baa6f5d959..7cf3f52b0e7 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php @@ -463,6 +463,9 @@ public function exportPostAction() $this->_prepareDownloadResponse('tax_rates.csv', $content); } + /** + * @inheritDoc + */ protected function _isAllowed() { @@ -470,13 +473,9 @@ protected function _isAllowed() switch ($action) { case 'importexport': return Mage::getSingleton('admin/session')->isAllowed('sales/tax/import_export'); - break; case 'index': - return Mage::getSingleton('admin/session')->isAllowed('sales/tax/rates'); - break; default: return Mage::getSingleton('admin/session')->isAllowed('sales/tax/rates'); - break; } } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php index 855e8629aac..c593cc940d7 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php @@ -33,6 +33,12 @@ */ class Mage_Adminhtml_Tax_RuleController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'sales/tax/rules'; + /** * Index action * @@ -223,16 +229,6 @@ protected function _initAction() return $this; } - /** - * Check if sales rules is allowed - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('sales/tax/rules'); - } - /** * Return model instance * @@ -257,7 +253,7 @@ protected function _getHelperModel($className) } /** - * Controller predispatch method + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ diff --git a/app/code/core/Mage/Adminhtml/controllers/TaxController.php b/app/code/core/Mage/Adminhtml/controllers/TaxController.php index 1e768dfe18d..002d6d1d71c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/TaxController.php +++ b/app/code/core/Mage/Adminhtml/controllers/TaxController.php @@ -54,7 +54,7 @@ public function ignoreTaxNotificationAction() /** * Check is allowed access to action * - * @return bool + * @return true */ protected function _isAllowed() { diff --git a/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php b/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php index 5489fc3e066..51d708ded6e 100644 --- a/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php +++ b/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php @@ -33,6 +33,12 @@ */ class Mage_Adminhtml_UrlrewriteController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'catalog/urlrewrite'; + /** * Instantiate urlrewrite, product and category * @@ -219,14 +225,4 @@ public function deleteAction() } $this->_redirect('*/*/'); } - - /** - * Check whether this contoller is allowed in admin permissions - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('catalog/urlrewrite'); - } } diff --git a/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php b/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php index b9fb0726a60..2ace9795e13 100644 --- a/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php +++ b/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php @@ -34,7 +34,13 @@ class Mage_Api2_Adminhtml_Api2_AttributeController extends Mage_Adminhtml_Controller_Action { /** - * Controller predispatch method + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'system/api'; + + /** + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ @@ -157,14 +163,4 @@ public function saveAction() $this->_redirect('*/*/edit', array('type' => $type)); } - - /** - * Check is allowed access to action - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/api'); - } } diff --git a/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php b/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php index 238d13beae6..ddb8f5667c1 100644 --- a/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php +++ b/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php @@ -34,7 +34,7 @@ class Mage_Api2_Adminhtml_Api2_RoleController extends Mage_Adminhtml_Controller_Action { /** - * Controller predispatch method + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ @@ -298,9 +298,7 @@ public function deleteAction() } /** - * Check against ACL - * - * @return bool + * @inheritDoc */ protected function _isAllowed() { diff --git a/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/SelectionController.php b/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/SelectionController.php index 3f930753627..73b302a249a 100644 --- a/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/SelectionController.php +++ b/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/SelectionController.php @@ -33,6 +33,12 @@ */ class Mage_Bundle_Adminhtml_Bundle_SelectionController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'catalog/products'; + protected function _construct() { $this->setUsedModuleName('Mage_Bundle'); @@ -67,13 +73,4 @@ public function gridAction() ->toHtml() ); } - /** - * Check for is allowed - * - * @return boolean - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('catalog/products'); - } } diff --git a/app/code/core/Mage/Captcha/controllers/Adminhtml/RefreshController.php b/app/code/core/Mage/Captcha/controllers/Adminhtml/RefreshController.php index 9b986a0c147..bd10c3d575b 100644 --- a/app/code/core/Mage/Captcha/controllers/Adminhtml/RefreshController.php +++ b/app/code/core/Mage/Captcha/controllers/Adminhtml/RefreshController.php @@ -36,8 +36,6 @@ class Mage_Captcha_Adminhtml_RefreshController extends Mage_Adminhtml_Controller /** * Refreshes captcha and returns JSON encoded URL to image (AJAX action) * Example: {'imgSrc': 'http://example.com/media/captcha/67842gh187612ngf8s.png'} - * - * @return null */ public function refreshAction() { diff --git a/app/code/core/Mage/Centinel/controllers/Adminhtml/Centinel/IndexController.php b/app/code/core/Mage/Centinel/controllers/Adminhtml/Centinel/IndexController.php index 7d3af1e7c56..99dafc3a98e 100644 --- a/app/code/core/Mage/Centinel/controllers/Adminhtml/Centinel/IndexController.php +++ b/app/code/core/Mage/Centinel/controllers/Adminhtml/Centinel/IndexController.php @@ -33,6 +33,12 @@ */ class Mage_Centinel_Adminhtml_Centinel_IndexController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'sales/order/actions/review_payment'; + /** * Process validate payment data action * @@ -107,7 +113,7 @@ private function _getPayment() /** * Return Centinel validation model * - * @return Mage_Centinel_Model_Service + * @return Mage_Centinel_Model_Service|false */ private function _getValidator() { @@ -116,15 +122,5 @@ private function _getValidator() } return false; } - - /** - * Check is allowed access to action - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/review_payment'); - } } diff --git a/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php b/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php index 07ada9586e3..5d99a33fb3e 100644 --- a/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php +++ b/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php @@ -33,6 +33,12 @@ */ class Mage_CurrencySymbol_Adminhtml_System_CurrencysymbolController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'system/currency/symbols'; + /** * Show Currency Symbols Management dialog */ @@ -87,14 +93,4 @@ public function resetAction() Mage::getModel('currencysymbol/system_currencysymbol')->resetValues(); $this->_redirectReferer(); } - - /** - * Check the permission to run it - * - * @return boolean - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/currency/symbols'); - } } diff --git a/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/FileController.php b/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/FileController.php index 280c0eafba2..5284244f2e3 100644 --- a/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/FileController.php +++ b/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/FileController.php @@ -33,6 +33,11 @@ */ class Mage_Downloadable_Adminhtml_Downloadable_FileController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'catalog/products'; /** * Upload file controller action @@ -79,14 +84,4 @@ public function uploadAction() $this->getResponse()->setBody(Mage::helper('core')->jsonEncode($result)); } - - /** - * Check admin permissions for this controller - * - * @return boolean - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('catalog/products'); - } } diff --git a/app/code/core/Mage/Downloadable/controllers/FileController.php b/app/code/core/Mage/Downloadable/controllers/FileController.php index 97fa69d0fa9..2e8ef544fbb 100644 --- a/app/code/core/Mage/Downloadable/controllers/FileController.php +++ b/app/code/core/Mage/Downloadable/controllers/FileController.php @@ -37,7 +37,7 @@ class Mage_Downloadable_FileController extends Mage_Downloadable_Adminhtml_Downloadable_FileController { /** - * Controller predispatch method + * Controller pre-dispatch method * Show 404 front page */ public function preDispatch() diff --git a/app/code/core/Mage/Downloadable/controllers/Product/EditController.php b/app/code/core/Mage/Downloadable/controllers/Product/EditController.php index a7635d9d01c..e65d93adc4d 100644 --- a/app/code/core/Mage/Downloadable/controllers/Product/EditController.php +++ b/app/code/core/Mage/Downloadable/controllers/Product/EditController.php @@ -37,7 +37,7 @@ class Mage_Downloadable_Product_EditController extends Mage_Downloadable_Adminhtml_Downloadable_Product_EditController { /** - * Controller predispatch method + * Controller pre-dispatch method * Show 404 front page */ public function preDispatch() diff --git a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php index 0b89739d991..7d2819820c2 100644 --- a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php +++ b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php @@ -33,6 +33,12 @@ */ class Mage_ImportExport_Adminhtml_ExportController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'system/convert/export'; + /** * Custom constructor. * @@ -58,16 +64,6 @@ protected function _initAction() return $this; } - /** - * Check access (in the ACL) for current user - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/convert/export'); - } - /** * Load data with filter applying and create file for download. * diff --git a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php index ead258551fc..00386a41b7b 100644 --- a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php +++ b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php @@ -33,6 +33,12 @@ */ class Mage_ImportExport_Adminhtml_ImportController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'system/convert/import'; + /** * Custom constructor. * @@ -58,16 +64,6 @@ protected function _initAction() return $this; } - /** - * Check access (in the ACL) for current user. - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/convert/import'); - } - /** * Index action. * diff --git a/app/code/core/Mage/Index/controllers/Adminhtml/ProcessController.php b/app/code/core/Mage/Index/controllers/Adminhtml/ProcessController.php index 03feebc00b6..4d9fe587695 100644 --- a/app/code/core/Mage/Index/controllers/Adminhtml/ProcessController.php +++ b/app/code/core/Mage/Index/controllers/Adminhtml/ProcessController.php @@ -25,6 +25,12 @@ */ class Mage_Index_Adminhtml_ProcessController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'system/index'; + /** * Initialize process object by request * @@ -229,14 +235,4 @@ public function massChangeModeAction() $this->_redirect('*/*/list'); } - - /** - * Check ACL permissins - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/index'); - } } diff --git a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php index db361caab53..270fce26e45 100644 --- a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php +++ b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php @@ -161,9 +161,7 @@ public function deleteAction() } /** - * Check admin permissions for this controller - * - * @return boolean + * @inheritDoc */ protected function _isAllowed() { diff --git a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizeController.php b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizeController.php index 24c39bd2e7f..082d3517a27 100644 --- a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizeController.php +++ b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizeController.php @@ -302,7 +302,7 @@ public function rejectSimpleAction() /** * Check admin permissions for this controller * - * @return boolean + * @return true */ protected function _isAllowed() { diff --git a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizedTokensController.php b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizedTokensController.php index 9b08f5c1df6..58446eb11ef 100644 --- a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizedTokensController.php +++ b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizedTokensController.php @@ -155,9 +155,7 @@ public function deleteAction() } /** - * Check admin permissions for this controller - * - * @return boolean + * @inheritDoc */ protected function _isAllowed() { diff --git a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/ConsumerController.php b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/ConsumerController.php index d048b2576e2..be85a6e20a8 100644 --- a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/ConsumerController.php +++ b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/ConsumerController.php @@ -237,9 +237,7 @@ public function saveAction() } /** - * Check admin permissions for this controller - * - * @return boolean + * @inheritDoc */ protected function _isAllowed() { diff --git a/app/code/core/Mage/PageCache/controllers/Adminhtml/PageCacheController.php b/app/code/core/Mage/PageCache/controllers/Adminhtml/PageCacheController.php index 3276f4977a3..db203060e95 100644 --- a/app/code/core/Mage/PageCache/controllers/Adminhtml/PageCacheController.php +++ b/app/code/core/Mage/PageCache/controllers/Adminhtml/PageCacheController.php @@ -33,6 +33,12 @@ */ class Mage_PageCache_Adminhtml_PageCacheController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'page_cache'; + /** * Retrieve session model * @@ -67,14 +73,4 @@ public function cleanAction() } $this->_redirect('*/cache/index'); } - - /** - * Check current user permission on resource and privilege - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('page_cache'); - } } diff --git a/app/code/core/Mage/Paygate/controllers/Adminhtml/Paygate/Authorizenet/PaymentController.php b/app/code/core/Mage/Paygate/controllers/Adminhtml/Paygate/Authorizenet/PaymentController.php index 0a2a185d26a..deef4673e14 100644 --- a/app/code/core/Mage/Paygate/controllers/Adminhtml/Paygate/Authorizenet/PaymentController.php +++ b/app/code/core/Mage/Paygate/controllers/Adminhtml/Paygate/Authorizenet/PaymentController.php @@ -33,6 +33,11 @@ */ class Mage_Paygate_Adminhtml_Paygate_Authorizenet_PaymentController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'sales/order/actions/review_payment'; /** * Cancel active partail authorizations @@ -76,14 +81,4 @@ protected function _getPaymentMethodsHtml() $output = $layout->getOutput(); return $output; } - - /** - * Check is allowed access to action - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/review_payment'); - } } diff --git a/app/code/core/Mage/Paypal/controllers/Adminhtml/Paypal/ReportsController.php b/app/code/core/Mage/Paypal/controllers/Adminhtml/Paypal/ReportsController.php index 65852fd195f..926eb678fdd 100644 --- a/app/code/core/Mage/Paypal/controllers/Adminhtml/Paypal/ReportsController.php +++ b/app/code/core/Mage/Paypal/controllers/Adminhtml/Paypal/ReportsController.php @@ -122,8 +122,7 @@ protected function _initAction() } /** - * ACL check - * @return bool + * @inheritDoc */ protected function _isAllowed() { @@ -132,13 +131,10 @@ protected function _isAllowed() case 'index': case 'details': return Mage::getSingleton('admin/session')->isAllowed('report/salesroot/paypal_settlement_reports/view'); - break; case 'fetch': return Mage::getSingleton('admin/session')->isAllowed('report/salesroot/paypal_settlement_reports/fetch'); - break; default: return Mage::getSingleton('admin/session')->isAllowed('report/salesroot/paypal_settlement_reports'); - break; } } } diff --git a/app/code/core/Mage/Rss/controllers/CatalogController.php b/app/code/core/Mage/Rss/controllers/CatalogController.php index 966d6ebef65..9224caea4e0 100644 --- a/app/code/core/Mage/Rss/controllers/CatalogController.php +++ b/app/code/core/Mage/Rss/controllers/CatalogController.php @@ -100,7 +100,7 @@ public function categoryAction() } /** - * Controller predispatch method to change area for some specific action. + * Controller pre-dispatch method to change area for some specific action. * * @return $this */ diff --git a/app/code/core/Mage/Rss/controllers/OrderController.php b/app/code/core/Mage/Rss/controllers/OrderController.php index 0c7dcdb54a5..2c83d1280a6 100644 --- a/app/code/core/Mage/Rss/controllers/OrderController.php +++ b/app/code/core/Mage/Rss/controllers/OrderController.php @@ -77,7 +77,7 @@ public function statusAction() } /** - * Controller predispatch method to change area for some specific action. + * Controller pre-dispatch method to change area for some specific action. * * @return $this */ diff --git a/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php b/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php index 784a1b3b3d4..e6582e4cba6 100644 --- a/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php +++ b/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php @@ -33,6 +33,12 @@ */ class Mage_Widget_Adminhtml_Widget_InstanceController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'cms/widget_instance'; + /** * Session getter * @@ -300,7 +306,7 @@ public function templateAction() } /** - * Controller predispatch method + * Controller pre-dispatch method * * @return Mage_Adminhtml_Controller_Action */ @@ -310,16 +316,6 @@ public function preDispatch() return parent::preDispatch(); } - /** - * Check is allowed access to action - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('cms/widget_instance'); - } - /** * Prepare widget parameters * diff --git a/app/code/core/Mage/Widget/controllers/Adminhtml/WidgetController.php b/app/code/core/Mage/Widget/controllers/Adminhtml/WidgetController.php index f87cde66385..5c772df417d 100644 --- a/app/code/core/Mage/Widget/controllers/Adminhtml/WidgetController.php +++ b/app/code/core/Mage/Widget/controllers/Adminhtml/WidgetController.php @@ -33,6 +33,12 @@ */ class Mage_Widget_Adminhtml_WidgetController extends Mage_Adminhtml_Controller_Action { + /** + * ACL resource + * @see Mage_Adminhtml_Controller_Action::_isAllowed() + */ + const ADMIN_RESOURCE = 'cms/widget_instance'; + /** * Wisywyg widget plugin main page */ @@ -84,14 +90,4 @@ public function buildWidgetAction() $html = Mage::getSingleton('widget/widget')->getWidgetDeclaration($type, $params, $asIs); $this->getResponse()->setBody($html); } - - /** - * Check is allowed access to action - * - * @return bool - */ - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('cms/widget_instance'); - } } From a252af84f7f0ca2c4def48474351d53a137894f8 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 2 Aug 2022 15:40:04 +0200 Subject: [PATCH 43/61] Revert "Add basic text for Ukraine (#2074)" (#2325) This reverts commit 33dfa269fa60d56f4d7af19a393179e3ae927fab. --- README.md | 2 -- .../default/default/template/notification/toolbar.phtml | 6 ------ skin/adminhtml/default/default/boxes.css | 1 - skin/adminhtml/default/default/images/flag-ua.svg | 4 ---- 4 files changed, 13 deletions(-) delete mode 100644 skin/adminhtml/default/default/images/flag-ua.svg diff --git a/README.md b/README.md index 6fa5c54cfeb..51e3e33a983 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,6 @@ Unit Tests workflow badge

    - Stop russian war. **Free Ukraine!** ([Read more](https://en.wikipedia.org/wiki/2022_Russian_invasion_of_Ukraine)) - # Magento - Long Term Support This repository is the home of an **unofficial** community-driven project. It's goal is to be a dependable alternative diff --git a/app/design/adminhtml/default/default/template/notification/toolbar.phtml b/app/design/adminhtml/default/default/template/notification/toolbar.phtml index cf072655de3..b523dc6aa90 100644 --- a/app/design/adminhtml/default/default/template/notification/toolbar.phtml +++ b/app/design/adminhtml/default/default/template/notification/toolbar.phtml @@ -24,12 +24,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> - -
    - Stop russian war. Free Ukraine! - __('Read details') ?> -
    - - - - From a328ce10c76890d524b1c96be35b41349b85b15e Mon Sep 17 00:00:00 2001 From: Flyingmana Date: Tue, 2 Aug 2022 16:05:59 +0200 Subject: [PATCH 44/61] bump version --- .github/changelog/version_19.txt | 94 +++++++++++++++++++++++++++++++- app/Mage.php | 4 +- 2 files changed, 95 insertions(+), 3 deletions(-) diff --git a/.github/changelog/version_19.txt b/.github/changelog/version_19.txt index ec083c50a4b..1b6bc062940 100644 --- a/.github/changelog/version_19.txt +++ b/.github/changelog/version_19.txt @@ -1,5 +1,97 @@ -## v19.4.16 - unreleased +## v19.4.18 - unreleased + +## v19.4.17 - unreleased + +## v19.4.16 - 2022-05-18 + +Add field info to exception when thrown in saving System Configuration. by @kiatng in #1784 +Fix Tax Rule name update by @elidrissidev in #1728 +Fixed method addExpressionFieldToSelect to use Zend_Db_Expr by @midlan in #1259 +API fix option labels for store view by @woutersamaey in #1828 +Fix newsletter subcriber loading by customer by @mmenozzi in #1779 +Fix file delete of customer attribute by @kiatng in #927 +Trim trailing whitespace by @luigifab in #1834 and #1846 +Updated .gitignore by @midlan in #1859 +Add gitpod online IDE config by @Flyingmana in #1836 +Add phpstan configuration, dependencies and github action by @Flyingmana in #1875 +Add Mage_Index helpers declaration to config.xml by @elidrissidev in #1878 +API: _getLocation - removed unused argument; fix phpdoc by @Sekiphp in #1867 +Grid page size: replaced similar lines to foreach by @Sekiphp in #1856 +Fix exception handling on Observer call when class not found by @spinsch in #1861 +Fixes catalog pricerules with dates in conditions, closes #433 by @sreichel in #1159 +Zend_Locale_Format::isNumber throws notice for float values by @fballiano in #1758 +Update PayPal currencies and countries by @luigifab in #1805 +extend php Syntax check to php 8.1 by @Flyingmana in #1883 +Fix incompatible declaration error by @holozaen in #1890 +[PHP 8.1] Fix deprecation notice in mcryptcompat lib by @Sdfendor in #1891 +Bugfix #1885 - Add to cart only accepts 1 item by @gdemarsico in #1896 +Array to string conversion when adding reviews from backend by @fballiano in #1769 +Update phpdoc in Collection.php by @rubanooo in #1816 +Fix syntax in lib/Zend/Locale/Data/es_419.xml by @elidrissidev in #1901 +make fulltext search separator (OR/AND) configurable from backend by @sreichel in #1852 +Revert of Mage_Adminhtml_Block_Widget_Grid::_exportIterateCollection by @midlan in #1914 +demo.html is an unnecessary file by @ADDISON74 in #1926 +Sort ascending CMS Block list in Categories by @ADDISON74 in #1925 +[PHP 8.0] Refactor legacy usage of implode in Mage_Api2 by @elidrissidev in #1938 +Initialize Api2 Fields validator's required fields array by @elidrissidev in #1936 +No alt tag value in Recently Viewed Products side block by @ADDISON74 in #1920 +Dashboard - Top 5 Search Terms link issue by @ADDISON74 in #1917 +Removed unused var $_odd in templates. by @kiatng in #1964 +Documentation fix on README file about composer require by @nimasan in #1954 +Fix typo in Zend/Date.php by @eltociear in #1979 +[PHP 8.0] Check if track progressdetail is an array before calling count by @elidrissidev in #1982 +[PHP 8.1] Fix cookie deletion behavior by @Sdfendor in #1984 +updateAttributeSet() accepting array or string by @Sekiphp in #1535 +Fix typo in code comment by @dotancohen in #1988 +Fix #1924 non-existing field by @woutersamaey in #1941 +Added optgroup feature for massaction items (grids) by @Sekiphp in #1913 +PHPDoc fix for Mage_Core_Model_Config by @Sdfendor in #1802 +Missing middlename for salesOrderAddressEntity in SOAP APIs by @fballiano in #1977 +Attribute note adminhtml show translate by @boesbo in #1710 +fix typo in _applyCustomOption() to correctly calculate min/max price by @jouriy in #1500 +Fix typo: Replace 'Retrive' with 'Retrieve' globally by @tmewes in #1995 +Add formkey validation to Newsletter subscribe action (theme BC-break) by @elidrissidev in #1866 +Added ability to add target attribute for adminhtml menu items by @Sekiphp in #1985 +Add docblock to app\code\core\Mage\Adminhtml\Block\Widget\Grid\Column… by @kiatng in #1987 +[PHP 8.1] Fix passing null to trim() by @elidrissidev in #2002 +Replaced remaining deprecated urlEscape calls. by @Sdfendor in #2008 +Update phpstan version by @tmotyl in #2015 +Use mb_substr to split the postcode by @luigifab in #1357 +Fix count(): Parameter must be an array or an object that implements Countable by @Sekiphp in #1960 +Fix getting default min_sale_qty when trying to mass-update product attributes by @elidrissidev in #1850 +Add polyfill for PHP8 native string functions by @tmotyl in #2014 +Improve getScheme on Zend_Controller_Request_Http by @mmenozzi in #1872 +Fix @method declarations in Mage_Catalog_Model_Resource_Eav_Attribute by @Caprico85 in #2031 +Deprecated global function "now" because it's equivalent to Varien_Date::now() by @Sdfendor in #1991 +Fixed the unused parameter in assignProduct by @rubanooo in #2011 +Remove white space for config values for #1852 by @luigifab in #2020 +password_new.html - typo in vars by @m-overlund in #2039 +add unit Tests and send coverage results to SonarCloud by @Flyingmana in #2041 +Use vanillaJS instead of prototype in Wishlist add to cart column by @MarcinNowakMacopedia in #2051 +do not mark github job as failes through sonar failure by @Flyingmana in #2053 +Analyze most of the source code with phpstan. Provide baseline. by @tmotyl in #2035 +Update PHPdoc and remove useless var by @bastienlm in #2056 +Add unit tests for security helper validateAgainstBlockMethodBlacklist and provide composer.lock by @tmotyl in #2058 +Fix widget edition in WYSIWYG by @FredericMartinez in #1605 +Use vanillaJS instead of encodeURI in wishlist add to cart by @MarcinNowakMacopedia in #2052 +Fixed bug on incorrect category store_id when set with store code in … by @kiatng in #1601 +Remove notification survey block by @kkrieger85 in #1267 +Fixed grid filter reset by @spinsch in #821 +Documentation of some changes by @luigifab in #1831 +Fix: Integrity constraint violation: Duplicate key by @tim-breitenstein-it in #1331 +Align label with value by @AlterWeb in #1230 +Remove backend current date from backend's header by @fballiano in #2063 +Lazy load contributors images by @luigifab in #2070 +Do not save customer addresses when there are no changes by @luigifab in #1579 +Removed getQty() from Mage_Wishlist_IndexController by @fballiano in #2072 +Add title for old googlecheckout payment method by @luigifab in #2076 +Default sortby should be read from core_config_data by @fballiano in #2062 +Prevent Zend_Date from checking locale for know date codes by @MarcinNowakMacopedia in #2050 +Update admin login pages by @luigifab in #1618 +Do not render action or massaction column in totals row in adminhtml grid by @theroch in #1530 +Fix instructions update for bank transfer orders by @luigifab in #2075 +Add missing attributes to salesOrderInvoiceInfo SOAP method by @elidrissidev in #1999 ## v19.4.15 - 2021-08-26 diff --git a/app/Mage.php b/app/Mage.php index 6eefc1b7b49..3a75c48568e 100644 --- a/app/Mage.php +++ b/app/Mage.php @@ -220,7 +220,7 @@ public static function getOpenMageVersionInfo() return array( 'major' => '20', 'minor' => '0', - 'patch' => '14', + 'patch' => '15', 'stability' => '', // beta,alpha,rc 'number' => '', // 1,2,3,0.3.7,x.7.z.92 @see https://semver.org/#spec-item-9 ); @@ -229,7 +229,7 @@ public static function getOpenMageVersionInfo() return array( 'major' => '19', 'minor' => '4', - 'patch' => '16', + 'patch' => '17', 'stability' => '', // beta,alpha,rc 'number' => '', // 1,2,3,0.3.7,x.7.z.92 @see https://semver.org/#spec-item-9 ); From 1b8fa4acc4c7bcd4d6ed579b651daba4edce5b24 Mon Sep 17 00:00:00 2001 From: Flyingmana Date: Tue, 2 Aug 2022 16:11:44 +0200 Subject: [PATCH 45/61] update changelog for current release --- .github/changelog/version_19.txt | 138 ++++++++++++++++++++++++++++++- 1 file changed, 137 insertions(+), 1 deletion(-) diff --git a/.github/changelog/version_19.txt b/.github/changelog/version_19.txt index 1b6bc062940..0fafdf3df25 100644 --- a/.github/changelog/version_19.txt +++ b/.github/changelog/version_19.txt @@ -1,7 +1,143 @@ ## v19.4.18 - unreleased -## v19.4.17 - unreleased +## v19.4.17 - 2022-08-02 + +Replaced a lot of Magento logos with OpenMage ones by @fballiano in #1599 +Remove end class comment by @luigifab in #2092 +Trim trailing whitespace by @luigifab in #2093 +Issue #268: sales_order_create_sidebar_wishlist breaks if wishlist module is disabled by @fballiano in #2059 +Better messages for product alerts by @fballiano in #1930 +Clean review_entity_summary when reviews are deleted by @fballiano in #1103 +Fixed admin tabs order not working properly. by @kiatng in #1360 +Fix admin menu z-index when debug template paths is enabled by @elidrissidev in #1819 +Change default sort in CMS Pages/Blocks/Widgets grids by @ADDISON74 in #1922 +Small improvements in Manage Attributes grid by @ADDISON74 in #1944 +Added database ID to EAV options table by @fballiano in #2060 +Clean up empty directories created when file requested does not exist in remote storage. by @colinmollenhour in #1338 +Add a word-break to list items to keep the layout intact by @loekvangool in #1321 +fix download custom option backend by @empiricompany in #1827 +Fix Varien_File_Uploader ignored errors with try catch by @luigifab in #1277 +User-configurable cron expression for regular cache flushing #2086 by @LukasCesal in #2087 +Fixed infinite loop of popup alerts in backend attribute set page by @kiatng in #1672 +Added option not to use timezone in rendering datetime in backend grid. by @kiatng in #1997 +Upgrade GitHub action/checkout to v3 by @fballiano in #2141 +Fix admin menu z-index for popup message by @luigifab in #2142 +Fix undefined array key when an image depend on another field by @luigifab in #2133 +Fix supplied resource is not a valid stream resource for Varien_Io_File by @eneiasramos in #2040 +Raise phpstan level to 1 and fix basic issues by @tmotyl in #2055 +fix wrong tier price percentage rounding by @empiricompany in #2089 +Replaced travis badge with workflow badges by @fballiano in #2067 +Update References to Documentation/Magento Website - Issue #988 by @fballiano in #2069 +Create a global config cache rather than a config cache per store by @rvelhote in #1066 +Rise Phpstan level 2, fix some issues by @tmotyl in #2146 +Backend mask title has padding also when not having an icon by @fballiano in #2145 +Fix config menu css from Isse #1219 by @aterjung in #1224 +Fix protect code changing on order save by @justinbeaty in #1422 +Introducing polyfill for is_countable() by @fballiano in #2163 +Ensure there are no emails without recipient in email queue by @lemundo-team in #1109 +Fix Core Bug: To make "01/01/1970" a valid birthday by @1Shiroyuuki1 in #1851 +Fix issues with isCurrentlySecure detection and Offloader Header config. by @colinmollenhour in #1462 +PHP 8 fix null provided to count() in tax calculation class by @iamniels in #2162 +Better error handling for issues during bulk attribute update by @woutersamaey in #1434 +Allow to cancel orders like registerCancellation by @luigifab in #1804 +Revert "Fix wrong payment info template paths" by @fballiano in #2179 +Fix Failed IPN changing to Payment Received incorrectly by @fballiano in #2183 +Reverted commit 2ae8c05 by @fballiano in #2182 +Revert "creditmemo bundle inventory calculation error" by @fballiano in #2186 +Sourcemap link removed since this file is not minified by @fballiano in #2187 +Remove suppression operator from translate method to support PHP 8 by @iamniels in #2161 +[PHP 8] Fix TypeError when calling round() with a string argument by @elidrissidev in #2193 +Backend - Change the default sort column in Export page by @ADDISON74 in #2170 +Fix warnings on undefined user agent by @Caprico85 in #2032 +Fix PHP 8 Fatal error: Uncaught ValueError: imagecolorsforindex() in Varien_Image_Adapter_Gd2 by @iamniels in #2197 +Do not calculate catalogrules when there are none by @tmotyl in #1119 +replacing apc with apcu functions. by @f1-outsourcing in #1951 +Add robots.txt.sample by @simbus82 in #1024 +Changed timestamp definition to fix issue #1166 by @fballiano in #2189 +Cast params receiving int to string by @holozaen in #2144 +Set log level from config by @elidrissidev in #1727 +Expected PayPal (Express) field not found in NVP Response: AMT by @luigifab in #1520 +Fix display of Insert widget and Insert variable by @luigifab in #1848 +Fix region API list response - Update Api.php --> bug by @kyansi in #792 +Fixed issue #2001, EAV datetime attribute can't save time. by @kiatng in #2003 +Wrap max log level retrieval from config in a try catch by @elidrissidev in #2203 +Fix to allow for always reorder by @seansan in #504 +Remove frontend_type tag for text by @luigifab in #2148 +Pass delimiter char to preg_quote by @MarcinNowakMacopedia in #2047 +Avoids multiplying all price adjustments by the number of websites by @azambon in #1303 +Use latest media editor plugin (989c4b5 from 2015030) for tinymce v3.5 by @theroch in #1123 +Some more room for the category menu by @loekvangool in #1314 +PHP 8: Fix cannot remove category on admin product edit categories tab by @iamniels in #2205 +Config cache for system.xml loader: Speed improvement by @lamskoy in #1916 +Avoid session invalidation when changing session lifetime. by @colinmollenhour in #546 +Modernize setCategoryIds() by @loekvangool in #1308 +Replace Magento word with OpenMage in root files by @ADDISON74 in #2215 +Remove backslash character in translations files by @ADDISON74 in #2219 +Fix ACL resource name typo in Api2 roles page by @elidrissidev in #2222 +Missing bottom borders in Orders page with Gift Messages allowed by @ADDISON74 in #2220 +Backend > Orders grid - More space for columns by @ADDISON74 in #2217 +Fixed issue #2196, throws error if an email is already a newsletter s… by @kiatng in #2214 +Widen some dynamic admin input fields by @loekvangool in #1315 +Admin's password validation during Api's role/user removing process by @przemyslaw-p in #1045 +Fix multiple "PHPDoc tag @param has invalid value" phpstan errors by @tmotyl in #2227 +Fix for "non well formed numeric value" by @fballiano in #2225 +Fixed warning a non-numeric value encountered in /Mage/Catalog/Model/Resource/Product/Option.php by @kiatng in #2228 +Added support for sending subscribe confirm email by @fballiano in #2195 +Allow setting optional product attributes to null in REST API by @elidrissidev in #2230 +Fixed issue #2212 SQLSTATE[42S22]: Column not found: 1054 Unknown col… by @kiatng in #2221 +Drop LTS csv files by @luigifab in #1621 +Remove the word section by @luigifab in #2147 +Fix Missing Mage_Api_Model_Server_V2_Handler in SOAP v2 WSDL. by @SRaromicon in #392 +Throw exception when trying to modifying address that does not belong to logged in user by @fballiano in #2231 +Grid - iterate only columns with filters by @Sekiphp in #1642 +Fix Mage_Shell_Indexer wrong class name by @fballiano in #2234 +Backend > Manage Products grid - More space for columns by @ADDISON74 in #2218 +Made sitemap more flexible by @sreichel in #1854 +Update Mage_Eav_Model_Entity_Collection_Abstract::joinTable() by @cebe in #1814 +Add "Times used" indicator field to promo rule quote grid by @spinsch in #1853 +bugfix: fix adminhtml translation in config.xml for importexport module by @eneiasramos in #2244 +Replace deprecated global now() calls with Varien_Date::now() by @Sdfendor in #2250 +Fix the calculation of bundle saleable status by @aredridel in #2178 +Revert "Some more room for the category menu" by @ADDISON74 in #2254 +prevent customer review view from loading foreign reviews by @aterjung in #1970 +Fix for "reset filter" breaking grid sorting by @fballiano in #2252 +Flush Magento Cache - button and message changes by @ADDISON74 in #2261 +Can upload xlsx file by @sdecalom in #2266 +Backend grid heads - Remove colons after To, From and In words by @ADDISON74 in #2267 +Fixed documentation link for "store scope" in store switcher (backend) by @fballiano in #2256 +Fix Varien_Io_File ignored errors with error control operator by @luigifab in #1269 +Fix store id filter in catalogProductList SOAP method by @elidrissidev in #2243 +Small changes in .htaccess file /media directory by @ADDISON74 in #2280 +All .gitignore files in one place by @ADDISON74 in #2269 +Create/Update .htaccess file in skin and media directories by @ADDISON74 in #2289 +Add magento-composer-installer to allowed plugins by @elidrissidev in #2296 +Delete .htaccess.sample by @ADDISON74 in #2293 +Update php.ini.sample by @ADDISON74 in #2292 +Fix editing special price in product mass attribute update by @fballiano in #2287 +Added required PHP modules to composer.json by @fballiano in #2064 +Update robots.txt.sample by @ADDISON74 in #2307 +Include exception message when generating error report by @elidrissidev in #2311 +add some ReturnTypeWillChange annotations to Varien_object by @Flyingmana in #2301 +Fix xml validation problems by @fballiano in #2242 +Fix argument must contain at least one element by @luigifab in #2091 +XML validation workflow by @fballiano in #2314 +add basic unitTest for xml validation by @Flyingmana in #2304 +Addendum to PR 2087 by @ADDISON74 in #2308 +Allow to rename api.php by @luigifab in #2132 +Fix phpdoc for saveAttribute() by @Caprico85 in #2320 +Small changes in root files by @ADDISON74 in #2324 +Add a message calling for an end to the Russian invasion of Ukraine by @luigifab in #2074 +Mage Factory Methods: Direct "_registry" Access Without Method Call by @Sdfendor in #2319 +Fixes a notice by @azambon in #2318 +Add vendor folder to gitignore by @elidrissidev in #2334 +Fix for modphp8 by @fballiano in #2329 +Update Flat.php to correct bug #2337 by @matteorossi-thespacesm in #2338 +Fix #815 - add getAttributeRawText function by @justinbeaty in #2312 +gitignore: added VScode, PhpStorm files and ddev config.yaml by @sreichel in #2343 +Removed docker-dde sample by @sreichel in #2346 +Removed dead code by @sreichel in #2339 +Cosmetic fix in Mage_Sales_Model_Order_Payment by @fballiano in #2350 ## v19.4.16 - 2022-05-18 From 4721a48677f213f486d176430131337db31bd452 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 2 Aug 2022 17:25:26 +0200 Subject: [PATCH 46/61] Mage_Catalog_Model_Product_Attribute_Backend_Groupprice_Abstract: avoid loading all websites when using only the current one (#2351) --- .../Attribute/Backend/Groupprice/Abstract.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice/Abstract.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice/Abstract.php index b0e15b97587..ac70e2a5541 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice/Abstract.php @@ -55,14 +55,23 @@ abstract protected function _getDuplicateErrorMessage(); /** * Retrieve websites currency rates and base currency codes * + * @param int|null $websiteId * @return array */ - protected function _getWebsiteCurrencyRates() + protected function _getWebsiteCurrencyRates($websiteId = null) { if (is_null($this->_rates)) { $this->_rates = array(); $baseCurrency = Mage::app()->getBaseCurrencyCode(); - foreach (Mage::app()->getWebsites() as $website) { + + if (is_numeric($websiteId)) { + $website = Mage::app()->getWebsite($websiteId); + $websites = [$website]; + } else { + $websites = Mage::app()->getWebsites(); + } + + foreach ($websites as $website) { /* @var Mage_Core_Model_Website $website */ if ($website->getBaseCurrencyCode() != $baseCurrency) { $rate = Mage::getModel('directory/currency') @@ -189,7 +198,7 @@ public function validate($object) */ public function preparePriceData(array $priceData, $productTypeId, $websiteId) { - $rates = $this->_getWebsiteCurrencyRates(); + $rates = $this->_getWebsiteCurrencyRates($websiteId); $data = array(); $price = Mage::getSingleton('catalog/product_type')->priceFactory($productTypeId); foreach ($priceData as $v) { From cf82b8f623e754e63c9a64dbf3c21adaf46ddc56 Mon Sep 17 00:00:00 2001 From: Flyingmana Date: Tue, 2 Aug 2022 17:32:00 +0200 Subject: [PATCH 47/61] update changelog --- .github/changelog/version_20.txt | 251 ++++++++++++++++++++++++++++++- 1 file changed, 250 insertions(+), 1 deletion(-) diff --git a/.github/changelog/version_20.txt b/.github/changelog/version_20.txt index 8e017d843c3..7c9b8fca0d0 100644 --- a/.github/changelog/version_20.txt +++ b/.github/changelog/version_20.txt @@ -1,5 +1,254 @@ -## v20.0.14 - unreleased +## v20.0.16 - unreleased + +## v20.0.15 - 2022-08-02 + +Version bump to prepare for next release by @fballiano in #2088 +Replaced a lot of Magento logos with OpenMage ones by @fballiano in #1599 +Remove end class comment by @luigifab in #2092 +Trim trailing whitespace by @luigifab in #2093 +Issue #268: sales_order_create_sidebar_wishlist breaks if wishlist module is disabled by @fballiano in #2059 +Better messages for product alerts by @fballiano in #1930 +Clean review_entity_summary when reviews are deleted by @fballiano in #1103 +Fixed admin tabs order not working properly. by @kiatng in #1360 +Fix admin menu z-index when debug template paths is enabled by @elidrissidev in #1819 +Change default sort in CMS Pages/Blocks/Widgets grids by @ADDISON74 in #1922 +Small improvements in Manage Attributes grid by @ADDISON74 in #1944 +Merge 20.0.14 to 20.0 branch by @fballiano in #2135 +Added database ID to EAV options table by @fballiano in #2060 +Clean up empty directories created when file requested does not exist in remote storage. by @colinmollenhour in #1338 +Add a word-break to list items to keep the layout intact by @loekvangool in #1321 +fix download custom option backend by @empiricompany in #1827 +Fix Varien_File_Uploader ignored errors with try catch by @luigifab in #1277 +User-configurable cron expression for regular cache flushing #2086 by @LukasCesal in #2087 +Fixed infinite loop of popup alerts in backend attribute set page by @kiatng in #1672 +Added option not to use timezone in rendering datetime in backend grid. by @kiatng in #1997 +Upgrade GitHub action/checkout to v3 by @fballiano in #2141 +Fix admin menu z-index for popup message by @luigifab in #2142 +Fix undefined array key when an image depend on another field by @luigifab in #2133 +Fix supplied resource is not a valid stream resource for Varien_Io_File by @eneiasramos in #2040 +Raise phpstan level to 1 and fix basic issues by @tmotyl in #2055 +fix wrong tier price percentage rounding by @empiricompany in #2089 +Replaced travis badge with workflow badges by @fballiano in #2067 +Update References to Documentation/Magento Website - Issue #988 by @fballiano in #2069 +Create a global config cache rather than a config cache per store by @rvelhote in #1066 +Rise Phpstan level 2, fix some issues by @tmotyl in #2146 +Backend mask title has padding also when not having an icon by @fballiano in #2145 +Fix config menu css from Isse #1219 by @aterjung in #1224 +Fix protect code changing on order save by @justinbeaty in #1422 +Introducing polyfill for is_countable() by @fballiano in #2163 +Ensure there are no emails without recipient in email queue by @lemundo-team in #1109 +Fix Core Bug: To make "01/01/1970" a valid birthday by @1Shiroyuuki1 in #1851 +Fix issues with isCurrentlySecure detection and Offloader Header config. by @colinmollenhour in #1462 +PHP 8 fix null provided to count() in tax calculation class by @iamniels in #2162 +Better error handling for issues during bulk attribute update by @woutersamaey in #1434 +Allow to cancel orders like registerCancellation by @luigifab in #1804 +Revert "Fix wrong payment info template paths" by @fballiano in #2179 +Fix Failed IPN changing to Payment Received incorrectly by @fballiano in #2183 +Reverted commit 2ae8c05 by @fballiano in #2182 +Revert "creditmemo bundle inventory calculation error" by @fballiano in #2186 +Sourcemap link removed since this file is not minified by @fballiano in #2187 +Remove suppression operator from translate method to support PHP 8 by @iamniels in #2161 +[PHP 8] Fix TypeError when calling round() with a string argument by @elidrissidev in #2193 +Backend - Change the default sort column in Export page by @ADDISON74 in #2170 +Fix warnings on undefined user agent by @Caprico85 in #2032 +Fix PHP 8 Fatal error: Uncaught ValueError: imagecolorsforindex() in Varien_Image_Adapter_Gd2 by @iamniels in #2197 +Do not calculate catalogrules when there are none by @tmotyl in #1119 +replacing apc with apcu functions. by @f1-outsourcing in #1951 +Add robots.txt.sample by @simbus82 in #1024 +Changed timestamp definition to fix issue #1166 by @fballiano in #2189 +Cast params receiving int to string by @holozaen in #2144 +Set log level from config by @elidrissidev in #1727 +Expected PayPal (Express) field not found in NVP Response: AMT by @luigifab in #1520 +(BC) Remove js index file by @luigifab in #1622 +Fix display of Insert widget and Insert variable by @luigifab in #1848 +Fix region API list response - Update Api.php --> bug by @kyansi in #792 +Fixed issue #2001, EAV datetime attribute can't save time. by @kiatng in #2003 +Wrap max log level retrieval from config in a try catch by @elidrissidev in #2203 +Fix to allow for always reorder by @seansan in #504 +Remove frontend_type tag for text by @luigifab in #2148 +Reduce needless saves by avoiding setting _hasDataChanges flag by @colinmollenhour in #2066 +Pass delimiter char to preg_quote by @MarcinNowakMacopedia in #2047 +Phpstan errors in pr1325 by @kiatng in #2207 +Avoids multiplying all price adjustments by the number of websites by @azambon in #1303 +Use latest media editor plugin (989c4b5 from 2015030) for tinymce v3.5 by @theroch in #1123 +Some more room for the category menu by @loekvangool in #1314 +PHP 8: Fix cannot remove category on admin product edit categories tab by @iamniels in #2205 +Config cache for system.xml loader: Speed improvement by @lamskoy in #1916 +Remove strict typing for Mage_Catalog_Model_Product->setStockItem met… by @colinmollenhour in #2208 +Avoid session invalidation when changing session lifetime. by @colinmollenhour in #546 +Modernize setCategoryIds() by @loekvangool in #1308 +Replace Magento word with OpenMage in root files by @ADDISON74 in #2215 +Remove backslash character in translations files by @ADDISON74 in #2219 +Fix ACL resource name typo in Api2 roles page by @elidrissidev in #2222 +Missing bottom borders in Orders page with Gift Messages allowed by @ADDISON74 in #2220 +Backend > Orders grid - More space for columns by @ADDISON74 in #2217 +Fixed issue #2196, throws error if an email is already a newsletter s… by @kiatng in #2214 +Widen some dynamic admin input fields by @loekvangool in #1315 +Admin's password validation during Api's role/user removing process by @przemyslaw-p in #1045 +Fix multiple "PHPDoc tag @param has invalid value" phpstan errors by @tmotyl in #2227 +Fix for "non well formed numeric value" by @fballiano in #2225 +Fixed warning a non-numeric value encountered in /Mage/Catalog/Model/Resource/Product/Option.php by @kiatng in #2228 +Added support for sending subscribe confirm email by @fballiano in #2195 +Allow setting optional product attributes to null in REST API by @elidrissidev in #2230 +Fixed issue #2212 SQLSTATE[42S22]: Column not found: 1054 Unknown col… by @kiatng in #2221 +Drop LTS csv files by @luigifab in #1621 +Remove the word section by @luigifab in #2147 +Fix Missing Mage_Api_Model_Server_V2_Handler in SOAP v2 WSDL. by @SRaromicon in #392 +Throw exception when trying to modifying address that does not belong to logged in user by @fballiano in #2231 +Grid - iterate only columns with filters by @Sekiphp in #1642 +Fix Mage_Shell_Indexer wrong class name by @fballiano in #2234 +Backend > Manage Products grid - More space for columns by @ADDISON74 in #2218 +Make oldFields mapping hardcoded to speed up system by @tmotyl in #921 +Made sitemap more flexible by @sreichel in #1854 +Update Mage_Eav_Model_Entity_Collection_Abstract::joinTable() by @cebe in #1814 +Add "Times used" indicator field to promo rule quote grid by @spinsch in #1853 +bugfix: fix adminhtml translation in config.xml for importexport module by @eneiasramos in #2244 +Replace deprecated global now() calls with Varien_Date::now() by @Sdfendor in #2250 +Fix the calculation of bundle saleable status by @aredridel in #2178 +Revert "Some more room for the category menu" by @ADDISON74 in #2254 +prevent customer review view from loading foreign reviews by @aterjung in #1970 +Fix for "reset filter" breaking grid sorting by @fballiano in #2252 +Flush Magento Cache - button and message changes by @ADDISON74 in #2261 +Can upload xlsx file by @sdecalom in #2266 +Backend grid heads - Remove colons after To, From and In words by @ADDISON74 in #2267 +Merge v19 to v20 by @fballiano in #2206 +Fixed documentation link for "store scope" in store switcher (backend) by @fballiano in #2256 +Fix Varien_Io_File ignored errors with error control operator by @luigifab in #1269 +Fix store id filter in catalogProductList SOAP method by @elidrissidev in #2243 +Small changes in .htaccess file /media directory by @ADDISON74 in #2280 +Removed lib/flex by @fballiano in #2271 +All .gitignore files in one place by @ADDISON74 in #2269 +Create/Update .htaccess file in skin and media directories by @ADDISON74 in #2289 +Add magento-composer-installer to allowed plugins by @elidrissidev in #2296 +Delete .htaccess.sample by @ADDISON74 in #2293 +Update php.ini.sample by @ADDISON74 in #2292 +Fix editing special price in product mass attribute update by @fballiano in #2287 +Added required PHP modules to composer.json by @fballiano in #2064 +Update robots.txt.sample by @ADDISON74 in #2307 +Include exception message when generating error report by @elidrissidev in #2311 +add some ReturnTypeWillChange annotations to Varien_object by @Flyingmana in #2301 +Fix xml validation problems by @fballiano in #2242 +Create .htaccess file in js directory (OM-20 only) by @ADDISON74 in #2305 +Fix argument must contain at least one element by @luigifab in #2091 +Order add comment functionality in REST API by @elidrissidev in #2315 +XML validation workflow by @fballiano in #2314 +add basic unitTest for xml validation by @Flyingmana in #2304 +Fix "Variable might not be defined" PHPStan error by @elidrissidev in #2316 +Addendum to PR 2087 by @ADDISON74 in #2308 +Allow to rename api.php by @luigifab in #2132 +Removed module Mage_PageCache by @fballiano in #2258 +Fix phpdoc for saveAttribute() by @Caprico85 in #2320 +Small changes in root files by @ADDISON74 in #2324 +Add a message calling for an end to the Russian invasion of Ukraine by @luigifab in #2074 +Mage Factory Methods: Direct "_registry" Access Without Method Call by @Sdfendor in #2319 +Fixes a notice by @azambon in #2318 +Add vendor folder to gitignore by @elidrissidev in #2334 +Fix for modphp8 by @fballiano in #2329 +Fix for modphp8 by @fballiano in #2328 +Update Flat.php to correct bug #2337 by @matteorossi-thespacesm in #2338 +Fix #815 - add getAttributeRawText function by @justinbeaty in #2312 +gitignore: added VScode, PhpStorm files and ddev config.yaml by @sreichel in #2343 +Removed docker-dde sample by @sreichel in #2346 +Removed dead code by @sreichel in #2339 +Cosmetic fix in Mage_Sales_Model_Order_Payment by @fballiano in #2350 + + +## v20.0.14 - 2022-05-18 + +Add field info to exception when thrown in saving System Configuration. by @kiatng in #1784 +Fix Tax Rule name update by @elidrissidev in #1728 +Fixed method addExpressionFieldToSelect to use Zend_Db_Expr by @midlan in #1259 +enable programmatic creation of reviews for specific users by @luigifab in #1803 +API fix option labels for store view by @woutersamaey in #1828 +Fix newsletter subcriber loading by customer by @mmenozzi in #1779 +Fix file delete of customer attribute by @kiatng in #927 +Trim trailing whitespace by @luigifab in #1834 and #1846 +Updated .gitignore by @midlan in #1859 +Add gitpod online IDE config by @Flyingmana in #1836 +Add phpstan configuration, dependencies and github action by @Flyingmana in #1875 +Add Mage_Index helpers declaration to config.xml by @elidrissidev in #1878 +API: _getLocation - removed unused argument; fix phpdoc by @Sekiphp in #1867 +Grid page size: replaced similar lines to foreach by @Sekiphp in #1856 +Fix exception handling on Observer call when class not found by @spinsch in #1861 +Fixes catalog pricerules with dates in conditions, closes #433 by @sreichel in #1159 +Zend_Locale_Format::isNumber throws notice for float values by @fballiano in #1758 +Update PayPal currencies and countries by @luigifab in #1805 +Aggregate most viewed products report daily via a Cron job by @elidrissidev in #1829 +extend php Syntax check to php 8.1 by @Flyingmana in #1883 +Fix incompatible declaration error by @holozaen in #1890 +Zend registry - removed method offset exists (using parental) by @Sekiphp in #1873 +[PHP 8.1] Fix deprecation notice in mcryptcompat lib by @Sdfendor in #1891 +Bugfix #1885 - Add to cart only accepts 1 item by @gdemarsico in #1896 +Array to string conversion when adding reviews from backend by @fballiano in #1769 +Update phpdoc in Collection.php by @rubanooo in #1816 +Fix syntax in lib/Zend/Locale/Data/es_419.xml by @elidrissidev in #1901 +make fulltext search separator (OR/AND) configurable from backend by @sreichel in #1852 +Revert of Mage_Adminhtml_Block_Widget_Grid::_exportIterateCollection by @midlan in #1914 +demo.html is an unnecessary file by @ADDISON74 in #1926 +Revert #1355 for transactional email by @luigifab in #1898 +Sort ascending CMS Block list in Categories by @ADDISON74 in #1925 +[PHP 8.0] Refactor legacy usage of implode in Mage_Api2 by @elidrissidev in #1938 +Initialize Api2 Fields validator's required fields array by @elidrissidev in #1936 +No alt tag value in Recently Viewed Products side block by @ADDISON74 in #1920 +Dashboard - Top 5 Search Terms link issue by @ADDISON74 in #1917 +Removed unused var $_odd in templates. by @kiatng in #1964 +Documentation fix on README file about composer require by @nimasan in #1954 +Fix typo in Zend/Date.php by @eltociear in #1979 +[PHP 8.0] Check if track progressdetail is an array before calling count by @elidrissidev in #1982 +[PHP 8.1] Fix cookie deletion behavior by @Sdfendor in #1984 +updateAttributeSet() accepting array or string by @Sekiphp in #1535 +Fix typo in code comment by @dotancohen in #1988 +Fix #1924 non-existing field by @woutersamaey in #1941 +Added optgroup feature for massaction items (grids) by @Sekiphp in #1913 +PHPDoc fix for Mage_Core_Model_Config by @Sdfendor in #1802 +Missing middlename for salesOrderAddressEntity in SOAP APIs by @fballiano in #1977 +Attribute note adminhtml show translate by @boesbo in #1710 +Removed global polyfill function for PHP versions below 7.0 by @Sdfendor in #1990 +fix typo in _applyCustomOption() to correctly calculate min/max price by @jouriy in #1500 +Fix typo: Replace 'Retrive' with 'Retrieve' globally by @tmewes in #1995 +Add formkey validation to Newsletter subscribe action (theme BC-break) by @elidrissidev in #1866 +Added ability to add target attribute for adminhtml menu items by @Sekiphp in #1985 +Add docblock to app\code\core\Mage\Adminhtml\Block\Widget\Grid\Column… by @kiatng in #1987 +[PHP 8.1] Fix passing null to trim() by @elidrissidev in #2002 +Replaced remaining deprecated urlEscape calls. by @Sdfendor in #2008 +Update phpstan version by @tmotyl in #2015 +Replaced isAvailable() with isSalable() so events are considered by @woutersamaey in #1630 +Use mb_substr to split the postcode by @luigifab in #1357 +Fix count(): Parameter must be an array or an object that implements Countable by @Sekiphp in #1960 +Fix getting default min_sale_qty when trying to mass-update product attributes by @elidrissidev in #1850 +Add polyfill for PHP8 native string functions by @tmotyl in #2014 +Improve getScheme on Zend_Controller_Request_Http by @mmenozzi in #1872 +Fix @method declarations in Mage_Catalog_Model_Resource_Eav_Attribute by @Caprico85 in #2031 +Deprecated global function "now" because it's equivalent to Varien_Date::now() by @Sdfendor in #1991 +Fixed the unused parameter in assignProduct by @rubanooo in #2011 +Remove white space for config values for #1852 by @luigifab in #2020 +password_new.html - typo in vars by @m-overlund in #2039 +add unit Tests and send coverage results to SonarCloud by @Flyingmana in #2041 +Use vanillaJS instead of prototype in Wishlist add to cart column by @MarcinNowakMacopedia in #2051 +do not mark github job as failes through sonar failure by @Flyingmana in #2053 +Analyze most of the source code with phpstan. Provide baseline. by @tmotyl in #2035 +Update PHPdoc and remove useless var by @bastienlm in #2056 +Add unit tests for security helper validateAgainstBlockMethodBlacklist and provide composer.lock by @tmotyl in #2058 +Fix widget edition in WYSIWYG by @FredericMartinez in #1605 +Use vanillaJS instead of encodeURI in wishlist add to cart by @MarcinNowakMacopedia in #2052 +Fixed bug on incorrect category store_id when set with store code in … by @kiatng in #1601 +Remove notification survey block by @kkrieger85 in #1267 +Fixed grid filter reset by @spinsch in #821 +Documentation of some changes by @luigifab in #1831 +Fix: Integrity constraint violation: Duplicate key by @tim-breitenstein-it in #1331 +Align label with value by @AlterWeb in #1230 +Remove backend current date from backend's header by @fballiano in #2063 +Lazy load contributors images by @luigifab in #2070 +Do not save customer addresses when there are no changes by @luigifab in #1579 +Removed getQty() from Mage_Wishlist_IndexController by @fballiano in #2072 +Add title for old googlecheckout payment method by @luigifab in #2076 +Default sortby should be read from core_config_data by @fballiano in #2062 +Prevent Zend_Date from checking locale for know date codes by @MarcinNowakMacopedia in #2050 +Update admin login pages by @luigifab in #1618 +Do not render action or massaction column in totals row in adminhtml grid by @theroch in #1530 +Fix instructions update for bank transfer orders by @luigifab in #2075 +Add missing attributes to salesOrderInvoiceInfo SOAP method by @elidrissidev in #1999 ## v20.0.13 - 2021-08-26 From 7f352b60f804a26aec68f98e20410e87b592dca6 Mon Sep 17 00:00:00 2001 From: Fabian Blechschmidt Date: Wed, 3 Aug 2022 18:40:53 +0200 Subject: [PATCH 48/61] Added support for HTTP2 to Mage_HTTP_Client_Curl (#1137) --- lib/Mage/HTTP/Client/Curl.php | 56 ++++++++++++++++++++++++----------- 1 file changed, 39 insertions(+), 17 deletions(-) diff --git a/lib/Mage/HTTP/Client/Curl.php b/lib/Mage/HTTP/Client/Curl.php index fd9e14e7b07..4d27ac15e03 100644 --- a/lib/Mage/HTTP/Client/Curl.php +++ b/lib/Mage/HTTP/Client/Curl.php @@ -421,31 +421,29 @@ public function doError($string) * Parse headers - CURL callback functin * * @param resource $ch curl handle, not needed - * @param string $data + * @param string $data + * * @return int */ - protected function parseHeaders($ch, $data) + protected function parseHeaders($ch, $data): int { - if($this->_headerCount == 0) { + if ($this->_headerCount === 0) { + $line = explode(' ', trim($data), 3); - $line = explode(" ", trim($data), 3); - if(count($line) != 3) { - return $this->doError("Invalid response line returned from server: ".$data); - } - $this->_responseStatus = intval($line[1]); + $this->validateHttpVersion($line); + $this->_responseStatus = (int)$line[1]; } else { //var_dump($data); $name = $value = ''; - $out = explode(": ", trim($data), 2); - if(count($out) == 2) { - $name = $out[0]; - $value = $out[1]; + $out = explode(': ', trim($data), 2); + if (count($out) === 2) { + list($name, $value) = $out; } - if(strlen($name)) { - if("Set-Cookie" == $name) { - if(!isset($this->_responseHeaders[$name])) { - $this->_responseHeaders[$name] = array(); + if ($name !== '') { + if ($name === 'Set-Cookie') { + if (!isset($this->_responseHeaders[$name])) { + $this->_responseHeaders[$name] = []; } $this->_responseHeaders[$name][] = $value; } else { @@ -456,10 +454,34 @@ protected function parseHeaders($ch, $data) } $this->_headerCount++; - return strlen($data); } + /** + * @param array $line + * + * @throws Exception + */ + protected function validateHttpVersion(array $line) + { + if ($line[0] === 'HTTP/1.0' || $line[0] === 'HTTP/1.1') { + if (count($line) !== 3) { + $this->doError('Invalid response line returned from server: ' . implode(' ', $line)); + } + + return; + } + + if ($line[0] === 'HTTP/2') { + if (!in_array(count($line), [2, 3])) { + $this->doError('Invalid response line returned from server: ' . implode(' ', $line)); + } + + return; + } + $this->doError('Invalid response line returned from server: ' . $data); + } + /** * Set curl option directly * From 18e68a223dffc3d8dec6bb3e7ac485a6338baacd Mon Sep 17 00:00:00 2001 From: Colin Mollenhour Date: Wed, 3 Aug 2022 09:41:36 -0700 Subject: [PATCH 49/61] Blocked access to all dot files (#2349) --- .htaccess | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.htaccess b/.htaccess index 585273a3a4b..fbf3c6a99a4 100644 --- a/.htaccess +++ b/.htaccess @@ -99,6 +99,12 @@ #RewriteBase /magento/ +############################################ +## Prevent serving "hidden" files like git repository + + RewriteCond %{REQUEST_URI} /\. + RewriteRule ^(.*)$ / [R=404,L] + ############################################ ## uncomment next line to enable light API calls processing From 83aa1abbc4a70154f8943e570e1261d7371b2adc Mon Sep 17 00:00:00 2001 From: Kevin Jakob Date: Fri, 5 Aug 2022 05:45:03 +0200 Subject: [PATCH 50/61] Capitalization Adjustment Regarding CamelCase in Method Names (#2365) * refactor: Adjusted capitalization of two public methods. * refactor: Adjusted capitalization of one protected method. * refactor: Adjusted capitalization of where call. * chore: Removed fixed error from phpstan baseline. --- .github/phpstan-baseline.neon | 5 ----- app/code/core/Mage/Catalog/Block/Category/View.php | 6 +++--- app/code/core/Mage/Newsletter/Model/Resource/Subscriber.php | 2 +- .../base/default/template/catalog/category/view.phtml | 4 ++-- lib/Varien/Io/File.php | 6 +++--- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.github/phpstan-baseline.neon b/.github/phpstan-baseline.neon index b9793e3ee90..d491be91d22 100644 --- a/.github/phpstan-baseline.neon +++ b/.github/phpstan-baseline.neon @@ -5435,11 +5435,6 @@ parameters: count: 2 path: ../app/code/core/Mage/Newsletter/Model/Resource/Queue.php - - - message: "#^Call to method Zend_Db_Select\\:\\:where\\(\\) with incorrect case\\: Where$#" - count: 1 - path: ../app/code/core/Mage/Newsletter/Model/Resource/Subscriber.php - - message: "#^Call to an undefined method Mage_Customer_Model_Entity_Attribute\\:\\:getAttributeId\\(\\)\\.$#" count: 3 diff --git a/app/code/core/Mage/Catalog/Block/Category/View.php b/app/code/core/Mage/Catalog/Block/Category/View.php index 743effb41a5..2240b9b418a 100644 --- a/app/code/core/Mage/Catalog/Block/Category/View.php +++ b/app/code/core/Mage/Catalog/Block/Category/View.php @@ -60,7 +60,7 @@ protected function _prepareLayout() /* want to show rss feed in the url */ - if ($this->IsRssCatalogEnable() && $this->IsTopCategory()) { + if ($this->isRssCatalogEnable() && $this->isTopCategory()) { $title = $this->helper('rss')->__('%s RSS Feed', $this->getCurrentCategory()->getName()); $headBlock->addItem('rss', $this->getRssLink(), 'title="'.$title.'"'); } @@ -72,7 +72,7 @@ protected function _prepareLayout() /** * @return string */ - public function IsRssCatalogEnable() + public function isRssCatalogEnable() { return Mage::getStoreConfig('rss/catalog/category'); } @@ -80,7 +80,7 @@ public function IsRssCatalogEnable() /** * @return bool */ - public function IsTopCategory() + public function isTopCategory() { return $this->getCurrentCategory()->getLevel()==2; } diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Subscriber.php b/app/code/core/Mage/Newsletter/Model/Resource/Subscriber.php index 04f439b1414..17b07d0f880 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Subscriber.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Subscriber.php @@ -127,7 +127,7 @@ public function loadByCustomer(Mage_Customer_Model_Customer $customer) $select = $this->_read->select() ->from($this->getMainTable()) ->where('subscriber_email=:subscriber_email') - ->Where('store_id=:store_id'); + ->where('store_id=:store_id'); $result = $this->_read->fetchRow( $select, diff --git a/app/design/frontend/base/default/template/catalog/category/view.phtml b/app/design/frontend/base/default/template/catalog/category/view.phtml index 4a748657290..9cbacf2213a 100644 --- a/app/design/frontend/base/default/template/catalog/category/view.phtml +++ b/app/design/frontend/base/default/template/catalog/category/view.phtml @@ -28,7 +28,7 @@ /** * Category view template * - * @see Mage_Catalog_Block_Category_View + * @var Mage_Catalog_Block_Category_View $this */ ?>
    - IsRssCatalogEnable() && $this->IsTopCategory()): ?> + isRssCatalogEnable() && $this->isTopCategory()): ?> __('Subscribe to RSS Feed') ?>

    categoryAttribute($_category, $_category->getName(), 'name') ?>

    diff --git a/lib/Varien/Io/File.php b/lib/Varien/Io/File.php index 946b072f9cb..d35bc5971d7 100644 --- a/lib/Varien/Io/File.php +++ b/lib/Varien/Io/File.php @@ -254,7 +254,7 @@ public function streamClose() if ($this->_streamLocked) { $this->streamUnlock(); } - if ($this->_IsValidSource($this->_streamHandler)) { + if ($this->_isValidSource($this->_streamHandler)) { @fclose($this->_streamHandler); } $this->chmod($this->_streamFileName, $this->_streamChmod); @@ -466,7 +466,7 @@ public function read($filename, $dest=null) */ public function write($filename, $src, $mode=null) { - if (!$this->_IsValidSource($src) || !$this->_isFilenameWriteable($filename)) { + if (!$this->_isValidSource($src) || !$this->_isFilenameWriteable($filename)) { return false; } @@ -491,7 +491,7 @@ public function write($filename, $src, $mode=null) * @param string|resource $src * @return bool */ - protected function _IsValidSource($src) + protected function _isValidSource($src) { // In case of a string if (is_string($src)) { From 9cb2748665b47a9b5f890c9a5c35c5743337f2d1 Mon Sep 17 00:00:00 2001 From: sv3n Date: Fri, 5 Aug 2022 05:48:11 +0200 Subject: [PATCH 51/61] Some microoptimization (#2335) * Avoid duplicate method calls * Replaced array_push() * Changed substr() third parameter * Use array_key_exists() * php7 opcode - internal functions --- .../Adminhtml/Block/Api/Tab/Rolesedit.php | 2 +- .../Product/Helper/Form/Gallery/Content.php | 47 ++-- .../Mage/Adminhtml/Block/Dashboard/Graph.php | 6 +- .../Adminhtml/Block/Newsletter/Queue/Edit.php | 4 +- .../Block/Permissions/Tab/Rolesedit.php | 4 +- .../Block/Sales/Order/Shipment/Packaging.php | 68 +++--- .../Block/System/Config/Switcher.php | 35 +-- .../Adminhtml/Block/System/Config/Tabs.php | 102 ++++---- .../System/Convert/Profile/Edit/Tab/Run.php | 2 +- .../Adminhtml/Block/System/Store/Tree.php | 30 +-- .../Adminhtml/controllers/IndexController.php | 2 +- .../Newsletter/QueueController.php | 9 +- .../Permissions/RoleController.php | 2 +- .../Sales/Order/ShipmentController.php | 4 +- app/code/core/Mage/Bundle/Model/Option.php | 2 +- .../core/Mage/Bundle/Model/Product/Type.php | 10 +- .../core/Mage/Catalog/Block/Layer/State.php | 7 +- app/code/core/Mage/Catalog/Model/Category.php | 3 +- .../Mage/Catalog/Model/Layer/Filter/Price.php | 6 +- app/code/core/Mage/Catalog/Model/Product.php | 2 +- .../core/Mage/Catalog/Model/Product/Api.php | 2 +- .../Model/Product/Attribute/Backend/Media.php | 6 +- .../Model/Product/Type/Configurable.php | 2 +- .../Catalog/Model/Product/Type/Grouped.php | 2 +- .../core/Mage/Catalog/Model/Resource/Url.php | 231 +++++++++--------- .../Mage/CatalogInventory/Model/Observer.php | 58 ++--- app/code/core/Mage/Checkout/Model/Cart.php | 3 +- app/code/core/Mage/Core/Block/Abstract.php | 4 +- .../Mage/Core/Controller/Varien/Front.php | 2 +- .../core/Mage/Core/Model/Design/Package.php | 2 +- app/code/core/Mage/Core/Model/Email/Info.php | 8 +- .../Mage/Core/Model/Email/Template/Mailer.php | 2 +- app/code/core/Mage/Core/Model/Store.php | 1 + app/code/core/Mage/Core/Model/Store/Group.php | 30 +-- app/code/core/Mage/Core/Model/Website.php | 52 ++-- .../controllers/AccountController.php | 2 +- .../core/Mage/Downloadable/Helper/File.php | 2 +- .../Mage/Downloadable/Model/Product/Type.php | 2 +- .../Model/Import/Entity/Customer/Address.php | 5 +- .../Model/Import/Entity/Product.php | 2 +- .../Model/Entity/Quote/Item/Collection.php | 5 +- app/code/core/Mage/Sales/Model/Quote.php | 2 +- .../core/Mage/SalesRule/Model/Validator.php | 40 +-- app/code/core/Mage/Uploader/Helper/File.php | 2 +- .../Mage/Usa/Model/Shipping/Carrier/Dhl.php | 2 +- .../Model/Shipping/Carrier/Dhl/Label/Pdf.php | 2 +- app/code/core/Mage/Widget/Model/Widget.php | 27 +- .../Mage/Wishlist/Controller/Abstract.php | 2 +- 48 files changed, 451 insertions(+), 396 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php index ee45783d0ea..82e9e1fb31a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php @@ -42,7 +42,7 @@ public function __construct() { && $item->getApiPermission() == 'allow') { $resources[$item->getResource_id()]['checked'] = true; - array_push($selrids, $item->getResource_id()); + $selrids[] = $item->getResource_id(); } } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php index 8a29d3f3109..52fa611de0d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php @@ -24,7 +24,6 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ - /** * Catalog product form gallery content * @@ -47,6 +46,9 @@ public function __construct() $this->setTemplate('catalog/product/helper/gallery.phtml'); } + /** + * @inheritDoc + */ protected function _prepareLayout() { $this->setChild('uploader', @@ -57,16 +59,16 @@ protected function _prepareLayout() ->setFileParameterName('image') ->setTarget(Mage::getModel('adminhtml/url')->addSessionParam()->getUrl( '*/catalog_product_gallery/upload', - array('_query' => false) + ['_query' => false] )); $browseConfig = $this->getUploader()->getButtonConfig(); $browseConfig - ->setAttributes(array( + ->setAttributes([ 'accept' => $browseConfig->getMimeTypesByExtensions('gif, png, jpeg, jpg') - )); + ]); - Mage::dispatchEvent('catalog_product_gallery_prepare_layout', array('block' => $this)); + Mage::dispatchEvent('catalog_product_gallery_prepare_layout', ['block' => $this]); return parent::_prepareLayout(); } @@ -91,11 +93,17 @@ public function getUploaderHtml() return $this->getChildHtml('uploader'); } + /** + * @return string + */ public function getJsObjectName() { return $this->getHtmlId() . 'JsObject'; } + /** + * @return string + */ public function getAddImagesButton() { return $this->getButtonHtml( @@ -106,6 +114,9 @@ public function getAddImagesButton() ); } + /** + * @return string + */ public function getImagesJson() { if(is_array($this->getElement()->getValue())) { @@ -121,14 +132,16 @@ public function getImagesJson() return '[]'; } + /** + * @return string + */ public function getImagesValuesJson() { - $values = array(); + $values = []; foreach ($this->getMediaAttributes() as $attribute) { - /* @var $attribute Mage_Eav_Model_Entity_Attribute */ - $values[$attribute->getAttributeCode()] = $this->getElement()->getDataObject()->getData( - $attribute->getAttributeCode() - ); + /* @var Mage_Eav_Model_Entity_Attribute $attribute */ + $attributeCode = $attribute->getAttributeCode(); + $values[$attributeCode] = $this->getElement()->getDataObject()->getData($attributeCode); } return Mage::helper('core')->jsonEncode($values); } @@ -140,18 +153,21 @@ public function getImagesValuesJson() */ public function getImageTypes() { - $imageTypes = array(); + $imageTypes = []; foreach ($this->getMediaAttributes() as $attribute) { - /* @var $attribute Mage_Eav_Model_Entity_Attribute */ - $imageTypes[$attribute->getAttributeCode()] = array( + /* @var Mage_Eav_Model_Entity_Attribute $attribute */ + $imageTypes[$attribute->getAttributeCode()] = [ 'label' => $attribute->getFrontend()->getLabel() . ' ' . Mage::helper('catalog')->__($this->getElement()->getScopeLabel($attribute)), 'field' => $this->getElement()->getAttributeFieldName($attribute) - ); + ]; } return $imageTypes; } + /** + * @return bool + */ public function hasUseDefault() { foreach ($this->getMediaAttributes() as $attribute) { @@ -173,6 +189,9 @@ public function getMediaAttributes() return $this->getElement()->getDataObject()->getMediaAttributes(); } + /** + * @return string + */ public function getImageTypesJson() { return Mage::helper('core')->jsonEncode($this->getImageTypes()); diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php index 8672db23994..3a896f8798b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php @@ -322,12 +322,12 @@ public function getChartUrl($directUrl = true) $currentvalue = $thisdataarray[$j]; if (is_numeric($currentvalue)) { $ylocation = $yorigin + $currentvalue; - array_push($chartdata, $ylocation . $dataDelimiter); + $chartdata[] = $ylocation . $dataDelimiter; } else { - array_push($chartdata, $dataMissing . $dataDelimiter); + $chartdata[] = $dataMissing . $dataDelimiter; } } - array_push($chartdata, $dataSetdelimiter); + $chartdata[] = $dataSetdelimiter; } $buffer = implode('', $chartdata); diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php index d04b228324d..15bcb65cfd8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php @@ -245,9 +245,7 @@ public function getIsTextType() */ public function getCanResume() { - return in_array($this->getQueue()->getQueueStatus(), array( - Mage_Newsletter_Model_Queue::STATUS_PAUSE - )); + return $this->getQueue()->getQueueStatus() == Mage_Newsletter_Model_Queue::STATUS_PAUSE; } /** diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php index 519eb2545dc..c0ade190065 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php @@ -105,7 +105,7 @@ public function __construct() if (array_key_exists(strtolower($itemResourceId), $resources)) { if ($item->isAllowed()) { $resources[$itemResourceId]['checked'] = true; - array_push($selrids, $itemResourceId); + $selrids[] = $itemResourceId; } } } @@ -119,7 +119,7 @@ public function __construct() $undefinedResourceId ) == Mage_Admin_Model_Rules::RULE_PERMISSION_ALLOWED ) { - array_push($selrids, $undefinedResourceId); + $selrids[] = $undefinedResourceId; } } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php index da7e996fa1f..f37cd5d3158 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php @@ -53,25 +53,26 @@ public function getConfigDataJson() { $shipmentId = $this->getShipment()->getId(); $orderId = $this->getRequest()->getParam('order_id'); - $urlParams = array(); + $urlParams = []; - $itemsQty = array(); - $itemsPrice = array(); - $itemsName = array(); - $itemsWeight = array(); - $itemsProductId = array(); + $itemsQty = []; + $itemsPrice = []; + $itemsName = []; + $itemsWeight = []; + $itemsProductId = []; if ($shipmentId) { $urlParams['shipment_id'] = $shipmentId; $createLabelUrl = $this->getUrl('*/sales_order_shipment/createLabel', $urlParams); $itemsGridUrl = $this->getUrl('*/sales_order_shipment/getShippingItemsGrid', $urlParams); foreach ($this->getShipment()->getAllItems() as $item) { - $itemsQty[$item->getId()] = $item->getQty(); - $itemsPrice[$item->getId()] = $item->getPrice(); - $itemsName[$item->getId()] = $item->getName(); - $itemsWeight[$item->getId()] = $item->getWeight(); - $itemsProductId[$item->getId()] = $item->getProductId(); - $itemsOrderItemId[$item->getId()] = $item->getOrderItemId(); + $itemId = $item->getId(); + $itemsQty[$itemId] = $item->getQty(); + $itemsPrice[$itemId] = $item->getPrice(); + $itemsName[$itemId] = $item->getName(); + $itemsWeight[$itemId] = $item->getWeight(); + $itemsProductId[$itemId] = $item->getProductId(); + $itemsOrderItemId[$itemId] = $item->getOrderItemId(); } } else if ($orderId) { $urlParams['order_id'] = $orderId; @@ -79,15 +80,16 @@ public function getConfigDataJson() $itemsGridUrl = $this->getUrl('*/sales_order_shipment/getShippingItemsGrid', $urlParams); foreach ($this->getShipment()->getAllItems() as $item) { - $itemsQty[$item->getOrderItemId()] = $item->getQty()*1; - $itemsPrice[$item->getOrderItemId()] = $item->getPrice(); - $itemsName[$item->getOrderItemId()] = $item->getName(); - $itemsWeight[$item->getOrderItemId()] = $item->getWeight(); - $itemsProductId[$item->getOrderItemId()] = $item->getProductId(); - $itemsOrderItemId[$item->getOrderItemId()] = $item->getOrderItemId(); + $orderItemId = $item->getOrderItemId(); + $itemsQty[$orderItemId] = $item->getQty()*1; + $itemsPrice[$orderItemId] = $item->getPrice(); + $itemsName[$orderItemId] = $item->getName(); + $itemsWeight[$orderItemId] = $item->getWeight(); + $itemsProductId[$orderItemId] = $item->getProductId(); + $itemsOrderItemId[$orderItemId] = $orderItemId; } } - $data = array( + $data = [ 'createLabelUrl' => $createLabelUrl, 'itemsGridUrl' => $itemsGridUrl, 'errorQtyOverLimit' => Mage::helper('sales')->__('The quantity you want to add exceeds the total shipped quantity for some of selected Product(s)'), @@ -100,7 +102,7 @@ public function getConfigDataJson() 'shipmentItemsProductId' => $itemsProductId, 'shipmentItemsOrderItemId' => $itemsOrderItemId, 'customizable' => $this->_getCustomizableContainers(), - ); + ]; return Mage::helper('core')->jsonEncode($data); } @@ -117,14 +119,14 @@ public function getContainers() $carrier = $order->getShippingCarrier(); $countryShipper = Mage::getStoreConfig(Mage_Shipping_Model_Shipping::XML_PATH_STORE_COUNTRY_ID, $storeId); if ($carrier) { - $params = new Varien_Object(array( + $params = new Varien_Object([ 'method' => $order->getShippingMethod(true)->getMethod(), 'country_shipper' => $countryShipper, 'country_recipient' => $address->getCountryId(), - )); + ]); return $carrier->getContainerTypes($params); } - return array(); + return []; } /** @@ -138,7 +140,7 @@ protected function _getCustomizableContainers() if ($carrier) { return $carrier->getCustomizableContainerTypes(); } - return array(); + return []; } /** @@ -169,7 +171,7 @@ public function getDeliveryConfirmationTypeByCode($code) $countryId = $this->getShipment()->getOrder()->getShippingAddress()->getCountryId(); $carrier = $this->getShipment()->getOrder()->getShippingCarrier(); if ($carrier) { - $params = new Varien_Object(array('country_recipient' => $countryId)); + $params = new Varien_Object(['country_recipient' => $countryId]); $confirmationTypes = $carrier->getDeliveryConfirmationTypes($params); $confirmationType = !empty($confirmationTypes[$code]) ? $confirmationTypes[$code] : ''; return $confirmationType; @@ -203,7 +205,7 @@ public function getPackages() if ($packages) { $packages = unserialize($packages, ['allowed_classes' => false]); } else { - $packages = array(); + $packages = []; } return $packages; } @@ -258,11 +260,11 @@ public function getDeliveryConfirmationTypes() { $countryId = $this->getShipment()->getOrder()->getShippingAddress()->getCountryId(); $carrier = $this->getShipment()->getOrder()->getShippingCarrier(); - $params = new Varien_Object(array('country_recipient' => $countryId)); + $params = new Varien_Object(['country_recipient' => $countryId]); if ($carrier && is_array($carrier->getDeliveryConfirmationTypes($params))) { return $carrier->getDeliveryConfirmationTypes($params); } - return array(); + return []; } /** @@ -276,10 +278,10 @@ public function getPrintButton() $url = $this->getUrl('*/sales_order_shipment/printPackage', $data); return $this->getLayout() ->createBlock('adminhtml/widget_button') - ->setData(array( + ->setData([ 'label' => Mage::helper('sales')->__('Print'), 'onclick' => 'setLocation(\'' . $url . '\')' - )) + ]) ->toHtml(); } @@ -310,14 +312,14 @@ public function getContentTypes() $carrier = $order->getShippingCarrier(); $countryShipper = Mage::getStoreConfig(Mage_Shipping_Model_Shipping::XML_PATH_STORE_COUNTRY_ID, $storeId); if ($carrier) { - $params = new Varien_Object(array( + $params = new Varien_Object([ 'method' => $order->getShippingMethod(true)->getMethod(), 'country_shipper' => $countryShipper, 'country_recipient' => $address->getCountryId(), - )); + ]); return $carrier->getContentTypes($params); } - return array(); + return []; } /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php index 091afffe888..c7f0f990980 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php @@ -24,9 +24,11 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ - class Mage_Adminhtml_Block_System_Config_Switcher extends Mage_Adminhtml_Block_Template { + /** + * @inheritDoc + */ protected function _prepareLayout() { $this->setTemplate('system/config/switcher.phtml'); @@ -50,13 +52,13 @@ public function getStoreSelectOptions() $url = Mage::getModel('adminhtml/url'); - $options = array(); - $options['default'] = array( + $options = []; + $options['default'] = [ 'label' => Mage::helper('adminhtml')->__('Default Config'), - 'url' => $url->getUrl('*/*/*', array('section'=>$section)), + 'url' => $url->getUrl('*/*/*', ['section'=>$section]), 'selected' => !$curWebsite && !$curStore, 'style' => 'background:#ccc; font-weight:bold;', - ); + ]; foreach ($storeModel->getWebsiteCollection() as $website) { $websiteShow = false; @@ -71,34 +73,35 @@ public function getStoreSelectOptions() } if (!$websiteShow) { $websiteShow = true; - $options['website_' . $website->getCode()] = array( + $options['website_' . $website->getCode()] = [ 'label' => $website->getName(), - 'url' => $url->getUrl('*/*/*', array('section'=>$section, 'website'=>$website->getCode())), + 'url' => $url->getUrl('*/*/*', ['section'=>$section, 'website'=>$website->getCode()]), 'selected' => !$curStore && $curWebsite == $website->getCode(), 'style' => 'padding-left:16px; background:#DDD; font-weight:bold;', - ); + ]; } if (!$groupShow) { $groupShow = true; - $options['group_' . $group->getId() . '_open'] = array( + $options['group_' . $group->getId() . '_open'] = [ 'is_group' => true, 'is_close' => false, 'label' => $group->getName(), 'style' => 'padding-left:32px;' - ); + ]; } - $options['store_' . $store->getCode()] = array( + $storeCode = $store->getCode(); + $options['store_' . $storeCode] = [ 'label' => $store->getName(), - 'url' => $url->getUrl('*/*/*', array('section'=>$section, 'website'=>$website->getCode(), 'store'=>$store->getCode())), - 'selected' => $curStore == $store->getCode(), + 'url' => $url->getUrl('*/*/*', ['section'=>$section, 'website'=>$website->getCode(), 'store'=>$storeCode]), + 'selected' => $curStore == $storeCode, 'style' => '', - ); + ]; } if ($groupShow) { - $options['group_' . $group->getId() . '_close'] = array( + $options['group_' . $group->getId() . '_close'] = [ 'is_group' => true, 'is_close' => true, - ); + ]; } } } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php index d58e6af2e82..b011a95d4ac 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php @@ -24,7 +24,6 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ - /** * System configuration tabs block * @@ -84,22 +83,22 @@ public function initTabs() $sections = (array)$sections; - usort($sections, array($this, '_sort')); - usort($tabs, array($this, '_sort')); + usort($sections, [$this, '_sort']); + usort($tabs, [$this, '_sort']); foreach ($tabs as $tab) { $helperName = $configFields->getAttributeModule($tab); $label = Mage::helper($helperName)->__((string)$tab->label); - $this->addTab($tab->getName(), array( + $this->addTab($tab->getName(), [ 'label' => $label, 'class' => (string) $tab->class - )); + ]); } foreach ($sections as $section) { - Mage::dispatchEvent('adminhtml_block_system_config_init_tab_sections_before', array('section' => $section)); + Mage::dispatchEvent('adminhtml_block_system_config_init_tab_sections_before', ['section' => $section]); $hasChildren = $configFields->hasChildren($section, $websiteCode, $storeCode); //$code = $section->getPath(); @@ -120,15 +119,15 @@ public function initTabs() if (!$this->getRequest()->getParam('website') && !$this->getRequest()->getParam('store')) { $this->_addBreadcrumb($label); } else { - $this->_addBreadcrumb($label, '', $url->getUrl('*/*/*', array('section'=>$code))); + $this->_addBreadcrumb($label, '', $url->getUrl('*/*/*', ['section'=>$code])); } } if ( $sectionAllowed && $hasChildren) { - $this->addSection($code, (string)$section->tab, array( + $this->addSection($code, (string)$section->tab, [ 'class' => (string)$section->class, 'label' => $label, - 'url' => $url->getUrl('*/*/*', array('_current'=>true, 'section'=>$code)), - )); + 'url' => $url->getUrl('*/*/*', ['_current'=>true, 'section'=>$code]), + ]); } if ($code == $current) { @@ -152,6 +151,13 @@ public function initTabs() return $this; } + /** + * Add tab + * + * @param string $code + * @param array $config + * @return $this + */ public function addTab($code, $config) { $tab = new Varien_Object($config); @@ -175,6 +181,12 @@ public function getTab($code) return null; } + /** + * @param string $code + * @param string $tabCode + * @param array $config + * @return $this + */ public function addSection($code, $tabCode, $config) { if($tab = $this->getTab($tabCode)) { @@ -188,6 +200,11 @@ public function addSection($code, $tabCode, $config) return $this; } + /** + * Get tabs + * + * @return array + */ public function getTabs() { return $this->_tabs; @@ -210,13 +227,13 @@ public function getStoreSelectOptions() $url = Mage::getModel('adminhtml/url'); - $options = array(); - $options['default'] = array( + $options = []; + $options['default'] = [ 'label' => Mage::helper('adminhtml')->__('Default Config'), - 'url' => $url->getUrl('*/*/*', array('section'=>$section)), + 'url' => $url->getUrl('*/*/*', ['section'=>$section]), 'selected' => !$curWebsite && !$curStore, 'style' => 'background:#ccc; font-weight:bold;', - ); + ]; foreach ($storeModel->getWebsiteCollection() as $website) { $websiteShow = false; @@ -231,34 +248,35 @@ public function getStoreSelectOptions() } if (!$websiteShow) { $websiteShow = true; - $options['website_' . $website->getCode()] = array( + $options['website_' . $website->getCode()] = [ 'label' => $website->getName(), - 'url' => $url->getUrl('*/*/*', array('section'=>$section, 'website'=>$website->getCode())), + 'url' => $url->getUrl('*/*/*', ['section'=>$section, 'website'=>$website->getCode()]), 'selected' => !$curStore && $curWebsite == $website->getCode(), 'style' => 'padding-left:16px; background:#DDD; font-weight:bold;', - ); + ]; } if (!$groupShow) { $groupShow = true; - $options['group_' . $group->getId() . '_open'] = array( + $options['group_' . $group->getId() . '_open'] = [ 'is_group' => true, 'is_close' => false, 'label' => $group->getName(), 'style' => 'padding-left:32px;' - ); + ]; } - $options['store_' . $store->getCode()] = array( + $storeCode = $store->getCode(); + $options['store_' . $storeCode] = [ 'label' => $store->getName(), - 'url' => $url->getUrl('*/*/*', array('section'=>$section, 'website'=>$website->getCode(), 'store'=>$store->getCode())), - 'selected' => $curStore == $store->getCode(), + 'url' => $url->getUrl('*/*/*', ['section'=>$section, 'website'=>$website->getCode(), 'store'=>$storeCode]), + 'selected' => $curStore == $storeCode, 'style' => '', - ); + ]; } if ($groupShow) { - $options['group_' . $group->getId() . '_close'] = array( + $options['group_' . $group->getId() . '_close'] = [ 'is_group' => true, 'is_close' => true, - ); + ]; } } } @@ -279,36 +297,36 @@ public function getStoreButtonsHtml() $html = ''; if (!$curWebsite && !$curStore) { - $html .= $this->getLayout()->createBlock('adminhtml/widget_button')->setData(array( + $html .= $this->getLayout()->createBlock('adminhtml/widget_button')->setData([ 'label' => Mage::helper('adminhtml')->__('New Website'), 'onclick' => "location.href='".$this->getUrl('*/system_website/new')."'", 'class' => 'add', - ))->toHtml(); + ])->toHtml(); } elseif (!$curStore) { - $html .= $this->getLayout()->createBlock('adminhtml/widget_button')->setData(array( + $html .= $this->getLayout()->createBlock('adminhtml/widget_button')->setData([ 'label' => Mage::helper('adminhtml')->__('Edit Website'), - 'onclick' => "location.href='".$this->getUrl('*/system_website/edit', array('website'=>$curWebsite))."'", - ))->toHtml(); - $html .= $this->getLayout()->createBlock('adminhtml/widget_button')->setData(array( + 'onclick' => "location.href='".$this->getUrl('*/system_website/edit', ['website'=>$curWebsite])."'", + ])->toHtml(); + $html .= $this->getLayout()->createBlock('adminhtml/widget_button')->setData([ 'label' => Mage::helper('adminhtml')->__('New Store View'), - 'onclick' => "location.href='".$this->getUrl('*/system_store/new', array('website'=>$curWebsite))."'", + 'onclick' => "location.href='".$this->getUrl('*/system_store/new', ['website'=>$curWebsite])."'", 'class' => 'add', - ))->toHtml(); - $html .= $this->getLayout()->createBlock('adminhtml/widget_button')->setData(array( + ])->toHtml(); + $html .= $this->getLayout()->createBlock('adminhtml/widget_button')->setData([ 'label' => Mage::helper('adminhtml')->__('Delete Website'), - 'onclick' => "location.href='".$this->getUrl('*/system_website/delete', array('website'=>$curWebsite))."'", + 'onclick' => "location.href='".$this->getUrl('*/system_website/delete', ['website'=>$curWebsite])."'", 'class' => 'delete', - ))->toHtml(); + ])->toHtml(); } else { - $html .= $this->getLayout()->createBlock('adminhtml/widget_button')->setData(array( + $html .= $this->getLayout()->createBlock('adminhtml/widget_button')->setData([ 'label' => Mage::helper('adminhtml')->__('Edit Store View'), - 'onclick' => "location.href='".$this->getUrl('*/system_store/edit', array('store'=>$curStore))."'", - ))->toHtml(); - $html .= $this->getLayout()->createBlock('adminhtml/widget_button')->setData(array( + 'onclick' => "location.href='".$this->getUrl('*/system_store/edit', ['store'=>$curStore])."'", + ])->toHtml(); + $html .= $this->getLayout()->createBlock('adminhtml/widget_button')->setData([ 'label' => Mage::helper('adminhtml')->__('Delete Store View'), - 'onclick' => "location.href='".$this->getUrl('*/system_store/delete', array('store'=>$curStore))."'", + 'onclick' => "location.href='".$this->getUrl('*/system_store/delete', ['store'=>$curStore])."'", 'class' => 'delete', - ))->toHtml(); + ])->toHtml(); } return $html; diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php index e561b270e30..8dbf5fce136 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php @@ -81,7 +81,7 @@ public function getImportedFiles() while (false !== ($entry = $dir->read())) { if($entry != '.' && $entry != '..' - && in_array(strtolower(substr($entry, strrpos($entry, '.')+1)), array($this->getParseType()))) + && strtolower(substr($entry, strrpos($entry, '.') + 1)) == $this->getParseType()) { $files[] = $entry; } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Tree.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Tree.php index 79fcfec4540..073cb238a38 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Tree.php @@ -24,7 +24,6 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ - /** * Adminhtml store tree * @@ -70,42 +69,43 @@ protected function _prepareLayout() */ public function getTableData() { - $data = array(); + $data = []; foreach (Mage::getModel('core/website')->getCollection() as $website) { /** @var Mage_Core_Model_Website $website */ $groupCollection = $website->getGroupCollection(); - $data[$website->getId()] = array( + $websiteId = $website->getId(); + $data[$websiteId] = [ 'object' => $website, - 'storeGroups' => array(), + 'storeGroups' => [], 'count' => 0 - ); + ]; $defaultGroupId = $website->getDefaultGroupId(); foreach ($groupCollection as $storeGroup) { /** @var Mage_Core_Model_Store_Group $storeGroup */ $storeCollection = $storeGroup->getStoreCollection(); $storeGroupCount = max(1, $storeCollection->count()); - $data[$website->getId()]['storeGroups'][$storeGroup->getId()] = array( + $data[$websiteId]['storeGroups'][$storeGroup->getId()] = [ 'object' => $storeGroup, - 'stores' => array(), + 'stores' => [], 'count' => $storeGroupCount - ); - $data[$website->getId()]['count'] += $storeGroupCount; + ]; + $data[$websiteId]['count'] += $storeGroupCount; if ($storeGroup->getId() == $defaultGroupId) { $storeGroup->setData('is_default', true); } $defaultStoreId = $storeGroup->getDefaultStoreId(); foreach ($storeCollection as $store) { /** @var Mage_Core_Model_Store $store */ - $data[$website->getId()]['storeGroups'][$storeGroup->getId()]['stores'][$store->getId()] = array( + $data[$websiteId]['storeGroups'][$storeGroup->getId()]['stores'][$store->getId()] = [ 'object' => $store - ); + ]; if ($store->getId() == $defaultStoreId) { $store->setData('is_default', true); } } } - $data[$website->getId()]['count'] = max(1, $data[$website->getId()]['count']); + $data[$websiteId]['count'] = max(1, $data[$websiteId]['count']); } return $data; } @@ -130,7 +130,7 @@ public function renderWebsite(Mage_Core_Model_Website $website) { return $this->_createCellTemplate() ->setObject($website) - ->setLinkUrl($this->getUrl('*/*/editWebsite', array('website_id' => $website->getWebsiteId()))) + ->setLinkUrl($this->getUrl('*/*/editWebsite', ['website_id' => $website->getWebsiteId()])) ->setInfo($this->__('Code') . ': ' . $this->escapeHtml($website->getCode())) ->toHtml(); } @@ -146,7 +146,7 @@ public function renderStoreGroup(Mage_Core_Model_Store_Group $storeGroup) $rootCategory = Mage::getModel('catalog/category')->load($storeGroup->getRootCategoryId()); return $this->_createCellTemplate() ->setObject($storeGroup) - ->setLinkUrl($this->getUrl('*/*/editGroup', array('group_id' => $storeGroup->getGroupId()))) + ->setLinkUrl($this->getUrl('*/*/editGroup', ['group_id' => $storeGroup->getGroupId()])) ->setInfo($this->__('Root Category') . ': ' . $this->escapeHtml($rootCategory->getName())) ->toHtml(); } @@ -161,7 +161,7 @@ public function renderStore(Mage_Core_Model_Store $store) { $cell = $this->_createCellTemplate() ->setObject($store) - ->setLinkUrl($this->getUrl('*/*/editStore', array('store_id' => $store->getStoreId()))) + ->setLinkUrl($this->getUrl('*/*/editStore', ['store_id' => $store->getStoreId()])) ->setInfo($this->__('Code') . ': ' . $this->escapeHtml($store->getCode())); if (!$store->getIsActive()) { $cell->setClass('strike'); diff --git a/app/code/core/Mage/Adminhtml/controllers/IndexController.php b/app/code/core/Mage/Adminhtml/controllers/IndexController.php index e6eb5876b2a..5b5be49b773 100644 --- a/app/code/core/Mage/Adminhtml/controllers/IndexController.php +++ b/app/code/core/Mage/Adminhtml/controllers/IndexController.php @@ -325,7 +325,7 @@ public function resetPasswordPostAction() $errorMessages = array(); if (iconv_strlen($password) <= 0) { - array_push($errorMessages, Mage::helper('adminhtml')->__('New password field cannot be empty.')); + $errorMessages[] = Mage::helper('adminhtml')->__('New password field cannot be empty.'); } /** @var Mage_Admin_Model_User $user */ $user = $this->_getModel('admin/user')->load($userId); diff --git a/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php index ef5b6193324..33f40ab0377 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php @@ -129,8 +129,7 @@ public function pauseAction() $queue = Mage::getSingleton('newsletter/queue') ->load($this->getRequest()->getParam('id')); - if (!in_array($queue->getQueueStatus(), - array(Mage_Newsletter_Model_Queue::STATUS_SENDING))) { + if ($queue->getQueueStatus() != Mage_Newsletter_Model_Queue::STATUS_SENDING) { $this->_redirect('*/*'); return; } @@ -146,8 +145,7 @@ public function resumeAction() $queue = Mage::getSingleton('newsletter/queue') ->load($this->getRequest()->getParam('id')); - if (!in_array($queue->getQueueStatus(), - array(Mage_Newsletter_Model_Queue::STATUS_PAUSE))) { + if ($queue->getQueueStatus() != Mage_Newsletter_Model_Queue::STATUS_PAUSE) { $this->_redirect('*/*'); return; } @@ -163,8 +161,7 @@ public function cancelAction() $queue = Mage::getSingleton('newsletter/queue') ->load($this->getRequest()->getParam('id')); - if (!in_array($queue->getQueueStatus(), - array(Mage_Newsletter_Model_Queue::STATUS_SENDING))) { + if ($queue->getQueueStatus() != Mage_Newsletter_Model_Queue::STATUS_SENDING) { $this->_redirect('*/*'); return; } diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php index b203b4a3684..58e1d7f08bc 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php @@ -339,7 +339,7 @@ public function refreshRolesAction() } else { foreach ($resourceAcl->getResources() as $resource) { if ($resourceAcl->isAllowed($roleTypeId, $resource)) { - array_push($selectedResourceIds, $resource); + $selectedResourceIds[] = $resource; } } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php index 929524539be..9ed82dbb772 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php @@ -643,7 +643,7 @@ public function massPrintShippingLabelAction() switch ($request->getParam('massaction_prepare_key')) { case 'shipment_ids': $ids = $request->getParam('shipment_ids'); - array_filter($ids, 'intval'); + array_filter($ids, '\intval'); if (!empty($ids)) { $shipments = Mage::getResourceModel('sales/order_shipment_collection') ->addFieldToFilter('entity_id', array('in' => $ids)); @@ -651,7 +651,7 @@ public function massPrintShippingLabelAction() break; case 'order_ids': $ids = $request->getParam('order_ids'); - array_filter($ids, 'intval'); + array_filter($ids, '\intval'); if (!empty($ids)) { $shipments = Mage::getResourceModel('sales/order_shipment_collection') ->setOrderFilter(array('in' => $ids)); diff --git a/app/code/core/Mage/Bundle/Model/Option.php b/app/code/core/Mage/Bundle/Model/Option.php index ace6fea8b09..996294406b5 100644 --- a/app/code/core/Mage/Bundle/Model/Option.php +++ b/app/code/core/Mage/Bundle/Model/Option.php @@ -85,7 +85,7 @@ public function addSelection($selection) if (!$selections = $this->getData('selections')) { $selections = array(); } - array_push($selections, $selection); + $selections[] = $selection; $this->setSelections($selections); return $this; } diff --git a/app/code/core/Mage/Bundle/Model/Product/Type.php b/app/code/core/Mage/Bundle/Model/Product/Type.php index 5495f85f097..6fdb7837690 100644 --- a/app/code/core/Mage/Bundle/Model/Product/Type.php +++ b/app/code/core/Mage/Bundle/Model/Product/Type.php @@ -542,7 +542,7 @@ protected function _prepareProduct(Varien_Object $buyRequest, $product, $process $options = $buyRequest->getBundleOption(); if (is_array($options)) { - $options = array_filter($options, 'intval'); + $options = array_filter($options, '\intval'); $qtys = $buyRequest->getBundleOptionQty(); foreach ($options as $_optionId => $_selections) { if (empty($_selections)) { @@ -673,7 +673,7 @@ protected function _prepareProduct(Varien_Object $buyRequest, $product, $process } $result[] = $_result[0]->setParentProductId($product->getId()) - ->addCustomOption('bundle_option_ids', serialize(array_map('intval', $optionIds))) + ->addCustomOption('bundle_option_ids', serialize(array_map('\intval', $optionIds))) ->addCustomOption('bundle_selection_attributes', serialize($attributes)); if ($isStrictProcessMode) { @@ -690,7 +690,7 @@ protected function _prepareProduct(Varien_Object $buyRequest, $product, $process foreach ($result as $item) { $item->addCustomOption('bundle_identity', $uniqueKey); } - $product->addCustomOption('bundle_option_ids', serialize(array_map('intval', $optionIds))); + $product->addCustomOption('bundle_option_ids', serialize(array_map('\intval', $optionIds))); $product->addCustomOption('bundle_selection_ids', serialize($selectionIds)); return $result; @@ -1009,8 +1009,8 @@ public function processBuyRequest($product, $buyRequest) $option = $buyRequest->getBundleOption(); $optionQty = $buyRequest->getBundleOptionQty(); - $option = (is_array($option)) ? array_filter($option, 'intval') : array(); - $optionQty = (is_array($optionQty)) ? array_filter($optionQty, 'intval') : array(); + $option = (is_array($option)) ? array_filter($option, '\intval') : array(); + $optionQty = (is_array($optionQty)) ? array_filter($optionQty, '\intval') : array(); $options = array( 'bundle_option' => $option, diff --git a/app/code/core/Mage/Catalog/Block/Layer/State.php b/app/code/core/Mage/Catalog/Block/Layer/State.php index 15d92c5ec89..29372d3ecc1 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/State.php +++ b/app/code/core/Mage/Catalog/Block/Layer/State.php @@ -54,7 +54,7 @@ public function getActiveFilters() { $filters = $this->getLayer()->getState()->getFilters(); if (!is_array($filters)) { - $filters = array(); + $filters = []; } return $filters; } @@ -66,9 +66,10 @@ public function getActiveFilters() */ public function getClearUrl() { - $filterState = array(); + $filterState = []; foreach ($this->getActiveFilters() as $item) { - $filterState[$item->getFilter()->getRequestVar()] = $item->getFilter()->getCleanValue(); + $filter = $item->getFilter(); + $filterState[$filter->getRequestVar()] = $filter->getCleanValue(); } $params['_current'] = true; $params['_use_rewrite'] = true; diff --git a/app/code/core/Mage/Catalog/Model/Category.php b/app/code/core/Mage/Catalog/Model/Category.php index c3cc5a1bbcd..9d2285c55a3 100644 --- a/app/code/core/Mage/Catalog/Model/Category.php +++ b/app/code/core/Mage/Catalog/Model/Category.php @@ -421,7 +421,8 @@ public function getStoreIds() $storeCollection = Mage::getModel('core/store')->getCollection()->loadByCategoryIds($nodes); /** @var Mage_Core_Model_Store $store */ foreach ($storeCollection as $store) { - $storeIds[$store->getId()] = $store->getId(); + $storeId = $store->getId(); + $storeIds[$storeId] = $storeId; } $entityStoreId = $this->getStoreId(); diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Price.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Price.php index e347c547cab..a7bea9616e0 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Price.php +++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Price.php @@ -552,7 +552,7 @@ public function loadPrices($limit, $offset = null, $lowerPrice = null, $upperPri { $prices = $this->_getResource()->loadPrices($this, $limit, $offset, $lowerPrice, $upperPrice); if ($prices) { - $prices = array_map('floatval', $prices); + $prices = array_map('\floatval', $prices); } return $prices; @@ -570,7 +570,7 @@ public function loadPreviousPrices($price, $index, $lowerPrice = null) { $prices = $this->_getResource()->loadPreviousPrices($this, $price, $index, $lowerPrice); if ($prices) { - $prices = array_map('floatval', $prices); + $prices = array_map('\floatval', $prices); } return $prices; @@ -588,7 +588,7 @@ public function loadNextPrices($price, $rightIndex, $upperPrice = null) { $prices = $this->_getResource()->loadNextPrices($this, $price, $rightIndex, $upperPrice); if ($prices) { - $prices = array_map('floatval', $prices); + $prices = array_map('\floatval', $prices); } return $prices; diff --git a/app/code/core/Mage/Catalog/Model/Product.php b/app/code/core/Mage/Catalog/Model/Product.php index a5772d811a6..4bc8d9e1127 100644 --- a/app/code/core/Mage/Catalog/Model/Product.php +++ b/app/code/core/Mage/Catalog/Model/Product.php @@ -588,7 +588,7 @@ public function setCategoryIds($ids) } elseif (!is_array($ids)) { Mage::throwException(Mage::helper('catalog')->__('Invalid category IDs.')); } - $ids = array_filter(array_map('intval', $ids)); + $ids = array_filter(array_map('\intval', $ids)); $this->setData('category_ids', $ids); return $this; } diff --git a/app/code/core/Mage/Catalog/Model/Product/Api.php b/app/code/core/Mage/Catalog/Model/Product/Api.php index 168ddde78dd..04bf8b3851a 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Api.php @@ -449,7 +449,7 @@ public function getAdditionalAttributes($productType, $attributeSetId) */ protected function _checkProductTypeExists($productType) { - if (!in_array($productType, array_keys(Mage::getModel('catalog/product_type')->getOptionArray()))) { + if (!array_key_exists($productType, Mage::getModel('catalog/product_type')->getOptionArray())) { $this->_fault('product_type_not_exists'); } } diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php index 224c7951219..a1712b5c857 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php @@ -167,12 +167,12 @@ public function beforeSave($object) $object->setData($mediaAttrCode, 'no_selection'); } - if (in_array($attrData, array_keys($newImages))) { + if (array_key_exists($attrData, $newImages)) { $object->setData($mediaAttrCode, $newImages[$attrData]['new_file']); $object->setData($mediaAttrCode.'_label', $newImages[$attrData]['label']); } - if (in_array($attrData, array_keys($existImages))) { + if (array_key_exists($attrData, $existImages)) { $object->setData($mediaAttrCode.'_label', $existImages[$attrData]['label']); } } @@ -585,7 +585,7 @@ protected function _moveImageFromTmp($file) } if (strrpos($file, '.tmp') == strlen($file)-4) { - $file = substr($file, 0, strlen($file)-4); + $file = substr($file, 0, -4); } $destFile = $this->_getUniqueFileName($file, $ioObject->dirsep()); diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php index f839a16ca1e..b2618afa6af 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php @@ -861,7 +861,7 @@ public function getSku($product = null) public function processBuyRequest($product, $buyRequest) { $superAttribute = $buyRequest->getSuperAttribute(); - $superAttribute = (is_array($superAttribute)) ? array_filter($superAttribute, 'intval') : array(); + $superAttribute = (is_array($superAttribute)) ? array_filter($superAttribute, '\intval') : array(); $options = array('super_attribute' => $superAttribute); diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php b/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php index 7e9b4354409..c48448ceb41 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php @@ -365,7 +365,7 @@ public function getProductsToPurchaseByReqGroups($product = null) public function processBuyRequest($product, $buyRequest) { $superGroup = $buyRequest->getSuperGroup(); - $superGroup = (is_array($superGroup)) ? array_filter($superGroup, 'intval') : array(); + $superGroup = (is_array($superGroup)) ? array_filter($superGroup, '\intval') : array(); $options = array('super_group' => $superGroup); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Url.php b/app/code/core/Mage/Catalog/Model/Resource/Url.php index eb4a07a60cb..ea2e937f62e 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Url.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Url.php @@ -46,14 +46,14 @@ class Mage_Catalog_Model_Resource_Url extends Mage_Core_Model_Resource_Db_Abstra * * @var array */ - protected $_categoryAttributes = array(); + protected $_categoryAttributes = []; /** * Product attribute properties cache * * @var array */ - protected $_productAttributes = array(); + protected $_productAttributes = []; /** * Limit products for select @@ -67,7 +67,7 @@ class Mage_Catalog_Model_Resource_Url extends Mage_Core_Model_Resource_Db_Abstra * * @var array */ - protected $_rootChildrenIds = array(); + protected $_rootChildrenIds = []; /** * Load core Url rewrite model @@ -129,10 +129,10 @@ public function getRewriteByIdPath($idPath, $storeId) ->from($this->getMainTable()) ->where('store_id = :store_id') ->where('id_path = :id_path'); - $bind = array( + $bind = [ 'store_id' => (int)$storeId, 'id_path' => $idPath - ); + ]; $row = $adapter->fetchRow($select, $bind); if (!$row) { @@ -158,10 +158,10 @@ public function getRewriteByRequestPath($requestPath, $storeId) ->from($this->getMainTable()) ->where('store_id = :store_id') ->where('request_path = :request_path'); - $bind = array( + $bind = [ 'request_path' => $requestPath, 'store_id' => (int)$storeId - ); + ]; $row = $adapter->fetchRow($select, $bind); if (!$row) { @@ -196,13 +196,13 @@ public function getLastUsedRewriteRequestIncrement($prefix, $suffix, $storeId) ->from($this->getMainTable(), new Zend_Db_Expr('MAX(' . $urlIncrementPartExpression . ')')) ->where('store_id = :store_id') ->where('request_path LIKE :request_path') - ->where($adapter->prepareSqlCondition('request_path', array( + ->where($adapter->prepareSqlCondition('request_path', [ 'regexp' => '^' . preg_quote($prefix) . '[0-9]*' . preg_quote($suffix) . '$' - ))); - $bind = array( + ])); + $bind = [ 'store_id' => (int)$storeId, 'request_path' => $prefix . '%' . $suffix, - ); + ]; return (int)$adapter->fetchOne($select, $bind); } @@ -221,7 +221,7 @@ public function checkRequestPaths($paths, $storeId) ->from($this->getMainTable(), 'request_path') ->where('store_id = :store_id') ->where('request_path IN (?)', $paths); - $data = $adapter->fetchCol($select, array('store_id' => $storeId)); + $data = $adapter->fetchCol($select, ['store_id' => $storeId]); $paths = array_diff($paths, $data); if (empty($paths)) { return false; @@ -241,17 +241,17 @@ public function checkRequestPaths($paths, $storeId) */ public function prepareRewrites($storeId, $categoryIds = null, $productIds = null) { - $rewrites = array(); + $rewrites = []; $adapter = $this->_getWriteAdapter(); $select = $adapter->select() ->from($this->getMainTable()) ->where('store_id = :store_id') ->where('is_system = ?', 1); - $bind = array('store_id' => $storeId); + $bind = ['store_id' => $storeId]; if ($categoryIds === null) { $select->where('category_id IS NULL'); } elseif ($categoryIds) { - $catIds = is_array($categoryIds) ? $categoryIds : array($categoryIds); + $catIds = is_array($categoryIds) ? $categoryIds : [$categoryIds]; // Check maybe we request products and root category id is within categoryIds, // it's a separate case because root category products are stored with NULL categoryId @@ -306,13 +306,13 @@ public function saveRewrite($rewriteData, $rewrite) if ($rewrite && $rewrite->getId()) { if ($rewriteData['request_path'] != $rewrite->getRequestPath()) { // Update existing rewrites history and avoid chain redirects - $where = array('target_path = ?' => $rewrite->getRequestPath()); + $where = ['target_path = ?' => $rewrite->getRequestPath()]; if ($rewrite->getStoreId()) { $where['store_id = ?'] = (int)$rewrite->getStoreId(); } $adapter->update( $this->getMainTable(), - array('target_path' => $rewriteData['request_path']), + ['target_path' => $rewriteData['request_path']], $where ); } @@ -354,24 +354,24 @@ public function saveCategoryAttribute(Varien_Object $category, $attributeCode) if (!isset($this->_categoryAttributes[$attributeCode])) { $attribute = $this->getCategoryModel()->getResource()->getAttribute($attributeCode); - $this->_categoryAttributes[$attributeCode] = array( + $this->_categoryAttributes[$attributeCode] = [ 'entity_type_id' => $attribute->getEntityTypeId(), 'attribute_id' => $attribute->getId(), 'table' => $attribute->getBackend()->getTable(), 'is_global' => $attribute->getIsGlobal() - ); + ]; unset($attribute); } $attributeTable = $this->_categoryAttributes[$attributeCode]['table']; - $attributeData = array( + $attributeData = [ 'entity_type_id' => $this->_categoryAttributes[$attributeCode]['entity_type_id'], 'attribute_id' => $this->_categoryAttributes[$attributeCode]['attribute_id'], 'store_id' => $category->getStoreId(), 'entity_id' => $category->getId(), 'value' => $category->getData($attributeCode) - ); + ]; if ($this->_categoryAttributes[$attributeCode]['is_global'] || $category->getStoreId() == 0) { $attributeData['store_id'] = 0; @@ -386,7 +386,7 @@ public function saveCategoryAttribute(Varien_Object $category, $attributeCode) $row = $adapter->fetchRow($select); if ($row) { - $whereCond = array('value_id = ?' => $row['value_id']); + $whereCond = ['value_id = ?' => $row['value_id']]; $adapter->update($attributeTable, $attributeData, $whereCond); } else { $adapter->insert($attributeTable, $attributeData); @@ -403,7 +403,7 @@ public function saveCategoryAttribute(Varien_Object $category, $attributeCode) $row = $adapter->fetchRow($select); if ($row) { - $whereCond = array('value_id = ?' => $row['value_id']); + $whereCond = ['value_id = ?' => $row['value_id']]; $adapter->update($attributeTable, $attributeData, $whereCond); } else { $adapter->insert($attributeTable, $attributeData); @@ -428,33 +428,33 @@ protected function _getCategoryAttribute($attributeCode, $categoryIds, $storeId) if (!isset($this->_categoryAttributes[$attributeCode])) { $attribute = $this->getCategoryModel()->getResource()->getAttribute($attributeCode); - $this->_categoryAttributes[$attributeCode] = array( + $this->_categoryAttributes[$attributeCode] = [ 'entity_type_id' => $attribute->getEntityTypeId(), 'attribute_id' => $attribute->getId(), 'table' => $attribute->getBackend()->getTable(), 'is_global' => $attribute->getIsGlobal(), 'is_static' => $attribute->isStatic() - ); + ]; unset($attribute); } if (!is_array($categoryIds)) { - $categoryIds = array($categoryIds); + $categoryIds = [$categoryIds]; } $attributeTable = $this->_categoryAttributes[$attributeCode]['table']; $select = $adapter->select(); - $bind = array(); + $bind = []; if ($this->_categoryAttributes[$attributeCode]['is_static']) { $select ->from( $this->getTable('catalog/category'), - array('value' => $attributeCode, 'entity_id' => 'entity_id') + ['value' => $attributeCode, 'entity_id' => 'entity_id'] ) ->where('entity_id IN(?)', $categoryIds); } elseif ($this->_categoryAttributes[$attributeCode]['is_global'] || $storeId == 0) { $select - ->from($attributeTable, array('entity_id', 'value')) + ->from($attributeTable, ['entity_id', 'value']) ->where('attribute_id = :attribute_id') ->where('store_id = ?', 0) ->where('entity_id IN(?)', $categoryIds); @@ -463,13 +463,13 @@ protected function _getCategoryAttribute($attributeCode, $categoryIds, $storeId) $valueExpr = $adapter->getCheckSql('t2.value_id > 0', 't2.value', 't1.value'); $select ->from( - array('t1' => $attributeTable), - array('entity_id', 'value' => $valueExpr) + ['t1' => $attributeTable], + ['entity_id', 'value' => $valueExpr] ) ->joinLeft( - array('t2' => $attributeTable), + ['t2' => $attributeTable], 't1.entity_id = t2.entity_id AND t1.attribute_id = t2.attribute_id AND t2.store_id = :store_id', - array() + [] ) ->where('t1.store_id = ?', 0) ->where('t1.attribute_id = :attribute_id') @@ -481,7 +481,7 @@ protected function _getCategoryAttribute($attributeCode, $categoryIds, $storeId) $rowSet = $adapter->fetchAll($select, $bind); - $attributes = array(); + $attributes = []; foreach ($rowSet as $row) { $attributes[$row['entity_id']] = $row['value']; } @@ -508,24 +508,24 @@ public function saveProductAttribute(Varien_Object $product, $attributeCode) if (!isset($this->_productAttributes[$attributeCode])) { $attribute = $this->getProductModel()->getResource()->getAttribute($attributeCode); - $this->_productAttributes[$attributeCode] = array( + $this->_productAttributes[$attributeCode] = [ 'entity_type_id' => $attribute->getEntityTypeId(), 'attribute_id' => $attribute->getId(), 'table' => $attribute->getBackend()->getTable(), 'is_global' => $attribute->getIsGlobal() - ); + ]; unset($attribute); } $attributeTable = $this->_productAttributes[$attributeCode]['table']; - $attributeData = array( + $attributeData = [ 'entity_type_id' => $this->_productAttributes[$attributeCode]['entity_type_id'], 'attribute_id' => $this->_productAttributes[$attributeCode]['attribute_id'], 'store_id' => $product->getStoreId(), 'entity_id' => $product->getId(), 'value' => $product->getData($attributeCode) - ); + ]; if ($this->_productAttributes[$attributeCode]['is_global'] || $product->getStoreId() == 0) { $attributeData['store_id'] = 0; @@ -540,7 +540,7 @@ public function saveProductAttribute(Varien_Object $product, $attributeCode) $row = $adapter->fetchRow($select); if ($row) { - $whereCond = array('value_id = ?' => $row['value_id']); + $whereCond = ['value_id = ?' => $row['value_id']]; $adapter->update($attributeTable, $attributeData, $whereCond); } else { $adapter->insert($attributeTable, $attributeData); @@ -557,7 +557,7 @@ public function saveProductAttribute(Varien_Object $product, $attributeCode) $row = $adapter->fetchRow($select); if ($row) { - $whereCond = array('value_id = ?' => $row['value_id']); + $whereCond = ['value_id = ?' => $row['value_id']]; $adapter->update($attributeTable, $attributeData, $whereCond); } else { $adapter->insert($attributeTable, $attributeData); @@ -582,24 +582,24 @@ public function _getProductAttribute($attributeCode, $productIds, $storeId) if (!isset($this->_productAttributes[$attributeCode])) { $attribute = $this->getProductModel()->getResource()->getAttribute($attributeCode); - $this->_productAttributes[$attributeCode] = array( + $this->_productAttributes[$attributeCode] = [ 'entity_type_id' => $attribute->getEntityTypeId(), 'attribute_id' => $attribute->getId(), 'table' => $attribute->getBackend()->getTable(), 'is_global' => $attribute->getIsGlobal() - ); + ]; unset($attribute); } if (!is_array($productIds)) { - $productIds = array($productIds); + $productIds = [$productIds]; } - $bind = array('attribute_id' => $this->_productAttributes[$attributeCode]['attribute_id']); + $bind = ['attribute_id' => $this->_productAttributes[$attributeCode]['attribute_id']]; $select = $adapter->select(); $attributeTable = $this->_productAttributes[$attributeCode]['table']; if ($this->_productAttributes[$attributeCode]['is_global'] || $storeId == 0) { $select - ->from($attributeTable, array('entity_id', 'value')) + ->from($attributeTable, ['entity_id', 'value']) ->where('attribute_id = :attribute_id') ->where('store_id = ?', 0) ->where('entity_id IN(?)', $productIds); @@ -607,13 +607,13 @@ public function _getProductAttribute($attributeCode, $productIds, $storeId) $valueExpr = $adapter->getCheckSql('t2.value_id > 0', 't2.value', 't1.value'); $select ->from( - array('t1' => $attributeTable), - array('entity_id', 'value' => $valueExpr) + ['t1' => $attributeTable], + ['entity_id', 'value' => $valueExpr] ) ->joinLeft( - array('t2' => $attributeTable), + ['t2' => $attributeTable], 't1.entity_id = t2.entity_id AND t1.attribute_id = t2.attribute_id AND t2.store_id=:store_id', - array() + [] ) ->where('t1.store_id = ?', 0) ->where('t1.attribute_id = :attribute_id') @@ -623,7 +623,7 @@ public function _getProductAttribute($attributeCode, $productIds, $storeId) $rowSet = $adapter->fetchAll($select, $bind); - $attributes = array(); + $attributes = []; foreach ($rowSet as $row) { $attributes[$row['entity_id']] = $row['value']; } @@ -662,9 +662,10 @@ protected function _prepareCategoryParentId(Varien_Object $category) */ protected function _prepareStoreRootCategories($stores) { - $rootCategoryIds = array(); + $rootCategoryIds = []; foreach ($stores as $store) { - $rootCategoryIds[$store->getRootCategoryId()] = $store->getRootCategoryId(); + $rootCategoryId = $store->getRootCategoryId(); + $rootCategoryIds[$rootCategoryId] = $rootCategoryId; } if ($rootCategoryIds) { $categories = $this->_getCategories($rootCategoryIds); @@ -694,20 +695,20 @@ protected function _getCategories($categoryIds, $storeId = null, $path = null) { $isActiveAttribute = Mage::getSingleton('eav/config') ->getAttribute(Mage_Catalog_Model_Category::ENTITY, 'is_active'); - $categories = array(); + $categories = []; $adapter = $this->_getReadAdapter(); if (!is_array($categoryIds)) { - $categoryIds = array($categoryIds); + $categoryIds = [$categoryIds]; } $isActiveExpr = $adapter->getCheckSql('c.value_id > 0', 'c.value', 'd.value'); $select = $adapter->select() - ->from(array('main_table' => $this->getTable('catalog/category')), array( + ->from(['main_table' => $this->getTable('catalog/category')], [ 'main_table.entity_id', 'main_table.parent_id', 'main_table.level', 'is_active' => $isActiveExpr, - 'main_table.path')); + 'main_table.path']); // Prepare variables for checking whether categories belong to store if ($path === null) { @@ -722,26 +723,26 @@ protected function _getCategories($categoryIds, $storeId = null, $path = null) ->where('main_table.path LIKE ?', $path . '%') ->order('main_table.path'); } - $table = $this->getTable(array('catalog/category', 'int')); + $table = $this->getTable(['catalog/category', 'int']); $select->joinLeft( - array('d' => $table), + ['d' => $table], 'd.attribute_id = :attribute_id AND d.store_id = 0 AND d.entity_id = main_table.entity_id', - array() + [] ) ->joinLeft( - array('c' => $table), + ['c' => $table], 'c.attribute_id = :attribute_id AND c.store_id = :store_id AND c.entity_id = main_table.entity_id', - array() + [] ); if ($storeId !== null) { $rootCategoryPath = $this->getStores($storeId)->getRootCategoryPath(); $rootCategoryPathLength = strlen($rootCategoryPath); } - $bind = array( + $bind = [ 'attribute_id' => (int)$isActiveAttribute->getId(), 'store_id' => (int)$storeId - ); + ]; $rowSet = $adapter->fetchAll($select, $bind); foreach ($rowSet as $row) { @@ -768,7 +769,7 @@ protected function _getCategories($categoryIds, $storeId = null, $path = null) unset($rowSet); if ($storeId !== null && $categories) { - foreach (array('name', 'url_key', 'url_path') as $attributeCode) { + foreach (['name', 'url_key', 'url_path'] as $attributeCode) { $attributes = $this->_getCategoryAttribute( $attributeCode, array_keys($categories), @@ -832,20 +833,20 @@ public function loadCategoryChilds(Varien_Object $category) } $categories = $this->_getCategories(null, $category->getStoreId(), $category->getPath() . '/'); - $category->setChilds(array()); + $category->setChilds([]); foreach ($categories as $child) { if (!is_array($child->getChilds())) { - $child->setChilds(array()); + $child->setChilds([]); } if ($child->getParentId() == $category->getId()) { - $category->setChilds($category->getChilds() + array($child->getId() => $child)); + $category->setChilds($category->getChilds() + [$child->getId() => $child]); } else { if (isset($categories[$child->getParentId()])) { if (!is_array($categories[$child->getParentId()]->getChilds())) { - $categories[$child->getParentId()]->setChilds(array()); + $categories[$child->getParentId()]->setChilds([]); } $categories[$child->getParentId()]->setChilds( - $categories[$child->getParentId()]->getChilds() + array($child->getId() => $child) + $categories[$child->getParentId()]->getChilds() + [$child->getId() => $child] ); } } @@ -871,10 +872,10 @@ public function getRootChildrenIds($categoryId, $categoryPath, $includeStart = t // Select all descedant category ids $adapter = $this->_getReadAdapter(); $select = $adapter->select() - ->from(array($this->getTable('catalog/category')), array('entity_id')) + ->from([$this->getTable('catalog/category')], ['entity_id']) ->where('path LIKE ?', $categoryPath . '/%'); - $categoryIds = array(); + $categoryIds = []; $rowSet = $adapter->fetchAll($select); foreach ($rowSet as $row) { $categoryIds[$row['entity_id']] = $row['entity_id']; @@ -924,10 +925,10 @@ public function getProductIdsByCategory($category) } $adapter = $this->_getReadAdapter(); $select = $adapter->select() - ->from($this->getTable('catalog/category_product'), array('product_id')) + ->from($this->getTable('catalog/category_product'), ['product_id']) ->where('category_id = :category_id') ->order('product_id'); - $bind = array('category_id' => $categoryId); + $bind = ['category_id' => $categoryId]; return $adapter->fetchCol($select, $bind); } @@ -943,25 +944,25 @@ public function getProductIdsByCategory($category) */ protected function _getProducts($productIds, $storeId, $entityId, &$lastEntityId) { - $products = array(); + $products = []; $websiteId = Mage::app()->getStore($storeId)->getWebsiteId(); $adapter = $this->_getReadAdapter(); if ($productIds !== null) { if (!is_array($productIds)) { - $productIds = array($productIds); + $productIds = [$productIds]; } } - $bind = array( + $bind = [ 'website_id' => (int)$websiteId, 'entity_id' => (int)$entityId, - ); + ]; $select = $adapter->select() ->useStraightJoin(true) - ->from(array('e' => $this->getTable('catalog/product')), array('entity_id')) + ->from(['e' => $this->getTable('catalog/product')], ['entity_id']) ->join( - array('w' => $this->getTable('catalog/product_website')), + ['w' => $this->getTable('catalog/product_website')], 'e.entity_id = w.product_id AND w.website_id = :website_id', - array() + [] ) ->where('e.entity_id > :entity_id') ->order('e.entity_id') @@ -974,7 +975,7 @@ protected function _getProducts($productIds, $storeId, $entityId, &$lastEntityId foreach ($rowSet as $row) { $product = new Varien_Object($row); $product->setIdFieldName('entity_id'); - $product->setCategoryIds(array()); + $product->setCategoryIds([]); $product->setStoreId($storeId); $products[$product->getId()] = $product; $lastEntityId = $product->getId(); @@ -986,7 +987,7 @@ protected function _getProducts($productIds, $storeId, $entityId, &$lastEntityId $select = $adapter->select() ->from( $this->getTable('catalog/category_product'), - array('product_id', 'category_id') + ['product_id', 'category_id'] ) ->where('product_id IN(?)', array_keys($products)); $categories = $adapter->fetchAll($select); @@ -997,7 +998,7 @@ protected function _getProducts($productIds, $storeId, $entityId, &$lastEntityId $products[$productId]->setCategoryIds($categoryIds); } - foreach (array('name', 'url_key', 'url_path') as $attributeCode) { + foreach (['name', 'url_key', 'url_path'] as $attributeCode) { $attributes = $this->_getProductAttribute($attributeCode, array_keys($products), $storeId); foreach ($attributes as $productId => $attributeValue) { $products[$productId]->setData($attributeCode, $attributeValue); @@ -1048,7 +1049,7 @@ public function getProductsByCategory(Varien_Object $category, &$lastEntityId) { $productIds = $this->getProductIdsByCategory($category); if (!$productIds) { - return array(); + return []; } return $this->_getProducts($productIds, $category->getStoreId(), $lastEntityId, $lastEntityId); } @@ -1064,19 +1065,19 @@ public function clearCategoryProduct($storeId) { $adapter = $this->_getWriteAdapter(); $select = $adapter->select() - ->from(array('tur' => $this->getMainTable()), $this->getIdFieldName()) + ->from(['tur' => $this->getMainTable()], $this->getIdFieldName()) ->joinLeft( - array('tcp' => $this->getTable('catalog/category_product')), + ['tcp' => $this->getTable('catalog/category_product')], 'tur.category_id = tcp.category_id AND tur.product_id = tcp.product_id', - array() + [] ) ->where('tur.store_id = :store_id') ->where('tur.category_id IS NOT NULL') ->where('tur.product_id IS NOT NULL') ->where('tcp.category_id IS NULL'); - $rewriteIds = $adapter->fetchCol($select, array('store_id' => $storeId)); + $rewriteIds = $adapter->fetchCol($select, ['store_id' => $storeId]); if ($rewriteIds) { - $where = array($this->getIdFieldName() . ' IN(?)' => $rewriteIds); + $where = [$this->getIdFieldName() . ' IN(?)' => $rewriteIds]; $adapter->delete($this->getMainTable(), $where); } @@ -1095,12 +1096,12 @@ public function clearCategoryProduct($storeId) * @param array $excludeCategoryIds Array of category Ids that should be skipped * @return $this */ - public function clearProductRewrites($productId, $storeId, $excludeCategoryIds = array()) + public function clearProductRewrites($productId, $storeId, $excludeCategoryIds = []) { - $where = array( + $where = [ 'product_id = ?' => $productId, 'store_id = ?' => $storeId - ); + ]; if (!empty($excludeCategoryIds)) { $where['category_id NOT IN (?)'] = $excludeCategoryIds; @@ -1131,11 +1132,11 @@ public function clearStoreCategoriesInvalidRewrites($storeId) $categoryIds = $this->getRootChildrenIds($rootCategoryId, $store->getRootCategoryPath()); // Remove all store catalog rewrites that are for some category or cartegory/product not within store categories - $where = array( + $where = [ 'store_id = ?' => $storeId, 'category_id IS NOT NULL', // For sure check that it's a catalog rewrite 'category_id NOT IN (?)' => $categoryIds - ); + ]; $this->_getWriteAdapter()->delete($this->getMainTable(), $where); @@ -1158,16 +1159,16 @@ public function clearStoreProductsInvalidRewrites($storeId, $productId = null) { $store = $this->getStores($storeId); $adapter = $this->_getReadAdapter(); - $bind = array( + $bind = [ 'website_id' => (int)$store->getWebsiteId(), 'store_id' => (int)$storeId - ); + ]; $select = $adapter->select() - ->from(array('rewrite' => $this->getMainTable()), $this->getIdFieldName()) + ->from(['rewrite' => $this->getMainTable()], $this->getIdFieldName()) ->joinLeft( - array('website' => $this->getTable('catalog/product_website')), + ['website' => $this->getTable('catalog/product_website')], 'rewrite.product_id = website.product_id AND website.website_id = :website_id', - array() + [] )->where('rewrite.store_id = :store_id') ->where('rewrite.category_id IS NULL'); if ($productId) { @@ -1179,7 +1180,7 @@ public function clearStoreProductsInvalidRewrites($storeId, $productId = null) $rewriteIds = $adapter->fetchCol($select, $bind); if ($rewriteIds) { - $where = array($this->getIdFieldName() . ' IN(?)' => $rewriteIds); + $where = [$this->getIdFieldName() . ' IN(?)' => $rewriteIds]; $this->_getWriteAdapter()->delete($this->getMainTable(), $where); } @@ -1227,7 +1228,7 @@ public function deleteCategoryProductStoreRewrites($categoryId, $productIds = nu // Notice that we don't include category_id = NULL in case of root category, // because product removed from all categories but assigned to store's website is still // assumed to be in root cat. Unassigned products must be removed by other routine. - $condition = array('category_id = ?' => $categoryId); + $condition = ['category_id = ?' => $categoryId]; if (empty($productIds)) { $condition[] = 'product_id IS NOT NULL'; } else { @@ -1256,7 +1257,7 @@ public function deleteCategoryProductStoreRewrites($categoryId, $productIds = nu */ public function getRewriteByProductStore(array $products) { - $result = array(); + $result = []; if (empty($products)) { return $result; @@ -1265,26 +1266,26 @@ public function getRewriteByProductStore(array $products) $select = $adapter->select() ->from( - array('i' => $this->getTable('catalog/category_product_index')), - array('product_id', 'store_id', 'visibility') + ['i' => $this->getTable('catalog/category_product_index')], + ['product_id', 'store_id', 'visibility'] ) ->joinLeft( - array('r' => $this->getMainTable()), + ['r' => $this->getMainTable()], 'i.product_id = r.product_id AND i.store_id=r.store_id AND r.category_id IS NULL', - array('request_path') + ['request_path'] ); - $bind = array(); + $bind = []; foreach ($products as $productId => $storeId) { $catId = Mage::app()->getStore($storeId)->getRootCategoryId(); $productBind = 'product_id' . $productId; $storeBind = 'store_id' . $storeId; $catBind = 'category_id' . $catId; - $cond = '(' . implode(' AND ', array( + $cond = '(' . implode(' AND ', [ 'i.product_id = :' . $productBind, 'i.store_id = :' . $storeBind, 'i.category_id = :' . $catBind, - )) . ')'; + ]) . ')'; $bind[$productBind] = $productId; $bind[$storeBind] = $storeId; $bind[$catBind] = $catId; @@ -1293,11 +1294,11 @@ public function getRewriteByProductStore(array $products) $rowSet = $adapter->fetchAll($select, $bind); foreach ($rowSet as $row) { - $result[$row['product_id']] = array( + $result[$row['product_id']] = [ 'store_id' => $row['store_id'], 'visibility' => $row['visibility'], 'url_rewrite' => $row['request_path'], - ); + ]; } return $result; @@ -1312,7 +1313,7 @@ public function getRewriteByProductStore(array $products) * @param array $_checkedPaths internal varible to prevent infinite loops. * @return string | bool */ - public function findFinalTargetPath($requestPath, $storeId, &$_checkedPaths = array()) + public function findFinalTargetPath($requestPath, $storeId, &$_checkedPaths = []) { if (in_array($requestPath, $_checkedPaths)) { return false; @@ -1321,7 +1322,7 @@ public function findFinalTargetPath($requestPath, $storeId, &$_checkedPaths = ar $_checkedPaths[] = $requestPath; $select = $this->_getWriteAdapter()->select() - ->from($this->getMainTable(), array('target_path', 'id_path')) + ->from($this->getMainTable(), ['target_path', 'id_path']) ->where('store_id = ?', $storeId) ->where('request_path = ?', $requestPath); @@ -1359,10 +1360,10 @@ public function deleteRewrite($requestPath, $storeId) */ public function deleteRewriteRecord($requestPath, $storeId, $rp = false) { - $conditions = array( + $conditions = [ 'store_id = ?' => $storeId, 'request_path = ?' => $requestPath, - ); + ]; if ($rp) { $conditions['options = ?'] = 'RP'; } diff --git a/app/code/core/Mage/CatalogInventory/Model/Observer.php b/app/code/core/Mage/CatalogInventory/Model/Observer.php index 9a06dc685c6..11809fd4e4e 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Observer.php +++ b/app/code/core/Mage/CatalogInventory/Model/Observer.php @@ -40,7 +40,7 @@ class Mage_CatalogInventory_Model_Observer * @deprecated after 1.4.2.0-rc1 * @var array */ - protected $_checkedProductsQty = array(); + protected $_checkedProductsQty = []; /** * Product qty's checked @@ -48,14 +48,14 @@ class Mage_CatalogInventory_Model_Observer * * @var array */ - protected $_checkedQuoteItems = array(); + protected $_checkedQuoteItems = []; /** * Array of items that need to be reindexed * * @var array */ - protected $_itemsForReindex = array(); + protected $_itemsForReindex = []; /** * Array, indexed by product's id to contain stockItems of already loaded products @@ -63,7 +63,7 @@ class Mage_CatalogInventory_Model_Observer * * @var array */ - protected $_stockItemsArray = array(); + protected $_stockItemsArray = []; /** * Add stock information to product @@ -179,21 +179,21 @@ public function copyInventoryData($observer) $newProduct = $observer->getEvent()->getNewProduct(); $newProduct->unsStockItem(); - $stockData = array( + $stockData = [ 'use_config_min_qty' => 1, 'use_config_min_sale_qty' => 1, 'use_config_max_sale_qty' => 1, 'use_config_backorders' => 1, 'use_config_notify_stock_qty' => 1 - ); + ]; $currentStockItem = $currentProduct->getStockItem(); if ($currentStockItem) { - $stockData += array( + $stockData += [ 'use_config_enable_qty_inc' => $currentStockItem->getData('use_config_enable_qty_inc'), 'enable_qty_increments' => $currentStockItem->getData('enable_qty_increments'), 'use_config_qty_increments' => $currentStockItem->getData('use_config_qty_increments'), 'qty_increments' => $currentStockItem->getData('qty_increments'), - ); + ]; } $newProduct->setStockData($stockData); @@ -258,10 +258,10 @@ protected function _prepareItemForSave($item, $product) protected function _removeErrorsFromQuoteAndItem($item, $code) { if ($item->getHasError()) { - $params = array( + $params = [ 'origin' => 'cataloginventory', 'code' => $code - ); + ]; $item->removeErrorInfosByParams($params); } @@ -289,10 +289,10 @@ protected function _removeErrorsFromQuoteAndItem($item, $code) } if ($quote->getHasError() && $canRemoveErrorFromQuote) { - $params = array( + $params = [ 'origin' => 'cataloginventory', 'code' => $code - ); + ]; $quote->removeErrorInfosByParams(null, $params); } @@ -689,10 +689,10 @@ protected function _addItemToQtyArray($quoteItem, &$items) if ($quoteItem->getProduct()) { $stockItem = $quoteItem->getProduct()->getStockItem(); } - $items[$productId] = array( + $items[$productId] = [ 'item' => $stockItem, 'qty' => $quoteItem->getTotalQty() - ); + ]; } } @@ -710,7 +710,7 @@ protected function _addItemToQtyArray($quoteItem, &$items) */ protected function _getProductsQty($relatedItems) { - $items = array(); + $items = []; foreach ($relatedItems as $item) { $productId = $item->getProductId(); if (!$productId) { @@ -729,7 +729,7 @@ protected function _getProductsQty($relatedItems) } /** - * Refresh stock index for specific stock items after succesful order placement + * Refresh stock index for specific stock items after successful order placement * * @param Varien_Event_Observer $observer * @return Mage_CatalogInventory_Model_Observer @@ -739,13 +739,15 @@ public function reindexQuoteInventory($observer) // Reindex quote ids /** @var Mage_Sales_Model_Quote $quote */ $quote = $observer->getEvent()->getQuote(); - $productIds = array(); + $productIds = []; foreach ($quote->getAllItems() as $item) { - $productIds[$item->getProductId()] = $item->getProductId(); + $productId = $item->getProductId(); + $productIds[$productId] = $productId; $children = $item->getChildrenItems(); if ($children) { foreach ($children as $childItem) { - $productIds[$childItem->getProductId()] = $childItem->getProductId(); + $childItemProductId = $childItem->getProductId(); + $productIds[$childItemProductId] = $childItemProductId; } } } @@ -758,10 +760,10 @@ public function reindexQuoteInventory($observer) * This limits the number of stock re-indexing that takes place, * especially in stores where stock is not managed **/ - $productIds = array_map('intval', $productIds); + $productIds = array_map('\intval', $productIds); $stockCollection = Mage::getModel('cataloginventory/stock_item')->getCollection() - ->addFieldToFilter('product_id', array('in' => $productIds)) - ->addFieldToFilter('manage_stock', array('eq' => 1)); + ->addFieldToFilter('product_id', ['in' => $productIds]) + ->addFieldToFilter('manage_stock', ['eq' => 1]); $stockCollection->getSelect()->reset(Zend_Db_Select::COLUMNS)->columns(['product_id']); $productIds = $stockCollection->getColumnValues('product_id'); @@ -770,14 +772,14 @@ public function reindexQuoteInventory($observer) } // Reindex previously remembered items - $productIds = array(); + $productIds = []; foreach ($this->_itemsForReindex as $item) { $item->save(); $productIds[] = $item->getProductId(); } Mage::getResourceSingleton('catalog/product_indexer_price')->reindexProductIds($productIds); - $this->_itemsForReindex = array(); // Clear list of remembered items - we don't need it anymore + $this->_itemsForReindex = []; // Clear list of remembered items - we don't need it anymore return $this; } @@ -791,7 +793,7 @@ public function refundOrderInventory($observer) { /* @var Mage_Sales_Model_Order_Creditmemo $creditmemo */ $creditmemo = $observer->getEvent()->getCreditmemo(); - $items = array(); + $items = []; foreach ($creditmemo->getAllItems() as $item) { /* @var Mage_Sales_Model_Order_Creditmemo_Item $item */ $return = false; @@ -810,10 +812,10 @@ public function refundOrderInventory($observer) if (isset($items[$item->getProductId()])) { $items[$item->getProductId()]['qty'] += $qty; } else { - $items[$item->getProductId()] = array( + $items[$item->getProductId()] = [ 'qty' => $qty, 'item' => null, - ); + ]; } } } @@ -968,7 +970,7 @@ public function lockOrderInventoryData($observer) { /** @var Mage_Sales_Model_Order $order */ $order = $observer->getEvent()->getOrder(); - $productIds = array(); + $productIds = []; /** * Do lock only for new order diff --git a/app/code/core/Mage/Checkout/Model/Cart.php b/app/code/core/Mage/Checkout/Model/Cart.php index 8e46c6bf58a..6ec634bb3e7 100644 --- a/app/code/core/Mage/Checkout/Model/Cart.php +++ b/app/code/core/Mage/Checkout/Model/Cart.php @@ -101,7 +101,8 @@ public function getQuoteProductIds() if (is_null($products)) { $products = array(); foreach ($this->getQuote()->getAllItems() as $item) { - $products[$item->getProductId()] = $item->getProductId(); + $productId = $item->getProductId(); + $products[$productId] = $productId; } $this->setData('product_ids', $products); } diff --git a/app/code/core/Mage/Core/Block/Abstract.php b/app/code/core/Mage/Core/Block/Abstract.php index 71ade2bb044..1641c84c848 100644 --- a/app/code/core/Mage/Core/Block/Abstract.php +++ b/app/code/core/Mage/Core/Block/Abstract.php @@ -723,7 +723,7 @@ public function insert($block, $siblingName = '', $after = false, $alias = '') if ($siblingName === '') { if ($after) { - array_push($this->_sortedChildren, $name); + $this->_sortedChildren[] = $name; } else { array_unshift($this->_sortedChildren, $name); } @@ -736,7 +736,7 @@ public function insert($block, $siblingName = '', $after = false, $alias = '') array_splice($this->_sortedChildren, $key, 0, $name); } else { if ($after) { - array_push($this->_sortedChildren, $name); + $this->_sortedChildren[] = $name; } else { array_unshift($this->_sortedChildren, $name); } diff --git a/app/code/core/Mage/Core/Controller/Varien/Front.php b/app/code/core/Mage/Core/Controller/Varien/Front.php index 8910c655eeb..91a1bff1ea8 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Front.php +++ b/app/code/core/Mage/Core/Controller/Varien/Front.php @@ -396,7 +396,7 @@ protected function _isAdminFrontNameMatched($request) if (is_array($adminFrontNameNodes)) { foreach ($adminFrontNameNodes as $frontNameNode) { /** @var SimpleXMLElement $frontNameNode */ - array_push($adminFrontNames, (string)$frontNameNode); + $adminFrontNames[] = (string)$frontNameNode; } } diff --git a/app/code/core/Mage/Core/Model/Design/Package.php b/app/code/core/Mage/Core/Model/Design/Package.php index 20dd83fe24a..9ab1ea4a566 100644 --- a/app/code/core/Mage/Core/Model/Design/Package.php +++ b/app/code/core/Mage/Core/Model/Design/Package.php @@ -888,7 +888,7 @@ protected function _cssMergerImportCallback($match) protected function _cssMergerUrlCallback($match) { $quote = ($match[1][0] == "'" || $match[1][0] == '"') ? $match[1][0] : ''; - $uri = ($quote == '') ? $match[1] : substr($match[1], 1, strlen($match[1]) - 2); + $uri = ($quote == '') ? $match[1] : substr($match[1], 1, -1); $uri = $this->_prepareUrl($uri); return "url({$quote}{$uri}{$quote})"; diff --git a/app/code/core/Mage/Core/Model/Email/Info.php b/app/code/core/Mage/Core/Model/Email/Info.php index ac76384db93..a4557cb4baa 100644 --- a/app/code/core/Mage/Core/Model/Email/Info.php +++ b/app/code/core/Mage/Core/Model/Email/Info.php @@ -76,8 +76,8 @@ class Mage_Core_Model_Email_Info extends Varien_Object */ public function addBcc($email, $name = null) { - array_push($this->_bccNames, $name); - array_push($this->_bccEmails, $email); + $this->_bccNames[] = $name; + $this->_bccEmails[] = $email; return $this; } @@ -90,8 +90,8 @@ public function addBcc($email, $name = null) */ public function addTo($email, $name = null) { - array_push($this->_toNames, $name); - array_push($this->_toEmails, $email); + $this->_toNames[] = $name; + $this->_toEmails[] = $email; return $this; } diff --git a/app/code/core/Mage/Core/Model/Email/Template/Mailer.php b/app/code/core/Mage/Core/Model/Email/Template/Mailer.php index 7af8b8c6b47..7ff671c3323 100644 --- a/app/code/core/Mage/Core/Model/Email/Template/Mailer.php +++ b/app/code/core/Mage/Core/Model/Email/Template/Mailer.php @@ -52,7 +52,7 @@ class Mage_Core_Model_Email_Template_Mailer extends Varien_Object */ public function addEmailInfo(Mage_Core_Model_Email_Info $emailInfo) { - array_push($this->_emailInfos, $emailInfo); + $this->_emailInfos[] = $emailInfo; return $this; } diff --git a/app/code/core/Mage/Core/Model/Store.php b/app/code/core/Mage/Core/Model/Store.php index 2335bc25be4..bd46cde21a1 100644 --- a/app/code/core/Mage/Core/Model/Store.php +++ b/app/code/core/Mage/Core/Model/Store.php @@ -42,6 +42,7 @@ * @method $this setName(string $value) * @method $thissetRootCategoryPath(string $value) * @method $this setRootCategory(Mage_Catalog_Model_Category $value) + * @method $this setRootCategoryPath(string $value) * @method int getSortOrder() * @method $this setSortOrder(int $value) * @method int getStoreId() diff --git a/app/code/core/Mage/Core/Model/Store/Group.php b/app/code/core/Mage/Core/Model/Store/Group.php index 92f0e1ec010..81673a5fa46 100644 --- a/app/code/core/Mage/Core/Model/Store/Group.php +++ b/app/code/core/Mage/Core/Model/Store/Group.php @@ -76,14 +76,14 @@ class Mage_Core_Model_Store_Group extends Mage_Core_Model_Abstract * * @var array */ - protected $_storeIds = array(); + protected $_storeIds = []; /** * Group store codes array * * @var array */ - protected $_storeCodes = array(); + protected $_storeCodes = []; /** * The number of stores in a group @@ -125,14 +125,15 @@ protected function _construct() */ protected function _loadStores() { - $this->_stores = array(); + $this->_stores = []; $this->_storesCount = 0; /** @var Mage_Core_Model_Store $store */ foreach ($this->getStoreCollection() as $store) { - $this->_stores[$store->getId()] = $store; - $this->_storeIds[$store->getId()] = $store->getId(); - $this->_storeCodes[$store->getId()] = $store->getCode(); - if ($this->getDefaultStoreId() == $store->getId()) { + $storeId = $store->getId(); + $this->_stores[$storeId] = $store; + $this->_storeIds[$storeId] = $storeId; + $this->_storeCodes[$storeId] = $store->getCode(); + if ($this->getDefaultStoreId() == $storeId) { $this->_defaultStore = $store; } $this->_storesCount ++; @@ -146,13 +147,14 @@ protected function _loadStores() */ public function setStores($stores) { - $this->_stores = array(); + $this->_stores = []; $this->_storesCount = 0; foreach ($stores as $store) { - $this->_stores[$store->getId()] = $store; - $this->_storeIds[$store->getId()] = $store->getId(); - $this->_storeCodes[$store->getId()] = $store->getCode(); - if ($this->getDefaultStoreId() == $store->getId()) { + $storeId = $store->getId(); + $this->_stores[$storeId] = $store; + $this->_storeIds[$storeId] = $storeId; + $this->_storeCodes[$storeId] = $store->getCode(); + if ($this->getDefaultStoreId() == $storeId) { $this->_defaultStore = $store; } $this->_storesCount ++; @@ -267,10 +269,10 @@ public function getDefaultStoreByLocale($locale) */ public function getStoresByLocale($locale) { - $stores = array(); + $stores = []; foreach ($this->getStores() as $store) { if ($store->getLocaleCode() == $locale) { - array_push($stores, $store); + $stores[] = $store; } } return $stores; diff --git a/app/code/core/Mage/Core/Model/Website.php b/app/code/core/Mage/Core/Model/Website.php index 94039d0de77..d4797bc2d04 100644 --- a/app/code/core/Mage/Core/Model/Website.php +++ b/app/code/core/Mage/Core/Model/Website.php @@ -73,7 +73,7 @@ class Mage_Core_Model_Website extends Mage_Core_Model_Abstract * * @var array */ - protected $_configCache = array(); + protected $_configCache = []; /** * Website Group Coleection array @@ -87,7 +87,7 @@ class Mage_Core_Model_Website extends Mage_Core_Model_Abstract * * @var array */ - protected $_groupIds = array(); + protected $_groupIds = []; /** * The number of groups in a website @@ -108,14 +108,14 @@ class Mage_Core_Model_Website extends Mage_Core_Model_Abstract * * @var array */ - protected $_storeIds = array(); + protected $_storeIds = []; /** * Website store codes array * * @var array */ - protected $_storeCodes = array(); + protected $_storeCodes = []; /** * The number of stores in a website @@ -215,7 +215,7 @@ public function getConfig($path) #throw Mage::exception('Mage_Core', Mage::helper('core')->__('Invalid website\'s configuration path: %s', $path)); } if ($config->hasChildren()) { - $value = array(); + $value = []; foreach ($config->children() as $k => $v) { $value[$k] = $v; } @@ -233,12 +233,13 @@ public function getConfig($path) */ protected function _loadGroups() { - $this->_groups = array(); + $this->_groups = []; $this->_groupsCount = 0; foreach ($this->getGroupCollection() as $group) { - $this->_groups[$group->getId()] = $group; - $this->_groupIds[$group->getId()] = $group->getId(); - if ($this->getDefaultGroupId() == $group->getId()) { + $groupId = $group->getId(); + $this->_groups[$groupId] = $group; + $this->_groupIds[$groupId] = $groupId; + if ($this->getDefaultGroupId() == $groupId) { $this->_defaultGroup = $group; } $this->_groupsCount ++; @@ -253,12 +254,13 @@ protected function _loadGroups() */ public function setGroups($groups) { - $this->_groups = array(); + $this->_groups = []; $this->_groupsCount = 0; foreach ($groups as $group) { - $this->_groups[$group->getId()] = $group; - $this->_groupIds[$group->getId()] = $group->getId(); - if ($this->getDefaultGroupId() == $group->getId()) { + $groupId = $group->getId(); + $this->_groups[$groupId] = $group; + $this->_groupIds[$groupId] = $groupId; + if ($this->getDefaultGroupId() == $groupId) { $this->_defaultGroup = $group; } $this->_groupsCount ++; @@ -339,13 +341,14 @@ public function getDefaultGroup() */ protected function _loadStores() { - $this->_stores = array(); + $this->_stores = []; $this->_storesCount = 0; foreach ($this->getStoreCollection() as $store) { - $this->_stores[$store->getId()] = $store; - $this->_storeIds[$store->getId()] = $store->getId(); - $this->_storeCodes[$store->getId()] = $store->getCode(); - if ($this->getDefaultGroup() && $this->getDefaultGroup()->getDefaultStoreId() == $store->getId()) { + $storeId = $store->getId(); + $this->_stores[$storeId] = $store; + $this->_storeIds[$storeId] = $storeId; + $this->_storeCodes[$storeId] = $store->getCode(); + if ($this->getDefaultGroup() && $this->getDefaultGroup()->getDefaultStoreId() == $storeId) { $this->_defaultStore = $store; } $this->_storesCount ++; @@ -359,13 +362,14 @@ protected function _loadStores() */ public function setStores($stores) { - $this->_stores = array(); + $this->_stores = []; $this->_storesCount = 0; foreach ($stores as $store) { - $this->_stores[$store->getId()] = $store; - $this->_storeIds[$store->getId()] = $store->getId(); - $this->_storeCodes[$store->getId()] = $store->getCode(); - if ($this->getDefaultGroup() && $this->getDefaultGroup()->getDefaultStoreId() == $store->getId()) { + $storeId = $store->getId(); + $this->_stores[$storeId] = $store; + $this->_storeIds[$storeId] = $storeId; + $this->_storeCodes[$storeId] = $store->getCode(); + if ($this->getDefaultGroup() && $this->getDefaultGroup()->getDefaultStoreId() == $storeId) { $this->_defaultStore = $store; } $this->_storesCount ++; @@ -460,7 +464,7 @@ public function isCanDelete() */ public function getWebsiteGroupStore() { - return implode('-', array($this->getWebsiteId(), $this->getGroupId(), $this->getStoreId())); + return implode('-', [$this->getWebsiteId(), $this->getGroupId(), $this->getStoreId()]); } /** diff --git a/app/code/core/Mage/Customer/controllers/AccountController.php b/app/code/core/Mage/Customer/controllers/AccountController.php index 99e50de1461..192d8f8a4e4 100644 --- a/app/code/core/Mage/Customer/controllers/AccountController.php +++ b/app/code/core/Mage/Customer/controllers/AccountController.php @@ -851,7 +851,7 @@ public function resetPasswordPostAction() $errorMessages = array(); if (iconv_strlen($password) <= 0) { - array_push($errorMessages, $this->_getHelper('customer')->__('New password field cannot be empty.')); + $errorMessages[] = $this->_getHelper('customer')->__('New password field cannot be empty.'); } /** @var Mage_Customer_Model_Customer $customer */ $customer = $this->_getModel('customer/customer')->load($customerId); diff --git a/app/code/core/Mage/Downloadable/Helper/File.php b/app/code/core/Mage/Downloadable/Helper/File.php index e4d426e0486..1722868258c 100644 --- a/app/code/core/Mage/Downloadable/Helper/File.php +++ b/app/code/core/Mage/Downloadable/Helper/File.php @@ -112,7 +112,7 @@ protected function _moveFileFromTmp($baseTmpPath, $basePath, $file) } if (strrpos($file, '.tmp') == strlen($file)-4) { - $file = substr($file, 0, strlen($file)-4); + $file = substr($file, 0, -4); } $destFile = dirname($file) . $ioObject->dirsep() diff --git a/app/code/core/Mage/Downloadable/Model/Product/Type.php b/app/code/core/Mage/Downloadable/Model/Product/Type.php index 49a45f167ac..689f2c6b7e7 100644 --- a/app/code/core/Mage/Downloadable/Model/Product/Type.php +++ b/app/code/core/Mage/Downloadable/Model/Product/Type.php @@ -467,7 +467,7 @@ public function isSalable($product = null) public function processBuyRequest($product, $buyRequest) { $links = $buyRequest->getLinks(); - $links = (is_array($links)) ? array_filter($links, 'intval') : array(); + $links = (is_array($links)) ? array_filter($links, '\intval') : array(); $options = array('links' => $links); diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer/Address.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer/Address.php index 1f3a1eff267..77a0ba95afd 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer/Address.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer/Address.php @@ -299,9 +299,10 @@ protected function _initAttributes() ->addExcludeHiddenFrontendFilter(); foreach ($addrCollection as $attribute) { - $this->_attributes[self::getColNameForAttrCode($attribute->getAttributeCode())] = array( + $attributeCode = $attribute->getAttributeCode(); + $this->_attributes[self::getColNameForAttrCode($attributeCode)] = array( 'id' => $attribute->getId(), - 'code' => $attribute->getAttributeCode(), + 'code' => $attributeCode, 'table' => $attribute->getBackend()->getTable(), 'is_required' => $attribute->getIsRequired(), 'rules' => $attribute->getValidateRules() diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php index e513f406536..10ef205acca 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php @@ -1979,7 +1979,7 @@ protected function _saveStockItem() */ protected function _filterRowData(&$rowData) { - $rowData = array_filter($rowData, 'strlen'); + $rowData = array_filter($rowData, '\strlen'); // Exceptions - for sku - put them back in if (!isset($rowData[self::COL_SKU])) { $rowData[self::COL_SKU] = null; diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Item/Collection.php index c5bae261fdb..51e3dfbfcdc 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Item/Collection.php @@ -123,9 +123,10 @@ protected function _afterLoad() */ protected function _getProductCollection() { - $productIds = array(); + $productIds = []; foreach ($this as $item) { - $productIds[$item->getProductId()] = $item->getProductId(); + $productId = $item->getProductId(); + $productIds[$productId] = $productId; if ($item->getSuperProductId()) { $productIds[$item->getSuperProductId()] = $item->getSuperProductId(); } diff --git a/app/code/core/Mage/Sales/Model/Quote.php b/app/code/core/Mage/Sales/Model/Quote.php index 3e2ecc88152..bf9b024e719 100644 --- a/app/code/core/Mage/Sales/Model/Quote.php +++ b/app/code/core/Mage/Sales/Model/Quote.php @@ -1595,7 +1595,7 @@ public function getErrors() foreach ($this->getMessages() as $message) { /* @var Mage_Core_Model_Message_Abstract $error */ if ($message->getType() == Mage_Core_Model_Message::ERROR) { - array_push($errors, $message); + $errors[] = $message; } } return $errors; diff --git a/app/code/core/Mage/SalesRule/Model/Validator.php b/app/code/core/Mage/SalesRule/Model/Validator.php index f8c6514c546..a75a6ed3956 100644 --- a/app/code/core/Mage/SalesRule/Model/Validator.php +++ b/app/code/core/Mage/SalesRule/Model/Validator.php @@ -54,14 +54,14 @@ class Mage_SalesRule_Model_Validator extends Mage_Core_Model_Abstract * * @var array */ - protected $_roundingDeltas = array(); + protected $_roundingDeltas = []; /** * Base rounding deltas * * @var array */ - protected $_baseRoundingDeltas = array(); + protected $_baseRoundingDeltas = []; /** * Quote address @@ -91,14 +91,14 @@ class Mage_SalesRule_Model_Validator extends Mage_Core_Model_Abstract * Information about item totals for rules. * @var array */ - protected $_rulesItemTotals = array(); + protected $_rulesItemTotals = []; /** * Store information about addresses which cart fixed rule applied for * * @var array */ - protected $_cartFixedRuleUsedForAddress = array(); + protected $_cartFixedRuleUsedForAddress = []; /** * Defines if rule with stop further rules is already applied @@ -320,7 +320,7 @@ public function process(Mage_Sales_Model_Quote_Item_Abstract $item) return $this; } - $appliedRuleIds = array(); + $appliedRuleIds = []; $this->_stopFurtherRules = false; foreach ($this->_getRules() as $rule) { /* @var Mage_SalesRule_Model_Rule $rule */ @@ -455,18 +455,18 @@ public function process(Mage_Sales_Model_Quote_Item_Abstract $item) break; } - $result = new Varien_Object(array( + $result = new Varien_Object([ 'discount_amount' => $discountAmount, 'base_discount_amount' => $baseDiscountAmount, - )); - Mage::dispatchEvent('salesrule_validator_process', array( + ]); + Mage::dispatchEvent('salesrule_validator_process', [ 'rule' => $rule, 'item' => $item, 'address' => $address, 'quote' => $quote, 'qty' => $qty, 'result' => $result, - )); + ]); $discountAmount = $result->getDiscountAmount(); $baseDiscountAmount = $result->getBaseDiscountAmount(); @@ -511,7 +511,8 @@ public function process(Mage_Sales_Model_Quote_Item_Abstract $item) $item->setOriginalDiscountAmount($originalDiscountAmount); $item->setBaseOriginalDiscountAmount($baseOriginalDiscountAmount); - $appliedRuleIds[$rule->getRuleId()] = $rule->getRuleId(); + $ruleId = $rule->getRuleId(); + $appliedRuleIds[$ruleId] = $ruleId; $this->_maintainAddressCouponCode($address, $rule); $this->_addDiscountDescription($address, $rule); @@ -759,7 +760,7 @@ public function processShippingAmount(Mage_Sales_Model_Quote_Address $address) $baseShippingAmount = $address->getBaseShippingAmount(); } $quote = $address->getQuote(); - $appliedRuleIds = array(); + $appliedRuleIds = []; foreach ($this->_getRules() as $rule) { /* @var Mage_SalesRule_Model_Rule $rule */ if (!$rule->getApplyToShipping() || !$this->_canProcessRule($rule, $address)) { @@ -818,7 +819,8 @@ public function processShippingAmount(Mage_Sales_Model_Quote_Address $address) ); $address->setShippingDiscountAmount($discountAmount); $address->setBaseShippingDiscountAmount($baseDiscountAmount); - $appliedRuleIds[$rule->getRuleId()] = $rule->getRuleId(); + $ruleId = $rule->getRuleId(); + $appliedRuleIds[$ruleId] = $ruleId; $this->_maintainAddressCouponCode($address, $rule); $this->_addDiscountDescription($address, $rule); @@ -844,10 +846,10 @@ public function processShippingAmount(Mage_Sales_Model_Quote_Address $address) public function mergeIds($a1, $a2, $asString = true) { if (!is_array($a1)) { - $a1 = empty($a1) ? array() : explode(',', $a1); + $a1 = empty($a1) ? [] : explode(',', $a1); } if (!is_array($a2)) { - $a2 = empty($a2) ? array() : explode(',', $a2); + $a2 = empty($a2) ? [] : explode(',', $a2); } $a = array_unique(array_merge($a1, $a2)); if ($asString) { @@ -891,7 +893,7 @@ public function getCartFixedRuleUsedForAddress($ruleId) */ public function initTotals($items, Mage_Sales_Model_Quote_Address $address) { - $address->setCartFixedRules(array()); + $address->setCartFixedRules([]); if (!$items) { return $this; @@ -918,11 +920,11 @@ public function initTotals($items, Mage_Sales_Model_Quote_Address $address) $validItemsCount++; } - $this->_rulesItemTotals[$rule->getId()] = array( + $this->_rulesItemTotals[$rule->getId()] = [ 'items_price' => $ruleTotalItemsPrice, 'base_items_price' => $ruleTotalBaseItemsPrice, 'items_count' => $validItemsCount, - ); + ]; } } $this->_stopFurtherRules = false; @@ -1091,12 +1093,12 @@ protected function _getHelper($name) */ public function sortItemsByPriority($items) { - $itemsSorted = array(); + $itemsSorted = []; foreach ($this->_getRules() as $rule) { foreach ($items as $itemKey => $itemValue) { if ($rule->getActions()->validate($itemValue)) { unset($items[$itemKey]); - array_push($itemsSorted, $itemValue); + $itemsSorted[] = $itemValue; } } } diff --git a/app/code/core/Mage/Uploader/Helper/File.php b/app/code/core/Mage/Uploader/Helper/File.php index 46853a782c9..f0d2ac4cbfc 100644 --- a/app/code/core/Mage/Uploader/Helper/File.php +++ b/app/code/core/Mage/Uploader/Helper/File.php @@ -733,7 +733,7 @@ public function getDataMaxSize() public function getDataMaxSizeInBytes() { $iniSize = $this->getDataMaxSize(); - $size = substr($iniSize, 0, strlen($iniSize)-1); + $size = substr($iniSize, 0, -1); $parsedSize = 0; switch (strtolower(substr($iniSize, strlen($iniSize)-1))) { case 't': diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php index ab43bb35712..d15d85259da 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php @@ -483,7 +483,7 @@ protected function _doRequest() foreach ($methods as $method) { $shipment = false; - if (in_array($method, array_keys($this->getCode('special_express')))) { + if (array_key_exists($method, $this->getCode('special_express'))) { $r->setService('E'); $r->setExtendedService($this->getCode('special_express', $method)); } else { diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf.php index 44a1aaec46e..6181f6439eb 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf.php @@ -109,7 +109,7 @@ public function render() (string)$piece->LicensePlate, (string)$piece->LicensePlateBarCode ); - array_push($pdf->pages, $page); + $pdf->pages[] = $page; $i++; } return $pdf->render(); diff --git a/app/code/core/Mage/Widget/Model/Widget.php b/app/code/core/Mage/Widget/Model/Widget.php index 7286027f258..6fe6e4967d2 100644 --- a/app/code/core/Mage/Widget/Model/Widget.php +++ b/app/code/core/Mage/Widget/Model/Widget.php @@ -52,7 +52,7 @@ public function getXmlConfig() Mage::app()->saveCache( $config->getXmlString(), 'widget_config', - array(Mage_Core_Model_Config::CACHE_TAG) + [Mage_Core_Model_Config::CACHE_TAG] ); } } @@ -112,7 +112,7 @@ public function getConfigAsObject($type) // Correct widget parameters and convert its data to objects $params = $object->getData('parameters'); - $newParams = array(); + $newParams = []; if (is_array($params)) { $sortOrder = 0; foreach ($params as $key => $data) { @@ -121,7 +121,7 @@ public function getConfigAsObject($type) $data['sort_order'] = isset($data['sort_order']) ? (int)$data['sort_order'] : $sortOrder; // prepare values (for drop-dawns) specified directly in configuration - $values = array(); + $values = []; if (isset($data['values']) && is_array($data['values'])) { foreach ($data['values'] as $value) { if (isset($value['label']) && isset($value['value'])) { @@ -148,7 +148,7 @@ public function getConfigAsObject($type) } } } - uasort($newParams, array($this, '_sortParameters')); + uasort($newParams, [$this, '_sortParameters']); $object->setData('parameters', $newParams); return $object; @@ -160,7 +160,7 @@ public function getConfigAsObject($type) * @param array $filters Key-value array of filters for widget node properties * @return Varien_Simplexml_Element */ - public function getWidgetsXml($filters = array()) + public function getWidgetsXml($filters = []) { $widgets = $this->getXmlConfig()->getNode(); $result = clone $widgets; @@ -191,22 +191,23 @@ public function getWidgetsXml($filters = array()) * @param array $filters Key-value array of filters for widget node properties * @return array */ - public function getWidgetsArray($filters = array()) + public function getWidgetsArray($filters = []) { if (!$this->_getData('widgets_array')) { - $result = array(); + $result = []; /** @var Varien_Simplexml_Element $widget */ foreach ($this->getWidgetsXml($filters) as $widget) { $helper = $widget->getAttribute('module') ? $widget->getAttribute('module') : 'widget'; $helper = Mage::helper($helper); - $result[$widget->getName()] = array( + $widgetName = $widget->getName(); + $result[$widgetName] = [ 'name' => $helper->__((string)$widget->name), - 'code' => $widget->getName(), + 'code' => $widgetName, 'type' => $widget->getAttribute('type'), 'description' => $helper->__((string)$widget->description) - ); + ]; } - usort($result, array($this, "_sortWidgets")); + usort($result, [$this, "_sortWidgets"]); $this->setData('widgets_array', $result); } return $this->_getData('widgets_array'); @@ -220,7 +221,7 @@ public function getWidgetsArray($filters = array()) * @param bool $asIs Return result as widget directive(true) or as placeholder image(false) * @return string Widget directive ready to parse */ - public function getWidgetDeclaration($type, $params = array(), $asIs = true) + public function getWidgetDeclaration($type, $params = [], $asIs = true) { $directive = '{{widget type="' . $type . '"'; @@ -268,7 +269,7 @@ public function getWidgetDeclaration($type, $params = array(), $asIs = true) */ public function getWidgetsRequiredJsFiles() { - $result = array(); + $result = []; foreach ($this->getWidgetsXml() as $widget) { if ($widget->js) { foreach (explode(',', (string)$widget->js) as $js) { diff --git a/app/code/core/Mage/Wishlist/Controller/Abstract.php b/app/code/core/Mage/Wishlist/Controller/Abstract.php index 11a0c62a993..6cc3c9db0a3 100644 --- a/app/code/core/Mage/Wishlist/Controller/Abstract.php +++ b/app/code/core/Mage/Wishlist/Controller/Abstract.php @@ -98,7 +98,7 @@ public function allcartAction() $qtysString = $this->getRequest()->getParam('qty'); if (isset($qtysString)) { - $qtys = array_filter(json_decode($qtysString), 'strlen'); + $qtys = array_filter(json_decode($qtysString), '\strlen'); } /** @var Mage_Wishlist_Model_Item $item */ From f799cffc868027784fdb99a41f6028fd5d7334c6 Mon Sep 17 00:00:00 2001 From: Ng Kiat Siong Date: Fri, 5 Aug 2022 16:40:40 +0800 Subject: [PATCH 52/61] Enclosed error with 
     tag for prettier error print
 (if developer mode is enabled). (#2368)

---
 app/Mage.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Mage.php b/app/Mage.php
index 3a75c48568e..c2b76432a54 100644
--- a/app/Mage.php
+++ b/app/Mage.php
@@ -33,6 +33,8 @@
 if (!empty($_SERVER['MAGE_IS_DEVELOPER_MODE']) || !empty($_ENV['MAGE_IS_DEVELOPER_MODE'])) {
     Mage::setIsDeveloperMode(true);
     ini_set('display_errors', 1);
+    ini_set('error_prepend_string', '
    ');
+    ini_set('error_append_string', '
    ');
 }
 
 /**

From e95d73cdbade8b96fbeb58ef58b233aad9a972ee Mon Sep 17 00:00:00 2001
From: sv3n 
Date: Fri, 5 Aug 2022 10:43:21 +0200
Subject: [PATCH 53/61] Updated phpstan to 1.8.2 (#2367)

---
 .github/phpstan-baseline.neon | 19 ++-----------------
 composer.json                 | 11 ++++++-----
 composer.lock                 | 20 ++++++++++----------
 3 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/.github/phpstan-baseline.neon b/.github/phpstan-baseline.neon
index d491be91d22..7d13eadf752 100644
--- a/.github/phpstan-baseline.neon
+++ b/.github/phpstan-baseline.neon
@@ -3317,7 +3317,7 @@ parameters:
 
 		-
 			message: "#^Binary operation \"\\*\" between string and 0\\.3 results in an error\\.$#"
-			count: 2
+			count: 1
 			path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php
 
 		-
@@ -3482,7 +3482,7 @@ parameters:
 
 		-
 			message: "#^Binary operation \"\\*\" between string and 0\\.3 results in an error\\.$#"
-			count: 2
+			count: 1
 			path: ../app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.php
 
 		-
@@ -3725,11 +3725,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Checkout/Block/Links.php
 
-		-
-			message: "#^PHPDoc tag @param has invalid value \\(\\$item\\)\\: Unexpected token \"\\$item\", expected type at offset 18$#"
-			count: 2
-			path: ../app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php
-
 		-
 			message: "#^Call to an undefined method Mage_Core_Helper_Abstract\\:\\:displayCartBothPrices\\(\\)\\.$#"
 			count: 1
@@ -5585,16 +5580,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Payment/Helper/Data.php
 
-		-
-			message: "#^PHPDoc tag @param has invalid value \\(\\$a\\)\\: Unexpected token \"\\$a\", expected type at offset 18$#"
-			count: 1
-			path: ../app/code/core/Mage/Payment/Helper/Data.php
-
-		-
-			message: "#^PHPDoc tag @param has invalid value \\(\\$b\\)\\: Unexpected token \"\\$b\", expected type at offset 35$#"
-			count: 1
-			path: ../app/code/core/Mage/Payment/Helper/Data.php
-
 		-
 			message: "#^Comparison operation \"\\<\" between \\(array\\|float\\|int\\) and 0\\.0001 results in an error\\.$#"
 			count: 1
diff --git a/composer.json b/composer.json
index 799328c4f2e..26d11b9262d 100644
--- a/composer.json
+++ b/composer.json
@@ -9,21 +9,21 @@
   "require": {
     "php": ">=7.0 <7.5 || >=8.0 <8.1",
     "ext-curl": "*",
+    "ext-dom": "*",
     "ext-gd": "*",
+    "ext-iconv": "*",
     "ext-json": "*",
+    "ext-libxml": "*",
     "ext-mbstring": "*",
     "ext-pdo": "*",
     "ext-simplexml": "*",
-    "ext-dom": "*",
-    "ext-libxml": "*",
     "ext-soap": "*",
-    "ext-iconv": "*",
     "ext-zlib": "*",
     "magento-hackathon/magento-composer-installer": "^3.1 || ^2.1 || ^4.0"
   },
   "require-dev": {
     "macopedia/phpstan-magento1": "^1.0.4",
-    "phpstan/phpstan": "^1.7.1"
+    "phpstan/phpstan": "^1.8"
   },
   "authors": [
     {
@@ -63,6 +63,7 @@
   "config": {
     "allow-plugins": {
       "magento-hackathon/magento-composer-installer": true
-    }
+    },
+    "sort-packages": true
   }
 }
diff --git a/composer.lock b/composer.lock
index 9c018cf41e1..bd88c14120e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2299d18979b1136a95773f7421ba16d4",
+    "content-hash": "41b19faf78fd7832d437d8c94c9cb252",
     "packages": [
         {
             "name": "eloquent/enumeration",
@@ -1204,16 +1204,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.7.1",
+            "version": "1.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "e3baed2ee2ef322e0f9b8fe8f87fdbe024c7c719"
+                "reference": "c53312ecc575caf07b0e90dee43883fdf90ca67c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e3baed2ee2ef322e0f9b8fe8f87fdbe024c7c719",
-                "reference": "e3baed2ee2ef322e0f9b8fe8f87fdbe024c7c719",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c53312ecc575caf07b0e90dee43883fdf90ca67c",
+                "reference": "c53312ecc575caf07b0e90dee43883fdf90ca67c",
                 "shasum": ""
             },
             "require": {
@@ -1239,7 +1239,7 @@
             "description": "PHPStan - PHP Static Analysis Tool",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.7.1"
+                "source": "https://github.com/phpstan/phpstan/tree/1.8.2"
             },
             "funding": [
                 {
@@ -1259,7 +1259,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-24T09:05:09+00:00"
+            "time": "2022-07-20T09:57:31+00:00"
         }
     ],
     "aliases": [],
@@ -1270,15 +1270,15 @@
     "platform": {
         "php": ">=7.0 <7.5 || >=8.0 <8.1",
         "ext-curl": "*",
+        "ext-dom": "*",
         "ext-gd": "*",
+        "ext-iconv": "*",
         "ext-json": "*",
+        "ext-libxml": "*",
         "ext-mbstring": "*",
         "ext-pdo": "*",
         "ext-simplexml": "*",
-        "ext-dom": "*",
-        "ext-libxml": "*",
         "ext-soap": "*",
-        "ext-iconv": "*",
         "ext-zlib": "*"
     },
     "platform-dev": [],

From 7d1a740e0a6102cee93bb38c983fca88c2570bbd Mon Sep 17 00:00:00 2001
From: Scott Moore 
Date: Fri, 5 Aug 2022 05:20:41 -0400
Subject: [PATCH 54/61] Escape product titles in MSRP JavaScript (#2366)

* Product names were not escaped. If contained a double quote, would break the JavaScript for MSRP/MAP

* update contribution list
---
 .all-contributorsrc                                      | 9 +++++++++
 README.md                                                | 1 +
 .../template/catalog/product/price_msrp_item.phtml       | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 4e583980e23..eabd644b004 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1342,6 +1342,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "discountscott",
+      "name": "Scott Moore",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5454596?v=4",
+      "profile": "https://github.com/discountscott",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7
diff --git a/README.md b/README.md
index 51e3e33a983..c512c27b2bc 100644
--- a/README.md
+++ b/README.md
@@ -388,6 +388,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   
   
     
    Enéias Ramos de Melo    
+    
    Scott Moore    
   
 
 
diff --git a/app/design/frontend/base/default/template/catalog/product/price_msrp_item.phtml b/app/design/frontend/base/default/template/catalog/product/price_msrp_item.phtml
index 585d107cb28..684e7fe016f 100644
--- a/app/design/frontend/base/default/template/catalog/product/price_msrp_item.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/price_msrp_item.phtml
@@ -84,7 +84,7 @@
 
                 Catalog.Map.addHelpLink(
                     $(''),
-                    "getName() ?>",
+                    "escapeHtml($_product->getName()) ?>",
                     $(""),
                     '',
                     "isSalable() ? $this->getAddToCartUrlCustom($_product, array(), false) : '' ?>"

From aa909dba88dc0459c88dfbd85c459409113d60c9 Mon Sep 17 00:00:00 2001
From: ADDISON <8360474+ADDISON74@users.noreply.github.com>
Date: Sat, 6 Aug 2022 00:13:03 +0300
Subject: [PATCH 55/61] Update boxes.css (#2330)

---
 skin/adminhtml/default/default/boxes.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/skin/adminhtml/default/default/boxes.css b/skin/adminhtml/default/default/boxes.css
index 9523fe1fdf3..9b82a0fafb8 100644
--- a/skin/adminhtml/default/default/boxes.css
+++ b/skin/adminhtml/default/default/boxes.css
@@ -206,10 +206,10 @@ table.actions td                { vertical-align:top; }
 .grid tr.filter select           { width:100%; }
 .grid tr.filter .range .range-line { margin-bottom:3px; width:100px; }
 .grid tr.filter .range div.date  { min-width:121px; }
-.grid tr.filter .range input     { float:right; width:50px !important; margin-top:0; }
-.grid tr.filter .range select    { float:right; width:56px !important; margin-top:0; }
-.grid tr.filter .range .label    { display:block; width:36px; float:left; padding-left:2px; }
-.grid tr.filter .date img        { width:15px; height:15px; cursor:pointer; vertical-align:middle; }
+.grid tr.filter .range input     { width:60px !important; margin-top:0; }
+.grid tr.filter .range select    { float:right; width:65px !important; margin-top:0; }
+.grid tr.filter .range .label    { display:block; width:30px; float:left; padding-right:3px; text-align:right; }
+.grid tr.filter .date img        { width:15px; height:15px; cursor:pointer; vertical-align:middle; padding-left:3px; }
 .grid .head-massaction select    { width:auto !important; max-width:90px; }
 .grid select.select-export-filter,
 .grid select.multiselect-export-filter { width:278px; }

From d292c514c19d4365018dec16dc07d4528d60334c Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano 
Date: Sat, 6 Aug 2022 16:50:30 +0100
Subject: [PATCH 56/61] Force describeTable() to use read DB adapter (#2371)

---
 app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php | 4 ++--
 app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php  | 6 +++---
 app/code/core/Mage/Core/Model/Resource/Abstract.php         | 2 +-
 app/code/core/Mage/Core/Model/Resource/Db/Abstract.php      | 2 +-
 app/code/core/Mage/Eav/Model/Entity/Abstract.php            | 2 +-
 app/code/core/Mage/Index/Model/Resource/Abstract.php        | 6 +++---
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php
index a62f8ccfe62..e4492ee89d4 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php
@@ -665,7 +665,7 @@ protected function _getStaticColumns()
         $helper = Mage::getResourceHelper('catalog');
         $columns = array();
         $columnsToSkip = array('entity_type_id', 'attribute_set_id');
-        $describe = $this->_getWriteAdapter()->describeTable($this->getTable('catalog/category'));
+        $describe = $this->_getReadAdapter()->describeTable($this->getTable('catalog/category'));
 
         foreach ($describe as $column) {
             if (in_array($column['COLUMN_NAME'], $columnsToSkip)) {
@@ -1161,7 +1161,7 @@ protected function _prepareDataForAllFields($category, $replaceFields = array())
     {
         $table = $this->getMainStoreTable($category->getStoreId());
         $this->_getWriteAdapter()->resetDdlCache($table);
-        $table = $this->_getWriteAdapter()->describeTable($table);
+        $table = $this->_getReadAdapter()->describeTable($table);
         $data = array();
         $idFieldName = Mage::getSingleton('catalog/category')->getIdFieldName();
         foreach ($table as $column => $columnData) {
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php
index 66aa3baabca..419a7deb90e 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php
@@ -118,7 +118,7 @@ public function getTypeId()
      */
     public function getAttributeForSelect($attributeCode)
     {
-        $describe = $this->_getWriteAdapter()->describeTable($this->getFlatTableName());
+        $describe = $this->_getReadAdapter()->describeTable($this->getFlatTableName());
         if (!isset($describe[$attributeCode])) {
             return null;
         }
@@ -140,7 +140,7 @@ public function getAttributeForSelect($attributeCode)
      */
     public function getAttributeSortColumn($attributeCode)
     {
-        $describe = $this->_getWriteAdapter()->describeTable($this->getFlatTableName());
+        $describe = $this->_getReadAdapter()->describeTable($this->getFlatTableName());
         if (!isset($describe[$attributeCode])) {
             return null;
         }
@@ -158,7 +158,7 @@ public function getAttributeSortColumn($attributeCode)
      */
     public function getAllTableColumns()
     {
-        $describe = $this->_getWriteAdapter()->describeTable($this->getFlatTableName());
+        $describe = $this->_getReadAdapter()->describeTable($this->getFlatTableName());
         return array_keys($describe);
     }
 
diff --git a/app/code/core/Mage/Core/Model/Resource/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Abstract.php
index 5dddab013bb..8c8b21fc543 100644
--- a/app/code/core/Mage/Core/Model/Resource/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Resource/Abstract.php
@@ -211,7 +211,7 @@ protected function _unserializeField(Varien_Object $object, $field, $defaultValu
     protected function _prepareDataForTable(Varien_Object $object, $table)
     {
         $data = array();
-        $fields = $this->_getWriteAdapter()->describeTable($table);
+        $fields = $this->_getReadAdapter()->describeTable($table);
         foreach (array_keys($fields) as $field) {
             if ($object->hasData($field)) {
                 $fieldValue = $object->getData($field);
diff --git a/app/code/core/Mage/Core/Model/Resource/Db/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Db/Abstract.php
index dff7a4ceb8c..e2843bb2611 100644
--- a/app/code/core/Mage/Core/Model/Resource/Db/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Resource/Db/Abstract.php
@@ -618,7 +618,7 @@ public function hasDataChanged($object)
             return true;
         }
 
-        $fields = $this->_getWriteAdapter()->describeTable($this->getMainTable());
+        $fields = $this->_getReadAdapter()->describeTable($this->getMainTable());
         foreach (array_keys($fields) as $field) {
             if ($object->getOrigData($field) != $object->getData($field)) {
                 return true;
diff --git a/app/code/core/Mage/Eav/Model/Entity/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Abstract.php
index 2453f3d6b40..9988c3db5ac 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Abstract.php
@@ -1167,7 +1167,7 @@ protected function _collectSaveData($newObject)
             $origData = array();
         }
 
-        $staticFields   = $this->_getWriteAdapter()->describeTable($this->getEntityTable());
+        $staticFields   = $this->_getReadAdapter()->describeTable($this->getEntityTable());
         $staticFields   = array_keys($staticFields);
         $attributeCodes = array_keys($this->_attributesByCode);
 
diff --git a/app/code/core/Mage/Index/Model/Resource/Abstract.php b/app/code/core/Mage/Index/Model/Resource/Abstract.php
index 54cc1657e49..759c508226a 100644
--- a/app/code/core/Mage/Index/Model/Resource/Abstract.php
+++ b/app/code/core/Mage/Index/Model/Resource/Abstract.php
@@ -142,11 +142,11 @@ public function cloneIndexTable($asOriginal = false)
     public function insertFromTable($sourceTable, $destTable, $readToIndex = true)
     {
         if ($readToIndex) {
-            $sourceColumns = array_keys($this->_getWriteAdapter()->describeTable($sourceTable));
-            $targetColumns = array_keys($this->_getWriteAdapter()->describeTable($destTable));
+            $sourceColumns = array_keys($this->_getReadAdapter()->describeTable($sourceTable));
+            $targetColumns = array_keys($this->_getReadAdapter()->describeTable($destTable));
         } else {
             $sourceColumns = array_keys($this->_getIndexAdapter()->describeTable($sourceTable));
-            $targetColumns = array_keys($this->_getWriteAdapter()->describeTable($destTable));
+            $targetColumns = array_keys($this->_getReadAdapter()->describeTable($destTable));
         }
         $select = $this->_getIndexAdapter()->select()->from($sourceTable, $sourceColumns);
 

From 18327f41fdf68ab54a9f89dd8485e5170921e3b0 Mon Sep 17 00:00:00 2001
From: sv3n 
Date: Sat, 6 Aug 2022 21:36:17 +0200
Subject: [PATCH 57/61] Do not install n98/n98_layouthelper (#2373)

---
 composer.json | 3 +++
 composer.lock | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 26d11b9262d..415c65276d0 100644
--- a/composer.json
+++ b/composer.json
@@ -25,6 +25,9 @@
     "macopedia/phpstan-magento1": "^1.0.4",
     "phpstan/phpstan": "^1.8"
   },
+  "conflict": {
+    "n98/n98_layouthelper": "*"
+  },
   "authors": [
     {
       "name": "Lee Saferite",
diff --git a/composer.lock b/composer.lock
index bd88c14120e..67fca161c56 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "41b19faf78fd7832d437d8c94c9cb252",
+    "content-hash": "ab93d8594c177fde90bd1611fb18162c",
     "packages": [
         {
             "name": "eloquent/enumeration",

From 645a95924db428c850cceffb6a06743da498ee35 Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano 
Date: Tue, 9 Aug 2022 21:30:26 +0100
Subject: [PATCH 58/61] Fixed broken boxes.css in OM 20.0.15 (#2364)

---
 skin/adminhtml/default/default/boxes.css | 57 ++++++++++++------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/skin/adminhtml/default/default/boxes.css b/skin/adminhtml/default/default/boxes.css
index f406ef42a50..072738dfcb6 100644
--- a/skin/adminhtml/default/default/boxes.css
+++ b/skin/adminhtml/default/default/boxes.css
@@ -588,7 +588,7 @@ div.main-col-inner { float:left; /* Fixes some inner clears in the liquid main-c
 /* HEADER & FOOTER
 *******************************************************************************/
 
-.logo                                   { float:left; margin:5px 20px 5px 27px; height:43px; }
+.logo                                   { float:left; margin:7px 20px 5px 32px; height:30px; }
 .header-top                             { border-bottom:1px solid #5F767F; }
 
 /* Header right */
@@ -672,30 +672,30 @@ div.autocomplete ul li { padding:.5em .7em; min-height:32px; cursor:pointer; tex
 
 
 /* Icon Head */ /* Headings with icon preceding text*/
-.icon-head                      { min-height:18px; background-repeat:no-repeat; background-position:0 0; padding-left:22px; }
-.head-customer-address-list     { background-image:url(images/fam_house.gif); }
-.head-edit-form                 { background-image:url(images/fam_page_white.gif); }
+.icon-head                      { min-height:18px; background-repeat:no-repeat; background-position:0 0; }
+.head-customer-address-list     { background-image:url(images/fam_house.gif); padding-left:22px; }
+.head-edit-form                 { background-image:url(images/fam_page_white.gif); padding-left:22px; }
 .head-customer-view             { background-image:url(images/fam_status_online.gif); padding-left:18px; }
 .head-customer,
 .head-customer-groups,
-.head-online-visitors           { background-image:url(images/fam_group.gif); }
-.head-user                      { background-image:url(images/fam_user.gif); }
-.head-user-edit                 { background-image:url(images/fam_user_edit.gif); }
+.head-online-visitors           { background-image:url(images/fam_group.gif); padding-left:22px; }
+.head-user                      { background-image:url(images/fam_user.gif); padding-left:22px; }
+.head-user-edit                 { background-image:url(images/fam_user_edit.gif); padding-left:22px; }
 .head-poll,
 .head-user-comment,
 .head-review,
 .head-rating,
-.head-comment                   { background-image:url(images/fam_comment.gif); }
-.head-catalog-search            { background-image:url(images/fam_magnifier.png); }
-.head-urlrewrite                { background-image:url(images/fam_link.gif); }
-.head-cart                      { background-image:url(images/fam_cart.gif); }
+.head-comment                   { background-image:url(images/fam_comment.gif); padding-left:22px; }
+.head-catalog-search            { background-image:url(images/fam_magnifier.png); padding-left:22px; }
+.head-urlrewrite                { background-image:url(images/fam_link.gif); padding-left:22px; }
+.head-cart                      { background-image:url(images/fam_cart.gif); padding-left:22px; }
 .head-system-account,
-.head-account                   { background-image:url(images/fam_account.gif); }
+.head-account                   { background-image:url(images/fam_account.gif); padding-left:22px; }
 .head-products,
 .head-catalog-product,
-.head-sitemap                   { background-image:url(images/fam_package.gif); }
-.head-newsletter                { background-image:url(images/fam_newspaper.gif); }
-.head-tag, .head-tag-product    { background-image:url(images/fam_tag_orange.gif); }
+.head-sitemap                   { background-image:url(images/fam_package.gif); padding-left:22px; }
+.head-newsletter                { background-image:url(images/fam_newspaper.gif); padding-left:22px; }
+.head-tag, .head-tag-product    { background-image:url(images/fam_tag_orange.gif); padding-left:22px; }
 .head-sales-order,
 .head-sales-invoice,
 .head-sales-shipment,
@@ -706,30 +706,30 @@ div.autocomplete ul li { padding:.5em .7em; min-height:32px; cursor:pointer; tex
 .head-sales-order-creditmemo,
 .head-adminhtml-recurring-profile,
 .head-adminhtml-billing-agreement,
-.head-checkout-agreement        { background-image:url(images/fam_folder_table.gif); }
+.head-checkout-agreement        { background-image:url(images/fam_folder_table.gif); padding-left:22px; }
 .head-tax,
 .head-tax-rule,
 .head-tax-rate-importExport,
 .head-tax-class,
 .head-system-currency,
 .head-promo-quote,
-.head-promo-catalog             { background-image:url(images/fam_money.gif); }
+.head-promo-catalog             { background-image:url(images/fam_money.gif); padding-left:22px; }
 .head-categories                { background-image:url(images/fam_folder_database.gif); padding-left:20px; color:#253033 !important; }
 .head-catalog-product-attribute { background-image:url(images/fam_rainbow.gif); padding-left:24px; }
 .head-product-attribute-sets    { background-image:url(images/fam_folder_palette.gif); padding-left:23px; }
 .head-cms-page, .head-cms-block,
-.head-adminhtml-widget-instance { background-image:url(images/application_view_tile.gif); }
+.head-adminhtml-widget-instance { background-image:url(images/application_view_tile.gif); padding-left:22px; }
 .head-report,
-.head-backups-control           { background-image:url(images/fam_server_database.gif); }
-.head-money, .head-promo-quote  { background-image:url(images/fam_money.gif); }
+.head-backups-control           { background-image:url(images/fam_server_database.gif); padding-left:22px; }
+.head-money, .head-promo-quote  { background-image:url(images/fam_money.gif); padding-left:22px; }
 .head-shipping-address,
-.head-billing-address           { background-image:url(images/fam_house.gif); }
-.head-shipping-method           { background-image:url(images/fam_lorry.gif); }
-.head-payment-method            { background-image:url(images/fam_creditcards.gif); }
-.head-order-date                { background-image:url(images/fam_calendar.gif); }
-.head-customer-sales-statistics { background-image:url(images/fam_money.gif); }
-.head-notification              { background-image:url(images/fam_folder_table.gif); }
-.head-compilation               { background-image:url(images/fam_package_go.gif); }
+.head-billing-address           { background-image:url(images/fam_house.gif); padding-left:22px; }
+.head-shipping-method           { background-image:url(images/fam_lorry.gif); padding-left:22px; }
+.head-payment-method            { background-image:url(images/fam_creditcards.gif); padding-left:22px; }
+.head-order-date                { background-image:url(images/fam_calendar.gif); padding-left:22px; }
+.head-customer-sales-statistics { background-image:url(images/fam_money.gif); padding-left:22px; }
+.head-notification              { background-image:url(images/fam_folder_table.gif); padding-left:22px; }
+.head-compilation               { background-image:url(images/fam_package_go.gif); padding-left:22px; }
 
 
 
@@ -741,7 +741,8 @@ div.autocomplete ul li { padding:.5em .7em; min-height:32px; cursor:pointer; tex
 /* LOGIN
 *******************************************************************************/
 #page-login                             { background:#f8f8f8; text-align:center; }
-.login-container                        { width:581px; margin:170px auto; padding-left:32px; background:url(images/login_logo.png) no-repeat; }
+.login-container                        { position: relative; width:581px; margin:170px auto; padding-left:32px; }
+.login-container::before                { content: "";position: absolute;width: 150px;height: 35px;top: 60px;left: -55px;background: url(images/logo_gray.svg) 0 0 no-repeat;background-size: contain;transform: rotate(-90deg); }
 .login-form                             { padding:27px 57px 35px 57px; background:url(images/login_box_bg.jpg) no-repeat; text-align:left; }
 .login-form .input-left                 { float:left; }
 .login-form .input-right                { float:right; }

From b1098b29f235d98cefd4484027c647b1af4c26cc Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano 
Date: Wed, 10 Aug 2022 19:10:56 +0100
Subject: [PATCH 59/61] Removed deprecated method Mage::setIsDownloader()
 (#2379)

---
 app/Mage.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/app/Mage.php b/app/Mage.php
index fb6b1b8b301..8367bfb11a1 100644
--- a/app/Mage.php
+++ b/app/Mage.php
@@ -1057,14 +1057,4 @@ public static function getScriptSystemUrl($folder, $exitIfNot = false)
 
         return $baseUrl;
     }
-
-    /**
-     * Set is downloader flag
-     *
-     * @deprecated
-     */
-    public static function setIsDownloader()
-    {
-
-    }
 }

From 32cb1e835e911f623b726d27fc0c6ae037aa349d Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano 
Date: Wed, 13 Jul 2022 12:21:07 +0200
Subject: [PATCH 60/61] rebased

---
 app/code/core/Mage/Adminhtml/Block/Backup.php | 117 -----
 .../Mage/Adminhtml/Block/Backup/Dialogs.php   |  53 ---
 .../core/Mage/Adminhtml/Block/Backup/Grid.php | 141 ------
 .../Adminhtml/Block/System/Store/Delete.php   |  99 -----
 .../Block/System/Store/Delete/Form.php        |  80 ----
 .../Block/System/Store/Delete/Group.php       |  70 ---
 .../Block/System/Store/Delete/Website.php     |  71 ----
 .../Adminhtml/Block/System/Store/Edit.php     |  16 +-
 .../controllers/System/BackupController.php   | 384 -----------------
 .../controllers/System/StoreController.php    |  41 --
 app/code/core/Mage/Backup/Exception.php       |  29 --
 app/code/core/Mage/Backup/Helper/Data.php     | 323 --------------
 app/code/core/Mage/Backup/Model/Backup.php    | 402 ------------------
 .../Mage/Backup/Model/Config/Backend/Cron.php |  90 ----
 .../Mage/Backup/Model/Config/Source/Type.php  |  52 ---
 app/code/core/Mage/Backup/Model/Db.php        | 185 --------
 .../core/Mage/Backup/Model/Fs/Collection.php  |  93 ----
 app/code/core/Mage/Backup/Model/Mysql4/Db.php |  38 --
 app/code/core/Mage/Backup/Model/Observer.php  |  95 -----
 .../core/Mage/Backup/Model/Resource/Db.php    | 316 --------------
 .../Backup/Model/Resource/Helper/Mysql4.php   | 322 --------------
 app/code/core/Mage/Backup/etc/adminhtml.xml   |  67 ---
 app/code/core/Mage/Backup/etc/config.xml      |  73 ----
 app/code/core/Mage/Backup/etc/system.xml      |  94 ----
 .../core_setup/upgrade-1.6.0.7-1.6.0.8.php    |  41 --
 .../default/template/backup/dialogs.phtml     | 198 ---------
 .../default/template/backup/left.phtml        |  27 --
 .../default/template/backup/list.phtml        |  40 --
 app/etc/modules/Mage_All.xml                  |   7 -
 app/locale/en_US/Mage_Backup.csv              |  55 ---
 js/mage/adminhtml/backup.js                   | 193 ---------
 lib/Mage/Backup.php                           |  59 ---
 lib/Mage/Backup/Abstract.php                  | 318 --------------
 lib/Mage/Backup/Archive/Tar.php               |  82 ----
 lib/Mage/Backup/Db.php                        | 119 ------
 lib/Mage/Backup/Exception.php                 |  36 --
 .../Backup/Exception/CantLoadSnapshot.php     |  36 --
 .../Backup/Exception/FtpConnectionFailed.php  |  36 --
 .../Backup/Exception/FtpValidationFailed.php  |  36 --
 .../Backup/Exception/NotEnoughFreeSpace.php   |  36 --
 .../Backup/Exception/NotEnoughPermissions.php |  36 --
 lib/Mage/Backup/Filesystem.php                | 284 -------------
 lib/Mage/Backup/Filesystem/Helper.php         | 141 ------
 lib/Mage/Backup/Filesystem/Iterator/File.php  | 112 -----
 .../Backup/Filesystem/Iterator/Filter.php     |  77 ----
 .../Backup/Filesystem/Rollback/Abstract.php   |  57 ---
 lib/Mage/Backup/Filesystem/Rollback/Fs.php    |  78 ----
 lib/Mage/Backup/Filesystem/Rollback/Ftp.php   | 198 ---------
 lib/Mage/Backup/Interface.php                 |  88 ----
 lib/Mage/Backup/Media.php                     |  99 -----
 lib/Mage/Backup/Nomedia.php                   |  82 ----
 lib/Mage/Backup/Snapshot.php                  | 140 ------
 52 files changed, 8 insertions(+), 5954 deletions(-)
 delete mode 100644 app/code/core/Mage/Adminhtml/Block/Backup.php
 delete mode 100644 app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php
 delete mode 100644 app/code/core/Mage/Adminhtml/Block/Backup/Grid.php
 delete mode 100644 app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php
 delete mode 100644 app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php
 delete mode 100644 app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php
 delete mode 100644 app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php
 delete mode 100644 app/code/core/Mage/Adminhtml/controllers/System/BackupController.php
 delete mode 100644 app/code/core/Mage/Backup/Exception.php
 delete mode 100644 app/code/core/Mage/Backup/Helper/Data.php
 delete mode 100644 app/code/core/Mage/Backup/Model/Backup.php
 delete mode 100644 app/code/core/Mage/Backup/Model/Config/Backend/Cron.php
 delete mode 100644 app/code/core/Mage/Backup/Model/Config/Source/Type.php
 delete mode 100644 app/code/core/Mage/Backup/Model/Db.php
 delete mode 100644 app/code/core/Mage/Backup/Model/Fs/Collection.php
 delete mode 100644 app/code/core/Mage/Backup/Model/Mysql4/Db.php
 delete mode 100644 app/code/core/Mage/Backup/Model/Observer.php
 delete mode 100644 app/code/core/Mage/Backup/Model/Resource/Db.php
 delete mode 100644 app/code/core/Mage/Backup/Model/Resource/Helper/Mysql4.php
 delete mode 100644 app/code/core/Mage/Backup/etc/adminhtml.xml
 delete mode 100644 app/code/core/Mage/Backup/etc/config.xml
 delete mode 100644 app/code/core/Mage/Backup/etc/system.xml
 delete mode 100644 app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.7-1.6.0.8.php
 delete mode 100644 app/design/adminhtml/default/default/template/backup/dialogs.phtml
 delete mode 100644 app/design/adminhtml/default/default/template/backup/left.phtml
 delete mode 100644 app/design/adminhtml/default/default/template/backup/list.phtml
 delete mode 100644 app/locale/en_US/Mage_Backup.csv
 delete mode 100644 js/mage/adminhtml/backup.js
 delete mode 100644 lib/Mage/Backup.php
 delete mode 100644 lib/Mage/Backup/Abstract.php
 delete mode 100644 lib/Mage/Backup/Archive/Tar.php
 delete mode 100644 lib/Mage/Backup/Db.php
 delete mode 100644 lib/Mage/Backup/Exception.php
 delete mode 100644 lib/Mage/Backup/Exception/CantLoadSnapshot.php
 delete mode 100644 lib/Mage/Backup/Exception/FtpConnectionFailed.php
 delete mode 100644 lib/Mage/Backup/Exception/FtpValidationFailed.php
 delete mode 100644 lib/Mage/Backup/Exception/NotEnoughFreeSpace.php
 delete mode 100644 lib/Mage/Backup/Exception/NotEnoughPermissions.php
 delete mode 100644 lib/Mage/Backup/Filesystem.php
 delete mode 100644 lib/Mage/Backup/Filesystem/Helper.php
 delete mode 100644 lib/Mage/Backup/Filesystem/Iterator/File.php
 delete mode 100644 lib/Mage/Backup/Filesystem/Iterator/Filter.php
 delete mode 100644 lib/Mage/Backup/Filesystem/Rollback/Abstract.php
 delete mode 100644 lib/Mage/Backup/Filesystem/Rollback/Fs.php
 delete mode 100644 lib/Mage/Backup/Filesystem/Rollback/Ftp.php
 delete mode 100644 lib/Mage/Backup/Interface.php
 delete mode 100644 lib/Mage/Backup/Media.php
 delete mode 100644 lib/Mage/Backup/Nomedia.php
 delete mode 100644 lib/Mage/Backup/Snapshot.php

diff --git a/app/code/core/Mage/Adminhtml/Block/Backup.php b/app/code/core/Mage/Adminhtml/Block/Backup.php
deleted file mode 100644
index 48b44ee040d..00000000000
--- a/app/code/core/Mage/Adminhtml/Block/Backup.php
+++ /dev/null
@@ -1,117 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Backup extends Mage_Adminhtml_Block_Template
-{
-    /**
-     * Block's template
-     *
-     * @var string
-     */
-    protected $_template = 'backup/list.phtml';
-
-    protected function _prepareLayout()
-    {
-        parent::_prepareLayout();
-        $this->setChild('createButton',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData(array(
-                    'label' => Mage::helper('backup')->__('Database Backup'),
-                    'onclick' => "return backup.backup('" . Mage_Backup_Helper_Data::TYPE_DB . "')",
-                    'class'  => 'task'
-                ))
-        );
-        $this->setChild('createSnapshotButton',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData(array(
-                    'label' => Mage::helper('backup')->__('System Backup'),
-                    'onclick' => "return backup.backup('" . Mage_Backup_Helper_Data::TYPE_SYSTEM_SNAPSHOT . "')",
-                    'class'  => ''
-                ))
-        );
-        $this->setChild('createMediaBackupButton',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData(array(
-                    'label' => Mage::helper('backup')->__('Database and Media Backup'),
-                    'onclick' => "return backup.backup('" . Mage_Backup_Helper_Data::TYPE_MEDIA . "')",
-                    'class'  => ''
-                ))
-        );
-        $this->setChild('backupsGrid',
-            $this->getLayout()->createBlock('adminhtml/backup_grid')
-        );
-
-        $this->setChild('dialogs', $this->getLayout()->createBlock('adminhtml/backup_dialogs'));
-        return $this;
-    }
-
-    public function getCreateButtonHtml()
-    {
-        return $this->getChildHtml('createButton');
-    }
-
-    /**
-     * Generate html code for "Create System Snapshot" button
-     *
-     * @return string
-     */
-    public function getCreateSnapshotButtonHtml()
-    {
-        return $this->getChildHtml('createSnapshotButton');
-    }
-
-    /**
-     * Generate html code for "Create Media Backup" button
-     *
-     * @return string
-     */
-    public function getCreateMediaBackupButtonHtml()
-    {
-        return $this->getChildHtml('createMediaBackupButton');
-    }
-
-    public function getGridHtml()
-    {
-        return $this->getChildHtml('backupsGrid');
-    }
-
-    /**
-     * Generate html code for pop-up messages that will appear when user click on "Rollback" link
-     *
-     * @return string
-     */
-    public function getDialogsHtml()
-    {
-        return $this->getChildHtml('dialogs');
-    }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php b/app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php
deleted file mode 100644
index f67d700f249..00000000000
--- a/app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php
+++ /dev/null
@@ -1,53 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Backup_Dialogs extends Mage_Adminhtml_Block_Template
-{
-    /**
-     * Block's template
-     *
-     * @var string
-     */
-    protected $_template = 'backup/dialogs.phtml';
-
-    /**
-     * Include backup.js file in page before rendering
-     *
-     * @see Mage_Core_Block_Abstract::_prepareLayout()
-     */
-    protected function _prepareLayout()
-    {
-        $this->getLayout()->getBlock('head')->addJs('mage/adminhtml/backup.js');
-        return parent::_prepareLayout();
-    }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php b/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php
deleted file mode 100644
index b4b8e40c122..00000000000
--- a/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php
+++ /dev/null
@@ -1,141 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Backup_Grid extends Mage_Adminhtml_Block_Widget_Grid
-{
-
-    protected function _construct()
-    {
-        $this->setSaveParametersInSession(true);
-        $this->setId('backupsGrid');
-        $this->setDefaultSort('time', 'desc');
-    }
-
-    /**
-     * Init backups collection
-     */
-    protected function _prepareCollection()
-    {
-        $collection = Mage::getSingleton('backup/fs_collection');
-        $this->setCollection($collection);
-        return parent::_prepareCollection();
-    }
-
-    /**
-     * Prepare mass action controls
-     *
-     * @return $this
-     */
-    protected function _prepareMassaction()
-    {
-        $this->setMassactionIdField('id');
-        $this->getMassactionBlock()->setFormFieldName('ids');
-
-        $this->getMassactionBlock()->addItem('delete', array(
-             'label'=> Mage::helper('adminhtml')->__('Delete'),
-             'url'  => $this->getUrl('*/*/massDelete'),
-             'confirm' => Mage::helper('backup')->__('Are you sure you want to delete the selected backup(s)?')
-        ));
-
-        return $this;
-    }
-
-    /**
-     * Configuration of grid
-     *
-     * @return $this
-     */
-    protected function _prepareColumns()
-    {
-        $url7zip = Mage::helper('adminhtml')->__('The archive can be uncompressed with %s on Windows systems', 'http://www.7-zip.org/', '7-Zip');
-
-        $this->addColumn('time', array(
-            'header'    => Mage::helper('backup')->__('Time'),
-            'index'     => 'date_object',
-            'type'      => 'datetime',
-            'width'     => 200
-        ));
-
-        $this->addColumn('display_name', array(
-            'header'    => Mage::helper('backup')->__('Name'),
-            'index'     => 'display_name',
-            'filter'    => false,
-            'sortable'  => true,
-            'width'     => 350
-        ));
-
-        $this->addColumn('size', array(
-            'header'    => Mage::helper('backup')->__('Size, Bytes'),
-            'index'     => 'size',
-            'type'      => 'number',
-            'sortable'  => true,
-            'filter'    => false
-        ));
-
-        $this->addColumn('type', array(
-            'header'    => Mage::helper('backup')->__('Type'),
-            'type'      => 'options',
-            'options'   => Mage::helper('backup')->getBackupTypes(),
-            'index'     => 'type',
-            'width'     => 300
-        ));
-
-        $this->addColumn('download', array(
-            'header'    => Mage::helper('backup')->__('Download'),
-            'format'    => '$extension   ('.$url7zip.')',
-            'index'     => 'type',
-            'sortable'  => false,
-            'filter'    => false
-        ));
-
-        if (Mage::helper('backup')->isRollbackAllowed()){
-            $this->addColumn('action', array(
-                    'header'   => Mage::helper('backup')->__('Action'),
-                    'type'     => 'action',
-                    'width'    => '80px',
-                    'filter'   => false,
-                    'actions'  => array(array(
-                        'url'     => '#',
-                        'caption' => Mage::helper('backup')->__('Rollback'),
-                        'onclick' => 'return backup.rollback(\'$type\', \'$time\');'
-                    )),
-                    'index'    => 'type',
-                    'sortable' => false
-            ));
-        }
-
-        return $this;
-    }
-
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php
deleted file mode 100644
index 89747840dc4..00000000000
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php
+++ /dev/null
@@ -1,99 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_System_Store_Delete extends Mage_Adminhtml_Block_Widget_Form_Container
-{
-
-    /**
-     * Class constructor
-     *
-     */
-    public function __construct()
-    {
-        $this->_objectId = 'item_id';
-        $this->_mode = 'delete';
-        $this->_controller = 'system_store';
-
-        parent::__construct();
-
-        $this->_removeButton('save');
-        $this->_removeButton('reset');
-
-        $this->_updateButton('delete', 'area', 'footer');
-        $this->_updateButton('delete', 'onclick', 'editForm.submit();');
-
-        $this->_addButton('cancel', array(
-            'label'     => Mage::helper('adminhtml')->__('Cancel'),
-            'onclick'   => 'setLocation(\'' . $this->getBackUrl() . '\')',
-        ), 2, 100, 'footer');
-
-    }
-
-    /**
-     * Get edit form container header text
-     *
-     * @return string
-     */
-    public function getHeaderText()
-    {
-        return Mage::helper('adminhtml')->__("Delete %s '%s'", $this->getStoreTypeTitle(), $this->escapeHtml($this->getChild('form')->getDataObject()->getName()));
-    }
-
-    /**
-     * Set store type title
-     *
-     * @param string $title
-     * @return $this
-     */
-    public function setStoreTypeTitle($title)
-    {
-        $this->_updateButton('delete', 'label', Mage::helper('adminhtml')->__('Delete %s', $title));
-        return $this->setData('store_type_title', $title);
-    }
-
-    /**
-     * Set back URL for "Cancel" and "Back" buttons
-     *
-     * @param string $url
-     * @return $this
-     */
-    public function setBackUrl($url)
-    {
-        $this->setData('back_url', $url);
-        $this->_updateButton('cancel', 'onclick', "setLocation('" . $url . "')");
-        $this->_updateButton('back', 'onclick', "setLocation('" . $url . "')");
-        return $this;
-    }
-
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php
deleted file mode 100644
index af126a7e191..00000000000
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php
+++ /dev/null
@@ -1,80 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_System_Store_Delete_Form extends Mage_Adminhtml_Block_Widget_Form
-{
-
-    /**
-     * Init form
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setId('store_delete_form');
-        $this->setTitle(Mage::helper('cms')->__('Block Information'));
-    }
-
-    protected function _prepareForm()
-    {
-        $dataObject = $this->getDataObject();
-
-        $form = new Varien_Data_Form(array('id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post'));
-
-        $form->setHtmlIdPrefix('store_');
-
-        $fieldset = $form->addFieldset('base_fieldset', array('legend' => Mage::helper('core')->__('Backup Options'), 'class' => 'fieldset-wide'));
-
-        $fieldset->addField('item_id', 'hidden', array(
-            'name'  => 'item_id',
-            'value' => $dataObject->getId(),
-        ));
-
-        $fieldset->addField('create_backup', 'select', array(
-            'label'     => Mage::helper('adminhtml')->__('Create DB Backup'),
-            'title'     => Mage::helper('adminhtml')->__('Create DB Backup'),
-            'name'      => 'create_backup',
-            'options'   => array(
-                '1' => Mage::helper('adminhtml')->__('Yes'),
-                '0' => Mage::helper('adminhtml')->__('No'),
-            ),
-            'value'     => '1',
-        ));
-
-        $form->setUseContainer(true);
-        $this->setForm($form);
-
-        return parent::_prepareForm();
-    }
-
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php
deleted file mode 100644
index a4275b1fdf2..00000000000
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php
+++ /dev/null
@@ -1,70 +0,0 @@
-
- */
-
-class Mage_Adminhtml_Block_System_Store_Delete_Group extends Mage_Adminhtml_Block_Template
-{
-    protected function _prepareLayout()
-    {
-        $itemId = $this->getRequest()->getParam('group_id');
-
-        $this->setTemplate('system/store/delete_group.phtml');
-        $this->setAction($this->getUrl('*/*/deleteGroupPost', array('group_id'=>$itemId)));
-        $this->setChild('confirm_deletion_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData(array(
-                    'label'     => Mage::helper('core')->__('Delete Store'),
-                    'onclick'   => "deleteForm.submit()",
-                    'class'     => 'cancel'
-                ))
-        );
-        $onClick = "setLocation('".$this->getUrl('*/*/editGroup', array('group_id'=>$itemId))."')";
-        $this->setChild('cancel_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData(array(
-                    'label'     => Mage::helper('core')->__('Cancel'),
-                    'onclick'   => $onClick,
-                    'class'     => 'cancel'
-                ))
-        );
-        $this->setChild('back_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData(array(
-                    'label'     => Mage::helper('core')->__('Back'),
-                    'onclick'   => $onClick,
-                    'class'     => 'cancel'
-                ))
-        );
-        return parent::_prepareLayout();
-    }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php
deleted file mode 100644
index db60e9f1fe0..00000000000
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php
+++ /dev/null
@@ -1,71 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_System_Store_Delete_Website extends Mage_Adminhtml_Block_Template
-{
-
-    protected function _prepareLayout()
-    {
-        $itemId = $this->getRequest()->getParam('website_id');
-
-        $this->setTemplate('system/store/delete_website.phtml');
-        $this->setAction($this->getUrl('*/*/deleteWebsitePost', array('website_id'=>$itemId)));
-        $this->setChild('confirm_deletion_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData(array(
-                    'label'     => Mage::helper('core')->__('Delete Website'),
-                    'onclick'   => "deleteForm.submit()",
-                    'class'     => 'cancel'
-                ))
-        );
-        $onClick = "setLocation('".$this->getUrl('*/*/editWebsite', array('website_id'=>$itemId))."')";
-        $this->setChild('cancel_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData(array(
-                    'label'     => Mage::helper('core')->__('Cancel'),
-                    'onclick'   => $onClick,
-                    'class'     => 'cancel'
-                ))
-        );
-        $this->setChild('back_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData(array(
-                    'label'     => Mage::helper('core')->__('Back'),
-                    'onclick'   => $onClick,
-                    'class'     => 'cancel'
-                ))
-        );
-        return parent::_prepareLayout();
-    }
-
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php
index 888293dbbf6..d8b04ea2531 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php
@@ -40,28 +40,24 @@ class Mage_Adminhtml_Block_System_Store_Edit extends Mage_Adminhtml_Block_Widget
      */
     public function __construct()
     {
-        $backupAvailable =
-            Mage::getSingleton('admin/session')->isAllowed('system/tools/backup')
-            && Mage::helper('core')->isModuleEnabled('Mage_Backup')
-            && !Mage::getStoreConfigFlag('advanced/modules_disable_output/Mage_Backup');
         switch (Mage::registry('store_type')) {
             case 'website':
                 $this->_objectId = 'website_id';
                 $saveLabel   = Mage::helper('core')->__('Save Website');
                 $deleteLabel = Mage::helper('core')->__('Delete Website');
-                $deleteUrl   = $this->_getDeleteUrl(Mage::registry('store_type'), $backupAvailable);
+                $deleteUrl   = $this->_getDeleteUrl(Mage::registry('store_type'));
                 break;
             case 'group':
                 $this->_objectId = 'group_id';
                 $saveLabel   = Mage::helper('core')->__('Save Store');
                 $deleteLabel = Mage::helper('core')->__('Delete Store');
-                $deleteUrl   = $this->_getDeleteUrl(Mage::registry('store_type'), $backupAvailable);
+                $deleteUrl   = $this->_getDeleteUrl(Mage::registry('store_type'));
                 break;
             case 'store':
                 $this->_objectId = 'store_id';
                 $saveLabel   = Mage::helper('core')->__('Save Store View');
                 $deleteLabel = Mage::helper('core')->__('Delete Store View');
-                $deleteUrl   = $this->_getDeleteUrl(Mage::registry('store_type'), $backupAvailable);
+                $deleteUrl   = $this->_getDeleteUrl(Mage::registry('store_type'));
                 break;
         }
         $this->_controller = 'system_store';
@@ -70,7 +66,11 @@ public function __construct()
 
         $this->_updateButton('save', 'label', $saveLabel);
         $this->_updateButton('delete', 'label', $deleteLabel);
-        $this->_updateButton('delete', 'onclick', 'setLocation(\''.$deleteUrl.'\');');
+        $this->_updateButton('delete', 'onclick', 'deleteConfirm(\''
+            . Mage::helper('core')->jsQuoteEscape(
+                Mage::helper('adminhtml')->__('Are you sure you want to do this?')
+            )
+            .'\', \'' . $deleteUrl . '\')');
 
         if (!Mage::registry('store_data')->isCanDelete()) {
             $this->_removeButton('delete');
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php b/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php
deleted file mode 100644
index 3e1c8e58c62..00000000000
--- a/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php
+++ /dev/null
@@ -1,384 +0,0 @@
-
- */
-class Mage_Adminhtml_System_BackupController extends Mage_Adminhtml_Controller_Action
-{
-    /**
-     * Controller pre-dispatch method
-     *
-     * @return Mage_Adminhtml_Controller_Action
-     */
-    public function preDispatch()
-    {
-        $this->_setForcedFormKeyActions(array('create', 'massDelete'));
-        return parent::preDispatch();
-    }
-
-    /**
-     * Backup list action
-     */
-    public function indexAction()
-    {
-        $this->_title($this->__('System'))->_title($this->__('Tools'))->_title($this->__('Backups'));
-
-        if($this->getRequest()->getParam('ajax')) {
-            $this->_forward('grid');
-            return;
-        }
-
-        $this->loadLayout();
-        $this->_setActiveMenu('system');
-        $this->_addBreadcrumb(Mage::helper('adminhtml')->__('System'), Mage::helper('adminhtml')->__('System'));
-        $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Tools'), Mage::helper('adminhtml')->__('Tools'));
-        $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Backups'), Mage::helper('adminhtml')->__('Backup'));
-
-        $this->_addContent($this->getLayout()->createBlock('adminhtml/backup', 'backup'));
-
-        $this->renderLayout();
-    }
-
-    /**
-     * Backup list action
-     */
-    public function gridAction()
-    {
-        $this->getResponse()->setBody($this->getLayout()->createBlock('adminhtml/backup_grid')->toHtml());
-    }
-
-    /**
-     * Create backup action
-     *
-     * @return Mage_Adminhtml_Controller_Action
-     */
-    public function createAction()
-    {
-        if (!$this->getRequest()->isAjax()) {
-            return $this->getUrl('*/*/index');
-        }
-
-        $response = new Varien_Object();
-
-        /**
-         * @var Mage_Backup_Helper_Data $helper
-         */
-        $helper = Mage::helper('backup');
-
-        try {
-            $type = $this->getRequest()->getParam('type');
-
-            if ($type == Mage_Backup_Helper_Data::TYPE_SYSTEM_SNAPSHOT
-                && $this->getRequest()->getParam('exclude_media')
-            ) {
-                $type = Mage_Backup_Helper_Data::TYPE_SNAPSHOT_WITHOUT_MEDIA;
-            }
-
-            $backupManager = Mage_Backup::getBackupInstance($type)
-                ->setBackupExtension($helper->getExtensionByType($type))
-                ->setTime(time())
-                ->setBackupsDir($helper->getBackupsDir());
-
-            $backupManager->setName($this->getRequest()->getParam('backup_name'));
-
-            Mage::register('backup_manager', $backupManager);
-
-            if ($this->getRequest()->getParam('maintenance_mode')) {
-                $turnedOn = $helper->turnOnMaintenanceMode();
-
-                if (!$turnedOn) {
-                    $response->setError(
-                        Mage::helper('backup')->__('You do not have sufficient permissions to enable Maintenance Mode during this operation.')
-                            . ' ' . Mage::helper('backup')->__('Please either unselect the "Put store on the maintenance mode" checkbox or update your permissions to proceed with the backup."')
-                    );
-                    $backupManager->setErrorMessage(Mage::helper('backup')->__("System couldn't put store on the maintenance mode"));
-                    return $this->getResponse()->setBody($response->toJson());
-                }
-            }
-
-            if ($type != Mage_Backup_Helper_Data::TYPE_DB) {
-                $backupManager->setRootDir(Mage::getBaseDir())
-                    ->addIgnorePaths($helper->getBackupIgnorePaths());
-            }
-
-            $successMessage = $helper->getCreateSuccessMessageByType($type);
-
-            $backupManager->create();
-
-            $this->_getSession()->addSuccess($successMessage);
-
-            $response->setRedirectUrl($this->getUrl('*/*/index'));
-        } catch (Mage_Backup_Exception_NotEnoughFreeSpace $e) {
-            $errorMessage = Mage::helper('backup')->__('Not enough free space to create backup.');
-        } catch (Mage_Backup_Exception_NotEnoughPermissions $e) {
-            Mage::log($e->getMessage());
-            $errorMessage = Mage::helper('backup')->__('Not enough permissions to create backup.');
-        } catch (Exception  $e) {
-            Mage::log($e->getMessage());
-            $errorMessage = Mage::helper('backup')->__('An error occurred while creating the backup.');
-        }
-
-        if (!empty($errorMessage)) {
-            $response->setError($errorMessage);
-            $backupManager->setErrorMessage($errorMessage);
-        }
-
-        if ($this->getRequest()->getParam('maintenance_mode')) {
-            $helper->turnOffMaintenanceMode();
-        }
-
-        $this->getResponse()->setBody($response->toJson());
-    }
-
-    /**
-     * Download backup action
-     *
-     * @return Mage_Adminhtml_Controller_Action
-     */
-    public function downloadAction()
-    {
-        /* @var $backup Mage_Backup_Model_Backup */
-        $backup = Mage::getModel('backup/backup')->loadByTimeAndType(
-            $this->getRequest()->getParam('time'),
-            $this->getRequest()->getParam('type')
-        );
-
-        if (!$backup->getTime() || !$backup->exists()) {
-            return $this->_redirect('*/*');
-        }
-
-        $fileName = Mage::helper('backup')->generateBackupDownloadName($backup);
-
-        $this->_prepareDownloadResponse($fileName, null, 'application/octet-stream', $backup->getSize());
-
-        $this->getResponse()->sendHeaders();
-
-        $backup->output();
-        exit();
-    }
-
-    /**
-     * Rollback Action
-     *
-     * @return Mage_Adminhtml_Controller_Action
-     */
-    public function rollbackAction()
-    {
-        if (!Mage::helper('backup')->isRollbackAllowed()){
-            return $this->_forward('denied');
-        }
-
-        if (!$this->getRequest()->isAjax()) {
-            return $this->getUrl('*/*/index');
-        }
-
-        $helper = Mage::helper('backup');
-        $response = new Varien_Object();
-
-        try {
-            /* @var $backup Mage_Backup_Model_Backup */
-            $backup = Mage::getModel('backup/backup')->loadByTimeAndType(
-                $this->getRequest()->getParam('time'),
-                $this->getRequest()->getParam('type')
-            );
-
-            if (!$backup->getTime() || !$backup->exists()) {
-                return $this->_redirect('*/*');
-            }
-
-            if (!$backup->getTime()) {
-                throw new Mage_Backup_Exception_CantLoadSnapshot();
-            }
-
-            $type = $backup->getType();
-
-            $backupManager = Mage_Backup::getBackupInstance($type)
-                ->setBackupExtension($helper->getExtensionByType($type))
-                ->setTime($backup->getTime())
-                ->setBackupsDir($helper->getBackupsDir())
-                ->setName($backup->getName(), false)
-                ->setResourceModel(Mage::getResourceModel('backup/db'));
-
-            Mage::register('backup_manager', $backupManager);
-
-            $passwordValid = Mage::getModel('backup/backup')->validateUserPassword(
-                $this->getRequest()->getParam('password')
-            );
-
-            if (!$passwordValid) {
-                $response->setError(Mage::helper('backup')->__('Invalid Password.'));
-                $backupManager->setErrorMessage(Mage::helper('backup')->__('Invalid Password.'));
-                return $this->getResponse()->setBody($response->toJson());
-            }
-
-            if ($this->getRequest()->getParam('maintenance_mode')) {
-                $turnedOn = $helper->turnOnMaintenanceMode();
-
-                if (!$turnedOn) {
-                    $response->setError(
-                        Mage::helper('backup')->__('You do not have sufficient permissions to enable Maintenance Mode during this operation.')
-                            . ' ' . Mage::helper('backup')->__('Please either unselect the "Put store on the maintenance mode" checkbox or update your permissions to proceed with the rollback."')
-                    );
-                    $backupManager->setErrorMessage(Mage::helper('backup')->__("System couldn't put store on the maintenance mode"));
-                    return $this->getResponse()->setBody($response->toJson());
-                }
-            }
-
-            if ($type != Mage_Backup_Helper_Data::TYPE_DB) {
-
-                $backupManager->setRootDir(Mage::getBaseDir())
-                    ->addIgnorePaths($helper->getRollbackIgnorePaths());
-
-                if ($this->getRequest()->getParam('use_ftp', false)) {
-                    $backupManager->setUseFtp(
-                        $this->getRequest()->getParam('ftp_host', ''),
-                        $this->getRequest()->getParam('ftp_user', ''),
-                        $this->getRequest()->getParam('ftp_pass', ''),
-                        $this->getRequest()->getParam('ftp_path', '')
-                    );
-                }
-            }
-
-            $backupManager->rollback();
-
-            $helper->invalidateCache()->invalidateIndexer();
-
-            $adminSession = $this->_getSession();
-            $adminSession->unsetAll();
-            $adminSession->getCookie()->delete($adminSession->getSessionName());
-
-            $response->setRedirectUrl($this->getUrl('*'));
-        } catch (Mage_Backup_Exception_CantLoadSnapshot $e) {
-            $errorMsg = Mage::helper('backup')->__('Backup file not found');
-        } catch (Mage_Backup_Exception_FtpConnectionFailed $e) {
-            $errorMsg = Mage::helper('backup')->__('Failed to connect to FTP');
-        } catch (Mage_Backup_Exception_FtpValidationFailed $e) {
-            $errorMsg = Mage::helper('backup')->__('Failed to validate FTP');
-        } catch (Mage_Backup_Exception_NotEnoughPermissions $e) {
-            Mage::log($e->getMessage());
-            $errorMsg = Mage::helper('backup')->__('Not enough permissions to perform rollback');
-        } catch (Exception $e) {
-            Mage::log($e->getMessage());
-            $errorMsg = Mage::helper('backup')->__('Failed to rollback');
-        }
-
-        if (!empty($errorMsg)) {
-            $response->setError($errorMsg);
-            $backupManager->setErrorMessage($errorMsg);
-        }
-
-        if ($this->getRequest()->getParam('maintenance_mode')) {
-            $helper->turnOffMaintenanceMode();
-        }
-
-        $this->getResponse()->setBody($response->toJson());
-    }
-
-    /**
-     * Delete backups mass action
-     *
-     * @return Mage_Adminhtml_Controller_Action
-     */
-    public function massDeleteAction()
-    {
-        $backupIds = $this->getRequest()->getParam('ids', array());
-
-        if (!is_array($backupIds) || !count($backupIds)) {
-            return $this->_redirect('*/*/index');
-        }
-
-        /** @var Mage_Backup_Model_Backup $backupModel */
-        $backupModel = Mage::getModel('backup/backup');
-        $resultData = new Varien_Object();
-        $resultData->setIsSuccess(false);
-        $resultData->setDeleteResult(array());
-        Mage::register('backup_manager', $resultData);
-
-        $deleteFailMessage = Mage::helper('backup')->__('Failed to delete one or several backups.');
-
-        try {
-            $allBackupsDeleted = true;
-
-            foreach ($backupIds as $id) {
-                list($time, $type) = explode('_', $id);
-                $backupModel
-                    ->loadByTimeAndType($time, $type)
-                    ->deleteFile();
-
-                if ($backupModel->exists()) {
-                    $allBackupsDeleted = false;
-                    $result = Mage::helper('adminhtml')->__('failed');
-                } else {
-                    $result = Mage::helper('adminhtml')->__('successful');
-                }
-
-                $resultData->setDeleteResult(
-                    array_merge($resultData->getDeleteResult(), array($backupModel->getFileName() . ' ' . $result))
-                );
-            }
-
-            $resultData->setIsSuccess(true);
-            if ($allBackupsDeleted) {
-                $this->_getSession()->addSuccess(
-                    Mage::helper('backup')->__('The selected backup(s) has been deleted.')
-                );
-            }
-            else {
-                throw new Exception($deleteFailMessage);
-            }
-        } catch (Exception $e) {
-            $resultData->setIsSuccess(false);
-            $this->_getSession()->addError($deleteFailMessage);
-        }
-
-        return $this->_redirect('*/*/index');
-    }
-
-    /**
-     * @inheritDoc
-     */
-    protected function _isAllowed()
-    {
-        return Mage::getSingleton('admin/session')->isAllowed('system/tools/backup')
-            && Mage::helper('core')->isModuleEnabled('Mage_Backup')
-            && !Mage::getStoreConfigFlag('advanced/modules_disable_output/Mage_Backup');
-    }
-
-    /**
-     * Retrieve adminhtml session model
-     *
-     * @return Mage_Adminhtml_Model_Session
-     */
-    protected function _getSession()
-    {
-        return Mage::getSingleton('adminhtml/session');
-    }
-}
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php b/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php
index be650828fd8..85aeece7ce3 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php
@@ -374,8 +374,6 @@ public function deleteWebsitePostAction()
             return ;
         }
 
-        $this->_backupDatabase('*/*/editWebsite', array('website_id' => $itemId));
-
         try {
             $model->delete();
             $this->_getSession()->addSuccess(Mage::helper('core')->__('The website has been deleted.'));
@@ -406,8 +404,6 @@ public function deleteGroupPostAction()
             return ;
         }
 
-        $this->_backupDatabase('*/*/editGroup', array('group_id' => $itemId));
-
         try {
             $model->delete();
             $this->_getSession()->addSuccess(Mage::helper('core')->__('The store has been deleted.'));
@@ -442,8 +438,6 @@ public function deleteStorePostAction()
             return ;
         }
 
-        $this->_backupDatabase('*/*/editStore', array('store_id' => $itemId));
-
         try {
             $model->delete();
 
@@ -462,41 +456,6 @@ public function deleteStorePostAction()
         $this->_redirect('*/*/editStore', array('store_id' => $itemId));
     }
 
-    /**
-     * Backup database
-     *
-     * @param string $failPath redirect path if backup failed
-     * @param array $arguments
-     * @return $this
-     */
-    protected function _backupDatabase($failPath, $arguments=array())
-    {
-        if (! $this->getRequest()->getParam('create_backup')) {
-            return $this;
-        }
-        try {
-            $backupDb = Mage::getModel('backup/db');
-            $backup   = Mage::getModel('backup/backup')
-                ->setTime(time())
-                ->setType('db')
-                ->setPath(Mage::getBaseDir('var') . DS . 'backups');
-
-            $backupDb->createBackup($backup);
-            $this->_getSession()->addSuccess(Mage::helper('backup')->__('Database was successfuly backed up.'));
-        }
-        catch (Mage_Core_Exception $e) {
-            $this->_getSession()->addError($e->getMessage());
-            $this->_redirect($failPath, $arguments);
-            return ;
-        }
-        catch (Exception $e) {
-            $this->_getSession()->addException($e, Mage::helper('backup')->__('Unable to create backup. Please, try again later.'));
-            $this->_redirect($failPath, $arguments);
-            return ;
-        }
-        return $this;
-    }
-
     /**
      * Add notification on deleting store / store view / website
      *
diff --git a/app/code/core/Mage/Backup/Exception.php b/app/code/core/Mage/Backup/Exception.php
deleted file mode 100644
index 55cd36caa4a..00000000000
--- a/app/code/core/Mage/Backup/Exception.php
+++ /dev/null
@@ -1,29 +0,0 @@
- $this->__('Database'),
-            self::TYPE_MEDIA                  => $this->__('Database and Media'),
-            self::TYPE_SYSTEM_SNAPSHOT        => $this->__('System'),
-            self::TYPE_SNAPSHOT_WITHOUT_MEDIA => $this->__('System (excluding Media)')
-        );
-    }
-
-    /**
-     * Get all possible backup type values
-     *
-     * @return array
-     */
-    public function getBackupTypesList()
-    {
-        return array(
-            self::TYPE_DB,
-            self::TYPE_SYSTEM_SNAPSHOT,
-            self::TYPE_SNAPSHOT_WITHOUT_MEDIA,
-            self::TYPE_MEDIA
-        );
-    }
-
-    /**
-     * Get default backup type value
-     *
-     * @return string
-     */
-    public function getDefaultBackupType()
-    {
-        return self::TYPE_DB;
-    }
-
-    /**
-     * Get directory path where backups stored
-     *
-     * @return string
-     */
-    public function getBackupsDir()
-    {
-        return Mage::getBaseDir('var') . DS . 'backups';
-    }
-
-    /**
-     * Get backup file extension by backup type
-     *
-     * @param string $type
-     * @return string
-     */
-    public function getExtensionByType($type)
-    {
-        $extensions = $this->getExtensions();
-        return isset($extensions[$type]) ? $extensions[$type] : '';
-    }
-
-    /**
-     * Get all types to extensions map
-     *
-     * @return array
-     */
-    public function getExtensions()
-    {
-        return array(
-            self::TYPE_SYSTEM_SNAPSHOT => 'tgz',
-            self::TYPE_SNAPSHOT_WITHOUT_MEDIA => 'tgz',
-            self::TYPE_MEDIA => 'tgz',
-            self::TYPE_DB => 'gz'
-        );
-    }
-
-    /**
-     * Generate backup download name
-     *
-     * @param Mage_Backup_Model_Backup $backup
-     * @return string
-     */
-    public function generateBackupDownloadName(Mage_Backup_Model_Backup $backup)
-    {
-        $additionalExtension = $backup->getType() == self::TYPE_DB ? '.sql' : '';
-        return $backup->getType() . '-' . date('YmdHis', $backup->getTime()) . $additionalExtension . '.'
-            . $this->getExtensionByType($backup->getType());
-    }
-
-    /**
-     * Check Permission for Rollback
-     *
-     * @return boolean
-     */
-    public function isRollbackAllowed(){
-        return Mage::getSingleton('admin/session')->isAllowed('system/tools/backup/rollback' );
-    }
-
-    /**
-     * Get paths that should be ignored when creating system snapshots
-     *
-     * @return array
-     */
-    public function getBackupIgnorePaths()
-    {
-        return array(
-            '.svn',
-            'maintenance.flag',
-            Mage::getBaseDir('var') . DS . 'session',
-            Mage::getBaseDir('var') . DS . 'cache',
-            Mage::getBaseDir('var') . DS . 'full_page_cache',
-            Mage::getBaseDir('var') . DS . 'locks',
-            Mage::getBaseDir('var') . DS . 'log',
-            Mage::getBaseDir('var') . DS . 'report'
-        );
-    }
-
-    /**
-     * Get paths that should be ignored when rolling back system snapshots
-     *
-     * @return array
-     */
-    public function getRollbackIgnorePaths()
-    {
-        return array(
-            '.svn',
-            'maintenance.flag',
-            Mage::getBaseDir('var') . DS . 'session',
-            Mage::getBaseDir('var') . DS . 'locks',
-            Mage::getBaseDir('var') . DS . 'log',
-            Mage::getBaseDir('var') . DS . 'report',
-            Mage::getBaseDir('app') . DS . 'Mage.php',
-            Mage::getBaseDir() . DS . 'errors',
-            Mage::getBaseDir() . DS . 'index.php'
-        );
-    }
-
-    /**
-     * Put store into maintenance mode
-     *
-     * @return bool
-     */
-    public function turnOnMaintenanceMode()
-    {
-        $maintenanceFlagFile = $this->getMaintenanceFlagFilePath();
-        $result = file_put_contents($maintenanceFlagFile, 'maintenance');
-
-        return $result !== false;
-    }
-
-    /**
-     * Turn off store maintenance mode
-     */
-    public function turnOffMaintenanceMode()
-    {
-        $maintenanceFlagFile = $this->getMaintenanceFlagFilePath();
-        @unlink($maintenanceFlagFile);
-    }
-
-    /**
-     * Get backup create success message by backup type
-     *
-     * @param string $type
-     * @return string
-     */
-    public function getCreateSuccessMessageByType($type)
-    {
-        $messagesMap = array(
-            self::TYPE_SYSTEM_SNAPSHOT => $this->__('The system backup has been created.'),
-            self::TYPE_SNAPSHOT_WITHOUT_MEDIA => $this->__('The system (excluding Media) backup has been created.'),
-            self::TYPE_MEDIA => $this->__('The database and media backup has been created.'),
-            self::TYPE_DB => $this->__('The database backup has been created.')
-        );
-
-        if (!isset($messagesMap[$type])) {
-            return;
-        }
-
-        return $messagesMap[$type];
-    }
-
-    /**
-     * Get path to maintenance flag file
-     *
-     * @return string
-     */
-    protected function getMaintenanceFlagFilePath()
-    {
-        return Mage::getBaseDir() . DS . 'maintenance.flag';
-    }
-
-    /**
-     * Invalidate Cache
-     * @return $this
-     */
-    public function invalidateCache()
-    {
-        if ($cacheTypesNode = Mage::getConfig()->getNode(Mage_Core_Model_Cache::XML_PATH_TYPES)) {
-            $cacheTypesList = array_keys($cacheTypesNode->asArray());
-            Mage::app()->getCacheInstance()->invalidateType($cacheTypesList);
-        }
-        return $this;
-    }
-
-    /**
-     * Invalidate Indexer
-     *
-     * @return $this
-     */
-    public function invalidateIndexer()
-    {
-        foreach (Mage::getResourceModel('index/process_collection') as $process){
-            $process->changeStatus(Mage_Index_Model_Process::STATUS_REQUIRE_REINDEX);
-        }
-        return $this;
-    }
-
-    /**
-     * Creates backup's display name from it's name
-     *
-     * @param string $name
-     * @return string
-     */
-    public function nameToDisplayName($name)
-    {
-        return str_replace('_', ' ', $name);
-    }
-
-    /**
-     * Extracts information from backup's filename
-     *
-     * @param string $filename
-     * @return Varien_Object
-     */
-    public function extractDataFromFilename($filename)
-    {
-        $extensions = $this->getExtensions();
-
-        $filenameWithoutExtension = $filename;
-
-        foreach ($extensions as $extension) {
-            $filenameWithoutExtension = preg_replace('/' . preg_quote($extension, '/') . '$/', '',
-                $filenameWithoutExtension
-            );
-        }
-
-        $filenameWithoutExtension = substr($filenameWithoutExtension, 0, strrpos($filenameWithoutExtension, "."));
-
-        list($time, $type) = explode("_", $filenameWithoutExtension);
-
-        $name = str_replace($time . '_' . $type, '', $filenameWithoutExtension);
-
-        if (!empty($name)) {
-            $name = substr($name, 1);
-        }
-
-        $result = new Varien_Object();
-        $result->addData(array(
-            'name' => $name,
-            'type' => $type,
-            'time' => $time
-        ));
-
-        return $result;
-    }
-}
diff --git a/app/code/core/Mage/Backup/Model/Backup.php b/app/code/core/Mage/Backup/Model/Backup.php
deleted file mode 100644
index 467d88160d2..00000000000
--- a/app/code/core/Mage/Backup/Model/Backup.php
+++ /dev/null
@@ -1,402 +0,0 @@
-
- */
-class Mage_Backup_Model_Backup extends Varien_Object
-{
-    /* internal constants */
-    const COMPRESS_RATE     = 9;
-
-    /**
-     * Type of backup file
-     *
-     * @var string
-     */
-    private $_type  = 'db';
-
-    /**
-     * Gz file pointer
-     *
-     * @var resource
-     */
-    protected $_handler = null;
-
-    /**
-     * Load backup file info
-     *
-     * @param string fileName
-     * @param string filePath
-     * @return $this
-     */
-    public function load($fileName, $filePath)
-    {
-        $backupData = Mage::helper('backup')->extractDataFromFilename($fileName);
-
-        $this->addData(array(
-            'id'   => $filePath . DS . $fileName,
-            'time' => (int)$backupData->getTime(),
-            'path' => $filePath,
-            'extension' => Mage::helper('backup')->getExtensionByType($backupData->getType()),
-            'display_name' => Mage::helper('backup')->nameToDisplayName($backupData->getName()),
-            'name' => $backupData->getName(),
-            'date_object' => new Zend_Date((int)$backupData->getTime(), Mage::app()->getLocale()->getLocaleCode())
-        ));
-
-        $this->setType($backupData->getType());
-        return $this;
-    }
-
-    /**
-     * Checks backup file exists.
-     *
-     * @return boolean
-     */
-    public function exists()
-    {
-        return is_file($this->getPath() . DS . $this->getFileName());
-    }
-
-    /**
-     * Return file name of backup file
-     *
-     * @return string
-     */
-    public function getFileName()
-    {
-        $filename = $this->getTime() . "_" . $this->getType();
-        $backupName = $this->getName();
-
-        if (!empty($backupName)) {
-            $filename .= '_' . $backupName;
-        }
-
-        $filename .= '.' . Mage::helper('backup')->getExtensionByType($this->getType());
-
-        return $filename;
-    }
-
-    /**
-     * Sets type of file
-     *
-     * @param string $value
-     * @return $this
-     */
-    public function setType($value='db')
-    {
-        $possibleTypes = Mage::helper('backup')->getBackupTypesList();
-        if(!in_array($value, $possibleTypes)) {
-            $value = Mage::helper('backup')->getDefaultBackupType();
-        }
-
-        $this->_type = $value;
-        $this->setData('type', $this->_type);
-
-        return $this;
-    }
-
-    /**
-     * Returns type of backup file
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * Set the backup file content
-     *
-     * @param string $content
-     * @return $this
-     * @throws Mage_Backup_Exception
-     */
-    public function setFile(&$content)
-    {
-        if (!$this->hasData('time') || !$this->hasData('type') || !$this->hasData('path')) {
-            Mage::throwException(Mage::helper('backup')->__('Wrong order of creation for new backup.'));
-        }
-
-        $ioProxy = new Varien_Io_File();
-        $ioProxy->setAllowCreateFolders(true);
-        $ioProxy->open(array('path'=>$this->getPath()));
-
-        $compress = 0;
-        if (extension_loaded("zlib")) {
-            $compress = 1;
-        }
-
-        $rawContent = '';
-        if ( $compress ) {
-            $rawContent = gzcompress( $content, self::COMPRESS_RATE );
-        } else {
-            $rawContent = $content;
-        }
-
-        $fileHeaders = pack("ll", $compress, strlen($rawContent));
-        $ioProxy->write($this->getFileName(), $fileHeaders . $rawContent);
-        return $this;
-    }
-
-    /**
-     * Return content of backup file
-     *
-     * @todo rewrite to Varien_IO, but there no possibility read part of files.
-     * @return string
-     * @throws Mage_Backup_Exception
-     */
-    public function &getFile()
-    {
-
-        if (!$this->exists()) {
-            Mage::throwException(Mage::helper('backup')->__("Backup file does not exist."));
-        }
-
-        $fResource = @fopen($this->getPath() . DS . $this->getFileName(), "rb");
-        if (!$fResource) {
-            Mage::throwException(Mage::helper('backup')->__("Cannot read backup file."));
-        }
-
-        $content = '';
-        $compressed = 0;
-
-        $info = unpack("lcompress/llength", fread($fResource, 8));
-        if ($info['compress']) { // If file compressed by zlib
-            $compressed = 1;
-        }
-
-        if ($compressed && !extension_loaded("zlib")) {
-            fclose($fResource);
-            Mage::throwException(Mage::helper('backup')->__('The file was compressed with Zlib, but this extension is not installed on server.'));
-        }
-
-        if ($compressed) {
-            $content = gzuncompress(fread($fResource, $info['length']));
-        } else {
-            $content = fread($fResource, $info['length']);
-        }
-
-        fclose($fResource);
-
-        return $content;
-    }
-
-    /**
-     * Delete backup file
-     *
-     * @throws Mage_Backup_Exception
-     * @return $this
-     */
-    public function deleteFile()
-    {
-        if (!$this->exists()) {
-            Mage::throwException(Mage::helper('backup')->__("Backup file does not exist."));
-        }
-
-        $ioProxy = new Varien_Io_File();
-        $ioProxy->open(array('path'=>$this->getPath()));
-        $ioProxy->rm($this->getFileName());
-        return $this;
-    }
-
-    /**
-     * Open backup file (write or read mode)
-     *
-     * @param bool $write
-     * @return $this
-     */
-    public function open($write = false)
-    {
-        if (is_null($this->getPath())) {
-            Mage::exception('Mage_Backup', Mage::helper('backup')->__('Backup file path was not specified.'));
-        }
-
-        $ioAdapter = new Varien_Io_File();
-        try {
-            $path = $ioAdapter->getCleanPath($this->getPath());
-            $ioAdapter->checkAndCreateFolder($path);
-            $filePath = $path . DS . $this->getFileName();
-        }
-        catch (Exception $e) {
-            Mage::exception('Mage_Backup', $e->getMessage());
-        }
-
-        if ($write && $ioAdapter->fileExists($filePath)) {
-            $ioAdapter->rm($filePath);
-        }
-        if (!$write && !$ioAdapter->fileExists($filePath)) {
-            Mage::exception('Mage_Backup', Mage::helper('backup')->__('Backup file "%s" does not exist.', $this->getFileName()));
-        }
-
-        $mode = $write ? 'wb' . self::COMPRESS_RATE : 'rb';
-
-        $this->_handler = @gzopen($filePath, $mode);
-
-        if (!$this->_handler) {
-            throw new Mage_Backup_Exception_NotEnoughPermissions(
-                Mage::helper('backup')->__('Backup file "%s" cannot be read from or written to.', $this->getFileName())
-            );
-        }
-
-        return $this;
-    }
-
-    /**
-     * Read backup uncomressed data
-     *
-     * @param int $length
-     * @return string
-     */
-    public function read($length)
-    {
-        if (is_null($this->_handler)) {
-            Mage::exception('Mage_Backup', Mage::helper('backup')->__('Backup file handler was unspecified.'));
-        }
-
-        return gzread($this->_handler, $length);
-    }
-
-    public function eof()
-    {
-        if (is_null($this->_handler)) {
-            Mage::exception('Mage_Backup', Mage::helper('backup')->__('Backup file handler was unspecified.'));
-        }
-
-        return gzeof($this->_handler);
-    }
-
-    /**
-     * Write to backup file
-     *
-     * @param string $string
-     * @return $this
-     */
-    public function write($string)
-    {
-        if (is_null($this->_handler)) {
-            Mage::exception('Mage_Backup', Mage::helper('backup')->__('Backup file handler was unspecified.'));
-        }
-
-        try {
-            gzwrite($this->_handler, $string);
-        }
-        catch (Exception $e) {
-            Mage::exception('Mage_Backup', Mage::helper('backup')->__('An error occurred while writing to the backup file "%s".', $this->getFileName()));
-        }
-
-        return $this;
-    }
-
-    /**
-     * Close open backup file
-     *
-     * @return $this
-     */
-    public function close()
-    {
-        @gzclose($this->_handler);
-        $this->_handler = null;
-
-        return $this;
-    }
-
-    /**
-     * Print output
-     *
-     */
-    public function output()
-    {
-        if (!$this->exists()) {
-            return ;
-        }
-
-        $ioAdapter = new Varien_Io_File();
-        $ioAdapter->open(array('path' => $this->getPath()));
-
-        $ioAdapter->streamOpen($this->getFileName(), 'r');
-        while ($buffer = $ioAdapter->streamRead()) {
-            echo $buffer;
-        }
-        $ioAdapter->streamClose();
-    }
-
-    public function getSize()
-    {
-        if (!is_null($this->getData('size'))) {
-            return $this->getData('size');
-        }
-
-        if ($this->exists()) {
-            $this->setData('size', filesize($this->getPath() . DS . $this->getFileName()));
-            return $this->getData('size');
-        }
-
-        return 0;
-    }
-
-    /**
-     * Validate user password
-     *
-     * @param string $password
-     * @return bool
-     */
-    public function validateUserPassword($password)
-    {
-        $userPasswordHash = Mage::getModel('admin/session')->getUser()->getPassword();
-        return Mage::helper('core')->validateHash($password, $userPasswordHash);
-    }
-
-    /**
-     * Load backup by it's type and creation timestamp
-     *
-     * @param int $timestamp
-     * @param string $type
-     * @return $this
-     */
-    public function loadByTimeAndType($timestamp, $type)
-    {
-        $backupsCollection = Mage::getSingleton('backup/fs_collection');
-        $backupId = $timestamp . '_' . $type;
-
-        foreach ($backupsCollection as $backup) {
-            if ($backup->getId() == $backupId) {
-                $this->setType($backup->getType())
-                    ->setTime($backup->getTime())
-                    ->setName($backup->getName())
-                    ->setPath($backup->getPath());
-                break;
-            }
-        }
-
-        return $this;
-    }
-}
diff --git a/app/code/core/Mage/Backup/Model/Config/Backend/Cron.php b/app/code/core/Mage/Backup/Model/Config/Backend/Cron.php
deleted file mode 100644
index 462e4f89780..00000000000
--- a/app/code/core/Mage/Backup/Model/Config/Backend/Cron.php
+++ /dev/null
@@ -1,90 +0,0 @@
-
- */
-class Mage_Backup_Model_Config_Backend_Cron extends Mage_Core_Model_Config_Data
-{
-    const CRON_STRING_PATH  = 'crontab/jobs/system_backup/schedule/cron_expr';
-    const CRON_MODEL_PATH   = 'crontab/jobs/system_backup/run/model';
-
-    const XML_PATH_BACKUP_ENABLED       = 'groups/backup/fields/enabled/value';
-    const XML_PATH_BACKUP_TIME          = 'groups/backup/fields/time/value';
-    const XML_PATH_BACKUP_FREQUENCY     = 'groups/backup/fields/frequency/value';
-
-    /**
-     * Cron settings after save
-     *
-     * @return $this
-     */
-    protected function _afterSave()
-    {
-        $enabled   = $this->getData(self::XML_PATH_BACKUP_ENABLED);
-        $time      = $this->getData(self::XML_PATH_BACKUP_TIME);
-        $frequency = $this->getData(self::XML_PATH_BACKUP_FREQUENCY);
-
-        $frequencyWeekly  = Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency::CRON_WEEKLY;
-        $frequencyMonthly = Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency::CRON_MONTHLY;
-
-        if ($enabled) {
-            $cronExprArray = array(
-                intval($time[1]),                                   # Minute
-                intval($time[0]),                                   # Hour
-                ($frequency == $frequencyMonthly) ? '1' : '*',          # Day of the Month
-                '*',                                                    # Month of the Year
-                ($frequency == $frequencyWeekly) ? '1' : '*',           # Day of the Week
-            );
-            $cronExprString = implode(' ', $cronExprArray);
-        }
-        else {
-            $cronExprString = '';
-        }
-
-        try {
-            Mage::getModel('core/config_data')
-                ->load(self::CRON_STRING_PATH, 'path')
-                ->setValue($cronExprString)
-                ->setPath(self::CRON_STRING_PATH)
-                ->save();
-
-            Mage::getModel('core/config_data')
-                ->load(self::CRON_MODEL_PATH, 'path')
-                ->setValue((string) Mage::getConfig()->getNode(self::CRON_MODEL_PATH))
-                ->setPath(self::CRON_MODEL_PATH)
-                ->save();
-        }
-        catch (Exception $e) {
-            Mage::throwException(Mage::helper('backup')->__('Unable to save the cron expression.'));
-        }
-        return $this;
-    }
-}
diff --git a/app/code/core/Mage/Backup/Model/Config/Source/Type.php b/app/code/core/Mage/Backup/Model/Config/Source/Type.php
deleted file mode 100644
index 894212be414..00000000000
--- a/app/code/core/Mage/Backup/Model/Config/Source/Type.php
+++ /dev/null
@@ -1,52 +0,0 @@
-
- */
-class Mage_Backup_Model_Config_Source_Type
-{
-    /**
-     * return possible options
-     *
-     * @return array
-     */
-    public function toOptionArray()
-    {
-        $backupTypes = array();
-        foreach(Mage::helper('backup')->getBackupTypes() as $type => $label) {
-            $backupTypes[] = array(
-                'label' => $label,
-                'value' => $type,
-            );
-        }
-        return $backupTypes;
-    }
-}
diff --git a/app/code/core/Mage/Backup/Model/Db.php b/app/code/core/Mage/Backup/Model/Db.php
deleted file mode 100644
index cf99504840b..00000000000
--- a/app/code/core/Mage/Backup/Model/Db.php
+++ /dev/null
@@ -1,185 +0,0 @@
-
- */
-class Mage_Backup_Model_Db
-{
-
-    /**
-     * Buffer length for multi rows
-     * default 100 Kb
-     *
-     */
-    const BUFFER_LENGTH = 102400;
-
-    /**
-     * List of tables which data should not be backed up
-     *
-     * @var array
-     */
-    protected $_ignoreDataTablesList = array(
-        'importexport/importdata'
-    );
-
-    /**
-     * Retrieve resource model
-     *
-     * @return Mage_Backup_Model_Mysql4_Db
-     */
-    public function getResource()
-    {
-        return Mage::getResourceSingleton('backup/db');
-    }
-
-    public function getTables()
-    {
-        return $this->getResource()->getTables();
-    }
-
-    public function getTableCreateScript($tableName, $addDropIfExists=false)
-    {
-        return $this->getResource()->getTableCreateScript($tableName, $addDropIfExists);
-    }
-
-    public function getTableDataDump($tableName)
-    {
-        return $this->getResource()->getTableDataDump($tableName);
-    }
-
-    public function getHeader()
-    {
-        return $this->getResource()->getHeader();
-    }
-
-    public function getFooter()
-    {
-        return $this->getResource()->getFooter();
-    }
-
-    public function renderSql()
-    {
-        ini_set('max_execution_time', 0);
-        $sql = $this->getHeader();
-
-        $tables = $this->getTables();
-        foreach ($tables as $tableName) {
-            $sql.= $this->getTableCreateScript($tableName, true);
-            $sql.= $this->getTableDataDump($tableName);
-        }
-
-        $sql.= $this->getFooter();
-        return $sql;
-    }
-
-    /**
-     * Create backup and stream write to adapter
-     *
-     * @param Mage_Backup_Model_Backup $backup
-     * @return $this
-     */
-    public function createBackup(Mage_Backup_Model_Backup $backup)
-    {
-        $backup->open(true);
-
-        $this->getResource()->beginTransaction();
-        try {
-            $tables = $this->getResource()->getTables();
-
-            $backup->write($this->getResource()->getHeader());
-
-            $ignoreDataTablesList = $this->getIgnoreDataTablesList();
-
-            foreach ($tables as $table) {
-                $backup->write($this->getResource()->getTableHeader($table)
-                    . $this->getResource()->getTableDropSql($table) . "\n");
-                $backup->write($this->getResource()->getTableCreateSql($table, false) . "\n");
-
-                $tableStatus = $this->getResource()->getTableStatus($table);
-
-                if ($tableStatus->getRows() && !in_array($table, $ignoreDataTablesList)) {
-                    $backup->write($this->getResource()->getTableDataBeforeSql($table));
-
-                    if ($tableStatus->getDataLength() > self::BUFFER_LENGTH) {
-                        if ($tableStatus->getAvgRowLength() > 0 && $tableStatus->getAvgRowLength() < self::BUFFER_LENGTH) {
-                            // Process rows in batches
-                            $limit = floor(self::BUFFER_LENGTH / $tableStatus->getAvgRowLength());
-                            $multiRowsLength = ceil($tableStatus->getRows() / $limit);
-                        } else {
-                            // Process rows one by one
-                            $limit = 1;
-                            $multiRowsLength = $tableStatus->getRows();
-                        }
-                    } else {
-                        // Process all rows at once
-                        $limit = $tableStatus->getRows();
-                        $multiRowsLength = 1;
-                    }
-
-                    for ($i = 0; $i < $multiRowsLength; $i++) {
-                        $backup->write($this->getResource()->getTableDataSql($table, $limit, $i * $limit));
-                    }
-
-                    $backup->write($this->getResource()->getTableDataAfterSql($table));
-                }
-            }
-            $backup->write($this->getResource()->getTableForeignKeysSql());
-            $backup->write($this->getResource()->getFooter());
-
-            $this->getResource()->commitTransaction();
-        } catch (Exception $e) {
-            $this->getResource()->rollBackTransaction();
-            throw $e;
-        }
-
-        $backup->close();
-
-        return $this;
-    }
-
-    /**.
-     * Returns the list of tables which data should not be backed up
-     *
-     * @return array
-     */
-    public function getIgnoreDataTablesList()
-    {
-        $result = array();
-        $resource = Mage::getSingleton('core/resource');
-
-        foreach ($this->_ignoreDataTablesList as $table) {
-            $result[] = $resource->getTableName($table);
-        }
-
-        return $result;
-    }
-}
diff --git a/app/code/core/Mage/Backup/Model/Fs/Collection.php b/app/code/core/Mage/Backup/Model/Fs/Collection.php
deleted file mode 100644
index e6a2b86e1d6..00000000000
--- a/app/code/core/Mage/Backup/Model/Fs/Collection.php
+++ /dev/null
@@ -1,93 +0,0 @@
-
- */
-class Mage_Backup_Model_Fs_Collection extends Varien_Data_Collection_Filesystem
-{
-    /**
-     * Folder, where all backups are stored
-     *
-     * @var string
-     */
-    protected $_baseDir;
-
-    /**
-     * Set collection specific parameters and make sure backups folder will exist
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->_baseDir = Mage::getBaseDir('var') . DS . 'backups';
-
-        // check for valid base dir
-        $ioProxy = new Varien_Io_File();
-        $ioProxy->mkdir($this->_baseDir);
-        if (!is_file($this->_baseDir . DS . '.htaccess')) {
-            $ioProxy->open(array('path' => $this->_baseDir));
-            $ioProxy->write('.htaccess', 'deny from all', 0644);
-        }
-
-        // set collection specific params
-        $extensions = Mage::helper('backup')->getExtensions();
-
-        foreach ($extensions as $key => $value) {
-            $extensions[] = '(' . preg_quote($value, '/') . ')';
-        }
-        $extensions = implode('|', $extensions);
-
-        $this
-            ->setOrder('time', self::SORT_ORDER_DESC)
-            ->addTargetDir($this->_baseDir)
-            ->setFilesFilter('/^[a-z0-9\-\_]+\.' . $extensions . '$/')
-            ->setCollectRecursively(false)
-        ;
-    }
-
-    /**
-     * Get backup-specific data from model for each row
-     *
-     * @param string $filename
-     * @return array
-     */
-    protected function _generateRow($filename)
-    {
-        $row = parent::_generateRow($filename);
-        foreach (Mage::getSingleton('backup/backup')->load($row['basename'], $this->_baseDir)
-            ->getData() as $key => $value) {
-            $row[$key] = $value;
-        }
-        $row['size'] = filesize($filename);
-        $row['id'] = $row['time'] . '_' . $row['type'];
-        return $row;
-    }
-}
diff --git a/app/code/core/Mage/Backup/Model/Mysql4/Db.php b/app/code/core/Mage/Backup/Model/Mysql4/Db.php
deleted file mode 100644
index 48c15f475b6..00000000000
--- a/app/code/core/Mage/Backup/Model/Mysql4/Db.php
+++ /dev/null
@@ -1,38 +0,0 @@
-
- * @deprecated
- */
-class Mage_Backup_Model_Mysql4_Db extends Mage_Backup_Model_Resource_Db
-{
-}
diff --git a/app/code/core/Mage/Backup/Model/Observer.php b/app/code/core/Mage/Backup/Model/Observer.php
deleted file mode 100644
index 82429df61d8..00000000000
--- a/app/code/core/Mage/Backup/Model/Observer.php
+++ /dev/null
@@ -1,95 +0,0 @@
-
- */
-class Mage_Backup_Model_Observer
-{
-    const XML_PATH_BACKUP_ENABLED          = 'system/backup/enabled';
-    const XML_PATH_BACKUP_TYPE             = 'system/backup/type';
-    const XML_PATH_BACKUP_MAINTENANCE_MODE = 'system/backup/maintenance';
-
-    /**
-     * Error messages
-     *
-     * @var array
-     */
-    protected $_errors = array();
-
-    /**
-     * Create Backup
-     *
-     * @return Mage_Log_Model_Cron
-     */
-    public function scheduledBackup()
-    {
-        if (!Mage::getStoreConfigFlag(self::XML_PATH_BACKUP_ENABLED)) {
-            return $this;
-        }
-
-        if (Mage::getStoreConfigFlag(self::XML_PATH_BACKUP_MAINTENANCE_MODE)) {
-            Mage::helper('backup')->turnOnMaintenanceMode();
-        }
-
-        $type = Mage::getStoreConfig(self::XML_PATH_BACKUP_TYPE);
-
-        $this->_errors = array();
-        try {
-            $backupManager = Mage_Backup::getBackupInstance($type)
-                ->setBackupExtension(Mage::helper('backup')->getExtensionByType($type))
-                ->setTime(time())
-                ->setBackupsDir(Mage::helper('backup')->getBackupsDir());
-
-            Mage::register('backup_manager', $backupManager);
-
-            if ($type != Mage_Backup_Helper_Data::TYPE_DB) {
-                $backupManager->setRootDir(Mage::getBaseDir())
-                    ->addIgnorePaths(Mage::helper('backup')->getBackupIgnorePaths());
-            }
-
-            $backupManager->create();
-            Mage::log(Mage::helper('backup')->getCreateSuccessMessageByType($type));
-        }
-        catch (Exception $e) {
-            $this->_errors[] = $e->getMessage();
-            $this->_errors[] = $e->getTrace();
-            Mage::log($e->getMessage(), Zend_Log::ERR);
-            Mage::logException($e);
-        }
-
-        if (Mage::getStoreConfigFlag(self::XML_PATH_BACKUP_MAINTENANCE_MODE)) {
-            Mage::helper('backup')->turnOffMaintenanceMode();
-        }
-
-        return $this;
-    }
-}
diff --git a/app/code/core/Mage/Backup/Model/Resource/Db.php b/app/code/core/Mage/Backup/Model/Resource/Db.php
deleted file mode 100644
index dd039f7558d..00000000000
--- a/app/code/core/Mage/Backup/Model/Resource/Db.php
+++ /dev/null
@@ -1,316 +0,0 @@
-
- */
-class Mage_Backup_Model_Resource_Db
-{
-    /**
-     * Database connection adapter
-     *
-     * @var Varien_Db_Adapter_Pdo_Mysql
-     */
-    protected $_write;
-
-    /**
-     * tables Foreign key data array
-     * [tbl_name] = array(create foreign key strings)
-     *
-     * @var array
-     */
-    protected $_foreignKeys    = array();
-
-    /**
-     * Initialize Backup DB resource model
-     *
-     */
-    public function __construct()
-    {
-        $this->_write = Mage::getSingleton('core/resource')->getConnection('backup_write');
-    }
-
-    /**
-     * Enter description here ...
-     *
-     * @deprecated after 1.4.0.0-alpha2
-     *
-     */
-    public function crear()
-    {
-        $this->clear();
-    }
-
-    /**
-     * Clear data
-     *
-     */
-    public function clear()
-    {
-        $this->_foreignKeys = array();
-    }
-
-    /**
-     * Retrieve table list
-     *
-     * @return array
-     */
-    public function getTables()
-    {
-        return $this->_write->listTables();
-    }
-
-    /**
-     * Retrieve SQL fragment for drop table
-     *
-     * @param string $tableName
-     * @return string
-     */
-    public function getTableDropSql($tableName)
-    {
-        return Mage::getResourceHelper('backup')->getTableDropSql($tableName);
-    }
-
-    /**
-     * Retrieve SQL fragment for create table
-     *
-     * @param string $tableName
-     * @param bool $withForeignKeys
-     * @return string
-     */
-    public function getTableCreateSql($tableName, $withForeignKeys = false)
-    {
-        return Mage::getResourceHelper('backup')->getTableCreateSql($tableName, $withForeignKeys = false);
-    }
-
-    /**
-     * Retrieve foreign keys for table(s)
-     *
-     * @param string|null $tableName
-     * @return string
-     */
-    public function getTableForeignKeysSql($tableName = null)
-    {
-        $fkScript = '';
-        if (!$tableName) {
-            $tables = $this->getTables();
-            foreach($tables as $table) {
-                $tableFkScript = Mage::getResourceHelper('backup')->getTableForeignKeysSql($table);
-                if (!empty($tableFkScript)) {
-                    $fkScript .= "\n" . $tableFkScript;
-                }
-            }
-        } else {
-            $fkScript = $this->getTableForeignKeysSql($tableName);
-        }
-        return $fkScript;
-    }
-
-    /**
-     * Retrieve table status
-     *
-     * @param string $tableName
-     * @return Varien_Object|false
-     */
-    public function getTableStatus($tableName)
-    {
-        $row = $this->_write->showTableStatus($tableName);
-
-        if ($row) {
-            $statusObject = new Varien_Object();
-            $statusObject->setIdFieldName('name');
-            foreach ($row as $field => $value) {
-                $statusObject->setData(strtolower($field), $value);
-            }
-
-            $cntRow = $this->_write->fetchRow(
-                    $this->_write->select()->from($tableName, 'COUNT(1) as rows'));
-            $statusObject->setRows($cntRow['rows']);
-
-            return $statusObject;
-        }
-
-        return false;
-    }
-
-    /**
-     * Quote Table Row
-     *
-     * @deprecated
-     *
-     * @param string $tableName
-     * @param array $row
-     * @return array
-     */
-    protected function _quoteRow($tableName, array $row)
-    {
-        return $row;
-    }
-
-    /**
-     * Retrieve table partical data SQL insert
-     *
-     * @param string $tableName
-     * @param int $count
-     * @param int $offset
-     * @return string
-     */
-    public function getTableDataSql($tableName, $count = null, $offset = null)
-    {
-        return Mage::getResourceHelper('backup')->getPartInsertSql($tableName, $count, $offset);
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $tableName
-     * @param bool $addDropIfExists
-     * @return string
-     */
-    public function getTableCreateScript($tableName, $addDropIfExists = false)
-    {
-        return Mage::getResourceHelper('backup')->getTableCreateScript($tableName, $addDropIfExists);
-    }
-
-    /**
-     * Retrieve table header comment
-     *
-     * @param string $tableName
-     * @return string
-     */
-    public function getTableHeader($tableName)
-    {
-        $quotedTableName = $this->_write->quoteIdentifier($tableName);
-        return "\n--\n"
-            . "-- Table structure for table {$quotedTableName}\n"
-            . "--\n\n";
-    }
-
-    /**
-     * Return table data dump
-     *
-     * @param string $tableName
-     * @param bool $step
-     * @return string
-     */
-    public function getTableDataDump($tableName, $step = false)
-    {
-        return $this->getTableDataSql($tableName);
-    }
-
-    /**
-     * Returns SQL header data
-     *
-     * @return string
-     */
-    public function getHeader()
-    {
-        return Mage::getResourceHelper('backup')->getHeader();
-    }
-
-    /**
-     * Returns SQL footer data
-     *
-     * @return string
-     */
-    public function getFooter()
-    {
-        return Mage::getResourceHelper('backup')->getFooter();
-    }
-
-    /**
-     * Retrieve before insert data SQL fragment
-     *
-     * @param string $tableName
-     * @return string
-     */
-    public function getTableDataBeforeSql($tableName)
-    {
-        return Mage::getResourceHelper('backup')->getTableDataBeforeSql($tableName);
-    }
-
-    /**
-     * Retrieve after insert data SQL fragment
-     *
-     * @param string $tableName
-     * @return string
-     */
-    public function getTableDataAfterSql($tableName)
-    {
-        return Mage::getResourceHelper('backup')->getTableDataAfterSql($tableName);
-    }
-
-    /**
-     * Start transaction mode
-     *
-     * @return $this
-     */
-    public function beginTransaction()
-    {
-        Mage::getResourceHelper('backup')->turnOnSerializableMode();
-        $this->_write->beginTransaction();
-        return $this;
-    }
-
-    /**
-     * Commit transaction
-     *
-     * @return $this
-     */
-    public function commitTransaction()
-    {
-        $this->_write->commit();
-        Mage::getResourceHelper('backup')->turnOnReadCommittedMode();
-        return $this;
-    }
-
-    /**
-     * Rollback transaction
-     *
-     * @return $this
-     */
-    public function rollBackTransaction()
-    {
-        $this->_write->rollBack();
-        return $this;
-    }
-
-    /**
-     * Run sql code
-     *
-     * @param string|Zend_Db_Select $command
-     * @return $this
-     */
-    public function runCommand($command){
-        $this->_write->query($command);
-        return $this;
-    }
-}
diff --git a/app/code/core/Mage/Backup/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/Backup/Model/Resource/Helper/Mysql4.php
deleted file mode 100644
index 48760bb908c..00000000000
--- a/app/code/core/Mage/Backup/Model/Resource/Helper/Mysql4.php
+++ /dev/null
@@ -1,322 +0,0 @@
-_getReadAdapter()->quoteIdentifier($tableName);
-        return sprintf('DROP TABLE IF EXISTS %s;', $quotedTableName);
-    }
-
-    /**
-     * Retrieve foreign keys for table(s)
-     *
-     * @param string|null $tableName
-     * @return string|false
-     */
-    public function getTableForeignKeysSql($tableName = null)
-    {
-        $sql = false;
-
-        if ($tableName === null) {
-            $sql = '';
-            foreach ($this->_foreignKeys as $table => $foreignKeys) {
-                $sql .= $this->_buildForeignKeysAlterTableSql($table, $foreignKeys);
-            }
-        } else if (isset($this->_foreignKeys[$tableName])) {
-            $foreignKeys = $this->_foreignKeys[$tableName];
-            $sql = $this->_buildForeignKeysAlterTableSql($tableName, $foreignKeys);
-        }
-
-        return $sql;
-    }
-
-    /**
-     * Build sql that will add foreign keys to it
-     *
-     * @param string $tableName
-     * @param array $foreignKeys
-     * @return string
-     */
-    protected function _buildForeignKeysAlterTableSql($tableName, $foreignKeys)
-    {
-        if (!is_array($foreignKeys) || empty($foreignKeys)) {
-            return '';
-        }
-
-        return sprintf("ALTER TABLE %s\n  %s;\n",
-            $this->_getReadAdapter()->quoteIdentifier($tableName),
-            implode(",\n  ", $foreignKeys)
-        );
-    }
-
-     /**
-     * Get create script for table
-     *
-     * @param string $tableName
-     * @param boolean $addDropIfExists
-     * @return string
-     */
-    public function getTableCreateScript($tableName, $addDropIfExists = false)
-    {
-        $script = '';
-        $quotedTableName = $this->_getReadAdapter()->quoteIdentifier($tableName);
-
-        if ($addDropIfExists) {
-            $script .= 'DROP TABLE IF EXISTS ' . $quotedTableName .";\n";
-        }
-        //TODO fix me
-        $sql     = 'SHOW CREATE TABLE ' . $quotedTableName;
-        $data    = $this->_getReadAdapter()->fetchRow($sql);
-        $script .= isset($data['Create Table']) ? $data['Create Table'].";\n" : '';
-
-        return $script;
-    }
-    /**
-     * Retrieve SQL fragment for create table
-     *
-     * @param string $tableName
-     * @param bool $withForeignKeys
-     * @return string
-     */
-    public function getTableCreateSql($tableName, $withForeignKeys = false)
-    {
-        $adapter         = $this->_getReadAdapter();
-        $quotedTableName = $adapter->quoteIdentifier($tableName);
-        $query           = 'SHOW CREATE TABLE ' . $quotedTableName;
-        $row             = $adapter->fetchRow($query);
-
-        if (!$row || !isset($row['Table']) || !isset($row['Create Table'])) {
-            return false;
-        }
-
-        $regExp  = '/,\s+CONSTRAINT `([^`]*)` FOREIGN KEY \(`([^`]*)`\) '
-            . 'REFERENCES `([^`]*)` \(`([^`]*)`\)'
-            . '( ON DELETE (RESTRICT|CASCADE|SET NULL|NO ACTION))?'
-            . '( ON UPDATE (RESTRICT|CASCADE|SET NULL|NO ACTION))?/';
-        $matches = array();
-        preg_match_all($regExp, $row['Create Table'], $matches, PREG_SET_ORDER);
-
-        if (is_array($matches)) {
-            foreach ($matches as $match) {
-                $this->_foreignKeys[$tableName][] = sprintf('ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s)%s%s',
-                    $adapter->quoteIdentifier($match[1]),
-                    $adapter->quoteIdentifier($match[2]),
-                    $adapter->quoteIdentifier($match[3]),
-                    $adapter->quoteIdentifier($match[4]),
-                    isset($match[5]) ? $match[5] : '',
-                    isset($match[7]) ? $match[7] : ''
-                );
-            }
-        }
-
-        if ($withForeignKeys) {
-            $sql = $row['Create Table'];
-        } else {
-            $sql = preg_replace($regExp, '', $row['Create Table']);
-        }
-
-        return $sql . ';';
-    }
-    /**
-     * Returns SQL header data, move from original resource model
-     *
-     * @return string
-     */
-    public function getHeader()
-    {
-        $dbConfig = $this->_getReadAdapter()->getConfig();
-
-        $versionRow = $this->_getReadAdapter()->fetchRow('SHOW VARIABLES LIKE \'version\'');
-        $hostName   = !empty($dbConfig['unix_socket']) ? $dbConfig['unix_socket']
-            : (!empty($dbConfig['host']) ? $dbConfig['host'] : 'localhost');
-
-        $header = "-- Magento DB backup\n"
-            . "--\n"
-            . "-- Host: {$hostName}    Database: {$dbConfig['dbname']}\n"
-            . "-- ------------------------------------------------------\n"
-            . "-- Server version: {$versionRow['Value']}\n\n"
-            . "/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;\n"
-            . "/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;\n"
-            . "/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;\n"
-            . "/*!40101 SET NAMES utf8 */;\n"
-            . "/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;\n"
-            . "/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;\n"
-            . "/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;\n"
-            . "/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;\n";
-
-        return $header;
-    }
-
-    /**
-     * Returns SQL footer data, move from original resource model
-     *
-     * @return string
-     */
-    public function getFooter()
-    {
-        $footer = "\n/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;\n"
-            . "/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; \n"
-            . "/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;\n"
-            . "/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;\n"
-            . "/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;\n"
-            . "/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;\n"
-            . "/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;\n"
-            . "\n-- Dump completed on " . Mage::getSingleton('core/date')->gmtDate() . " GMT";
-
-        return $footer;
-    }
-
-    /**
-     * Retrieve before insert data SQL fragment
-     *
-     * @param string $tableName
-     * @return string
-     */
-    public function getTableDataBeforeSql($tableName)
-    {
-        $quotedTableName = $this->_getReadAdapter()->quoteIdentifier($tableName);
-        return "\n--\n"
-            . "-- Dumping data for table {$quotedTableName}\n"
-            . "--\n\n"
-            . "LOCK TABLES {$quotedTableName} WRITE;\n"
-            . "/*!40000 ALTER TABLE {$quotedTableName} DISABLE KEYS */;\n";
-    }
-
-    /**
-     * Retrieve after insert data SQL fragment
-     *
-     * @param string $tableName
-     * @return string
-     */
-    public function getTableDataAfterSql($tableName)
-    {
-        $quotedTableName = $this->_getReadAdapter()->quoteIdentifier($tableName);
-        return "/*!40000 ALTER TABLE {$quotedTableName} ENABLE KEYS */;\n"
-            . "UNLOCK TABLES;\n";
-    }
-
-    /**
-     * Return table part data SQL insert
-     *
-     * @param string $tableName
-     * @param int $count
-     * @param int $offset
-     * @return string
-     */
-    public function getPartInsertSql($tableName, $count = null, $offset = null)
-    {
-        $sql = null;
-        $adapter = $this->_getWriteAdapter();
-        $select = $adapter->select()
-            ->from($tableName)
-            ->limit($count, $offset);
-        $query  = $adapter->query($select);
-
-        while ($row = $query->fetch()) {
-            if ($sql === null) {
-                $sql = sprintf('INSERT INTO %s VALUES ', $adapter->quoteIdentifier($tableName));
-            } else {
-                $sql .= ',';
-            }
-
-            $sql .= $this->_quoteRow($tableName, $row);
-        }
-
-        if ($sql !== null) {
-            $sql .= ';' . "\n";
-        }
-
-        return $sql;
-    }
-    /**
-     * Return table data SQL insert
-     *
-     * @param string $tableName
-     * @return string
-     */
-    public function getInsertSql($tableName)
-    {
-        return $this->getPartInsertSql($tableName);
-    }
-    /**
-     * Quote Table Row
-     *
-     * @param string $tableName
-     * @param array $row
-     * @return string
-     */
-    protected function _quoteRow($tableName, array $row)
-    {
-        $adapter   = $this->_getReadAdapter();
-        $describe  = $adapter->describeTable($tableName);
-        $dataTypes = array('bigint', 'mediumint', 'smallint', 'tinyint');
-        $rowData   = array();
-        foreach ($row as $k => $v) {
-            if ($v === null) {
-                $value = 'NULL';
-            } elseif (in_array(strtolower($describe[$k]['DATA_TYPE']), $dataTypes)) {
-                $value = $v;
-            } else {
-                $value = $adapter->quoteInto('?', $v);
-            }
-            $rowData[] = $value;
-        }
-
-        return sprintf('(%s)', implode(',', $rowData));
-    }
-
-    /**
-     * Turn on serializable mode
-     */
-    public function turnOnSerializableMode()
-    {
-        $this->_getReadAdapter()->query("SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE");
-    }
-
-    /**
-     * Turn on read committed mode
-     */
-    public function turnOnReadCommittedMode()
-    {
-        $this->_getReadAdapter()->query("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED");
-    }
-}
diff --git a/app/code/core/Mage/Backup/etc/adminhtml.xml b/app/code/core/Mage/Backup/etc/adminhtml.xml
deleted file mode 100644
index ca9f81cd752..00000000000
--- a/app/code/core/Mage/Backup/etc/adminhtml.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-    
-        
-            
-                
-                    
-                        
-                            Backups
-                            adminhtml/system_backup
-                        
-                    
-                
-            
-        
-    
-    
-        
-            
-                
-                    
-                        
-                            
-                                
-                                    
-                                        Backups
-                                            
-                                                
-                                                    Rollback
-                                                
-                                            
-                                    
-                                
-                            
-                        
-                    
-                
-            
-        
-    
-
diff --git a/app/code/core/Mage/Backup/etc/config.xml b/app/code/core/Mage/Backup/etc/config.xml
deleted file mode 100644
index d315ac57061..00000000000
--- a/app/code/core/Mage/Backup/etc/config.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-    
-        
-            1.6.0.0
-        
-    
-    
-        
-            
-                Mage_Backup_Model
-                backup_resource
-            
-            
-                Mage_Backup_Model_Resource
-                backup_mysql4
-            
-        
-        
-            
-                
-                    Mage_Backup
-                
-            
-        
-    
-    
-        
-            
-                
-                    
-                        Mage_Backup.csv
-                    
-                
-            
-        
-    
-    
-        
-            
-                
-                    backup/observer::scheduledBackup
-                
-            
-        
-    
-
diff --git a/app/code/core/Mage/Backup/etc/system.xml b/app/code/core/Mage/Backup/etc/system.xml
deleted file mode 100644
index 66d1808f58e..00000000000
--- a/app/code/core/Mage/Backup/etc/system.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
-
-    
-        
-            
-                
-                    
-                    500
-                    1
-                    0
-                    0
-                    
-                        
-                            
-                            select
-                            adminhtml/system_config_source_yesno
-                            10
-                            1
-                            0
-                            0
-                        
-                        
-                            
-                            select
-                            1
-                            backup/config_source_type
-                            20
-                            1
-                            0
-                            0
-                        
-                        
-                        
-                            
-                            select
-                            1
-                            adminhtml/system_config_source_cron_frequency
-                            backup/config_backend_cron
-                            40
-                            1
-                            0
-                            0
-                        
-                        
-                            
-                            Put store on the maintenance mode while backup's creation
-                            select
-                            1
-                            adminhtml/system_config_source_yesno
-                            50
-                            1
-                            0
-                            0
-                        
-                    
-                
-            
-        
-    
-
diff --git a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.7-1.6.0.8.php b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.7-1.6.0.8.php
deleted file mode 100644
index 0351e84e881..00000000000
--- a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.7-1.6.0.8.php
+++ /dev/null
@@ -1,41 +0,0 @@
-startSetup();
-$connection = $installer->getConnection();
-
-$connection->delete(
-    $this->getTable('core_config_data'),
-    $connection->prepareSqlCondition('path', array(
-        'like' => 'system/backup/enabled'
-    ))
-);
-$installer->setConfigData('advanced/modules_disable_output/Mage_Backup', 1);
-
-$installer->endSetup();
diff --git a/app/design/adminhtml/default/default/template/backup/dialogs.phtml b/app/design/adminhtml/default/default/template/backup/dialogs.phtml
deleted file mode 100644
index 401dcb1858b..00000000000
--- a/app/design/adminhtml/default/default/template/backup/dialogs.phtml
+++ /dev/null
@@ -1,198 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-getUrl('*/*/rollback');
-    $backupUrl = $this->getUrl('*/*/create');
-?>
-
-
diff --git a/app/design/adminhtml/default/default/template/backup/left.phtml b/app/design/adminhtml/default/default/template/backup/left.phtml
deleted file mode 100644
index 13bb9c08d36..00000000000
--- a/app/design/adminhtml/default/default/template/backup/left.phtml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
    __('Create Backup') ?>
    
diff --git a/app/design/adminhtml/default/default/template/backup/list.phtml b/app/design/adminhtml/default/default/template/backup/list.phtml
deleted file mode 100644
index 5189b12a0ad..00000000000
--- a/app/design/adminhtml/default/default/template/backup/list.phtml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
    
-
-    
-        
-        
-    
-
    __('Backups') ?>
    		
-            getCreateSnapshotButtonHtml(); ?>
-            getCreateMediaBackupButtonHtml(); ?>
-            getCreateButtonHtml(); ?>
-        
    
-
    
-getGridHtml() ?>
-getDialogsHtml() ?>
diff --git a/app/etc/modules/Mage_All.xml b/app/etc/modules/Mage_All.xml
index 054a44d952f..6d4604e8d23 100644
--- a/app/etc/modules/Mage_All.xml
+++ b/app/etc/modules/Mage_All.xml
@@ -233,13 +233,6 @@
                 
             
         
-        
-            false
-            core
-            
-                
-            
-        
         
             true
             core
diff --git a/app/locale/en_US/Mage_Backup.csv b/app/locale/en_US/Mage_Backup.csv
deleted file mode 100644
index be22b2b719d..00000000000
--- a/app/locale/en_US/Mage_Backup.csv
+++ /dev/null
@@ -1,55 +0,0 @@
-"Action","Action"
-"An error occurred while creating the backup.","An error occurred while creating the backup."
-"An error occurred while writing to the backup file ""%s"".","An error occurred while writing to the backup file ""%s""."
-"Are you sure you want to delete the selected backup(s)?","Are you sure you want to delete the selected backup(s)?"
-"Backup Type","Backup Type"
-"Backup file ""%s"" cannot be read from or written to.","Backup file ""%s"" cannot be read from or written to."
-"Backup file ""%s"" does not exist.","Backup file ""%s"" does not exist."
-"Backup file does not exist.","Backup file does not exist."
-"Backup file handler was unspecified.","Backup file handler was unspecified."
-"Backup file not found","Backup file not found"
-"Backup file path was not specified.","Backup file path was not specified."
-"Backups","Backups"
-"Cannot read backup file.","Cannot read backup file."
-"Create Backup","Create Backup"
-"Database","Database"
-"Database Backup","Database Backup"
-"Database and Media","Database and Media"
-"Database and Media Backup","Database and Media Backup"
-"Database was successfuly backed up.","Database was successfuly backed up."
-"Download","Download"
-"Enable Scheduled Backup","Enable Scheduled Backup"
-"Failed to connect to FTP","Failed to connect to FTP"
-"Failed to delete one or several backups.","Failed to delete one or several backups."
-"Failed to rollback","Failed to rollback"
-"Failed to validate FTP","Failed to validate FTP"
-"Frequency","Frequency"
-"Invalid Password.","Invalid Password."
-"Maintenance Mode","Maintenance Mode"
-"Name","Name"
-"Not enough free space to create backup.","Not enough free space to create backup."
-"Not enough permissions to create backup.","Not enough permissions to create backup."
-"Not enough permissions to perform rollback","Not enough permissions to perform rollback"
-"Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the backup.""","Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the backup."""
-"Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the rollback.""","Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the rollback."""
-"Put store on the maintenance mode while backup's creation","Put store on the maintenance mode while backup's creation"
-"Rollback","Rollback"
-"Scheduled Backup Settings","Scheduled Backup Settings"
-"Size, Bytes","Size, Bytes"
-"Start Time","Start Time"
-"System","System"
-"System (excluding Media)","System (excluding Media)"
-"System Backup","System Backup"
-"System couldn't put store on the maintenance mode","System couldn't put store on the maintenance mode"
-"The database and media backup has been created.","The database and media backup has been created."
-"The database backup has been created.","The database backup has been created."
-"The file was compressed with Zlib, but this extension is not installed on server.","The file was compressed with Zlib, but this extension is not installed on server."
-"The selected backup(s) has been deleted.","The selected backup(s) has been deleted."
-"The system (excluding Media) backup has been created.","The system (excluding Media) backup has been created."
-"The system backup has been created.","The system backup has been created."
-"Time","Time"
-"Type","Type"
-"Unable to create backup. Please, try again later.","Unable to create backup. Please, try again later."
-"Unable to save the cron expression.","Unable to save the cron expression."
-"Wrong order of creation for new backup.","Wrong order of creation for new backup."
-"You do not have sufficient permissions to enable Maintenance Mode during this operation.","You do not have sufficient permissions to enable Maintenance Mode during this operation."
diff --git a/js/mage/adminhtml/backup.js b/js/mage/adminhtml/backup.js
deleted file mode 100644
index e0407fdc6fc..00000000000
--- a/js/mage/adminhtml/backup.js
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magento.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magento.com for more information.
- *
- * @category    Mage
- * @package     Mage_Adminhtml
- * @copyright   Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-var AdminBackup = new Class.create();
-AdminBackup.prototype = {
-    initialize : function(a, b){
-        this.reset();
-        this.rollbackUrl = this.backupUrl = '';
-        this.rollbackValidator = new Validation($('rollback-form'));
-        this.backupValidator = new Validation($('backup-form'));
-    },
-
-    reset: function() {
-        this.time = 0;
-        this.type = '';
-        $('use-ftp-checkbox-row').hide();
-        $('use_ftp').checked = false;
-        $('ftp-credentials-container').hide();
-        $$('#ftp-credentials-container input').each(function(item) {
-            item.removeClassName('required-entry');
-        });
-        $('backup_maintenance_mode').checked = false;
-        $('rollback_maintenance_mode').checked = false;
-        $('exclude_media').checked = false;
-        $('password').value = '';
-        $('backup_name').value = '';
-        $$('.validation-advice').invoke('remove');
-        $$('input').invoke('removeClassName', 'validation-failed');
-        $$('input').invoke('removeClassName', 'validation-passed');
-        $$('.backup-messages').invoke('hide');
-        $$('#ftp-credentials-container input').each(function(item) {
-            item.value = '';
-        });
-    },
-
-    backup: function(type) {
-        this.reset();
-        this.type = type;
-        this.showBackupWarning();
-        return false;
-    },
-
-    rollback: function(type, time) {
-        this.reset();
-        this.time = time;
-        this.type = type;
-        this.showRollbackWarning();
-        return false;
-    },
-
-    showBackupWarning: function() {
-        this.showPopup('backup-warning');
-    },
-
-    showRollbackWarning: function() {
-        this.showPopup('rollback-warning');
-    },
-
-    requestBackupOptions: function() {
-        this.hidePopups();
-        var action = this.type != 'snapshot' ? 'hide' : 'show';
-        $$('#exclude-media-checkbox-container').invoke(action);
-        this.showPopup('backup-options');
-    },
-
-    requestPassword: function() {
-        this.hidePopups();
-        this.type != 'db' ? $('use-ftp-checkbox-row').show() : $('use-ftp-checkbox-row').hide();
-        this.showPopup('rollback-request-password');
-    },
-
-    toggleFtpCredentialsForm: function() {
-        $('use_ftp').checked ? $('ftp-credentials-container').show()
-            : $('ftp-credentials-container').hide();
-        var divId = 'rollback-request-password';
-
-        $$('#ftp-credentials-container input').each(function(item) {
-            if (item.name == 'ftp_path') return;
-            $('use_ftp').checked && item.name != 'dummy' ?
-                item.addClassName('required-entry') : item.removeClassName('required-entry');
-        });
-
-        $(divId).show().setStyle({
-            'marginTop': -$(divId).getDimensions().height / 2 + 'px'
-        });
-    },
-
-    submitBackup: function () {
-        if (!!this.backupValidator && this.backupValidator.validate()) {
-            this.hidePopups();
-            var data = {
-                'type': this.type,
-                'maintenance_mode': $('backup_maintenance_mode').checked ? 1 : 0,
-                'backup_name': $('backup_name').value,
-                'exclude_media': $('exclude_media').checked ? 1 : 0
-            };
-
-            new Ajax.Request(this.backupUrl, {
-                onSuccess: function(transport) {
-                    this.processResponse(transport, 'backup-options');
-                }.bind(this),
-                method: 'post',
-                parameters: data
-            });
-        }
-        return false;
-    },
-
-    submitRollback: function() {
-        if (!!this.rollbackValidator && this.rollbackValidator.validate()) {
-            var data = this.getPostData();
-            this.hidePopups();
-            new Ajax.Request(this.rollbackUrl, {
-                onSuccess: function(transport) {
-                    this.processResponse(transport, 'rollback-request-password');
-                }.bind(this),
-                method: 'post',
-                parameters: data
-            });
-        }
-        return false;
-    },
-
-    processResponse: function(transport, popupId) {
-        if (!transport.responseText.isJSON()) {
-            return;
-        }
-
-        var json = transport.responseText.evalJSON();
-
-        if (!!json.error) {
-            this.displayError(popupId, json.error);
-            this.showPopup(popupId);
-            return;
-        }
-
-        if (!!json.redirect_url) {
-            setLocation(json.redirect_url);
-        }
-    },
-
-    displayError: function(parentContainer, message) {
-        var messageHtml = this.getErrorMessageHtml(message);
-        $$('#' + parentContainer + ' .backup-messages .messages').invoke('update', messageHtml);
-        $$('#' + parentContainer + ' .backup-messages').invoke('show');
-    },
-
-    getErrorMessageHtml: function(message) {
-        return '
    • ' + message + '
    • ';
-    },
-
-    getPostData: function() {
-        var data = $('rollback-form').serialize(true);
-        data['time'] = this.time;
-        data['type'] = this.type;
-        return data;
-    },
-
-    showPopup: function(divId) {
-        $(divId).show().setStyle({
-            'marginTop': -$(divId).getDimensions().height / 2 + 'px'
-        });
-        $('popup-window-mask').setStyle({
-            height: $('html-body').getHeight() + 'px'
-        }).show();
-    },
-
-    hidePopups: function() {
-        $$('.backup-dialog').each(Element.hide);
-        $('popup-window-mask').hide();
-    }
-};
diff --git a/lib/Mage/Backup.php b/lib/Mage/Backup.php
deleted file mode 100644
index 3eb7b315f19..00000000000
--- a/lib/Mage/Backup.php
+++ /dev/null
@@ -1,59 +0,0 @@
-
- */
-class Mage_Backup
-{
-    /**
-     * List of supported a backup types
-     *
-     * @var array
-     */
-    static protected $_allowedBackupTypes = array('db', 'snapshot', 'filesystem', 'media', 'nomedia');
-
-    /**
-     * get Backup Instance By File Name
-     *
-     * @param  string $type
-     * @return Mage_Backup_Interface
-     */
-    static public function getBackupInstance($type)
-    {
-        $class = 'Mage_Backup_' . ucfirst($type);
-
-        if (!in_array($type, self::$_allowedBackupTypes) || !class_exists($class, true)){
-            throw new Mage_Exception('Current implementation not supported this type (' . $type . ') of backup.');
-        }
-
-        return new $class();
-    }
-}
diff --git a/lib/Mage/Backup/Abstract.php b/lib/Mage/Backup/Abstract.php
deleted file mode 100644
index c14e73bd9b0..00000000000
--- a/lib/Mage/Backup/Abstract.php
+++ /dev/null
@@ -1,318 +0,0 @@
-
- */
-abstract class Mage_Backup_Abstract implements  Mage_Backup_Interface
-{
-    /**
-     * Backup name
-     *
-     * @var string
-     */
-    protected $_name;
-
-    /**
-     * Backup creation date
-     *
-     * @var int
-     */
-    protected $_time;
-
-    /**
-     * Backup file extension
-     *
-     * @var string
-     */
-    protected $_backupExtension;
-
-    /**
-     * Resource model
-     *
-     * @var object
-     */
-    protected $_resourceModel;
-
-    /**
-     * Magento's root directory
-     *
-     * @var string
-     */
-    protected $_rootDir;
-
-    /**
-     * Path to directory where backups stored
-     *
-     * @var string
-     */
-    protected $_backupsDir;
-
-    /**
-     * Is last operation completed successfully
-     *
-     * @var bool
-     */
-    protected $_lastOperationSucceed = false;
-
-    /**
-     * Last failed operation error message
-     *
-     * @var string
-     */
-    protected $_lastErrorMessage;
-
-
-    /**
-     * Set Backup Extension
-     *
-     * @param string $backupExtension
-     * @return Mage_Backup_Interface
-     */
-    public function setBackupExtension($backupExtension)
-    {
-        $this->_backupExtension = $backupExtension;
-        return $this;
-    }
-
-    /**
-     * Get Backup Extension
-     *
-     * @return string
-     */
-    public function getBackupExtension()
-    {
-        return $this->_backupExtension;
-    }
-
-    /**
-     * Set Resource Model
-     *
-     * @param object $resourceModel
-     * @return Mage_Backup_Interface
-     */
-    public function setResourceModel($resourceModel)
-    {
-        $this->_resourceModel = $resourceModel;
-        return $this;
-    }
-
-    /**
-     * Get Resource Model
-     *
-     * @return object
-     */
-    public function getResourceModel()
-    {
-        return $this->_resourceModel;
-    }
-
-    /**
-     * Set Time
-     *
-     * @param int $time
-     * @return Mage_Backup_Interface
-     */
-    public function setTime($time)
-    {
-        $this->_time = $time;
-        return $this;
-    }
-
-    /**
-     * Get Time
-     *
-     * @return int
-     */
-    public function getTime()
-    {
-        return $this->_time;
-    }
-
-    /**
-     * Set root directory of Magento installation
-     *
-     * @param string $rootDir
-     * @throws Mage_Exception
-     * @return Mage_Backup_Interface
-     */
-    public function setRootDir($rootDir)
-    {
-        if (!is_dir($rootDir)) {
-            throw new Mage_Exception('Bad root directory');
-        }
-
-        $this->_rootDir = $rootDir;
-        return $this;
-    }
-
-    /**
-     * Get Magento's root directory
-     * @return string
-     */
-    public function getRootDir()
-    {
-        return $this->_rootDir;
-    }
-
-    /**
-     * Set path to directory where backups stored
-     *
-     * @param string $backupsDir
-     * @return Mage_Backup_Interface
-     */
-    public function setBackupsDir($backupsDir)
-    {
-        $this->_backupsDir = $backupsDir;
-        return $this;
-    }
-
-    /**
-     * Get path to directory where backups stored
-     *
-     * @return string
-     */
-    public function getBackupsDir()
-    {
-        return $this->_backupsDir;
-    }
-
-    /**
-     * Get path to backup
-     *
-     * @return string
-     */
-    public function getBackupPath()
-    {
-        return $this->getBackupsDir() . DS . $this->getBackupFilename();
-    }
-
-    /**
-     * Get backup file name
-     *
-     * @return string
-     */
-    public function getBackupFilename()
-    {
-        $filename = $this->getTime() . '_' . $this->getType();
-
-        $name = $this->getName();
-
-        if (!empty($name)) {
-            $filename .= '_' . $name;
-        }
-
-        $filename .= '.' . $this->getBackupExtension();
-
-        return $filename;
-    }
-
-    /**
-     * Check whether last operation completed successfully
-     *
-     * @return bool
-     */
-    public function getIsSuccess()
-    {
-        return $this->_lastOperationSucceed;
-    }
-
-    /**
-     * Get last error message
-     *
-     * @return string
-     */
-    public function getErrorMessage()
-    {
-        return $this->_lastErrorMessage;
-    }
-
-    /**
-     * Set error message
-     *
-     * @param string $errorMessage
-     * @return string
-     */
-    public function setErrorMessage($errorMessage)
-    {
-        $this->_lastErrorMessage = $errorMessage;
-    }
-
-    /**
-     * Set backup name
-     *
-     * @param string $name
-     * @param bool $applyFilter
-     * @return Mage_Backup_Interface
-     */
-    public function setName($name, $applyFilter = true)
-    {
-        if ($applyFilter) {
-            $name = $this->_filterName($name);
-        }
-        $this->_name = $name;
-        return $this;
-    }
-
-    /**
-     * Get backup name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Get backup display name
-     *
-     * @return string
-     */
-    public function getDisplayName()
-    {
-        return str_replace('_', ' ', $this->_name);
-    }
-
-    /**
-     * Removes disallowed characters and replaces spaces with underscores
-     *
-     * @param string $name
-     * @return string
-     */
-    protected function _filterName($name)
-    {
-        $name = trim(preg_replace('/[^\da-zA-Z ]/', '', $name));
-        $name = preg_replace('/\s{2,}/', ' ', $name);
-        $name = str_replace(' ', '_', $name);
-
-        return $name;
-    }
-}
diff --git a/lib/Mage/Backup/Archive/Tar.php b/lib/Mage/Backup/Archive/Tar.php
deleted file mode 100644
index c1e3a20b4e4..00000000000
--- a/lib/Mage/Backup/Archive/Tar.php
+++ /dev/null
@@ -1,82 +0,0 @@
-
- */
-class Mage_Backup_Archive_Tar extends Mage_Archive_Tar
-{
-    /**
-     * Filenames or filename parts that are used for filtering files
-     *
-     * @var array()
-     */
-    protected $_skipFiles = array();
-
-    /**
-     * Overridden Mage_Archive_Tar::_createTar method that does the same actions as it's parent but filters
-     * files using Mage_Backup_Filesystem_Iterator_Filter
-     *
-     * @see Mage_Archive_Tar::_createTar()
-     * @param bool $skipRoot
-     * @param bool $finalize
-     */
-    protected function _createTar($skipRoot = false, $finalize = false)
-    {
-        $path = $this->_getCurrentFile();
-
-        $filesystemIterator = new RecursiveIteratorIterator(
-            new RecursiveDirectoryIterator($path), RecursiveIteratorIterator::SELF_FIRST
-        );
-
-        $iterator = new Mage_Backup_Filesystem_Iterator_Filter($filesystemIterator, $this->_skipFiles);
-
-        foreach ($iterator as $item) {
-            $this->_setCurrentFile($item->getPathname());
-            $this->_packAndWriteCurrentFile();
-        }
-
-        if ($finalize) {
-            $this->_getWriter()->write(str_repeat("\0", self::TAR_BLOCK_SIZE * 12));
-        }
-    }
-
-    /**
-     * Set files that shouldn't be added to tarball
-     *
-     * @param array $skipFiles
-     * @return Mage_Backup_Archive_Tar
-     */
-    public function setSkipFiles(array $skipFiles)
-    {
-        $this->_skipFiles = $skipFiles;
-        return $this;
-    }
-}
diff --git a/lib/Mage/Backup/Db.php b/lib/Mage/Backup/Db.php
deleted file mode 100644
index f6333024885..00000000000
--- a/lib/Mage/Backup/Db.php
+++ /dev/null
@@ -1,119 +0,0 @@
-
- */
-class Mage_Backup_Db extends Mage_Backup_Abstract
-{
-    /**
-     * Implements Rollback functionality for Db
-     *
-     * @return bool
-     */
-    public function rollback()
-    {
-        set_time_limit(0);
-        ignore_user_abort(true);
-
-        $this->_lastOperationSucceed = false;
-
-        $archiveManager = new Mage_Archive();
-        $source = $archiveManager->unpack($this->getBackupPath(), $this->getBackupsDir());
-
-        $file = new Mage_Backup_Filesystem_Iterator_File($source);
-        foreach ($file as $statement) {
-            $this->getResourceModel()->runCommand($statement);
-        }
-        @unlink($source);
-
-        $this->_lastOperationSucceed = true;
-
-        return true;
-    }
-
-    /**
-     * Checks whether the line is last in sql command
-     *
-     * @param $line
-     * @return bool
-     */
-    protected function _isLineLastInCommand($line)
-    {
-        $cleanLine = trim($line);
-        $lineLength = strlen($cleanLine);
-
-        $returnResult = false;
-        if ($lineLength > 0){
-            $lastSymbolIndex = $lineLength-1;
-            if ($cleanLine[$lastSymbolIndex] == ';'){
-                $returnResult = true;
-            }
-        }
-
-        return $returnResult;
-    }
-
-    /**
-     * Implements Create Backup functionality for Db
-     *
-     * @return bool
-     */
-    public function create()
-    {
-        set_time_limit(0);
-        ignore_user_abort(true);
-
-        $this->_lastOperationSucceed = false;
-
-        $backup = Mage::getModel('backup/backup')
-            ->setTime($this->getTime())
-            ->setType($this->getType())
-            ->setPath($this->getBackupsDir())
-            ->setName($this->getName());
-
-        $backupDb = Mage::getModel('backup/db');
-        $backupDb->createBackup($backup);
-
-        $this->_lastOperationSucceed = true;
-
-        return true;
-    }
-
-    /**
-     * Get Backup Type
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return 'db';
-    }
-}
diff --git a/lib/Mage/Backup/Exception.php b/lib/Mage/Backup/Exception.php
deleted file mode 100644
index bef1a1d8def..00000000000
--- a/lib/Mage/Backup/Exception.php
+++ /dev/null
@@ -1,36 +0,0 @@
-
- */
-class Mage_Backup_Exception extends Mage_Exception
-{
-}
diff --git a/lib/Mage/Backup/Exception/CantLoadSnapshot.php b/lib/Mage/Backup/Exception/CantLoadSnapshot.php
deleted file mode 100644
index cd112d098ac..00000000000
--- a/lib/Mage/Backup/Exception/CantLoadSnapshot.php
+++ /dev/null
@@ -1,36 +0,0 @@
-
- */
-class Mage_Backup_Exception_CantLoadSnapshot extends Mage_Backup_Exception
-{
-}
diff --git a/lib/Mage/Backup/Exception/FtpConnectionFailed.php b/lib/Mage/Backup/Exception/FtpConnectionFailed.php
deleted file mode 100644
index a0fa41ac324..00000000000
--- a/lib/Mage/Backup/Exception/FtpConnectionFailed.php
+++ /dev/null
@@ -1,36 +0,0 @@
-
- */
-class Mage_Backup_Exception_FtpConnectionFailed extends Mage_Backup_Exception
-{
-}
diff --git a/lib/Mage/Backup/Exception/FtpValidationFailed.php b/lib/Mage/Backup/Exception/FtpValidationFailed.php
deleted file mode 100644
index d1eb04bf43d..00000000000
--- a/lib/Mage/Backup/Exception/FtpValidationFailed.php
+++ /dev/null
@@ -1,36 +0,0 @@
-
- */
-class Mage_Backup_Exception_FtpValidationFailed extends Mage_Backup_Exception
-{
-}
diff --git a/lib/Mage/Backup/Exception/NotEnoughFreeSpace.php b/lib/Mage/Backup/Exception/NotEnoughFreeSpace.php
deleted file mode 100644
index 37a64e79795..00000000000
--- a/lib/Mage/Backup/Exception/NotEnoughFreeSpace.php
+++ /dev/null
@@ -1,36 +0,0 @@
-
- */
-class Mage_Backup_Exception_NotEnoughFreeSpace extends Mage_Backup_Exception
-{
-}
diff --git a/lib/Mage/Backup/Exception/NotEnoughPermissions.php b/lib/Mage/Backup/Exception/NotEnoughPermissions.php
deleted file mode 100644
index 6db5b1b4946..00000000000
--- a/lib/Mage/Backup/Exception/NotEnoughPermissions.php
+++ /dev/null
@@ -1,36 +0,0 @@
-
- */
-class Mage_Backup_Exception_NotEnoughPermissions extends Mage_Backup_Exception
-{
-}
diff --git a/lib/Mage/Backup/Filesystem.php b/lib/Mage/Backup/Filesystem.php
deleted file mode 100644
index aae5222d978..00000000000
--- a/lib/Mage/Backup/Filesystem.php
+++ /dev/null
@@ -1,284 +0,0 @@
-
- */
-class Mage_Backup_Filesystem extends Mage_Backup_Abstract
-{
-    /**
-     * Paths that ignored when creating or rolling back snapshot
-     *
-     * @var array
-     */
-    protected $_ignorePaths = array();
-
-    /**
-     * Whether use ftp account for rollback procedure
-     *
-     * @var bool
-     */
-    protected $_useFtp = false;
-
-    /**
-     * Ftp host
-     *
-     * @var string
-     */
-    protected $_ftpHost;
-
-    /**
-     * Ftp username
-     *
-     * @var string
-     */
-    protected $_ftpUser;
-
-    /**
-     * Password to ftp account
-     *
-     * @var string
-     */
-    protected $_ftpPass;
-
-    /**
-     * Ftp path to Magento installation
-     *
-     * @var string
-     */
-    protected $_ftpPath;
-
-    /**
-     * Implementation Rollback functionality for Filesystem
-     *
-     * @throws Mage_Exception
-     * @return bool
-     */
-    public function rollback()
-    {
-        $this->_lastOperationSucceed = false;
-
-        set_time_limit(0);
-        ignore_user_abort(true);
-
-        $rollbackWorker = $this->_useFtp ? new Mage_Backup_Filesystem_Rollback_Ftp($this)
-            : new Mage_Backup_Filesystem_Rollback_Fs($this);
-        $rollbackWorker->run();
-
-        $this->_lastOperationSucceed = true;
-    }
-
-    /**
-     * Implementation Create Backup functionality for Filesystem
-     *
-     * @throws Mage_Exception
-     * @return boolean
-     */
-    public function create()
-    {
-        set_time_limit(0);
-        ignore_user_abort(true);
-
-        $this->_lastOperationSucceed = false;
-
-        $this->_checkBackupsDir();
-
-        $fsHelper = new Mage_Backup_Filesystem_Helper();
-
-        $filesInfo = $fsHelper->getInfo(
-            $this->getRootDir(),
-            Mage_Backup_Filesystem_Helper::INFO_READABLE | Mage_Backup_Filesystem_Helper::INFO_SIZE,
-            $this->getIgnorePaths()
-        );
-
-        if (!$filesInfo['readable']) {
-            throw new Mage_Backup_Exception_NotEnoughPermissions('Not enough permissions to read files for backup');
-        }
-
-        $freeSpace = disk_free_space($this->getBackupsDir());
-
-        if (2 * $filesInfo['size'] > $freeSpace) {
-            throw new Mage_Backup_Exception_NotEnoughFreeSpace('Not enough free space to create backup');
-        }
-
-        $tarTmpPath = $this->_getTarTmpPath();
-
-        $tarPacker = new Mage_Backup_Archive_Tar();
-        $tarPacker->setSkipFiles($this->getIgnorePaths())
-            ->pack($this->getRootDir(), $tarTmpPath, true);
-
-        if (!is_file($tarTmpPath) || filesize($tarTmpPath) == 0) {
-            throw new Mage_Exception('Failed to create backup');
-        }
-
-        $backupPath = $this->getBackupPath();
-
-        $gzPacker = new Mage_Archive_Gz();
-        $gzPacker->pack($tarTmpPath, $backupPath);
-
-        if (!is_file($backupPath) || filesize($backupPath) == 0) {
-            throw new Mage_Exception('Failed to create backup');
-        }
-
-        @unlink($tarTmpPath);
-
-        $this->_lastOperationSucceed = true;
-    }
-
-    /**
-     * Force class to use ftp for rollback procedure
-     *
-     * @param string $host
-     * @param string $username
-     * @param string $password
-     * @param string $path
-     * @return Mage_Backup_Filesystem
-     */
-    public function setUseFtp($host, $username, $password, $path)
-    {
-        $this->_useFtp = true;
-        $this->_ftpHost = $host;
-        $this->_ftpUser = $username;
-        $this->_ftpPass = $password;
-        $this->_ftpPath = $path;
-        return $this;
-    }
-
-    /**
-     * Get backup type
-     *
-     * @see Mage_Backup_Interface::getType()
-     * @return string
-     */
-    public function getType()
-    {
-        return 'filesystem';
-    }
-
-    /**
-     * Add path that should be ignoring when creating or rolling back backup
-     *
-     * @param string|array $paths
-     * @return Mage_Backup_Filesystem
-     */
-    public function addIgnorePaths($paths)
-    {
-        if (is_string($paths)) {
-            if (!in_array($paths, $this->_ignorePaths)) {
-                $this->_ignorePaths[] = $paths;
-            }
-        }
-        else if (is_array($paths)) {
-            foreach ($paths as $path) {
-                $this->addIgnorePaths($path);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get paths that should be ignored while creating or rolling back backup procedure
-     *
-     * @return array
-     */
-    public function getIgnorePaths()
-    {
-        return $this->_ignorePaths;
-    }
-
-    /**
-     * Set directory where backups saved and add it to ignore paths
-     *
-     * @see Mage_Backup_Abstract::setBackupsDir()
-     * @param string $backupsDir
-     * @return Mage_Backup_Filesystem
-     */
-    public function setBackupsDir($backupsDir)
-    {
-        parent::setBackupsDir($backupsDir);
-        $this->addIgnorePaths($backupsDir);
-        return $this;
-    }
-
-    /**
-     * getter for $_ftpPath variable
-     *
-     * @return string
-     */
-    public function getFtpPath()
-    {
-        return $this->_ftpPath;
-    }
-
-    /**
-     * Get ftp connection string
-     *
-     * @return string
-     */
-    public function getFtpConnectString()
-    {
-        return 'ftp://' . $this->_ftpUser . ':' . $this->_ftpPass . '@' . $this->_ftpHost . $this->_ftpPath;
-    }
-
-    /**
-     * Check backups directory existance and whether it's writeable
-     *
-     * @throws Mage_Exception
-     */
-    protected function _checkBackupsDir()
-    {
-        $backupsDir = $this->getBackupsDir();
-
-        if (!is_dir($backupsDir)) {
-            $backupsDirParentDirectory = basename($backupsDir);
-
-            if (!is_writeable($backupsDirParentDirectory)) {
-                throw new Mage_Backup_Exception_NotEnoughPermissions('Cant create backups directory');
-            }
-
-            mkdir($backupsDir);
-            chmod($backupsDir, 0777);
-        }
-
-        if (!is_writable($backupsDir)) {
-            throw new Mage_Backup_Exception_NotEnoughPermissions('Backups directory is not writeable');
-        }
-    }
-
-    /**
-     * Generate tmp name for tarball
-     */
-    protected function _getTarTmpPath()
-    {
-        $tmpName = '~tmp-'. microtime(true) . '.tar';
-        return $this->getBackupsDir() . DS . $tmpName;
-    }
-}
diff --git a/lib/Mage/Backup/Filesystem/Helper.php b/lib/Mage/Backup/Filesystem/Helper.php
deleted file mode 100644
index 25c28dab775..00000000000
--- a/lib/Mage/Backup/Filesystem/Helper.php
+++ /dev/null
@@ -1,141 +0,0 @@
-
- */
-class Mage_Backup_Filesystem_Helper
-{
-    /**
-     * Constant can be used in getInfo() function as second parameter.
-     * Check whether directory and all files/sub directories are writable
-     *
-     * @const int
-     */
-    const INFO_WRITABLE = 1;
-
-    /**
-     * Constant can be used in getInfo() function as second parameter.
-     * Check whether directory and all files/sub directories are readable
-     *
-     * @const int
-     */
-    const INFO_READABLE  = 2;
-
-    /**
-     * Constant can be used in getInfo() function as second parameter.
-     * Get directory size
-     *
-     * @const int
-     */
-    const INFO_SIZE      = 4;
-
-    /**
-     * Constant can be used in getInfo() function as second parameter.
-     * Combination of INFO_WRITABLE, INFO_READABLE, INFO_SIZE
-     *
-     * @const int
-     */
-    const INFO_ALL       = 7;
-
-    /**
-     * Recursively delete $path
-     *
-     * @param string $path
-     * @param array $skipPaths
-     * @param bool $removeRoot
-     * @throws Mage_Exception
-     */
-    public function rm($path, $skipPaths = array(), $removeRoot = false)
-    {
-        $filesystemIterator = new RecursiveIteratorIterator(
-            new RecursiveDirectoryIterator($path), RecursiveIteratorIterator::CHILD_FIRST
-        );
-
-        $iterator = new Mage_Backup_Filesystem_Iterator_Filter($filesystemIterator, $skipPaths);
-
-        foreach ($iterator as $item) {
-            $item->isDir() ? @rmdir($item->__toString()) : @unlink($item->__toString());
-        }
-
-        if ($removeRoot && is_dir($path)) {
-            @rmdir($path);
-        }
-    }
-
-    /**
-     * Get information (readable, writable, size) about $path
-     *
-     * @param string $path
-     * @param int $infoOptions
-     * @param array $skipFiles
-     */
-    public function getInfo($path, $infoOptions = self::INFO_ALL, $skipFiles = array())
-    {
-        $info = array();
-        if ($infoOptions & self::INFO_READABLE) {
-            $info['readable'] = true;
-        }
-
-        if ($infoOptions & self::INFO_WRITABLE) {
-            $info['writable'] = true;
-        }
-
-        if ($infoOptions & self::INFO_SIZE) {
-            $info['size'] = 0;
-        }
-
-        $filesystemIterator = new RecursiveIteratorIterator(
-            new RecursiveDirectoryIterator($path), RecursiveIteratorIterator::CHILD_FIRST
-        );
-
-        $iterator = new Mage_Backup_Filesystem_Iterator_Filter($filesystemIterator, $skipFiles);
-
-        foreach ($iterator as $item) {
-            if ($item->isLink()) {
-                continue;
-            }
-
-            if (($infoOptions & self::INFO_WRITABLE) && !$item->isWritable()) {
-                $info['writable'] = false;
-            }
-
-            if (($infoOptions & self::INFO_READABLE) && !$item->isReadable()) {
-                $info['readable'] = false;
-            }
-
-            if ($infoOptions & self::INFO_SIZE && !$item->isDir()) {
-                $info['size'] += $item->getSize();
-            }
-        }
-
-        return $info;
-    }
-}
diff --git a/lib/Mage/Backup/Filesystem/Iterator/File.php b/lib/Mage/Backup/Filesystem/Iterator/File.php
deleted file mode 100644
index bdc8739712f..00000000000
--- a/lib/Mage/Backup/Filesystem/Iterator/File.php
+++ /dev/null
@@ -1,112 +0,0 @@
-
- */
-class Mage_Backup_Filesystem_Iterator_File extends SplFileObject
-{
-    /**
-     * The statement that was last read during iteration
-     *
-     * @var string
-     */
-    protected $_currentStatement = '';
-
-    /**
-     * Return current sql statement
-     *
-     * @return string
-     */
-    public function current()
-    {
-        return $this->_currentStatement;
-    }
-
-    /**
-     * Iterate to next sql statement in file
-     */
-    public function next()
-    {
-        $this->_currentStatement = '';
-        while (!$this->eof()) {
-            $line = $this->fgets();
-            if (strlen(trim($line))) {
-                $this->_currentStatement .= $line;
-                if ($this->_isLineLastInCommand($line)) {
-                    break;
-                }
-            }
-        }
-    }
-
-    /**
-     * Return to first statement
-     */
-    public function rewind()
-    {
-        parent::rewind();
-        $this->next();
-    }
-
-    /**
-     * Check whether provided string is comment
-     *
-     * @param string $line
-     * @return bool
-     */
-    protected function _isComment($line)
-    {
-        return $line[0] == '#' || substr($line, 0, 2) == '--';
-    }
-
-    /**
-     * Check is line a last in sql command
-     *
-     * @param string $line
-     * @return bool
-     */
-    protected function _isLineLastInCommand($line)
-    {
-        $cleanLine = trim($line);
-        $lineLength = strlen($cleanLine);
-
-        $returnResult = false;
-        if ($lineLength > 0) {
-            $lastSymbolIndex = $lineLength - 1;
-            if ($cleanLine[$lastSymbolIndex] == ';') {
-                $returnResult = true;
-            }
-        }
-
-        return $returnResult;
-    }
-}
diff --git a/lib/Mage/Backup/Filesystem/Iterator/Filter.php b/lib/Mage/Backup/Filesystem/Iterator/Filter.php
deleted file mode 100644
index 1de96f7f1db..00000000000
--- a/lib/Mage/Backup/Filesystem/Iterator/Filter.php
+++ /dev/null
@@ -1,77 +0,0 @@
-
- */
-class Mage_Backup_Filesystem_Iterator_Filter extends FilterIterator
-{
-    /**
-     * Array that is used for filtering
-     *
-     * @var array
-     */
-    protected $_filters;
-
-    /**
-     * Constructor
-     *
-     * @param Iterator $iterator
-     * @param array $filters list of files to skip
-     */
-    public function __construct(Iterator $iterator, array $filters)
-    {
-        parent::__construct($iterator);
-        $this->_filters = $filters;
-    }
-
-    /**
-     * Check whether the current element of the iterator is acceptable
-     *
-     * @return bool
-     */
-    public function accept()
-    {
-        $current = $this->current()->__toString();
-        $currentFilename = $this->current()->getFilename();
-
-        if ($currentFilename == '.' || $currentFilename == '..') {
-            return false;
-        }
-
-        foreach ($this->_filters as $filter) {
-            if (false !== strpos($current, $filter)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-}
diff --git a/lib/Mage/Backup/Filesystem/Rollback/Abstract.php b/lib/Mage/Backup/Filesystem/Rollback/Abstract.php
deleted file mode 100644
index e131284ad7a..00000000000
--- a/lib/Mage/Backup/Filesystem/Rollback/Abstract.php
+++ /dev/null
@@ -1,57 +0,0 @@
-
- */
-abstract class Mage_Backup_Filesystem_Rollback_Abstract
-{
-    /**
-     * Snapshot object
-     *
-     * @var Mage_Backup_Filesystem
-     */
-    protected $_snapshot;
-
-    /**
-     * Default worker constructor
-     *
-     * @param Mage_Backup_Filesystem $snapshotObject
-     */
-    public function __construct(Mage_Backup_Filesystem $snapshotObject)
-    {
-        $this->_snapshot = $snapshotObject;
-    }
-
-    /**
-     * Main worker's function that makes files rollback
-     */
-    abstract public function run();
-}
diff --git a/lib/Mage/Backup/Filesystem/Rollback/Fs.php b/lib/Mage/Backup/Filesystem/Rollback/Fs.php
deleted file mode 100644
index 84d198cfe59..00000000000
--- a/lib/Mage/Backup/Filesystem/Rollback/Fs.php
+++ /dev/null
@@ -1,78 +0,0 @@
-
- */
-class Mage_Backup_Filesystem_Rollback_Fs extends Mage_Backup_Filesystem_Rollback_Abstract
-{
-    /**
-     * Files rollback implementation via local filesystem
-     *
-     * @see Mage_Backup_Filesystem_Rollback_Abstract::run()
-     * @throws Mage_Exception
-     */
-    public function run()
-    {
-        $snapshotPath = $this->_snapshot->getBackupPath();
-
-        if (!is_file($snapshotPath) || !is_readable($snapshotPath)) {
-            throw new Mage_Backup_Exception_CantLoadSnapshot('Cant load snapshot archive');
-        }
-
-        $fsHelper = new Mage_Backup_Filesystem_Helper();
-
-        $filesInfo = $fsHelper->getInfo(
-            $this->_snapshot->getRootDir(),
-            Mage_Backup_Filesystem_Helper::INFO_WRITABLE,
-            $this->_snapshot->getIgnorePaths()
-        );
-
-        if (!$filesInfo['writable']) {
-            throw new Mage_Backup_Exception_NotEnoughPermissions(
-                'Unable to make rollback because not all files are writable'
-            );
-        }
-
-        $archiver = new Mage_Archive();
-
-        /**
-         * we need these fake initializations because all magento's files in filesystem will be deleted and autoloader
-         * wont be able to load classes that we need for unpacking
-         */
-        new Mage_Archive_Tar();
-        new Mage_Archive_Gz();
-        new Mage_Archive_Helper_File('');
-        new Mage_Archive_Helper_File_Gz('');
-
-        $fsHelper->rm($this->_snapshot->getRootDir(), $this->_snapshot->getIgnorePaths());
-        $archiver->unpack($snapshotPath, $this->_snapshot->getRootDir());
-    }
-}
diff --git a/lib/Mage/Backup/Filesystem/Rollback/Ftp.php b/lib/Mage/Backup/Filesystem/Rollback/Ftp.php
deleted file mode 100644
index 7a1f803e0ee..00000000000
--- a/lib/Mage/Backup/Filesystem/Rollback/Ftp.php
+++ /dev/null
@@ -1,198 +0,0 @@
-
- */
-class Mage_Backup_Filesystem_Rollback_Ftp extends Mage_Backup_Filesystem_Rollback_Abstract
-{
-    /**
-     * Ftp client
-     *
-     * @var Mage_System_Ftp
-     */
-    protected $_ftpClient;
-
-    /**
-     * Files rollback implementation via ftp
-     *
-     * @see Mage_Backup_Filesystem_Rollback_Abstract::run()
-     * @throws Mage_Exception
-     */
-    public function run()
-    {
-        $snapshotPath = $this->_snapshot->getBackupPath();
-
-        if (!is_file($snapshotPath) || !is_readable($snapshotPath)) {
-            throw new Mage_Backup_Exception_CantLoadSnapshot('Cant load snapshot archive');
-        }
-
-        $this->_initFtpClient();
-        $this->_validateFtp();
-
-        $tmpDir = $this->_createTmpDir();
-        $this->_unpackSnapshot($tmpDir);
-
-        $fsHelper = new Mage_Backup_Filesystem_Helper();
-
-        $this->_cleanupFtp();
-        $this->_uploadBackupToFtp($tmpDir);
-
-        $fsHelper->rm($tmpDir, array(), true);
-    }
-
-    /**
-     * Initialize ftp client and connect to ftp
-     *
-     * @throws Mage_Backup_Exception_FtpConnectionFailed
-     */
-    protected function _initFtpClient()
-    {
-        try {
-            $this->_ftpClient = new Mage_System_Ftp();
-            $this->_ftpClient->connect($this->_snapshot->getFtpConnectString());
-        } catch (Exception $e) {
-            throw new Mage_Backup_Exception_FtpConnectionFailed($e->getMessage());
-        }
-    }
-
-    /**
-     * Perform ftp validation. Check whether ftp account provided points to current magento installation
-     *
-     * @throws Mage_Exception
-     */
-    protected function _validateFtp()
-    {
-        $validationFilename = '~validation-' . microtime(true) . '.tmp';
-        $validationFilePath = $this->_snapshot->getBackupsDir() . DS . $validationFilename;
-
-        $fh = @fopen($validationFilePath, 'w');
-        @fclose($fh);
-
-        if (!is_file($validationFilePath)) {
-            throw new Mage_Exception('Unable to validate ftp account');
-        }
-
-        $rootDir = $this->_snapshot->getRootDir();
-        $ftpPath = $this->_snapshot->getFtpPath() . DS . str_replace($rootDir, '', $validationFilePath);
-
-        $fileExistsOnFtp = $this->_ftpClient->fileExists($ftpPath);
-        @unlink($validationFilePath);
-
-        if (!$fileExistsOnFtp) {
-            throw new Mage_Backup_Exception_FtpValidationFailed('Failed to validate ftp account');
-        }
-    }
-
-    /**
-     * Unpack snapshot
-     *
-     * @param string $tmpDir
-     */
-    protected function _unpackSnapshot($tmpDir)
-    {
-        $snapshotPath = $this->_snapshot->getBackupPath();
-
-        $archiver = new Mage_Archive();
-        $archiver->unpack($snapshotPath, $tmpDir);
-    }
-
-    /**
-     * @throws Mage_Exception
-     * @return string
-     */
-    protected function _createTmpDir()
-    {
-        $tmpDir = $this->_snapshot->getBackupsDir() . DS . '~tmp-' . microtime(true);
-
-        $result = @mkdir($tmpDir);
-
-        if (false === $result) {
-            throw new Mage_Backup_Exception_NotEnoughPermissions('Failed to create directory ' . $tmpDir);
-        }
-
-        return $tmpDir;
-    }
-
-    /**
-     * Delete magento and all files from ftp
-     */
-    protected function _cleanupFtp()
-    {
-        $rootDir = $this->_snapshot->getRootDir();
-
-        $filesystemIterator = new RecursiveIteratorIterator(
-            new RecursiveDirectoryIterator($rootDir), RecursiveIteratorIterator::CHILD_FIRST
-        );
-
-        $iterator = new Mage_Backup_Filesystem_Iterator_Filter($filesystemIterator, $this->_snapshot->getIgnorePaths());
-
-        foreach ($iterator as $item) {
-            $ftpPath = $this->_snapshot->getFtpPath() . DS . str_replace($rootDir, '', $item->__toString());
-            $ftpPath = str_replace(DS, '/', $ftpPath);
-
-            $this->_ftpClient->delete($ftpPath);
-        }
-    }
-
-    /**
-     * Perform files rollback
-     *
-     * @param string $tmpDir
-     * @throws Mage_Exception
-     */
-    protected function _uploadBackupToFtp($tmpDir)
-    {
-        $filesystemIterator = new RecursiveIteratorIterator(
-            new RecursiveDirectoryIterator($tmpDir), RecursiveIteratorIterator::SELF_FIRST
-        );
-
-        $iterator = new Mage_Backup_Filesystem_Iterator_Filter($filesystemIterator, $this->_snapshot->getIgnorePaths());
-
-        foreach ($filesystemIterator as $item) {
-            $ftpPath = $this->_snapshot->getFtpPath() . DS . str_replace($tmpDir, '', $item->__toString());
-            $ftpPath = str_replace(DS, '/', $ftpPath);
-
-            if ($item->isLink()) {
-                continue;
-            }
-
-            if ($item->isDir()) {
-                $this->_ftpClient->mkdirRecursive($ftpPath);
-            } else {
-                $result = $this->_ftpClient->put($ftpPath, $item->__toString());
-                if (false === $result) {
-                    throw new Mage_Backup_Exception_NotEnoughPermissions('Failed to upload file '
-                        . $item->__toString() . ' to ftp');
-                }
-            }
-        }
-    }
-}
diff --git a/lib/Mage/Backup/Interface.php b/lib/Mage/Backup/Interface.php
deleted file mode 100644
index 958c7d0023a..00000000000
--- a/lib/Mage/Backup/Interface.php
+++ /dev/null
@@ -1,88 +0,0 @@
-
- */
-interface Mage_Backup_Interface
-{
-    /**
-     * Create Backup
-     *
-     * @return boolean
-     */
-    public function create();
-
-    /**
-     * Rollback Backup
-     *
-     * @return boolean
-     */
-    public function rollback();
-
-     /**
-     * Set Backup Extension
-     *
-     * @param string $backupExtension
-     * @return Mage_Backup_Interface
-     */
-    public function setBackupExtension($backupExtension);
-
-    /**
-     * Set Resource Model
-     *
-     * @param object $resourceModel
-     * @return Mage_Backup_Interface
-     */
-    public function setResourceModel($resourceModel);
-
-    /**
-     * Set Time
-     *
-     * @param int $time
-     * @return Mage_Backup_Interface
-     */
-    public function setTime($time);
-
-    /**
-    * Get Backup Type
-    *
-    * @return string
-    */
-    public function getType();
-
-    /**
-     * Set path to directory where backups stored
-     *
-     * @param string $backupsDir
-     * @return Mage_Backup_Interface
-     */
-    public function setBackupsDir($backupsDir);
-}
diff --git a/lib/Mage/Backup/Media.php b/lib/Mage/Backup/Media.php
deleted file mode 100644
index d44633687da..00000000000
--- a/lib/Mage/Backup/Media.php
+++ /dev/null
@@ -1,99 +0,0 @@
-
- */
-class Mage_Backup_Media extends Mage_Backup_Snapshot
-{
-    /**
-     * Implementation Rollback functionality for Snapshot
-     *
-     * @throws Mage_Exception
-     * @return bool
-     */
-    public function rollback()
-    {
-        $this->_prepareIgnoreList();
-        return parent::rollback();
-    }
-
-    /**
-     * Implementation Create Backup functionality for Snapshot
-     *
-     * @throws Mage_Exception
-     * @return bool
-     */
-    public function create()
-    {
-        $this->_prepareIgnoreList();
-        return parent::create();
-    }
-
-    /**
-     * Overlap getType
-     *
-     * @return string
-     * @see Mage_Backup_Interface::getType()
-     */
-    public function getType()
-    {
-        return 'media';
-    }
-
-    /**
-     * Add all folders and files except media and db backup to ignore list
-     *
-     * @return Mage_Backup_Media
-     */
-    protected function _prepareIgnoreList()
-    {
-        $iterator = new DirectoryIterator($this->getRootDir());
-
-        foreach ($iterator as $item) {
-            $filename = $item->getFilename();
-            if (!in_array($filename, array('media', 'var'))) {
-                $this->addIgnorePaths($item->getPathname());
-            }
-        }
-
-        $iterator = new DirectoryIterator($this->getRootDir() . DS . 'var');
-        $dbBackupFilename = $this->_getDbBackupManager()->getBackupFilename();
-
-        foreach ($iterator as $item) {
-            $filename = $item->getFilename();
-            if ($filename != $dbBackupFilename) {
-                $this->addIgnorePaths($item->getPathname());
-            }
-        }
-
-        return $this;
-    }
-}
diff --git a/lib/Mage/Backup/Nomedia.php b/lib/Mage/Backup/Nomedia.php
deleted file mode 100644
index a57d561edaf..00000000000
--- a/lib/Mage/Backup/Nomedia.php
+++ /dev/null
@@ -1,82 +0,0 @@
-
- */
-class Mage_Backup_Nomedia extends Mage_Backup_Snapshot
-{
-    /**
-     * Implementation Rollback functionality for Snapshot
-     *
-     * @throws Mage_Exception
-     * @return bool
-     */
-    public function rollback()
-    {
-        $this->_prepareIgnoreList();
-        return parent::rollback();
-    }
-
-    /**
-     * Implementation Create Backup functionality for Snapshot
-     *
-     * @throws Mage_Exception
-     * @return bool
-     */
-    public function create()
-    {
-        $this->_prepareIgnoreList();
-        return parent::create();
-    }
-
-    /**
-     * Overlap getType
-     *
-     * @return string
-     * @see Mage_Backup_Interface::getType()
-     */
-    public function getType()
-    {
-        return 'nomedia';
-    }
-
-    /**
-     * Add media folder to ignore list
-     *
-     * @return Mage_Backup_Media
-     */
-    protected function _prepareIgnoreList()
-    {
-        $this->addIgnorePaths($this->getRootDir() . DS . 'media');
-
-        return $this;
-    }
-}
diff --git a/lib/Mage/Backup/Snapshot.php b/lib/Mage/Backup/Snapshot.php
deleted file mode 100644
index 160a2d5d67b..00000000000
--- a/lib/Mage/Backup/Snapshot.php
+++ /dev/null
@@ -1,140 +0,0 @@
-
- */
-class Mage_Backup_Snapshot extends Mage_Backup_Filesystem
-{
-    /**
-     * Database backup manager
-     *
-     * @var Mage_Backup_Db
-     */
-    protected $_dbBackupManager;
-
-    /**
-     * Implementation Rollback functionality for Snapshot
-     *
-     * @throws Mage_Exception
-     * @return bool
-     */
-    public function rollback()
-    {
-        $result = parent::rollback();
-
-        $this->_lastOperationSucceed = false;
-
-        try {
-            $this->_getDbBackupManager()->rollback();
-        } catch (Exception $e) {
-            $this->_removeDbBackup();
-            throw $e;
-        }
-
-        $this->_removeDbBackup();
-        $this->_lastOperationSucceed = true;
-
-        return $result;
-    }
-
-    /**
-     * Implementation Create Backup functionality for Snapshot
-     *
-     * @throws Mage_Exception
-     * @return bool
-     */
-    public function create()
-    {
-        $this->_getDbBackupManager()->create();
-
-        try {
-            $result = parent::create();
-        } catch (Exception $e) {
-            $this->_removeDbBackup();
-            throw $e;
-        }
-
-        $this->_lastOperationSucceed = false;
-        $this->_removeDbBackup();
-        $this->_lastOperationSucceed = true;
-
-        return $result;
-    }
-
-    /**
-     * Overlap getType
-     *
-     * @return string
-     * @see Mage_Backup_Interface::getType()
-     */
-    public function getType()
-    {
-        return 'snapshot';
-    }
-
-    /**
-     * Create Db Instance
-     *
-     * @return Mage_Backup_Interface
-     */
-    protected function _createDbBackupInstance()
-    {
-        return Mage_Backup::getBackupInstance(Mage_Backup_Helper_Data::TYPE_DB)
-            ->setBackupExtension(Mage::helper('backup')->getExtensionByType(Mage_Backup_Helper_Data::TYPE_DB))
-            ->setTime($this->getTime())
-            ->setBackupsDir(Mage::getBaseDir("var"))
-            ->setResourceModel($this->getResourceModel());
-    }
-
-    /**
-     * Get database backup manager
-     *
-     * @return Mage_Backup_Db
-     */
-    protected function _getDbBackupManager()
-    {
-        if (is_null($this->_dbBackupManager)) {
-            $this->_dbBackupManager = $this->_createDbBackupInstance();
-        }
-
-        return $this->_dbBackupManager;
-    }
-
-    /**
-     * Remove Db backup after added it to the snapshot
-     *
-     * @return Mage_Backup_Snapshot
-     */
-    protected function _removeDbBackup(){
-        @unlink($this->_getDbBackupManager()->getBackupPath());
-        return $this;
-    }
-}

From 75809f1c683a3688e54ebc318bfe5d0a3307fded Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano 
Date: Wed, 13 Jul 2022 15:24:14 +0200
Subject: [PATCH 61/61] regenerated baseline and phpstorm meta

---
 .github/labeler.yml                           |    6 -
 .github/phpstan-baseline.neon                 |   95 -
 .github/phpstan.neon                          |    4 -
 .phpstorm.meta.php/magento_blocks.meta.php    |    8 -
 .../magento_blocks_methods.meta.php           |    8 -
 .phpstorm.meta.php/magento_helpers.meta.php   |   47 +-
 .../magento_helpers_methods.meta.php          |  752 +-
 .phpstorm.meta.php/magento_models.meta.php    | 1558 ++--
 .../magento_models_methods.meta.php           | 7007 ++++++++---------
 9 files changed, 4635 insertions(+), 4850 deletions(-)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 66495e0e992..a2799fcdf2e 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -95,12 +95,6 @@
   - app/design/frontend/*/*/template/authorizenet/*
   - app/design/frontend/*/*/template/authorizenet/**/*
 
-'Component: Backup':
-  - app/code/core/Mage/Backup/*
-  - app/code/core/Mage/Backup/**/*
-  - app/design/adminhtml/*/*/template/backup/*
-  - app/design/adminhtml/*/*/template/backup/**/*
-
 'Component: Bundle':
   - app/code/core/Mage/Bundle/*
   - app/code/core/Mage/Bundle/**/*
diff --git a/.github/phpstan-baseline.neon b/.github/phpstan-baseline.neon
index 7f28dc496a3..a08a663d523 100644
--- a/.github/phpstan-baseline.neon
+++ b/.github/phpstan-baseline.neon
@@ -70,16 +70,6 @@ parameters:
 			count: 2
 			path: ../app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php
 
-		-
-			message: "#^Cannot call method addJs\\(\\) on Mage_Core_Block_Abstract\\|false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php
-
-		-
-			message: "#^Method Mage_Adminhtml_Block_Widget_Grid\\:\\:setDefaultSort\\(\\) invoked with 2 parameters, 1 required\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Block/Backup/Grid.php
-
 		-
 			message: "#^Access to an undefined property Mage_Adminhtml_Block_Catalog_Category_Tab_Design\\:\\:\\$_category\\.$#"
 			count: 1
@@ -2130,91 +2120,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Authorizenet/controllers/Directpost/PaymentController.php
 
-		-
-			message: "#^PHPDoc tag @param has invalid value \\(string fileName\\)\\: Unexpected token \"fileName\", expected variable at offset 61$#"
-			count: 1
-			path: ../app/code/core/Mage/Backup/Model/Backup.php
-
-		-
-			message: "#^PHPDoc tag @param has invalid value \\(string filePath\\)\\: Unexpected token \"filePath\", expected variable at offset 91$#"
-			count: 1
-			path: ../app/code/core/Mage/Backup/Model/Backup.php
-
-		-
-			message: "#^Variable \\$filePath might not be defined\\.$#"
-			count: 4
-			path: ../app/code/core/Mage/Backup/Model/Backup.php
-
-		-
-			message: "#^Call to an undefined method Varien_Data_Collection\\:\\:addTargetDir\\(\\)\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Backup/Model/Fs/Collection.php
-
-		-
-			message: "#^Call to an undefined method Mage_Backup_Interface\\:\\:setRootDir\\(\\)\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Backup/Model/Observer.php
-
-		-
-			message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getFooter\\(\\)\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Backup/Model/Resource/Db.php
-
-		-
-			message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getHeader\\(\\)\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Backup/Model/Resource/Db.php
-
-		-
-			message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getPartInsertSql\\(\\)\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Backup/Model/Resource/Db.php
-
-		-
-			message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getTableCreateScript\\(\\)\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Backup/Model/Resource/Db.php
-
-		-
-			message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getTableCreateSql\\(\\)\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Backup/Model/Resource/Db.php
-
-		-
-			message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getTableDataAfterSql\\(\\)\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Backup/Model/Resource/Db.php
-
-		-
-			message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getTableDataBeforeSql\\(\\)\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Backup/Model/Resource/Db.php
-
-		-
-			message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getTableDropSql\\(\\)\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Backup/Model/Resource/Db.php
-
-		-
-			message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getTableForeignKeysSql\\(\\)\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Backup/Model/Resource/Db.php
-
-		-
-			message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:turnOnReadCommittedMode\\(\\)\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Backup/Model/Resource/Db.php
-
-		-
-			message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:turnOnSerializableMode\\(\\)\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Backup/Model/Resource/Db.php
-
-		-
-			message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#"
-			count: 1
-			path: ../app/code/core/Mage/Backup/Model/Resource/Db.php
-
 		-
 			message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getOptionsCollection\\(\\)\\.$#"
 			count: 1
diff --git a/.github/phpstan.neon b/.github/phpstan.neon
index cc2e2ab76b8..d7ec58221b8 100644
--- a/.github/phpstan.neon
+++ b/.github/phpstan.neon
@@ -11,7 +11,6 @@ parameters:
          - %currentWorkingDirectory%/app/code/core/Mage/Api
          - %currentWorkingDirectory%/app/code/core/Mage/Api2
          - %currentWorkingDirectory%/app/code/core/Mage/Authorizenet
-         - %currentWorkingDirectory%/app/code/core/Mage/Backup
          - %currentWorkingDirectory%/app/code/core/Mage/Bundle
          - %currentWorkingDirectory%/app/code/core/Mage/Captcha
          - %currentWorkingDirectory%/app/code/core/Mage/Catalog
@@ -91,9 +90,6 @@ parameters:
         # Class phpseclib\Net\SSH2 not found.
         - */Paypal/Model/Report/Settlement.php
 
-        # Class backup/db was not found while trying to analyse it
-        - */Adminhtml/controllers/System/BackupController.php
-
         # Dataflow/Model/Convert/Iterator.php
         - */Dataflow/Model/Convert/Iterator.php
 
diff --git a/.phpstorm.meta.php/magento_blocks.meta.php b/.phpstorm.meta.php/magento_blocks.meta.php
index 4dd68013afa..8663cd16289 100644
--- a/.phpstorm.meta.php/magento_blocks.meta.php
+++ b/.phpstorm.meta.php/magento_blocks.meta.php
@@ -22,9 +22,6 @@
             'adminhtml/api_user_edit_tabs' => \Mage_Adminhtml_Block_Api_User_Edit_Tabs::class,
             'adminhtml/api_user_grid' => \Mage_Adminhtml_Block_Api_User_Grid::class,
             'adminhtml/api_users' => \Mage_Adminhtml_Block_Api_Users::class,
-            'adminhtml/backup' => \Mage_Adminhtml_Block_Backup::class,
-            'adminhtml/backup_dialogs' => \Mage_Adminhtml_Block_Backup_Dialogs::class,
-            'adminhtml/backup_grid' => \Mage_Adminhtml_Block_Backup_Grid::class,
             'adminhtml/cache' => \Mage_Adminhtml_Block_Cache::class,
             'adminhtml/cache_additional' => \Mage_Adminhtml_Block_Cache_Additional::class,
             'adminhtml/cache_grid' => \Mage_Adminhtml_Block_Cache_Grid::class,
@@ -279,7 +276,6 @@
             'adminhtml/notification_grid_renderer_severity' => \Mage_Adminhtml_Block_Notification_Grid_Renderer_Severity::class,
             'adminhtml/notification_inbox' => \Mage_Adminhtml_Block_Notification_Inbox::class,
             'adminhtml/notification_security' => \Mage_Adminhtml_Block_Notification_Security::class,
-            'adminhtml/notification_survey' => \Mage_Adminhtml_Block_Notification_Survey::class,
             'adminhtml/notification_toolbar' => \Mage_Adminhtml_Block_Notification_Toolbar::class,
             'adminhtml/notification_window' => \Mage_Adminhtml_Block_Notification_Window::class,
             'adminhtml/page' => \Mage_Adminhtml_Block_Page::class,
@@ -661,10 +657,6 @@
             'adminhtml/system_email_template_grid_renderer_sender' => \Mage_Adminhtml_Block_System_Email_Template_Grid_Renderer_Sender::class,
             'adminhtml/system_email_template_grid_renderer_type' => \Mage_Adminhtml_Block_System_Email_Template_Grid_Renderer_Type::class,
             'adminhtml/system_email_template_preview' => \Mage_Adminhtml_Block_System_Email_Template_Preview::class,
-            'adminhtml/system_store_delete' => \Mage_Adminhtml_Block_System_Store_Delete::class,
-            'adminhtml/system_store_delete_form' => \Mage_Adminhtml_Block_System_Store_Delete_Form::class,
-            'adminhtml/system_store_delete_group' => \Mage_Adminhtml_Block_System_Store_Delete_Group::class,
-            'adminhtml/system_store_delete_website' => \Mage_Adminhtml_Block_System_Store_Delete_Website::class,
             'adminhtml/system_store_edit' => \Mage_Adminhtml_Block_System_Store_Edit::class,
             'adminhtml/system_store_edit_form' => \Mage_Adminhtml_Block_System_Store_Edit_Form::class,
             'adminhtml/system_store_grid' => \Mage_Adminhtml_Block_System_Store_Grid::class,
diff --git a/.phpstorm.meta.php/magento_blocks_methods.meta.php b/.phpstorm.meta.php/magento_blocks_methods.meta.php
index 63fd94080e3..4df72cece0e 100644
--- a/.phpstorm.meta.php/magento_blocks_methods.meta.php
+++ b/.phpstorm.meta.php/magento_blocks_methods.meta.php
@@ -22,9 +22,6 @@
             'adminhtml/api_user_edit_tabs' => \Mage_Adminhtml_Block_Api_User_Edit_Tabs::class,
             'adminhtml/api_user_grid' => \Mage_Adminhtml_Block_Api_User_Grid::class,
             'adminhtml/api_users' => \Mage_Adminhtml_Block_Api_Users::class,
-            'adminhtml/backup' => \Mage_Adminhtml_Block_Backup::class,
-            'adminhtml/backup_dialogs' => \Mage_Adminhtml_Block_Backup_Dialogs::class,
-            'adminhtml/backup_grid' => \Mage_Adminhtml_Block_Backup_Grid::class,
             'adminhtml/cache' => \Mage_Adminhtml_Block_Cache::class,
             'adminhtml/cache_additional' => \Mage_Adminhtml_Block_Cache_Additional::class,
             'adminhtml/cache_grid' => \Mage_Adminhtml_Block_Cache_Grid::class,
@@ -279,7 +276,6 @@
             'adminhtml/notification_grid_renderer_severity' => \Mage_Adminhtml_Block_Notification_Grid_Renderer_Severity::class,
             'adminhtml/notification_inbox' => \Mage_Adminhtml_Block_Notification_Inbox::class,
             'adminhtml/notification_security' => \Mage_Adminhtml_Block_Notification_Security::class,
-            'adminhtml/notification_survey' => \Mage_Adminhtml_Block_Notification_Survey::class,
             'adminhtml/notification_toolbar' => \Mage_Adminhtml_Block_Notification_Toolbar::class,
             'adminhtml/notification_window' => \Mage_Adminhtml_Block_Notification_Window::class,
             'adminhtml/page' => \Mage_Adminhtml_Block_Page::class,
@@ -661,10 +657,6 @@
             'adminhtml/system_email_template_grid_renderer_sender' => \Mage_Adminhtml_Block_System_Email_Template_Grid_Renderer_Sender::class,
             'adminhtml/system_email_template_grid_renderer_type' => \Mage_Adminhtml_Block_System_Email_Template_Grid_Renderer_Type::class,
             'adminhtml/system_email_template_preview' => \Mage_Adminhtml_Block_System_Email_Template_Preview::class,
-            'adminhtml/system_store_delete' => \Mage_Adminhtml_Block_System_Store_Delete::class,
-            'adminhtml/system_store_delete_form' => \Mage_Adminhtml_Block_System_Store_Delete_Form::class,
-            'adminhtml/system_store_delete_group' => \Mage_Adminhtml_Block_System_Store_Delete_Group::class,
-            'adminhtml/system_store_delete_website' => \Mage_Adminhtml_Block_System_Store_Delete_Website::class,
             'adminhtml/system_store_edit' => \Mage_Adminhtml_Block_System_Store_Edit::class,
             'adminhtml/system_store_edit_form' => \Mage_Adminhtml_Block_System_Store_Edit_Form::class,
             'adminhtml/system_store_grid' => \Mage_Adminhtml_Block_System_Store_Grid::class,
diff --git a/.phpstorm.meta.php/magento_helpers.meta.php b/.phpstorm.meta.php/magento_helpers.meta.php
index 0091174c8ad..7aad84e4444 100644
--- a/.phpstorm.meta.php/magento_helpers.meta.php
+++ b/.phpstorm.meta.php/magento_helpers.meta.php
@@ -2,8 +2,8 @@
 namespace PHPSTORM_META {
     override( \Mage::helper(0),
         map( [
-            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'adminnotification' => \Mage_AdminNotification_Helper_Data::class,
+            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'admin/block' => \Mage_Admin_Helper_Block::class,
             'admin' => \Mage_Admin_Helper_Data::class,
             'admin/data' => \Mage_Admin_Helper_Data::class,
@@ -23,32 +23,30 @@
             'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class,
             'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class,
             'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class,
-            'api2' => \Mage_Api2_Helper_Data::class,
             'api2/data' => \Mage_Api2_Helper_Data::class,
-            'api' => \Mage_Api_Helper_Data::class,
+            'api2' => \Mage_Api2_Helper_Data::class,
             'api/data' => \Mage_Api_Helper_Data::class,
+            'api' => \Mage_Api_Helper_Data::class,
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
-            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
-            'captcha/data' => \Mage_Captcha_Helper_Data::class,
+            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'captcha' => \Mage_Captcha_Helper_Data::class,
-            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
+            'captcha/data' => \Mage_Captcha_Helper_Data::class,
             'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
+            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
             'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
-            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class,
+            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class,
             'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class,
             'catalog/category' => \Mage_Catalog_Helper_Category::class,
             'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class,
             'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class,
-            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/data' => \Mage_Catalog_Helper_Data::class,
+            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class,
             'catalog/image' => \Mage_Catalog_Helper_Image::class,
             'catalog/map' => \Mage_Catalog_Helper_Map::class,
@@ -72,8 +70,8 @@
             'cms/data' => \Mage_Cms_Helper_Data::class,
             'cms/page' => \Mage_Cms_Helper_Page::class,
             'cms/wysiwyg_images' => \Mage_Cms_Helper_Wysiwyg_Images::class,
-            'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class,
             'configurableswatches' => \Mage_ConfigurableSwatches_Helper_Data::class,
+            'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class,
             'configurableswatches/list_price' => \Mage_ConfigurableSwatches_Helper_List_Price::class,
             'configurableswatches/mediafallback' => \Mage_ConfigurableSwatches_Helper_Mediafallback::class,
             'configurableswatches/productimg' => \Mage_ConfigurableSwatches_Helper_Productimg::class,
@@ -89,6 +87,7 @@
             'core/hint' => \Mage_Core_Helper_Hint::class,
             'core/http' => \Mage_Core_Helper_Http::class,
             'core/js' => \Mage_Core_Helper_Js::class,
+            'core/security' => \Mage_Core_Helper_Security::class,
             'core/string' => \Mage_Core_Helper_String::class,
             'core/translate' => \Mage_Core_Helper_Translate::class,
             'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class,
@@ -101,57 +100,57 @@
             'customer' => \Mage_Customer_Helper_Data::class,
             'dataflow' => \Mage_Dataflow_Helper_Data::class,
             'dataflow/data' => \Mage_Dataflow_Helper_Data::class,
-            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory' => \Mage_Directory_Helper_Data::class,
+            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory/url' => \Mage_Directory_Helper_Url::class,
             'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class,
             'downloadable' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/data' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/download' => \Mage_Downloadable_Helper_Download::class,
             'downloadable/file' => \Mage_Downloadable_Helper_File::class,
-            'eav' => \Mage_Eav_Helper_Data::class,
             'eav/data' => \Mage_Eav_Helper_Data::class,
+            'eav' => \Mage_Eav_Helper_Data::class,
             'giftmessage' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class,
             'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class,
             'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class,
             'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class,
-            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'importexport' => \Mage_ImportExport_Helper_Data::class,
-            'index/data' => \Mage_Index_Helper_Data::class,
+            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'index' => \Mage_Index_Helper_Data::class,
+            'index/data' => \Mage_Index_Helper_Data::class,
             'install' => \Mage_Install_Helper_Data::class,
             'install/data' => \Mage_Install_Helper_Data::class,
             'log/data' => \Mage_Log_Helper_Data::class,
             'log' => \Mage_Log_Helper_Data::class,
             'media/data' => \Mage_Media_Helper_Data::class,
             'media' => \Mage_Media_Helper_Data::class,
-            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'newsletter' => \Mage_Newsletter_Helper_Data::class,
+            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'oauth' => \Mage_Oauth_Helper_Data::class,
             'oauth/data' => \Mage_Oauth_Helper_Data::class,
             'pagecache' => \Mage_PageCache_Helper_Data::class,
             'pagecache/data' => \Mage_PageCache_Helper_Data::class,
-            'page' => \Mage_Page_Helper_Data::class,
             'page/data' => \Mage_Page_Helper_Data::class,
+            'page' => \Mage_Page_Helper_Data::class,
             'page/html' => \Mage_Page_Helper_Html::class,
             'page/layout' => \Mage_Page_Helper_Layout::class,
-            'payment' => \Mage_Payment_Helper_Data::class,
             'payment/data' => \Mage_Payment_Helper_Data::class,
-            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
+            'payment' => \Mage_Payment_Helper_Data::class,
             'paypaluk' => \Mage_PaypalUk_Helper_Data::class,
+            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
             'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class,
             'paypal/data' => \Mage_Paypal_Helper_Data::class,
             'paypal' => \Mage_Paypal_Helper_Data::class,
             'paypal/hss' => \Mage_Paypal_Helper_Hss::class,
-            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent' => \Mage_Persistent_Helper_Data::class,
+            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent/session' => \Mage_Persistent_Helper_Session::class,
-            'poll/data' => \Mage_Poll_Helper_Data::class,
             'poll' => \Mage_Poll_Helper_Data::class,
-            'productalert' => \Mage_ProductAlert_Helper_Data::class,
+            'poll/data' => \Mage_Poll_Helper_Data::class,
             'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
+            'productalert' => \Mage_ProductAlert_Helper_Data::class,
             'rating' => \Mage_Rating_Helper_Data::class,
             'rating/data' => \Mage_Rating_Helper_Data::class,
             'reports/data' => \Mage_Reports_Helper_Data::class,
@@ -175,10 +174,10 @@
             'sendfriend' => \Mage_Sendfriend_Helper_Data::class,
             'shipping' => \Mage_Shipping_Helper_Data::class,
             'shipping/data' => \Mage_Shipping_Helper_Data::class,
-            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'sitemap' => \Mage_Sitemap_Helper_Data::class,
-            'tag/data' => \Mage_Tag_Helper_Data::class,
+            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'tag' => \Mage_Tag_Helper_Data::class,
+            'tag/data' => \Mage_Tag_Helper_Data::class,
             'tax' => \Mage_Tax_Helper_Data::class,
             'tax/data' => \Mage_Tax_Helper_Data::class,
             'uploader/data' => \Mage_Uploader_Helper_Data::class,
diff --git a/.phpstorm.meta.php/magento_helpers_methods.meta.php b/.phpstorm.meta.php/magento_helpers_methods.meta.php
index 13c7da87fe7..8a0186896e3 100644
--- a/.phpstorm.meta.php/magento_helpers_methods.meta.php
+++ b/.phpstorm.meta.php/magento_helpers_methods.meta.php
@@ -2,8 +2,8 @@
 namespace PHPSTORM_META {
     override( \Mage_Admin_Model_User::_getHelper(0),
         map( [
-            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'adminnotification' => \Mage_AdminNotification_Helper_Data::class,
+            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'admin/block' => \Mage_Admin_Helper_Block::class,
             'admin' => \Mage_Admin_Helper_Data::class,
             'admin/data' => \Mage_Admin_Helper_Data::class,
@@ -23,32 +23,30 @@
             'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class,
             'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class,
             'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class,
-            'api2' => \Mage_Api2_Helper_Data::class,
             'api2/data' => \Mage_Api2_Helper_Data::class,
-            'api' => \Mage_Api_Helper_Data::class,
+            'api2' => \Mage_Api2_Helper_Data::class,
             'api/data' => \Mage_Api_Helper_Data::class,
+            'api' => \Mage_Api_Helper_Data::class,
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
-            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
-            'captcha/data' => \Mage_Captcha_Helper_Data::class,
+            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'captcha' => \Mage_Captcha_Helper_Data::class,
-            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
+            'captcha/data' => \Mage_Captcha_Helper_Data::class,
             'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
+            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
             'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
-            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class,
+            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class,
             'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class,
             'catalog/category' => \Mage_Catalog_Helper_Category::class,
             'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class,
             'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class,
-            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/data' => \Mage_Catalog_Helper_Data::class,
+            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class,
             'catalog/image' => \Mage_Catalog_Helper_Image::class,
             'catalog/map' => \Mage_Catalog_Helper_Map::class,
@@ -62,8 +60,8 @@
             'catalog/product_url' => \Mage_Catalog_Helper_Product_Url::class,
             'catalog/product_url_rewrite' => \Mage_Catalog_Helper_Product_Url_Rewrite::class,
             'catalog/product_view' => \Mage_Catalog_Helper_Product_View::class,
-            'centinel/data' => \Mage_Centinel_Helper_Data::class,
             'centinel' => \Mage_Centinel_Helper_Data::class,
+            'centinel/data' => \Mage_Centinel_Helper_Data::class,
             'checkout/cart' => \Mage_Checkout_Helper_Cart::class,
             'checkout' => \Mage_Checkout_Helper_Data::class,
             'checkout/data' => \Mage_Checkout_Helper_Data::class,
@@ -89,6 +87,7 @@
             'core/hint' => \Mage_Core_Helper_Hint::class,
             'core/http' => \Mage_Core_Helper_Http::class,
             'core/js' => \Mage_Core_Helper_Js::class,
+            'core/security' => \Mage_Core_Helper_Security::class,
             'core/string' => \Mage_Core_Helper_String::class,
             'core/translate' => \Mage_Core_Helper_Translate::class,
             'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class,
@@ -101,57 +100,57 @@
             'customer' => \Mage_Customer_Helper_Data::class,
             'dataflow' => \Mage_Dataflow_Helper_Data::class,
             'dataflow/data' => \Mage_Dataflow_Helper_Data::class,
-            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory' => \Mage_Directory_Helper_Data::class,
+            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory/url' => \Mage_Directory_Helper_Url::class,
             'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class,
             'downloadable' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/data' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/download' => \Mage_Downloadable_Helper_Download::class,
             'downloadable/file' => \Mage_Downloadable_Helper_File::class,
-            'eav' => \Mage_Eav_Helper_Data::class,
             'eav/data' => \Mage_Eav_Helper_Data::class,
+            'eav' => \Mage_Eav_Helper_Data::class,
             'giftmessage' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class,
             'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class,
             'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class,
             'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class,
-            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'importexport' => \Mage_ImportExport_Helper_Data::class,
-            'index/data' => \Mage_Index_Helper_Data::class,
+            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'index' => \Mage_Index_Helper_Data::class,
+            'index/data' => \Mage_Index_Helper_Data::class,
             'install' => \Mage_Install_Helper_Data::class,
             'install/data' => \Mage_Install_Helper_Data::class,
             'log/data' => \Mage_Log_Helper_Data::class,
             'log' => \Mage_Log_Helper_Data::class,
             'media/data' => \Mage_Media_Helper_Data::class,
             'media' => \Mage_Media_Helper_Data::class,
-            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'newsletter' => \Mage_Newsletter_Helper_Data::class,
+            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'oauth' => \Mage_Oauth_Helper_Data::class,
             'oauth/data' => \Mage_Oauth_Helper_Data::class,
             'pagecache' => \Mage_PageCache_Helper_Data::class,
             'pagecache/data' => \Mage_PageCache_Helper_Data::class,
-            'page' => \Mage_Page_Helper_Data::class,
             'page/data' => \Mage_Page_Helper_Data::class,
+            'page' => \Mage_Page_Helper_Data::class,
             'page/html' => \Mage_Page_Helper_Html::class,
             'page/layout' => \Mage_Page_Helper_Layout::class,
-            'payment' => \Mage_Payment_Helper_Data::class,
             'payment/data' => \Mage_Payment_Helper_Data::class,
-            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
+            'payment' => \Mage_Payment_Helper_Data::class,
             'paypaluk' => \Mage_PaypalUk_Helper_Data::class,
+            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
             'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class,
             'paypal/data' => \Mage_Paypal_Helper_Data::class,
             'paypal' => \Mage_Paypal_Helper_Data::class,
             'paypal/hss' => \Mage_Paypal_Helper_Hss::class,
-            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent' => \Mage_Persistent_Helper_Data::class,
+            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent/session' => \Mage_Persistent_Helper_Session::class,
-            'poll/data' => \Mage_Poll_Helper_Data::class,
             'poll' => \Mage_Poll_Helper_Data::class,
-            'productalert' => \Mage_ProductAlert_Helper_Data::class,
+            'poll/data' => \Mage_Poll_Helper_Data::class,
             'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
+            'productalert' => \Mage_ProductAlert_Helper_Data::class,
             'rating' => \Mage_Rating_Helper_Data::class,
             'rating/data' => \Mage_Rating_Helper_Data::class,
             'reports/data' => \Mage_Reports_Helper_Data::class,
@@ -175,10 +174,10 @@
             'sendfriend' => \Mage_Sendfriend_Helper_Data::class,
             'shipping' => \Mage_Shipping_Helper_Data::class,
             'shipping/data' => \Mage_Shipping_Helper_Data::class,
-            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'sitemap' => \Mage_Sitemap_Helper_Data::class,
-            'tag/data' => \Mage_Tag_Helper_Data::class,
+            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'tag' => \Mage_Tag_Helper_Data::class,
+            'tag/data' => \Mage_Tag_Helper_Data::class,
             'tax' => \Mage_Tax_Helper_Data::class,
             'tax/data' => \Mage_Tax_Helper_Data::class,
             'uploader/data' => \Mage_Uploader_Helper_Data::class,
@@ -196,8 +195,8 @@
     );
     override( \Mage_Adminhtml_Controller_Rss_Abstract::_getHelper(0),
         map( [
-            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'adminnotification' => \Mage_AdminNotification_Helper_Data::class,
+            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'admin/block' => \Mage_Admin_Helper_Block::class,
             'admin' => \Mage_Admin_Helper_Data::class,
             'admin/data' => \Mage_Admin_Helper_Data::class,
@@ -217,32 +216,30 @@
             'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class,
             'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class,
             'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class,
-            'api2' => \Mage_Api2_Helper_Data::class,
             'api2/data' => \Mage_Api2_Helper_Data::class,
-            'api' => \Mage_Api_Helper_Data::class,
+            'api2' => \Mage_Api2_Helper_Data::class,
             'api/data' => \Mage_Api_Helper_Data::class,
+            'api' => \Mage_Api_Helper_Data::class,
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
-            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
-            'captcha/data' => \Mage_Captcha_Helper_Data::class,
+            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'captcha' => \Mage_Captcha_Helper_Data::class,
-            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
+            'captcha/data' => \Mage_Captcha_Helper_Data::class,
             'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
+            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
             'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
-            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class,
+            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class,
             'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class,
             'catalog/category' => \Mage_Catalog_Helper_Category::class,
             'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class,
             'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class,
-            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/data' => \Mage_Catalog_Helper_Data::class,
+            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class,
             'catalog/image' => \Mage_Catalog_Helper_Image::class,
             'catalog/map' => \Mage_Catalog_Helper_Map::class,
@@ -266,8 +263,8 @@
             'cms/data' => \Mage_Cms_Helper_Data::class,
             'cms/page' => \Mage_Cms_Helper_Page::class,
             'cms/wysiwyg_images' => \Mage_Cms_Helper_Wysiwyg_Images::class,
-            'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class,
             'configurableswatches' => \Mage_ConfigurableSwatches_Helper_Data::class,
+            'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class,
             'configurableswatches/list_price' => \Mage_ConfigurableSwatches_Helper_List_Price::class,
             'configurableswatches/mediafallback' => \Mage_ConfigurableSwatches_Helper_Mediafallback::class,
             'configurableswatches/productimg' => \Mage_ConfigurableSwatches_Helper_Productimg::class,
@@ -283,6 +280,7 @@
             'core/hint' => \Mage_Core_Helper_Hint::class,
             'core/http' => \Mage_Core_Helper_Http::class,
             'core/js' => \Mage_Core_Helper_Js::class,
+            'core/security' => \Mage_Core_Helper_Security::class,
             'core/string' => \Mage_Core_Helper_String::class,
             'core/translate' => \Mage_Core_Helper_Translate::class,
             'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class,
@@ -295,57 +293,57 @@
             'customer' => \Mage_Customer_Helper_Data::class,
             'dataflow' => \Mage_Dataflow_Helper_Data::class,
             'dataflow/data' => \Mage_Dataflow_Helper_Data::class,
-            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory' => \Mage_Directory_Helper_Data::class,
+            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory/url' => \Mage_Directory_Helper_Url::class,
             'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class,
             'downloadable' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/data' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/download' => \Mage_Downloadable_Helper_Download::class,
             'downloadable/file' => \Mage_Downloadable_Helper_File::class,
-            'eav' => \Mage_Eav_Helper_Data::class,
             'eav/data' => \Mage_Eav_Helper_Data::class,
+            'eav' => \Mage_Eav_Helper_Data::class,
             'giftmessage' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class,
             'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class,
             'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class,
             'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class,
-            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'importexport' => \Mage_ImportExport_Helper_Data::class,
-            'index/data' => \Mage_Index_Helper_Data::class,
+            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'index' => \Mage_Index_Helper_Data::class,
+            'index/data' => \Mage_Index_Helper_Data::class,
             'install' => \Mage_Install_Helper_Data::class,
             'install/data' => \Mage_Install_Helper_Data::class,
             'log/data' => \Mage_Log_Helper_Data::class,
             'log' => \Mage_Log_Helper_Data::class,
             'media/data' => \Mage_Media_Helper_Data::class,
             'media' => \Mage_Media_Helper_Data::class,
-            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'newsletter' => \Mage_Newsletter_Helper_Data::class,
+            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'oauth' => \Mage_Oauth_Helper_Data::class,
             'oauth/data' => \Mage_Oauth_Helper_Data::class,
             'pagecache' => \Mage_PageCache_Helper_Data::class,
             'pagecache/data' => \Mage_PageCache_Helper_Data::class,
-            'page' => \Mage_Page_Helper_Data::class,
             'page/data' => \Mage_Page_Helper_Data::class,
+            'page' => \Mage_Page_Helper_Data::class,
             'page/html' => \Mage_Page_Helper_Html::class,
             'page/layout' => \Mage_Page_Helper_Layout::class,
-            'payment' => \Mage_Payment_Helper_Data::class,
             'payment/data' => \Mage_Payment_Helper_Data::class,
-            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
+            'payment' => \Mage_Payment_Helper_Data::class,
             'paypaluk' => \Mage_PaypalUk_Helper_Data::class,
+            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
             'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class,
             'paypal/data' => \Mage_Paypal_Helper_Data::class,
             'paypal' => \Mage_Paypal_Helper_Data::class,
             'paypal/hss' => \Mage_Paypal_Helper_Hss::class,
-            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent' => \Mage_Persistent_Helper_Data::class,
+            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent/session' => \Mage_Persistent_Helper_Session::class,
-            'poll/data' => \Mage_Poll_Helper_Data::class,
             'poll' => \Mage_Poll_Helper_Data::class,
-            'productalert' => \Mage_ProductAlert_Helper_Data::class,
+            'poll/data' => \Mage_Poll_Helper_Data::class,
             'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
+            'productalert' => \Mage_ProductAlert_Helper_Data::class,
             'rating' => \Mage_Rating_Helper_Data::class,
             'rating/data' => \Mage_Rating_Helper_Data::class,
             'reports/data' => \Mage_Reports_Helper_Data::class,
@@ -369,10 +367,10 @@
             'sendfriend' => \Mage_Sendfriend_Helper_Data::class,
             'shipping' => \Mage_Shipping_Helper_Data::class,
             'shipping/data' => \Mage_Shipping_Helper_Data::class,
-            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'sitemap' => \Mage_Sitemap_Helper_Data::class,
-            'tag/data' => \Mage_Tag_Helper_Data::class,
+            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'tag' => \Mage_Tag_Helper_Data::class,
+            'tag/data' => \Mage_Tag_Helper_Data::class,
             'tax' => \Mage_Tax_Helper_Data::class,
             'tax/data' => \Mage_Tax_Helper_Data::class,
             'uploader/data' => \Mage_Uploader_Helper_Data::class,
@@ -390,8 +388,8 @@
     );
     override( \Mage_Adminhtml_Tax_RuleController::_getHelperModel(0),
         map( [
-            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'adminnotification' => \Mage_AdminNotification_Helper_Data::class,
+            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'admin/block' => \Mage_Admin_Helper_Block::class,
             'admin' => \Mage_Admin_Helper_Data::class,
             'admin/data' => \Mage_Admin_Helper_Data::class,
@@ -411,32 +409,30 @@
             'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class,
             'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class,
             'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class,
-            'api2' => \Mage_Api2_Helper_Data::class,
             'api2/data' => \Mage_Api2_Helper_Data::class,
-            'api' => \Mage_Api_Helper_Data::class,
+            'api2' => \Mage_Api2_Helper_Data::class,
             'api/data' => \Mage_Api_Helper_Data::class,
+            'api' => \Mage_Api_Helper_Data::class,
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
-            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
-            'captcha/data' => \Mage_Captcha_Helper_Data::class,
+            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'captcha' => \Mage_Captcha_Helper_Data::class,
-            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
+            'captcha/data' => \Mage_Captcha_Helper_Data::class,
             'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
+            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
             'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
-            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class,
+            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class,
             'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class,
             'catalog/category' => \Mage_Catalog_Helper_Category::class,
             'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class,
             'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class,
-            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/data' => \Mage_Catalog_Helper_Data::class,
+            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class,
             'catalog/image' => \Mage_Catalog_Helper_Image::class,
             'catalog/map' => \Mage_Catalog_Helper_Map::class,
@@ -450,8 +446,8 @@
             'catalog/product_url' => \Mage_Catalog_Helper_Product_Url::class,
             'catalog/product_url_rewrite' => \Mage_Catalog_Helper_Product_Url_Rewrite::class,
             'catalog/product_view' => \Mage_Catalog_Helper_Product_View::class,
-            'centinel/data' => \Mage_Centinel_Helper_Data::class,
             'centinel' => \Mage_Centinel_Helper_Data::class,
+            'centinel/data' => \Mage_Centinel_Helper_Data::class,
             'checkout/cart' => \Mage_Checkout_Helper_Cart::class,
             'checkout' => \Mage_Checkout_Helper_Data::class,
             'checkout/data' => \Mage_Checkout_Helper_Data::class,
@@ -477,6 +473,7 @@
             'core/hint' => \Mage_Core_Helper_Hint::class,
             'core/http' => \Mage_Core_Helper_Http::class,
             'core/js' => \Mage_Core_Helper_Js::class,
+            'core/security' => \Mage_Core_Helper_Security::class,
             'core/string' => \Mage_Core_Helper_String::class,
             'core/translate' => \Mage_Core_Helper_Translate::class,
             'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class,
@@ -489,57 +486,57 @@
             'customer' => \Mage_Customer_Helper_Data::class,
             'dataflow' => \Mage_Dataflow_Helper_Data::class,
             'dataflow/data' => \Mage_Dataflow_Helper_Data::class,
-            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory' => \Mage_Directory_Helper_Data::class,
+            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory/url' => \Mage_Directory_Helper_Url::class,
             'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class,
             'downloadable' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/data' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/download' => \Mage_Downloadable_Helper_Download::class,
             'downloadable/file' => \Mage_Downloadable_Helper_File::class,
-            'eav' => \Mage_Eav_Helper_Data::class,
             'eav/data' => \Mage_Eav_Helper_Data::class,
+            'eav' => \Mage_Eav_Helper_Data::class,
             'giftmessage' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class,
             'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class,
             'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class,
             'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class,
-            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'importexport' => \Mage_ImportExport_Helper_Data::class,
-            'index/data' => \Mage_Index_Helper_Data::class,
+            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'index' => \Mage_Index_Helper_Data::class,
+            'index/data' => \Mage_Index_Helper_Data::class,
             'install' => \Mage_Install_Helper_Data::class,
             'install/data' => \Mage_Install_Helper_Data::class,
             'log/data' => \Mage_Log_Helper_Data::class,
             'log' => \Mage_Log_Helper_Data::class,
             'media/data' => \Mage_Media_Helper_Data::class,
             'media' => \Mage_Media_Helper_Data::class,
-            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'newsletter' => \Mage_Newsletter_Helper_Data::class,
+            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'oauth' => \Mage_Oauth_Helper_Data::class,
             'oauth/data' => \Mage_Oauth_Helper_Data::class,
             'pagecache' => \Mage_PageCache_Helper_Data::class,
             'pagecache/data' => \Mage_PageCache_Helper_Data::class,
-            'page' => \Mage_Page_Helper_Data::class,
             'page/data' => \Mage_Page_Helper_Data::class,
+            'page' => \Mage_Page_Helper_Data::class,
             'page/html' => \Mage_Page_Helper_Html::class,
             'page/layout' => \Mage_Page_Helper_Layout::class,
-            'payment' => \Mage_Payment_Helper_Data::class,
             'payment/data' => \Mage_Payment_Helper_Data::class,
-            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
+            'payment' => \Mage_Payment_Helper_Data::class,
             'paypaluk' => \Mage_PaypalUk_Helper_Data::class,
+            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
             'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class,
             'paypal/data' => \Mage_Paypal_Helper_Data::class,
             'paypal' => \Mage_Paypal_Helper_Data::class,
             'paypal/hss' => \Mage_Paypal_Helper_Hss::class,
-            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent' => \Mage_Persistent_Helper_Data::class,
+            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent/session' => \Mage_Persistent_Helper_Session::class,
-            'poll/data' => \Mage_Poll_Helper_Data::class,
             'poll' => \Mage_Poll_Helper_Data::class,
-            'productalert' => \Mage_ProductAlert_Helper_Data::class,
+            'poll/data' => \Mage_Poll_Helper_Data::class,
             'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
+            'productalert' => \Mage_ProductAlert_Helper_Data::class,
             'rating' => \Mage_Rating_Helper_Data::class,
             'rating/data' => \Mage_Rating_Helper_Data::class,
             'reports/data' => \Mage_Reports_Helper_Data::class,
@@ -563,10 +560,10 @@
             'sendfriend' => \Mage_Sendfriend_Helper_Data::class,
             'shipping' => \Mage_Shipping_Helper_Data::class,
             'shipping/data' => \Mage_Shipping_Helper_Data::class,
-            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'sitemap' => \Mage_Sitemap_Helper_Data::class,
-            'tag/data' => \Mage_Tag_Helper_Data::class,
+            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'tag' => \Mage_Tag_Helper_Data::class,
+            'tag/data' => \Mage_Tag_Helper_Data::class,
             'tax' => \Mage_Tax_Helper_Data::class,
             'tax/data' => \Mage_Tax_Helper_Data::class,
             'uploader/data' => \Mage_Uploader_Helper_Data::class,
@@ -584,8 +581,8 @@
     );
     override( \Mage_Api_Model_User::_getHelper(0),
         map( [
-            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'adminnotification' => \Mage_AdminNotification_Helper_Data::class,
+            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'admin/block' => \Mage_Admin_Helper_Block::class,
             'admin' => \Mage_Admin_Helper_Data::class,
             'admin/data' => \Mage_Admin_Helper_Data::class,
@@ -605,32 +602,30 @@
             'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class,
             'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class,
             'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class,
-            'api2' => \Mage_Api2_Helper_Data::class,
             'api2/data' => \Mage_Api2_Helper_Data::class,
-            'api' => \Mage_Api_Helper_Data::class,
+            'api2' => \Mage_Api2_Helper_Data::class,
             'api/data' => \Mage_Api_Helper_Data::class,
+            'api' => \Mage_Api_Helper_Data::class,
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
-            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
-            'captcha/data' => \Mage_Captcha_Helper_Data::class,
+            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'captcha' => \Mage_Captcha_Helper_Data::class,
-            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
+            'captcha/data' => \Mage_Captcha_Helper_Data::class,
             'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
+            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
             'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
-            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class,
+            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class,
             'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class,
             'catalog/category' => \Mage_Catalog_Helper_Category::class,
             'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class,
             'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class,
-            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/data' => \Mage_Catalog_Helper_Data::class,
+            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class,
             'catalog/image' => \Mage_Catalog_Helper_Image::class,
             'catalog/map' => \Mage_Catalog_Helper_Map::class,
@@ -654,8 +649,8 @@
             'cms/data' => \Mage_Cms_Helper_Data::class,
             'cms/page' => \Mage_Cms_Helper_Page::class,
             'cms/wysiwyg_images' => \Mage_Cms_Helper_Wysiwyg_Images::class,
-            'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class,
             'configurableswatches' => \Mage_ConfigurableSwatches_Helper_Data::class,
+            'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class,
             'configurableswatches/list_price' => \Mage_ConfigurableSwatches_Helper_List_Price::class,
             'configurableswatches/mediafallback' => \Mage_ConfigurableSwatches_Helper_Mediafallback::class,
             'configurableswatches/productimg' => \Mage_ConfigurableSwatches_Helper_Productimg::class,
@@ -671,6 +666,7 @@
             'core/hint' => \Mage_Core_Helper_Hint::class,
             'core/http' => \Mage_Core_Helper_Http::class,
             'core/js' => \Mage_Core_Helper_Js::class,
+            'core/security' => \Mage_Core_Helper_Security::class,
             'core/string' => \Mage_Core_Helper_String::class,
             'core/translate' => \Mage_Core_Helper_Translate::class,
             'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class,
@@ -683,57 +679,57 @@
             'customer' => \Mage_Customer_Helper_Data::class,
             'dataflow' => \Mage_Dataflow_Helper_Data::class,
             'dataflow/data' => \Mage_Dataflow_Helper_Data::class,
-            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory' => \Mage_Directory_Helper_Data::class,
+            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory/url' => \Mage_Directory_Helper_Url::class,
             'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class,
             'downloadable' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/data' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/download' => \Mage_Downloadable_Helper_Download::class,
             'downloadable/file' => \Mage_Downloadable_Helper_File::class,
-            'eav' => \Mage_Eav_Helper_Data::class,
             'eav/data' => \Mage_Eav_Helper_Data::class,
+            'eav' => \Mage_Eav_Helper_Data::class,
             'giftmessage' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class,
             'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class,
             'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class,
             'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class,
-            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'importexport' => \Mage_ImportExport_Helper_Data::class,
-            'index/data' => \Mage_Index_Helper_Data::class,
+            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'index' => \Mage_Index_Helper_Data::class,
+            'index/data' => \Mage_Index_Helper_Data::class,
             'install' => \Mage_Install_Helper_Data::class,
             'install/data' => \Mage_Install_Helper_Data::class,
             'log/data' => \Mage_Log_Helper_Data::class,
             'log' => \Mage_Log_Helper_Data::class,
             'media/data' => \Mage_Media_Helper_Data::class,
             'media' => \Mage_Media_Helper_Data::class,
-            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'newsletter' => \Mage_Newsletter_Helper_Data::class,
+            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'oauth' => \Mage_Oauth_Helper_Data::class,
             'oauth/data' => \Mage_Oauth_Helper_Data::class,
             'pagecache' => \Mage_PageCache_Helper_Data::class,
             'pagecache/data' => \Mage_PageCache_Helper_Data::class,
-            'page' => \Mage_Page_Helper_Data::class,
             'page/data' => \Mage_Page_Helper_Data::class,
+            'page' => \Mage_Page_Helper_Data::class,
             'page/html' => \Mage_Page_Helper_Html::class,
             'page/layout' => \Mage_Page_Helper_Layout::class,
-            'payment' => \Mage_Payment_Helper_Data::class,
             'payment/data' => \Mage_Payment_Helper_Data::class,
-            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
+            'payment' => \Mage_Payment_Helper_Data::class,
             'paypaluk' => \Mage_PaypalUk_Helper_Data::class,
+            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
             'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class,
             'paypal/data' => \Mage_Paypal_Helper_Data::class,
             'paypal' => \Mage_Paypal_Helper_Data::class,
             'paypal/hss' => \Mage_Paypal_Helper_Hss::class,
-            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent' => \Mage_Persistent_Helper_Data::class,
+            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent/session' => \Mage_Persistent_Helper_Session::class,
-            'poll/data' => \Mage_Poll_Helper_Data::class,
             'poll' => \Mage_Poll_Helper_Data::class,
-            'productalert' => \Mage_ProductAlert_Helper_Data::class,
+            'poll/data' => \Mage_Poll_Helper_Data::class,
             'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
+            'productalert' => \Mage_ProductAlert_Helper_Data::class,
             'rating' => \Mage_Rating_Helper_Data::class,
             'rating/data' => \Mage_Rating_Helper_Data::class,
             'reports/data' => \Mage_Reports_Helper_Data::class,
@@ -757,10 +753,10 @@
             'sendfriend' => \Mage_Sendfriend_Helper_Data::class,
             'shipping' => \Mage_Shipping_Helper_Data::class,
             'shipping/data' => \Mage_Shipping_Helper_Data::class,
-            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'sitemap' => \Mage_Sitemap_Helper_Data::class,
-            'tag/data' => \Mage_Tag_Helper_Data::class,
+            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'tag' => \Mage_Tag_Helper_Data::class,
+            'tag/data' => \Mage_Tag_Helper_Data::class,
             'tax' => \Mage_Tax_Helper_Data::class,
             'tax/data' => \Mage_Tax_Helper_Data::class,
             'uploader/data' => \Mage_Uploader_Helper_Data::class,
@@ -778,8 +774,8 @@
     );
     override( \Mage_Bundle_Model_Product_Price::_getHelperData(0),
         map( [
-            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'adminnotification' => \Mage_AdminNotification_Helper_Data::class,
+            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'admin/block' => \Mage_Admin_Helper_Block::class,
             'admin' => \Mage_Admin_Helper_Data::class,
             'admin/data' => \Mage_Admin_Helper_Data::class,
@@ -799,32 +795,30 @@
             'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class,
             'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class,
             'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class,
-            'api2' => \Mage_Api2_Helper_Data::class,
             'api2/data' => \Mage_Api2_Helper_Data::class,
-            'api' => \Mage_Api_Helper_Data::class,
+            'api2' => \Mage_Api2_Helper_Data::class,
             'api/data' => \Mage_Api_Helper_Data::class,
+            'api' => \Mage_Api_Helper_Data::class,
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
-            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
-            'captcha/data' => \Mage_Captcha_Helper_Data::class,
+            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'captcha' => \Mage_Captcha_Helper_Data::class,
-            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
+            'captcha/data' => \Mage_Captcha_Helper_Data::class,
             'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
+            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
             'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
-            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class,
+            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class,
             'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class,
             'catalog/category' => \Mage_Catalog_Helper_Category::class,
             'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class,
             'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class,
-            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/data' => \Mage_Catalog_Helper_Data::class,
+            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class,
             'catalog/image' => \Mage_Catalog_Helper_Image::class,
             'catalog/map' => \Mage_Catalog_Helper_Map::class,
@@ -838,8 +832,8 @@
             'catalog/product_url' => \Mage_Catalog_Helper_Product_Url::class,
             'catalog/product_url_rewrite' => \Mage_Catalog_Helper_Product_Url_Rewrite::class,
             'catalog/product_view' => \Mage_Catalog_Helper_Product_View::class,
-            'centinel/data' => \Mage_Centinel_Helper_Data::class,
             'centinel' => \Mage_Centinel_Helper_Data::class,
+            'centinel/data' => \Mage_Centinel_Helper_Data::class,
             'checkout/cart' => \Mage_Checkout_Helper_Cart::class,
             'checkout' => \Mage_Checkout_Helper_Data::class,
             'checkout/data' => \Mage_Checkout_Helper_Data::class,
@@ -865,6 +859,7 @@
             'core/hint' => \Mage_Core_Helper_Hint::class,
             'core/http' => \Mage_Core_Helper_Http::class,
             'core/js' => \Mage_Core_Helper_Js::class,
+            'core/security' => \Mage_Core_Helper_Security::class,
             'core/string' => \Mage_Core_Helper_String::class,
             'core/translate' => \Mage_Core_Helper_Translate::class,
             'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class,
@@ -877,57 +872,57 @@
             'customer' => \Mage_Customer_Helper_Data::class,
             'dataflow' => \Mage_Dataflow_Helper_Data::class,
             'dataflow/data' => \Mage_Dataflow_Helper_Data::class,
-            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory' => \Mage_Directory_Helper_Data::class,
+            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory/url' => \Mage_Directory_Helper_Url::class,
             'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class,
             'downloadable' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/data' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/download' => \Mage_Downloadable_Helper_Download::class,
             'downloadable/file' => \Mage_Downloadable_Helper_File::class,
-            'eav' => \Mage_Eav_Helper_Data::class,
             'eav/data' => \Mage_Eav_Helper_Data::class,
+            'eav' => \Mage_Eav_Helper_Data::class,
             'giftmessage' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class,
             'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class,
             'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class,
             'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class,
-            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'importexport' => \Mage_ImportExport_Helper_Data::class,
-            'index/data' => \Mage_Index_Helper_Data::class,
+            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'index' => \Mage_Index_Helper_Data::class,
+            'index/data' => \Mage_Index_Helper_Data::class,
             'install' => \Mage_Install_Helper_Data::class,
             'install/data' => \Mage_Install_Helper_Data::class,
             'log/data' => \Mage_Log_Helper_Data::class,
             'log' => \Mage_Log_Helper_Data::class,
             'media/data' => \Mage_Media_Helper_Data::class,
             'media' => \Mage_Media_Helper_Data::class,
-            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'newsletter' => \Mage_Newsletter_Helper_Data::class,
+            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'oauth' => \Mage_Oauth_Helper_Data::class,
             'oauth/data' => \Mage_Oauth_Helper_Data::class,
             'pagecache' => \Mage_PageCache_Helper_Data::class,
             'pagecache/data' => \Mage_PageCache_Helper_Data::class,
-            'page' => \Mage_Page_Helper_Data::class,
             'page/data' => \Mage_Page_Helper_Data::class,
+            'page' => \Mage_Page_Helper_Data::class,
             'page/html' => \Mage_Page_Helper_Html::class,
             'page/layout' => \Mage_Page_Helper_Layout::class,
-            'payment' => \Mage_Payment_Helper_Data::class,
             'payment/data' => \Mage_Payment_Helper_Data::class,
-            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
+            'payment' => \Mage_Payment_Helper_Data::class,
             'paypaluk' => \Mage_PaypalUk_Helper_Data::class,
+            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
             'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class,
             'paypal/data' => \Mage_Paypal_Helper_Data::class,
             'paypal' => \Mage_Paypal_Helper_Data::class,
             'paypal/hss' => \Mage_Paypal_Helper_Hss::class,
-            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent' => \Mage_Persistent_Helper_Data::class,
+            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent/session' => \Mage_Persistent_Helper_Session::class,
-            'poll/data' => \Mage_Poll_Helper_Data::class,
             'poll' => \Mage_Poll_Helper_Data::class,
-            'productalert' => \Mage_ProductAlert_Helper_Data::class,
+            'poll/data' => \Mage_Poll_Helper_Data::class,
             'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
+            'productalert' => \Mage_ProductAlert_Helper_Data::class,
             'rating' => \Mage_Rating_Helper_Data::class,
             'rating/data' => \Mage_Rating_Helper_Data::class,
             'reports/data' => \Mage_Reports_Helper_Data::class,
@@ -951,10 +946,10 @@
             'sendfriend' => \Mage_Sendfriend_Helper_Data::class,
             'shipping' => \Mage_Shipping_Helper_Data::class,
             'shipping/data' => \Mage_Shipping_Helper_Data::class,
-            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'sitemap' => \Mage_Sitemap_Helper_Data::class,
-            'tag/data' => \Mage_Tag_Helper_Data::class,
+            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'tag' => \Mage_Tag_Helper_Data::class,
+            'tag/data' => \Mage_Tag_Helper_Data::class,
             'tax' => \Mage_Tax_Helper_Data::class,
             'tax/data' => \Mage_Tax_Helper_Data::class,
             'uploader/data' => \Mage_Uploader_Helper_Data::class,
@@ -972,8 +967,8 @@
     );
     override( \Mage_Core_Block_Abstract::helper(0),
         map( [
-            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'adminnotification' => \Mage_AdminNotification_Helper_Data::class,
+            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'admin/block' => \Mage_Admin_Helper_Block::class,
             'admin' => \Mage_Admin_Helper_Data::class,
             'admin/data' => \Mage_Admin_Helper_Data::class,
@@ -993,32 +988,30 @@
             'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class,
             'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class,
             'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class,
-            'api2' => \Mage_Api2_Helper_Data::class,
             'api2/data' => \Mage_Api2_Helper_Data::class,
-            'api' => \Mage_Api_Helper_Data::class,
+            'api2' => \Mage_Api2_Helper_Data::class,
             'api/data' => \Mage_Api_Helper_Data::class,
+            'api' => \Mage_Api_Helper_Data::class,
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
-            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
-            'captcha/data' => \Mage_Captcha_Helper_Data::class,
+            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'captcha' => \Mage_Captcha_Helper_Data::class,
-            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
+            'captcha/data' => \Mage_Captcha_Helper_Data::class,
             'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
+            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
             'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
-            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class,
+            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class,
             'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class,
             'catalog/category' => \Mage_Catalog_Helper_Category::class,
             'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class,
             'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class,
-            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/data' => \Mage_Catalog_Helper_Data::class,
+            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class,
             'catalog/image' => \Mage_Catalog_Helper_Image::class,
             'catalog/map' => \Mage_Catalog_Helper_Map::class,
@@ -1042,8 +1035,8 @@
             'cms/data' => \Mage_Cms_Helper_Data::class,
             'cms/page' => \Mage_Cms_Helper_Page::class,
             'cms/wysiwyg_images' => \Mage_Cms_Helper_Wysiwyg_Images::class,
-            'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class,
             'configurableswatches' => \Mage_ConfigurableSwatches_Helper_Data::class,
+            'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class,
             'configurableswatches/list_price' => \Mage_ConfigurableSwatches_Helper_List_Price::class,
             'configurableswatches/mediafallback' => \Mage_ConfigurableSwatches_Helper_Mediafallback::class,
             'configurableswatches/productimg' => \Mage_ConfigurableSwatches_Helper_Productimg::class,
@@ -1059,6 +1052,7 @@
             'core/hint' => \Mage_Core_Helper_Hint::class,
             'core/http' => \Mage_Core_Helper_Http::class,
             'core/js' => \Mage_Core_Helper_Js::class,
+            'core/security' => \Mage_Core_Helper_Security::class,
             'core/string' => \Mage_Core_Helper_String::class,
             'core/translate' => \Mage_Core_Helper_Translate::class,
             'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class,
@@ -1071,57 +1065,57 @@
             'customer' => \Mage_Customer_Helper_Data::class,
             'dataflow' => \Mage_Dataflow_Helper_Data::class,
             'dataflow/data' => \Mage_Dataflow_Helper_Data::class,
-            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory' => \Mage_Directory_Helper_Data::class,
+            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory/url' => \Mage_Directory_Helper_Url::class,
             'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class,
             'downloadable' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/data' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/download' => \Mage_Downloadable_Helper_Download::class,
             'downloadable/file' => \Mage_Downloadable_Helper_File::class,
-            'eav' => \Mage_Eav_Helper_Data::class,
             'eav/data' => \Mage_Eav_Helper_Data::class,
+            'eav' => \Mage_Eav_Helper_Data::class,
             'giftmessage' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class,
             'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class,
             'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class,
             'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class,
-            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'importexport' => \Mage_ImportExport_Helper_Data::class,
-            'index/data' => \Mage_Index_Helper_Data::class,
+            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'index' => \Mage_Index_Helper_Data::class,
+            'index/data' => \Mage_Index_Helper_Data::class,
             'install' => \Mage_Install_Helper_Data::class,
             'install/data' => \Mage_Install_Helper_Data::class,
             'log/data' => \Mage_Log_Helper_Data::class,
             'log' => \Mage_Log_Helper_Data::class,
             'media/data' => \Mage_Media_Helper_Data::class,
             'media' => \Mage_Media_Helper_Data::class,
-            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'newsletter' => \Mage_Newsletter_Helper_Data::class,
+            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'oauth' => \Mage_Oauth_Helper_Data::class,
             'oauth/data' => \Mage_Oauth_Helper_Data::class,
             'pagecache' => \Mage_PageCache_Helper_Data::class,
             'pagecache/data' => \Mage_PageCache_Helper_Data::class,
-            'page' => \Mage_Page_Helper_Data::class,
             'page/data' => \Mage_Page_Helper_Data::class,
+            'page' => \Mage_Page_Helper_Data::class,
             'page/html' => \Mage_Page_Helper_Html::class,
             'page/layout' => \Mage_Page_Helper_Layout::class,
-            'payment' => \Mage_Payment_Helper_Data::class,
             'payment/data' => \Mage_Payment_Helper_Data::class,
-            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
+            'payment' => \Mage_Payment_Helper_Data::class,
             'paypaluk' => \Mage_PaypalUk_Helper_Data::class,
+            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
             'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class,
             'paypal/data' => \Mage_Paypal_Helper_Data::class,
             'paypal' => \Mage_Paypal_Helper_Data::class,
             'paypal/hss' => \Mage_Paypal_Helper_Hss::class,
-            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent' => \Mage_Persistent_Helper_Data::class,
+            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent/session' => \Mage_Persistent_Helper_Session::class,
-            'poll/data' => \Mage_Poll_Helper_Data::class,
             'poll' => \Mage_Poll_Helper_Data::class,
-            'productalert' => \Mage_ProductAlert_Helper_Data::class,
+            'poll/data' => \Mage_Poll_Helper_Data::class,
             'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
+            'productalert' => \Mage_ProductAlert_Helper_Data::class,
             'rating' => \Mage_Rating_Helper_Data::class,
             'rating/data' => \Mage_Rating_Helper_Data::class,
             'reports/data' => \Mage_Reports_Helper_Data::class,
@@ -1145,10 +1139,10 @@
             'sendfriend' => \Mage_Sendfriend_Helper_Data::class,
             'shipping' => \Mage_Shipping_Helper_Data::class,
             'shipping/data' => \Mage_Shipping_Helper_Data::class,
-            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'sitemap' => \Mage_Sitemap_Helper_Data::class,
-            'tag/data' => \Mage_Tag_Helper_Data::class,
+            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'tag' => \Mage_Tag_Helper_Data::class,
+            'tag/data' => \Mage_Tag_Helper_Data::class,
             'tax' => \Mage_Tax_Helper_Data::class,
             'tax/data' => \Mage_Tax_Helper_Data::class,
             'uploader/data' => \Mage_Uploader_Helper_Data::class,
@@ -1166,8 +1160,8 @@
     );
     override( \Mage_Core_Model_App::getHelper(0),
         map( [
-            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'adminnotification' => \Mage_AdminNotification_Helper_Data::class,
+            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'admin/block' => \Mage_Admin_Helper_Block::class,
             'admin' => \Mage_Admin_Helper_Data::class,
             'admin/data' => \Mage_Admin_Helper_Data::class,
@@ -1187,32 +1181,30 @@
             'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class,
             'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class,
             'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class,
-            'api2' => \Mage_Api2_Helper_Data::class,
             'api2/data' => \Mage_Api2_Helper_Data::class,
-            'api' => \Mage_Api_Helper_Data::class,
+            'api2' => \Mage_Api2_Helper_Data::class,
             'api/data' => \Mage_Api_Helper_Data::class,
+            'api' => \Mage_Api_Helper_Data::class,
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
-            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
-            'captcha/data' => \Mage_Captcha_Helper_Data::class,
+            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'captcha' => \Mage_Captcha_Helper_Data::class,
-            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
+            'captcha/data' => \Mage_Captcha_Helper_Data::class,
             'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
+            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
             'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
-            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class,
+            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class,
             'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class,
             'catalog/category' => \Mage_Catalog_Helper_Category::class,
             'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class,
             'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class,
-            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/data' => \Mage_Catalog_Helper_Data::class,
+            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class,
             'catalog/image' => \Mage_Catalog_Helper_Image::class,
             'catalog/map' => \Mage_Catalog_Helper_Map::class,
@@ -1226,8 +1218,8 @@
             'catalog/product_url' => \Mage_Catalog_Helper_Product_Url::class,
             'catalog/product_url_rewrite' => \Mage_Catalog_Helper_Product_Url_Rewrite::class,
             'catalog/product_view' => \Mage_Catalog_Helper_Product_View::class,
-            'centinel/data' => \Mage_Centinel_Helper_Data::class,
             'centinel' => \Mage_Centinel_Helper_Data::class,
+            'centinel/data' => \Mage_Centinel_Helper_Data::class,
             'checkout/cart' => \Mage_Checkout_Helper_Cart::class,
             'checkout' => \Mage_Checkout_Helper_Data::class,
             'checkout/data' => \Mage_Checkout_Helper_Data::class,
@@ -1253,6 +1245,7 @@
             'core/hint' => \Mage_Core_Helper_Hint::class,
             'core/http' => \Mage_Core_Helper_Http::class,
             'core/js' => \Mage_Core_Helper_Js::class,
+            'core/security' => \Mage_Core_Helper_Security::class,
             'core/string' => \Mage_Core_Helper_String::class,
             'core/translate' => \Mage_Core_Helper_Translate::class,
             'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class,
@@ -1265,57 +1258,57 @@
             'customer' => \Mage_Customer_Helper_Data::class,
             'dataflow' => \Mage_Dataflow_Helper_Data::class,
             'dataflow/data' => \Mage_Dataflow_Helper_Data::class,
-            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory' => \Mage_Directory_Helper_Data::class,
+            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory/url' => \Mage_Directory_Helper_Url::class,
             'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class,
             'downloadable' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/data' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/download' => \Mage_Downloadable_Helper_Download::class,
             'downloadable/file' => \Mage_Downloadable_Helper_File::class,
-            'eav' => \Mage_Eav_Helper_Data::class,
             'eav/data' => \Mage_Eav_Helper_Data::class,
+            'eav' => \Mage_Eav_Helper_Data::class,
             'giftmessage' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class,
             'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class,
             'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class,
             'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class,
-            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'importexport' => \Mage_ImportExport_Helper_Data::class,
-            'index/data' => \Mage_Index_Helper_Data::class,
+            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'index' => \Mage_Index_Helper_Data::class,
+            'index/data' => \Mage_Index_Helper_Data::class,
             'install' => \Mage_Install_Helper_Data::class,
             'install/data' => \Mage_Install_Helper_Data::class,
             'log/data' => \Mage_Log_Helper_Data::class,
             'log' => \Mage_Log_Helper_Data::class,
             'media/data' => \Mage_Media_Helper_Data::class,
             'media' => \Mage_Media_Helper_Data::class,
-            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'newsletter' => \Mage_Newsletter_Helper_Data::class,
+            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'oauth' => \Mage_Oauth_Helper_Data::class,
             'oauth/data' => \Mage_Oauth_Helper_Data::class,
             'pagecache' => \Mage_PageCache_Helper_Data::class,
             'pagecache/data' => \Mage_PageCache_Helper_Data::class,
-            'page' => \Mage_Page_Helper_Data::class,
             'page/data' => \Mage_Page_Helper_Data::class,
+            'page' => \Mage_Page_Helper_Data::class,
             'page/html' => \Mage_Page_Helper_Html::class,
             'page/layout' => \Mage_Page_Helper_Layout::class,
-            'payment' => \Mage_Payment_Helper_Data::class,
             'payment/data' => \Mage_Payment_Helper_Data::class,
-            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
+            'payment' => \Mage_Payment_Helper_Data::class,
             'paypaluk' => \Mage_PaypalUk_Helper_Data::class,
+            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
             'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class,
             'paypal/data' => \Mage_Paypal_Helper_Data::class,
             'paypal' => \Mage_Paypal_Helper_Data::class,
             'paypal/hss' => \Mage_Paypal_Helper_Hss::class,
-            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent' => \Mage_Persistent_Helper_Data::class,
+            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent/session' => \Mage_Persistent_Helper_Session::class,
-            'poll/data' => \Mage_Poll_Helper_Data::class,
             'poll' => \Mage_Poll_Helper_Data::class,
-            'productalert' => \Mage_ProductAlert_Helper_Data::class,
+            'poll/data' => \Mage_Poll_Helper_Data::class,
             'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
+            'productalert' => \Mage_ProductAlert_Helper_Data::class,
             'rating' => \Mage_Rating_Helper_Data::class,
             'rating/data' => \Mage_Rating_Helper_Data::class,
             'reports/data' => \Mage_Reports_Helper_Data::class,
@@ -1339,10 +1332,10 @@
             'sendfriend' => \Mage_Sendfriend_Helper_Data::class,
             'shipping' => \Mage_Shipping_Helper_Data::class,
             'shipping/data' => \Mage_Shipping_Helper_Data::class,
-            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'sitemap' => \Mage_Sitemap_Helper_Data::class,
-            'tag/data' => \Mage_Tag_Helper_Data::class,
+            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'tag' => \Mage_Tag_Helper_Data::class,
+            'tag/data' => \Mage_Tag_Helper_Data::class,
             'tax' => \Mage_Tax_Helper_Data::class,
             'tax/data' => \Mage_Tax_Helper_Data::class,
             'uploader/data' => \Mage_Uploader_Helper_Data::class,
@@ -1360,8 +1353,8 @@
     );
     override( \Mage_Core_Model_Factory::getHelper(0),
         map( [
-            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'adminnotification' => \Mage_AdminNotification_Helper_Data::class,
+            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'admin/block' => \Mage_Admin_Helper_Block::class,
             'admin' => \Mage_Admin_Helper_Data::class,
             'admin/data' => \Mage_Admin_Helper_Data::class,
@@ -1381,32 +1374,30 @@
             'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class,
             'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class,
             'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class,
-            'api2' => \Mage_Api2_Helper_Data::class,
             'api2/data' => \Mage_Api2_Helper_Data::class,
-            'api' => \Mage_Api_Helper_Data::class,
+            'api2' => \Mage_Api2_Helper_Data::class,
             'api/data' => \Mage_Api_Helper_Data::class,
+            'api' => \Mage_Api_Helper_Data::class,
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
-            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
-            'captcha/data' => \Mage_Captcha_Helper_Data::class,
+            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'captcha' => \Mage_Captcha_Helper_Data::class,
-            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
+            'captcha/data' => \Mage_Captcha_Helper_Data::class,
             'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
+            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
             'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
-            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class,
+            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class,
             'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class,
             'catalog/category' => \Mage_Catalog_Helper_Category::class,
             'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class,
             'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class,
-            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/data' => \Mage_Catalog_Helper_Data::class,
+            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class,
             'catalog/image' => \Mage_Catalog_Helper_Image::class,
             'catalog/map' => \Mage_Catalog_Helper_Map::class,
@@ -1430,8 +1421,8 @@
             'cms/data' => \Mage_Cms_Helper_Data::class,
             'cms/page' => \Mage_Cms_Helper_Page::class,
             'cms/wysiwyg_images' => \Mage_Cms_Helper_Wysiwyg_Images::class,
-            'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class,
             'configurableswatches' => \Mage_ConfigurableSwatches_Helper_Data::class,
+            'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class,
             'configurableswatches/list_price' => \Mage_ConfigurableSwatches_Helper_List_Price::class,
             'configurableswatches/mediafallback' => \Mage_ConfigurableSwatches_Helper_Mediafallback::class,
             'configurableswatches/productimg' => \Mage_ConfigurableSwatches_Helper_Productimg::class,
@@ -1447,6 +1438,7 @@
             'core/hint' => \Mage_Core_Helper_Hint::class,
             'core/http' => \Mage_Core_Helper_Http::class,
             'core/js' => \Mage_Core_Helper_Js::class,
+            'core/security' => \Mage_Core_Helper_Security::class,
             'core/string' => \Mage_Core_Helper_String::class,
             'core/translate' => \Mage_Core_Helper_Translate::class,
             'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class,
@@ -1459,57 +1451,57 @@
             'customer' => \Mage_Customer_Helper_Data::class,
             'dataflow' => \Mage_Dataflow_Helper_Data::class,
             'dataflow/data' => \Mage_Dataflow_Helper_Data::class,
-            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory' => \Mage_Directory_Helper_Data::class,
+            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory/url' => \Mage_Directory_Helper_Url::class,
             'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class,
             'downloadable' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/data' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/download' => \Mage_Downloadable_Helper_Download::class,
             'downloadable/file' => \Mage_Downloadable_Helper_File::class,
-            'eav' => \Mage_Eav_Helper_Data::class,
             'eav/data' => \Mage_Eav_Helper_Data::class,
+            'eav' => \Mage_Eav_Helper_Data::class,
             'giftmessage' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class,
             'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class,
             'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class,
             'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class,
-            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'importexport' => \Mage_ImportExport_Helper_Data::class,
-            'index/data' => \Mage_Index_Helper_Data::class,
+            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'index' => \Mage_Index_Helper_Data::class,
+            'index/data' => \Mage_Index_Helper_Data::class,
             'install' => \Mage_Install_Helper_Data::class,
             'install/data' => \Mage_Install_Helper_Data::class,
             'log/data' => \Mage_Log_Helper_Data::class,
             'log' => \Mage_Log_Helper_Data::class,
             'media/data' => \Mage_Media_Helper_Data::class,
             'media' => \Mage_Media_Helper_Data::class,
-            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'newsletter' => \Mage_Newsletter_Helper_Data::class,
+            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'oauth' => \Mage_Oauth_Helper_Data::class,
             'oauth/data' => \Mage_Oauth_Helper_Data::class,
             'pagecache' => \Mage_PageCache_Helper_Data::class,
             'pagecache/data' => \Mage_PageCache_Helper_Data::class,
-            'page' => \Mage_Page_Helper_Data::class,
             'page/data' => \Mage_Page_Helper_Data::class,
+            'page' => \Mage_Page_Helper_Data::class,
             'page/html' => \Mage_Page_Helper_Html::class,
             'page/layout' => \Mage_Page_Helper_Layout::class,
-            'payment' => \Mage_Payment_Helper_Data::class,
             'payment/data' => \Mage_Payment_Helper_Data::class,
-            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
+            'payment' => \Mage_Payment_Helper_Data::class,
             'paypaluk' => \Mage_PaypalUk_Helper_Data::class,
+            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
             'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class,
             'paypal/data' => \Mage_Paypal_Helper_Data::class,
             'paypal' => \Mage_Paypal_Helper_Data::class,
             'paypal/hss' => \Mage_Paypal_Helper_Hss::class,
-            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent' => \Mage_Persistent_Helper_Data::class,
+            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent/session' => \Mage_Persistent_Helper_Session::class,
-            'poll/data' => \Mage_Poll_Helper_Data::class,
             'poll' => \Mage_Poll_Helper_Data::class,
-            'productalert' => \Mage_ProductAlert_Helper_Data::class,
+            'poll/data' => \Mage_Poll_Helper_Data::class,
             'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
+            'productalert' => \Mage_ProductAlert_Helper_Data::class,
             'rating' => \Mage_Rating_Helper_Data::class,
             'rating/data' => \Mage_Rating_Helper_Data::class,
             'reports/data' => \Mage_Reports_Helper_Data::class,
@@ -1533,10 +1525,10 @@
             'sendfriend' => \Mage_Sendfriend_Helper_Data::class,
             'shipping' => \Mage_Shipping_Helper_Data::class,
             'shipping/data' => \Mage_Shipping_Helper_Data::class,
-            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'sitemap' => \Mage_Sitemap_Helper_Data::class,
-            'tag/data' => \Mage_Tag_Helper_Data::class,
+            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'tag' => \Mage_Tag_Helper_Data::class,
+            'tag/data' => \Mage_Tag_Helper_Data::class,
             'tax' => \Mage_Tax_Helper_Data::class,
             'tax/data' => \Mage_Tax_Helper_Data::class,
             'uploader/data' => \Mage_Uploader_Helper_Data::class,
@@ -1554,8 +1546,8 @@
     );
     override( \Mage_Core_Model_Layout::helper(0),
         map( [
-            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'adminnotification' => \Mage_AdminNotification_Helper_Data::class,
+            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'admin/block' => \Mage_Admin_Helper_Block::class,
             'admin' => \Mage_Admin_Helper_Data::class,
             'admin/data' => \Mage_Admin_Helper_Data::class,
@@ -1575,32 +1567,30 @@
             'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class,
             'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class,
             'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class,
-            'api2' => \Mage_Api2_Helper_Data::class,
             'api2/data' => \Mage_Api2_Helper_Data::class,
-            'api' => \Mage_Api_Helper_Data::class,
+            'api2' => \Mage_Api2_Helper_Data::class,
             'api/data' => \Mage_Api_Helper_Data::class,
+            'api' => \Mage_Api_Helper_Data::class,
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
-            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
-            'captcha/data' => \Mage_Captcha_Helper_Data::class,
+            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'captcha' => \Mage_Captcha_Helper_Data::class,
-            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
+            'captcha/data' => \Mage_Captcha_Helper_Data::class,
             'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
+            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
             'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
-            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class,
+            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class,
             'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class,
             'catalog/category' => \Mage_Catalog_Helper_Category::class,
             'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class,
             'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class,
-            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/data' => \Mage_Catalog_Helper_Data::class,
+            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class,
             'catalog/image' => \Mage_Catalog_Helper_Image::class,
             'catalog/map' => \Mage_Catalog_Helper_Map::class,
@@ -1614,8 +1604,8 @@
             'catalog/product_url' => \Mage_Catalog_Helper_Product_Url::class,
             'catalog/product_url_rewrite' => \Mage_Catalog_Helper_Product_Url_Rewrite::class,
             'catalog/product_view' => \Mage_Catalog_Helper_Product_View::class,
-            'centinel/data' => \Mage_Centinel_Helper_Data::class,
             'centinel' => \Mage_Centinel_Helper_Data::class,
+            'centinel/data' => \Mage_Centinel_Helper_Data::class,
             'checkout/cart' => \Mage_Checkout_Helper_Cart::class,
             'checkout' => \Mage_Checkout_Helper_Data::class,
             'checkout/data' => \Mage_Checkout_Helper_Data::class,
@@ -1641,6 +1631,7 @@
             'core/hint' => \Mage_Core_Helper_Hint::class,
             'core/http' => \Mage_Core_Helper_Http::class,
             'core/js' => \Mage_Core_Helper_Js::class,
+            'core/security' => \Mage_Core_Helper_Security::class,
             'core/string' => \Mage_Core_Helper_String::class,
             'core/translate' => \Mage_Core_Helper_Translate::class,
             'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class,
@@ -1653,57 +1644,57 @@
             'customer' => \Mage_Customer_Helper_Data::class,
             'dataflow' => \Mage_Dataflow_Helper_Data::class,
             'dataflow/data' => \Mage_Dataflow_Helper_Data::class,
-            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory' => \Mage_Directory_Helper_Data::class,
+            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory/url' => \Mage_Directory_Helper_Url::class,
             'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class,
             'downloadable' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/data' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/download' => \Mage_Downloadable_Helper_Download::class,
             'downloadable/file' => \Mage_Downloadable_Helper_File::class,
-            'eav' => \Mage_Eav_Helper_Data::class,
             'eav/data' => \Mage_Eav_Helper_Data::class,
+            'eav' => \Mage_Eav_Helper_Data::class,
             'giftmessage' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class,
             'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class,
             'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class,
             'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class,
-            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'importexport' => \Mage_ImportExport_Helper_Data::class,
-            'index/data' => \Mage_Index_Helper_Data::class,
+            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'index' => \Mage_Index_Helper_Data::class,
+            'index/data' => \Mage_Index_Helper_Data::class,
             'install' => \Mage_Install_Helper_Data::class,
             'install/data' => \Mage_Install_Helper_Data::class,
             'log/data' => \Mage_Log_Helper_Data::class,
             'log' => \Mage_Log_Helper_Data::class,
             'media/data' => \Mage_Media_Helper_Data::class,
             'media' => \Mage_Media_Helper_Data::class,
-            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'newsletter' => \Mage_Newsletter_Helper_Data::class,
+            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'oauth' => \Mage_Oauth_Helper_Data::class,
             'oauth/data' => \Mage_Oauth_Helper_Data::class,
             'pagecache' => \Mage_PageCache_Helper_Data::class,
             'pagecache/data' => \Mage_PageCache_Helper_Data::class,
-            'page' => \Mage_Page_Helper_Data::class,
             'page/data' => \Mage_Page_Helper_Data::class,
+            'page' => \Mage_Page_Helper_Data::class,
             'page/html' => \Mage_Page_Helper_Html::class,
             'page/layout' => \Mage_Page_Helper_Layout::class,
-            'payment' => \Mage_Payment_Helper_Data::class,
             'payment/data' => \Mage_Payment_Helper_Data::class,
-            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
+            'payment' => \Mage_Payment_Helper_Data::class,
             'paypaluk' => \Mage_PaypalUk_Helper_Data::class,
+            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
             'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class,
             'paypal/data' => \Mage_Paypal_Helper_Data::class,
             'paypal' => \Mage_Paypal_Helper_Data::class,
             'paypal/hss' => \Mage_Paypal_Helper_Hss::class,
-            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent' => \Mage_Persistent_Helper_Data::class,
+            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent/session' => \Mage_Persistent_Helper_Session::class,
-            'poll/data' => \Mage_Poll_Helper_Data::class,
             'poll' => \Mage_Poll_Helper_Data::class,
-            'productalert' => \Mage_ProductAlert_Helper_Data::class,
+            'poll/data' => \Mage_Poll_Helper_Data::class,
             'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
+            'productalert' => \Mage_ProductAlert_Helper_Data::class,
             'rating' => \Mage_Rating_Helper_Data::class,
             'rating/data' => \Mage_Rating_Helper_Data::class,
             'reports/data' => \Mage_Reports_Helper_Data::class,
@@ -1727,10 +1718,10 @@
             'sendfriend' => \Mage_Sendfriend_Helper_Data::class,
             'shipping' => \Mage_Shipping_Helper_Data::class,
             'shipping/data' => \Mage_Shipping_Helper_Data::class,
-            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'sitemap' => \Mage_Sitemap_Helper_Data::class,
-            'tag/data' => \Mage_Tag_Helper_Data::class,
+            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'tag' => \Mage_Tag_Helper_Data::class,
+            'tag/data' => \Mage_Tag_Helper_Data::class,
             'tax' => \Mage_Tax_Helper_Data::class,
             'tax/data' => \Mage_Tax_Helper_Data::class,
             'uploader/data' => \Mage_Uploader_Helper_Data::class,
@@ -1748,8 +1739,8 @@
     );
     override( \Mage_Customer_AccountController::_getHelper(0),
         map( [
-            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'adminnotification' => \Mage_AdminNotification_Helper_Data::class,
+            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'admin/block' => \Mage_Admin_Helper_Block::class,
             'admin' => \Mage_Admin_Helper_Data::class,
             'admin/data' => \Mage_Admin_Helper_Data::class,
@@ -1769,32 +1760,30 @@
             'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class,
             'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class,
             'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class,
-            'api2' => \Mage_Api2_Helper_Data::class,
             'api2/data' => \Mage_Api2_Helper_Data::class,
-            'api' => \Mage_Api_Helper_Data::class,
+            'api2' => \Mage_Api2_Helper_Data::class,
             'api/data' => \Mage_Api_Helper_Data::class,
+            'api' => \Mage_Api_Helper_Data::class,
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
-            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
-            'captcha/data' => \Mage_Captcha_Helper_Data::class,
+            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'captcha' => \Mage_Captcha_Helper_Data::class,
-            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
+            'captcha/data' => \Mage_Captcha_Helper_Data::class,
             'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
+            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
             'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
-            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class,
+            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class,
             'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class,
             'catalog/category' => \Mage_Catalog_Helper_Category::class,
             'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class,
             'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class,
-            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/data' => \Mage_Catalog_Helper_Data::class,
+            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class,
             'catalog/image' => \Mage_Catalog_Helper_Image::class,
             'catalog/map' => \Mage_Catalog_Helper_Map::class,
@@ -1818,8 +1807,8 @@
             'cms/data' => \Mage_Cms_Helper_Data::class,
             'cms/page' => \Mage_Cms_Helper_Page::class,
             'cms/wysiwyg_images' => \Mage_Cms_Helper_Wysiwyg_Images::class,
-            'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class,
             'configurableswatches' => \Mage_ConfigurableSwatches_Helper_Data::class,
+            'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class,
             'configurableswatches/list_price' => \Mage_ConfigurableSwatches_Helper_List_Price::class,
             'configurableswatches/mediafallback' => \Mage_ConfigurableSwatches_Helper_Mediafallback::class,
             'configurableswatches/productimg' => \Mage_ConfigurableSwatches_Helper_Productimg::class,
@@ -1835,6 +1824,7 @@
             'core/hint' => \Mage_Core_Helper_Hint::class,
             'core/http' => \Mage_Core_Helper_Http::class,
             'core/js' => \Mage_Core_Helper_Js::class,
+            'core/security' => \Mage_Core_Helper_Security::class,
             'core/string' => \Mage_Core_Helper_String::class,
             'core/translate' => \Mage_Core_Helper_Translate::class,
             'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class,
@@ -1847,57 +1837,57 @@
             'customer' => \Mage_Customer_Helper_Data::class,
             'dataflow' => \Mage_Dataflow_Helper_Data::class,
             'dataflow/data' => \Mage_Dataflow_Helper_Data::class,
-            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory' => \Mage_Directory_Helper_Data::class,
+            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory/url' => \Mage_Directory_Helper_Url::class,
             'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class,
             'downloadable' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/data' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/download' => \Mage_Downloadable_Helper_Download::class,
             'downloadable/file' => \Mage_Downloadable_Helper_File::class,
-            'eav' => \Mage_Eav_Helper_Data::class,
             'eav/data' => \Mage_Eav_Helper_Data::class,
+            'eav' => \Mage_Eav_Helper_Data::class,
             'giftmessage' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class,
             'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class,
             'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class,
             'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class,
-            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'importexport' => \Mage_ImportExport_Helper_Data::class,
-            'index/data' => \Mage_Index_Helper_Data::class,
+            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'index' => \Mage_Index_Helper_Data::class,
+            'index/data' => \Mage_Index_Helper_Data::class,
             'install' => \Mage_Install_Helper_Data::class,
             'install/data' => \Mage_Install_Helper_Data::class,
             'log/data' => \Mage_Log_Helper_Data::class,
             'log' => \Mage_Log_Helper_Data::class,
             'media/data' => \Mage_Media_Helper_Data::class,
             'media' => \Mage_Media_Helper_Data::class,
-            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'newsletter' => \Mage_Newsletter_Helper_Data::class,
+            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'oauth' => \Mage_Oauth_Helper_Data::class,
             'oauth/data' => \Mage_Oauth_Helper_Data::class,
             'pagecache' => \Mage_PageCache_Helper_Data::class,
             'pagecache/data' => \Mage_PageCache_Helper_Data::class,
-            'page' => \Mage_Page_Helper_Data::class,
             'page/data' => \Mage_Page_Helper_Data::class,
+            'page' => \Mage_Page_Helper_Data::class,
             'page/html' => \Mage_Page_Helper_Html::class,
             'page/layout' => \Mage_Page_Helper_Layout::class,
-            'payment' => \Mage_Payment_Helper_Data::class,
             'payment/data' => \Mage_Payment_Helper_Data::class,
-            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
+            'payment' => \Mage_Payment_Helper_Data::class,
             'paypaluk' => \Mage_PaypalUk_Helper_Data::class,
+            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
             'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class,
             'paypal/data' => \Mage_Paypal_Helper_Data::class,
             'paypal' => \Mage_Paypal_Helper_Data::class,
             'paypal/hss' => \Mage_Paypal_Helper_Hss::class,
-            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent' => \Mage_Persistent_Helper_Data::class,
+            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent/session' => \Mage_Persistent_Helper_Session::class,
-            'poll/data' => \Mage_Poll_Helper_Data::class,
             'poll' => \Mage_Poll_Helper_Data::class,
-            'productalert' => \Mage_ProductAlert_Helper_Data::class,
+            'poll/data' => \Mage_Poll_Helper_Data::class,
             'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
+            'productalert' => \Mage_ProductAlert_Helper_Data::class,
             'rating' => \Mage_Rating_Helper_Data::class,
             'rating/data' => \Mage_Rating_Helper_Data::class,
             'reports/data' => \Mage_Reports_Helper_Data::class,
@@ -1921,10 +1911,10 @@
             'sendfriend' => \Mage_Sendfriend_Helper_Data::class,
             'shipping' => \Mage_Shipping_Helper_Data::class,
             'shipping/data' => \Mage_Shipping_Helper_Data::class,
-            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'sitemap' => \Mage_Sitemap_Helper_Data::class,
-            'tag/data' => \Mage_Tag_Helper_Data::class,
+            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'tag' => \Mage_Tag_Helper_Data::class,
+            'tag/data' => \Mage_Tag_Helper_Data::class,
             'tax' => \Mage_Tax_Helper_Data::class,
             'tax/data' => \Mage_Tax_Helper_Data::class,
             'uploader/data' => \Mage_Uploader_Helper_Data::class,
@@ -1942,8 +1932,8 @@
     );
     override( \Mage_Customer_Model_Customer::_getHelper(0),
         map( [
-            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'adminnotification' => \Mage_AdminNotification_Helper_Data::class,
+            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'admin/block' => \Mage_Admin_Helper_Block::class,
             'admin' => \Mage_Admin_Helper_Data::class,
             'admin/data' => \Mage_Admin_Helper_Data::class,
@@ -1963,32 +1953,30 @@
             'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class,
             'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class,
             'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class,
-            'api2' => \Mage_Api2_Helper_Data::class,
             'api2/data' => \Mage_Api2_Helper_Data::class,
-            'api' => \Mage_Api_Helper_Data::class,
+            'api2' => \Mage_Api2_Helper_Data::class,
             'api/data' => \Mage_Api_Helper_Data::class,
+            'api' => \Mage_Api_Helper_Data::class,
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
-            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
-            'captcha/data' => \Mage_Captcha_Helper_Data::class,
+            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'captcha' => \Mage_Captcha_Helper_Data::class,
-            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
+            'captcha/data' => \Mage_Captcha_Helper_Data::class,
             'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
+            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
             'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
-            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class,
+            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class,
             'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class,
             'catalog/category' => \Mage_Catalog_Helper_Category::class,
             'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class,
             'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class,
-            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/data' => \Mage_Catalog_Helper_Data::class,
+            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class,
             'catalog/image' => \Mage_Catalog_Helper_Image::class,
             'catalog/map' => \Mage_Catalog_Helper_Map::class,
@@ -2002,8 +1990,8 @@
             'catalog/product_url' => \Mage_Catalog_Helper_Product_Url::class,
             'catalog/product_url_rewrite' => \Mage_Catalog_Helper_Product_Url_Rewrite::class,
             'catalog/product_view' => \Mage_Catalog_Helper_Product_View::class,
-            'centinel/data' => \Mage_Centinel_Helper_Data::class,
             'centinel' => \Mage_Centinel_Helper_Data::class,
+            'centinel/data' => \Mage_Centinel_Helper_Data::class,
             'checkout/cart' => \Mage_Checkout_Helper_Cart::class,
             'checkout' => \Mage_Checkout_Helper_Data::class,
             'checkout/data' => \Mage_Checkout_Helper_Data::class,
@@ -2029,6 +2017,7 @@
             'core/hint' => \Mage_Core_Helper_Hint::class,
             'core/http' => \Mage_Core_Helper_Http::class,
             'core/js' => \Mage_Core_Helper_Js::class,
+            'core/security' => \Mage_Core_Helper_Security::class,
             'core/string' => \Mage_Core_Helper_String::class,
             'core/translate' => \Mage_Core_Helper_Translate::class,
             'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class,
@@ -2041,57 +2030,57 @@
             'customer' => \Mage_Customer_Helper_Data::class,
             'dataflow' => \Mage_Dataflow_Helper_Data::class,
             'dataflow/data' => \Mage_Dataflow_Helper_Data::class,
-            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory' => \Mage_Directory_Helper_Data::class,
+            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory/url' => \Mage_Directory_Helper_Url::class,
             'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class,
             'downloadable' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/data' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/download' => \Mage_Downloadable_Helper_Download::class,
             'downloadable/file' => \Mage_Downloadable_Helper_File::class,
-            'eav' => \Mage_Eav_Helper_Data::class,
             'eav/data' => \Mage_Eav_Helper_Data::class,
+            'eav' => \Mage_Eav_Helper_Data::class,
             'giftmessage' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class,
             'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class,
             'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class,
             'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class,
-            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'importexport' => \Mage_ImportExport_Helper_Data::class,
-            'index/data' => \Mage_Index_Helper_Data::class,
+            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'index' => \Mage_Index_Helper_Data::class,
+            'index/data' => \Mage_Index_Helper_Data::class,
             'install' => \Mage_Install_Helper_Data::class,
             'install/data' => \Mage_Install_Helper_Data::class,
             'log/data' => \Mage_Log_Helper_Data::class,
             'log' => \Mage_Log_Helper_Data::class,
             'media/data' => \Mage_Media_Helper_Data::class,
             'media' => \Mage_Media_Helper_Data::class,
-            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'newsletter' => \Mage_Newsletter_Helper_Data::class,
+            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'oauth' => \Mage_Oauth_Helper_Data::class,
             'oauth/data' => \Mage_Oauth_Helper_Data::class,
             'pagecache' => \Mage_PageCache_Helper_Data::class,
             'pagecache/data' => \Mage_PageCache_Helper_Data::class,
-            'page' => \Mage_Page_Helper_Data::class,
             'page/data' => \Mage_Page_Helper_Data::class,
+            'page' => \Mage_Page_Helper_Data::class,
             'page/html' => \Mage_Page_Helper_Html::class,
             'page/layout' => \Mage_Page_Helper_Layout::class,
-            'payment' => \Mage_Payment_Helper_Data::class,
             'payment/data' => \Mage_Payment_Helper_Data::class,
-            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
+            'payment' => \Mage_Payment_Helper_Data::class,
             'paypaluk' => \Mage_PaypalUk_Helper_Data::class,
+            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
             'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class,
             'paypal/data' => \Mage_Paypal_Helper_Data::class,
             'paypal' => \Mage_Paypal_Helper_Data::class,
             'paypal/hss' => \Mage_Paypal_Helper_Hss::class,
-            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent' => \Mage_Persistent_Helper_Data::class,
+            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent/session' => \Mage_Persistent_Helper_Session::class,
-            'poll/data' => \Mage_Poll_Helper_Data::class,
             'poll' => \Mage_Poll_Helper_Data::class,
-            'productalert' => \Mage_ProductAlert_Helper_Data::class,
+            'poll/data' => \Mage_Poll_Helper_Data::class,
             'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
+            'productalert' => \Mage_ProductAlert_Helper_Data::class,
             'rating' => \Mage_Rating_Helper_Data::class,
             'rating/data' => \Mage_Rating_Helper_Data::class,
             'reports/data' => \Mage_Reports_Helper_Data::class,
@@ -2115,10 +2104,10 @@
             'sendfriend' => \Mage_Sendfriend_Helper_Data::class,
             'shipping' => \Mage_Shipping_Helper_Data::class,
             'shipping/data' => \Mage_Shipping_Helper_Data::class,
-            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'sitemap' => \Mage_Sitemap_Helper_Data::class,
-            'tag/data' => \Mage_Tag_Helper_Data::class,
+            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'tag' => \Mage_Tag_Helper_Data::class,
+            'tag/data' => \Mage_Tag_Helper_Data::class,
             'tax' => \Mage_Tax_Helper_Data::class,
             'tax/data' => \Mage_Tax_Helper_Data::class,
             'uploader/data' => \Mage_Uploader_Helper_Data::class,
@@ -2136,8 +2125,8 @@
     );
     override( \Mage_ImportExport_Model_Import_Entity_Product::getHelper(0),
         map( [
-            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'adminnotification' => \Mage_AdminNotification_Helper_Data::class,
+            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'admin/block' => \Mage_Admin_Helper_Block::class,
             'admin' => \Mage_Admin_Helper_Data::class,
             'admin/data' => \Mage_Admin_Helper_Data::class,
@@ -2157,32 +2146,30 @@
             'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class,
             'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class,
             'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class,
-            'api2' => \Mage_Api2_Helper_Data::class,
             'api2/data' => \Mage_Api2_Helper_Data::class,
-            'api' => \Mage_Api_Helper_Data::class,
+            'api2' => \Mage_Api2_Helper_Data::class,
             'api/data' => \Mage_Api_Helper_Data::class,
+            'api' => \Mage_Api_Helper_Data::class,
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
-            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
-            'captcha/data' => \Mage_Captcha_Helper_Data::class,
+            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'captcha' => \Mage_Captcha_Helper_Data::class,
-            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
+            'captcha/data' => \Mage_Captcha_Helper_Data::class,
             'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
+            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
             'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
-            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class,
+            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class,
             'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class,
             'catalog/category' => \Mage_Catalog_Helper_Category::class,
             'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class,
             'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class,
-            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/data' => \Mage_Catalog_Helper_Data::class,
+            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class,
             'catalog/image' => \Mage_Catalog_Helper_Image::class,
             'catalog/map' => \Mage_Catalog_Helper_Map::class,
@@ -2206,8 +2193,8 @@
             'cms/data' => \Mage_Cms_Helper_Data::class,
             'cms/page' => \Mage_Cms_Helper_Page::class,
             'cms/wysiwyg_images' => \Mage_Cms_Helper_Wysiwyg_Images::class,
-            'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class,
             'configurableswatches' => \Mage_ConfigurableSwatches_Helper_Data::class,
+            'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class,
             'configurableswatches/list_price' => \Mage_ConfigurableSwatches_Helper_List_Price::class,
             'configurableswatches/mediafallback' => \Mage_ConfigurableSwatches_Helper_Mediafallback::class,
             'configurableswatches/productimg' => \Mage_ConfigurableSwatches_Helper_Productimg::class,
@@ -2223,6 +2210,7 @@
             'core/hint' => \Mage_Core_Helper_Hint::class,
             'core/http' => \Mage_Core_Helper_Http::class,
             'core/js' => \Mage_Core_Helper_Js::class,
+            'core/security' => \Mage_Core_Helper_Security::class,
             'core/string' => \Mage_Core_Helper_String::class,
             'core/translate' => \Mage_Core_Helper_Translate::class,
             'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class,
@@ -2235,57 +2223,57 @@
             'customer' => \Mage_Customer_Helper_Data::class,
             'dataflow' => \Mage_Dataflow_Helper_Data::class,
             'dataflow/data' => \Mage_Dataflow_Helper_Data::class,
-            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory' => \Mage_Directory_Helper_Data::class,
+            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory/url' => \Mage_Directory_Helper_Url::class,
             'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class,
             'downloadable' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/data' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/download' => \Mage_Downloadable_Helper_Download::class,
             'downloadable/file' => \Mage_Downloadable_Helper_File::class,
-            'eav' => \Mage_Eav_Helper_Data::class,
             'eav/data' => \Mage_Eav_Helper_Data::class,
+            'eav' => \Mage_Eav_Helper_Data::class,
             'giftmessage' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class,
             'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class,
             'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class,
             'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class,
-            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'importexport' => \Mage_ImportExport_Helper_Data::class,
-            'index/data' => \Mage_Index_Helper_Data::class,
+            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'index' => \Mage_Index_Helper_Data::class,
+            'index/data' => \Mage_Index_Helper_Data::class,
             'install' => \Mage_Install_Helper_Data::class,
             'install/data' => \Mage_Install_Helper_Data::class,
             'log/data' => \Mage_Log_Helper_Data::class,
             'log' => \Mage_Log_Helper_Data::class,
             'media/data' => \Mage_Media_Helper_Data::class,
             'media' => \Mage_Media_Helper_Data::class,
-            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'newsletter' => \Mage_Newsletter_Helper_Data::class,
+            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'oauth' => \Mage_Oauth_Helper_Data::class,
             'oauth/data' => \Mage_Oauth_Helper_Data::class,
             'pagecache' => \Mage_PageCache_Helper_Data::class,
             'pagecache/data' => \Mage_PageCache_Helper_Data::class,
-            'page' => \Mage_Page_Helper_Data::class,
             'page/data' => \Mage_Page_Helper_Data::class,
+            'page' => \Mage_Page_Helper_Data::class,
             'page/html' => \Mage_Page_Helper_Html::class,
             'page/layout' => \Mage_Page_Helper_Layout::class,
-            'payment' => \Mage_Payment_Helper_Data::class,
             'payment/data' => \Mage_Payment_Helper_Data::class,
-            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
+            'payment' => \Mage_Payment_Helper_Data::class,
             'paypaluk' => \Mage_PaypalUk_Helper_Data::class,
+            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
             'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class,
             'paypal/data' => \Mage_Paypal_Helper_Data::class,
             'paypal' => \Mage_Paypal_Helper_Data::class,
             'paypal/hss' => \Mage_Paypal_Helper_Hss::class,
-            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent' => \Mage_Persistent_Helper_Data::class,
+            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent/session' => \Mage_Persistent_Helper_Session::class,
-            'poll/data' => \Mage_Poll_Helper_Data::class,
             'poll' => \Mage_Poll_Helper_Data::class,
-            'productalert' => \Mage_ProductAlert_Helper_Data::class,
+            'poll/data' => \Mage_Poll_Helper_Data::class,
             'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
+            'productalert' => \Mage_ProductAlert_Helper_Data::class,
             'rating' => \Mage_Rating_Helper_Data::class,
             'rating/data' => \Mage_Rating_Helper_Data::class,
             'reports/data' => \Mage_Reports_Helper_Data::class,
@@ -2309,10 +2297,10 @@
             'sendfriend' => \Mage_Sendfriend_Helper_Data::class,
             'shipping' => \Mage_Shipping_Helper_Data::class,
             'shipping/data' => \Mage_Shipping_Helper_Data::class,
-            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'sitemap' => \Mage_Sitemap_Helper_Data::class,
-            'tag/data' => \Mage_Tag_Helper_Data::class,
+            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'tag' => \Mage_Tag_Helper_Data::class,
+            'tag/data' => \Mage_Tag_Helper_Data::class,
             'tax' => \Mage_Tax_Helper_Data::class,
             'tax/data' => \Mage_Tax_Helper_Data::class,
             'uploader/data' => \Mage_Uploader_Helper_Data::class,
@@ -2330,8 +2318,8 @@
     );
     override( \Mage_Rss_Controller_Abstract::_getHelper(0),
         map( [
-            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'adminnotification' => \Mage_AdminNotification_Helper_Data::class,
+            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'admin/block' => \Mage_Admin_Helper_Block::class,
             'admin' => \Mage_Admin_Helper_Data::class,
             'admin/data' => \Mage_Admin_Helper_Data::class,
@@ -2351,32 +2339,30 @@
             'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class,
             'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class,
             'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class,
-            'api2' => \Mage_Api2_Helper_Data::class,
             'api2/data' => \Mage_Api2_Helper_Data::class,
-            'api' => \Mage_Api_Helper_Data::class,
+            'api2' => \Mage_Api2_Helper_Data::class,
             'api/data' => \Mage_Api_Helper_Data::class,
+            'api' => \Mage_Api_Helper_Data::class,
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
-            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
-            'captcha/data' => \Mage_Captcha_Helper_Data::class,
+            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'captcha' => \Mage_Captcha_Helper_Data::class,
-            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
+            'captcha/data' => \Mage_Captcha_Helper_Data::class,
             'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
+            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
             'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
-            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class,
+            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class,
             'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class,
             'catalog/category' => \Mage_Catalog_Helper_Category::class,
             'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class,
             'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class,
-            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/data' => \Mage_Catalog_Helper_Data::class,
+            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class,
             'catalog/image' => \Mage_Catalog_Helper_Image::class,
             'catalog/map' => \Mage_Catalog_Helper_Map::class,
@@ -2390,8 +2376,8 @@
             'catalog/product_url' => \Mage_Catalog_Helper_Product_Url::class,
             'catalog/product_url_rewrite' => \Mage_Catalog_Helper_Product_Url_Rewrite::class,
             'catalog/product_view' => \Mage_Catalog_Helper_Product_View::class,
-            'centinel/data' => \Mage_Centinel_Helper_Data::class,
             'centinel' => \Mage_Centinel_Helper_Data::class,
+            'centinel/data' => \Mage_Centinel_Helper_Data::class,
             'checkout/cart' => \Mage_Checkout_Helper_Cart::class,
             'checkout' => \Mage_Checkout_Helper_Data::class,
             'checkout/data' => \Mage_Checkout_Helper_Data::class,
@@ -2417,6 +2403,7 @@
             'core/hint' => \Mage_Core_Helper_Hint::class,
             'core/http' => \Mage_Core_Helper_Http::class,
             'core/js' => \Mage_Core_Helper_Js::class,
+            'core/security' => \Mage_Core_Helper_Security::class,
             'core/string' => \Mage_Core_Helper_String::class,
             'core/translate' => \Mage_Core_Helper_Translate::class,
             'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class,
@@ -2429,57 +2416,57 @@
             'customer' => \Mage_Customer_Helper_Data::class,
             'dataflow' => \Mage_Dataflow_Helper_Data::class,
             'dataflow/data' => \Mage_Dataflow_Helper_Data::class,
-            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory' => \Mage_Directory_Helper_Data::class,
+            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory/url' => \Mage_Directory_Helper_Url::class,
             'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class,
             'downloadable' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/data' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/download' => \Mage_Downloadable_Helper_Download::class,
             'downloadable/file' => \Mage_Downloadable_Helper_File::class,
-            'eav' => \Mage_Eav_Helper_Data::class,
             'eav/data' => \Mage_Eav_Helper_Data::class,
+            'eav' => \Mage_Eav_Helper_Data::class,
             'giftmessage' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class,
             'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class,
             'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class,
             'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class,
-            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'importexport' => \Mage_ImportExport_Helper_Data::class,
-            'index/data' => \Mage_Index_Helper_Data::class,
+            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'index' => \Mage_Index_Helper_Data::class,
+            'index/data' => \Mage_Index_Helper_Data::class,
             'install' => \Mage_Install_Helper_Data::class,
             'install/data' => \Mage_Install_Helper_Data::class,
             'log/data' => \Mage_Log_Helper_Data::class,
             'log' => \Mage_Log_Helper_Data::class,
             'media/data' => \Mage_Media_Helper_Data::class,
             'media' => \Mage_Media_Helper_Data::class,
-            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'newsletter' => \Mage_Newsletter_Helper_Data::class,
+            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'oauth' => \Mage_Oauth_Helper_Data::class,
             'oauth/data' => \Mage_Oauth_Helper_Data::class,
             'pagecache' => \Mage_PageCache_Helper_Data::class,
             'pagecache/data' => \Mage_PageCache_Helper_Data::class,
-            'page' => \Mage_Page_Helper_Data::class,
             'page/data' => \Mage_Page_Helper_Data::class,
+            'page' => \Mage_Page_Helper_Data::class,
             'page/html' => \Mage_Page_Helper_Html::class,
             'page/layout' => \Mage_Page_Helper_Layout::class,
-            'payment' => \Mage_Payment_Helper_Data::class,
             'payment/data' => \Mage_Payment_Helper_Data::class,
-            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
+            'payment' => \Mage_Payment_Helper_Data::class,
             'paypaluk' => \Mage_PaypalUk_Helper_Data::class,
+            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
             'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class,
             'paypal/data' => \Mage_Paypal_Helper_Data::class,
             'paypal' => \Mage_Paypal_Helper_Data::class,
             'paypal/hss' => \Mage_Paypal_Helper_Hss::class,
-            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent' => \Mage_Persistent_Helper_Data::class,
+            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent/session' => \Mage_Persistent_Helper_Session::class,
-            'poll/data' => \Mage_Poll_Helper_Data::class,
             'poll' => \Mage_Poll_Helper_Data::class,
-            'productalert' => \Mage_ProductAlert_Helper_Data::class,
+            'poll/data' => \Mage_Poll_Helper_Data::class,
             'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
+            'productalert' => \Mage_ProductAlert_Helper_Data::class,
             'rating' => \Mage_Rating_Helper_Data::class,
             'rating/data' => \Mage_Rating_Helper_Data::class,
             'reports/data' => \Mage_Reports_Helper_Data::class,
@@ -2503,10 +2490,10 @@
             'sendfriend' => \Mage_Sendfriend_Helper_Data::class,
             'shipping' => \Mage_Shipping_Helper_Data::class,
             'shipping/data' => \Mage_Shipping_Helper_Data::class,
-            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'sitemap' => \Mage_Sitemap_Helper_Data::class,
-            'tag/data' => \Mage_Tag_Helper_Data::class,
+            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'tag' => \Mage_Tag_Helper_Data::class,
+            'tag/data' => \Mage_Tag_Helper_Data::class,
             'tax' => \Mage_Tax_Helper_Data::class,
             'tax/data' => \Mage_Tax_Helper_Data::class,
             'uploader/data' => \Mage_Uploader_Helper_Data::class,
@@ -2524,8 +2511,8 @@
     );
     override( \Mage_SalesRule_Model_Validator::_getHelper(0),
         map( [
-            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'adminnotification' => \Mage_AdminNotification_Helper_Data::class,
+            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'admin/block' => \Mage_Admin_Helper_Block::class,
             'admin' => \Mage_Admin_Helper_Data::class,
             'admin/data' => \Mage_Admin_Helper_Data::class,
@@ -2545,32 +2532,30 @@
             'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class,
             'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class,
             'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class,
-            'api2' => \Mage_Api2_Helper_Data::class,
             'api2/data' => \Mage_Api2_Helper_Data::class,
-            'api' => \Mage_Api_Helper_Data::class,
+            'api2' => \Mage_Api2_Helper_Data::class,
             'api/data' => \Mage_Api_Helper_Data::class,
+            'api' => \Mage_Api_Helper_Data::class,
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
-            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
-            'captcha/data' => \Mage_Captcha_Helper_Data::class,
+            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'captcha' => \Mage_Captcha_Helper_Data::class,
-            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
+            'captcha/data' => \Mage_Captcha_Helper_Data::class,
             'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
+            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
             'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
-            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class,
+            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class,
             'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class,
             'catalog/category' => \Mage_Catalog_Helper_Category::class,
             'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class,
             'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class,
-            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/data' => \Mage_Catalog_Helper_Data::class,
+            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class,
             'catalog/image' => \Mage_Catalog_Helper_Image::class,
             'catalog/map' => \Mage_Catalog_Helper_Map::class,
@@ -2594,8 +2579,8 @@
             'cms/data' => \Mage_Cms_Helper_Data::class,
             'cms/page' => \Mage_Cms_Helper_Page::class,
             'cms/wysiwyg_images' => \Mage_Cms_Helper_Wysiwyg_Images::class,
-            'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class,
             'configurableswatches' => \Mage_ConfigurableSwatches_Helper_Data::class,
+            'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class,
             'configurableswatches/list_price' => \Mage_ConfigurableSwatches_Helper_List_Price::class,
             'configurableswatches/mediafallback' => \Mage_ConfigurableSwatches_Helper_Mediafallback::class,
             'configurableswatches/productimg' => \Mage_ConfigurableSwatches_Helper_Productimg::class,
@@ -2611,6 +2596,7 @@
             'core/hint' => \Mage_Core_Helper_Hint::class,
             'core/http' => \Mage_Core_Helper_Http::class,
             'core/js' => \Mage_Core_Helper_Js::class,
+            'core/security' => \Mage_Core_Helper_Security::class,
             'core/string' => \Mage_Core_Helper_String::class,
             'core/translate' => \Mage_Core_Helper_Translate::class,
             'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class,
@@ -2623,57 +2609,57 @@
             'customer' => \Mage_Customer_Helper_Data::class,
             'dataflow' => \Mage_Dataflow_Helper_Data::class,
             'dataflow/data' => \Mage_Dataflow_Helper_Data::class,
-            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory' => \Mage_Directory_Helper_Data::class,
+            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory/url' => \Mage_Directory_Helper_Url::class,
             'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class,
             'downloadable' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/data' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/download' => \Mage_Downloadable_Helper_Download::class,
             'downloadable/file' => \Mage_Downloadable_Helper_File::class,
-            'eav' => \Mage_Eav_Helper_Data::class,
             'eav/data' => \Mage_Eav_Helper_Data::class,
+            'eav' => \Mage_Eav_Helper_Data::class,
             'giftmessage' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class,
             'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class,
             'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class,
             'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class,
-            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'importexport' => \Mage_ImportExport_Helper_Data::class,
-            'index/data' => \Mage_Index_Helper_Data::class,
+            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'index' => \Mage_Index_Helper_Data::class,
+            'index/data' => \Mage_Index_Helper_Data::class,
             'install' => \Mage_Install_Helper_Data::class,
             'install/data' => \Mage_Install_Helper_Data::class,
             'log/data' => \Mage_Log_Helper_Data::class,
             'log' => \Mage_Log_Helper_Data::class,
             'media/data' => \Mage_Media_Helper_Data::class,
             'media' => \Mage_Media_Helper_Data::class,
-            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'newsletter' => \Mage_Newsletter_Helper_Data::class,
+            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'oauth' => \Mage_Oauth_Helper_Data::class,
             'oauth/data' => \Mage_Oauth_Helper_Data::class,
             'pagecache' => \Mage_PageCache_Helper_Data::class,
             'pagecache/data' => \Mage_PageCache_Helper_Data::class,
-            'page' => \Mage_Page_Helper_Data::class,
             'page/data' => \Mage_Page_Helper_Data::class,
+            'page' => \Mage_Page_Helper_Data::class,
             'page/html' => \Mage_Page_Helper_Html::class,
             'page/layout' => \Mage_Page_Helper_Layout::class,
-            'payment' => \Mage_Payment_Helper_Data::class,
             'payment/data' => \Mage_Payment_Helper_Data::class,
-            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
+            'payment' => \Mage_Payment_Helper_Data::class,
             'paypaluk' => \Mage_PaypalUk_Helper_Data::class,
+            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
             'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class,
             'paypal/data' => \Mage_Paypal_Helper_Data::class,
             'paypal' => \Mage_Paypal_Helper_Data::class,
             'paypal/hss' => \Mage_Paypal_Helper_Hss::class,
-            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent' => \Mage_Persistent_Helper_Data::class,
+            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent/session' => \Mage_Persistent_Helper_Session::class,
-            'poll/data' => \Mage_Poll_Helper_Data::class,
             'poll' => \Mage_Poll_Helper_Data::class,
-            'productalert' => \Mage_ProductAlert_Helper_Data::class,
+            'poll/data' => \Mage_Poll_Helper_Data::class,
             'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
+            'productalert' => \Mage_ProductAlert_Helper_Data::class,
             'rating' => \Mage_Rating_Helper_Data::class,
             'rating/data' => \Mage_Rating_Helper_Data::class,
             'reports/data' => \Mage_Reports_Helper_Data::class,
@@ -2697,10 +2683,10 @@
             'sendfriend' => \Mage_Sendfriend_Helper_Data::class,
             'shipping' => \Mage_Shipping_Helper_Data::class,
             'shipping/data' => \Mage_Shipping_Helper_Data::class,
-            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'sitemap' => \Mage_Sitemap_Helper_Data::class,
-            'tag/data' => \Mage_Tag_Helper_Data::class,
+            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'tag' => \Mage_Tag_Helper_Data::class,
+            'tag/data' => \Mage_Tag_Helper_Data::class,
             'tax' => \Mage_Tax_Helper_Data::class,
             'tax/data' => \Mage_Tax_Helper_Data::class,
             'uploader/data' => \Mage_Uploader_Helper_Data::class,
@@ -2718,8 +2704,8 @@
     );
     override( \Mage_Weee_Helper_Data::_getHelper(0),
         map( [
-            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'adminnotification' => \Mage_AdminNotification_Helper_Data::class,
+            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'admin/block' => \Mage_Admin_Helper_Block::class,
             'admin' => \Mage_Admin_Helper_Data::class,
             'admin/data' => \Mage_Admin_Helper_Data::class,
@@ -2739,32 +2725,30 @@
             'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class,
             'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class,
             'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class,
-            'api2' => \Mage_Api2_Helper_Data::class,
             'api2/data' => \Mage_Api2_Helper_Data::class,
-            'api' => \Mage_Api_Helper_Data::class,
+            'api2' => \Mage_Api2_Helper_Data::class,
             'api/data' => \Mage_Api_Helper_Data::class,
+            'api' => \Mage_Api_Helper_Data::class,
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
-            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
-            'captcha/data' => \Mage_Captcha_Helper_Data::class,
+            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'captcha' => \Mage_Captcha_Helper_Data::class,
-            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
+            'captcha/data' => \Mage_Captcha_Helper_Data::class,
             'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
+            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
             'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
-            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class,
+            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class,
             'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class,
             'catalog/category' => \Mage_Catalog_Helper_Category::class,
             'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class,
             'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class,
-            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/data' => \Mage_Catalog_Helper_Data::class,
+            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class,
             'catalog/image' => \Mage_Catalog_Helper_Image::class,
             'catalog/map' => \Mage_Catalog_Helper_Map::class,
@@ -2778,8 +2762,8 @@
             'catalog/product_url' => \Mage_Catalog_Helper_Product_Url::class,
             'catalog/product_url_rewrite' => \Mage_Catalog_Helper_Product_Url_Rewrite::class,
             'catalog/product_view' => \Mage_Catalog_Helper_Product_View::class,
-            'centinel/data' => \Mage_Centinel_Helper_Data::class,
             'centinel' => \Mage_Centinel_Helper_Data::class,
+            'centinel/data' => \Mage_Centinel_Helper_Data::class,
             'checkout/cart' => \Mage_Checkout_Helper_Cart::class,
             'checkout' => \Mage_Checkout_Helper_Data::class,
             'checkout/data' => \Mage_Checkout_Helper_Data::class,
@@ -2805,6 +2789,7 @@
             'core/hint' => \Mage_Core_Helper_Hint::class,
             'core/http' => \Mage_Core_Helper_Http::class,
             'core/js' => \Mage_Core_Helper_Js::class,
+            'core/security' => \Mage_Core_Helper_Security::class,
             'core/string' => \Mage_Core_Helper_String::class,
             'core/translate' => \Mage_Core_Helper_Translate::class,
             'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class,
@@ -2817,57 +2802,57 @@
             'customer' => \Mage_Customer_Helper_Data::class,
             'dataflow' => \Mage_Dataflow_Helper_Data::class,
             'dataflow/data' => \Mage_Dataflow_Helper_Data::class,
-            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory' => \Mage_Directory_Helper_Data::class,
+            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory/url' => \Mage_Directory_Helper_Url::class,
             'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class,
             'downloadable' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/data' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/download' => \Mage_Downloadable_Helper_Download::class,
             'downloadable/file' => \Mage_Downloadable_Helper_File::class,
-            'eav' => \Mage_Eav_Helper_Data::class,
             'eav/data' => \Mage_Eav_Helper_Data::class,
+            'eav' => \Mage_Eav_Helper_Data::class,
             'giftmessage' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class,
             'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class,
             'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class,
             'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class,
-            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'importexport' => \Mage_ImportExport_Helper_Data::class,
-            'index/data' => \Mage_Index_Helper_Data::class,
+            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'index' => \Mage_Index_Helper_Data::class,
+            'index/data' => \Mage_Index_Helper_Data::class,
             'install' => \Mage_Install_Helper_Data::class,
             'install/data' => \Mage_Install_Helper_Data::class,
             'log/data' => \Mage_Log_Helper_Data::class,
             'log' => \Mage_Log_Helper_Data::class,
             'media/data' => \Mage_Media_Helper_Data::class,
             'media' => \Mage_Media_Helper_Data::class,
-            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'newsletter' => \Mage_Newsletter_Helper_Data::class,
+            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'oauth' => \Mage_Oauth_Helper_Data::class,
             'oauth/data' => \Mage_Oauth_Helper_Data::class,
             'pagecache' => \Mage_PageCache_Helper_Data::class,
             'pagecache/data' => \Mage_PageCache_Helper_Data::class,
-            'page' => \Mage_Page_Helper_Data::class,
             'page/data' => \Mage_Page_Helper_Data::class,
+            'page' => \Mage_Page_Helper_Data::class,
             'page/html' => \Mage_Page_Helper_Html::class,
             'page/layout' => \Mage_Page_Helper_Layout::class,
-            'payment' => \Mage_Payment_Helper_Data::class,
             'payment/data' => \Mage_Payment_Helper_Data::class,
-            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
+            'payment' => \Mage_Payment_Helper_Data::class,
             'paypaluk' => \Mage_PaypalUk_Helper_Data::class,
+            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
             'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class,
             'paypal/data' => \Mage_Paypal_Helper_Data::class,
             'paypal' => \Mage_Paypal_Helper_Data::class,
             'paypal/hss' => \Mage_Paypal_Helper_Hss::class,
-            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent' => \Mage_Persistent_Helper_Data::class,
+            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent/session' => \Mage_Persistent_Helper_Session::class,
-            'poll/data' => \Mage_Poll_Helper_Data::class,
             'poll' => \Mage_Poll_Helper_Data::class,
-            'productalert' => \Mage_ProductAlert_Helper_Data::class,
+            'poll/data' => \Mage_Poll_Helper_Data::class,
             'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
+            'productalert' => \Mage_ProductAlert_Helper_Data::class,
             'rating' => \Mage_Rating_Helper_Data::class,
             'rating/data' => \Mage_Rating_Helper_Data::class,
             'reports/data' => \Mage_Reports_Helper_Data::class,
@@ -2891,10 +2876,10 @@
             'sendfriend' => \Mage_Sendfriend_Helper_Data::class,
             'shipping' => \Mage_Shipping_Helper_Data::class,
             'shipping/data' => \Mage_Shipping_Helper_Data::class,
-            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'sitemap' => \Mage_Sitemap_Helper_Data::class,
-            'tag/data' => \Mage_Tag_Helper_Data::class,
+            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'tag' => \Mage_Tag_Helper_Data::class,
+            'tag/data' => \Mage_Tag_Helper_Data::class,
             'tax' => \Mage_Tax_Helper_Data::class,
             'tax/data' => \Mage_Tax_Helper_Data::class,
             'uploader/data' => \Mage_Uploader_Helper_Data::class,
@@ -2912,8 +2897,8 @@
     );
     override( \Mage_Weee_Model_Config_Source_Fpt_Tax::_getHelper(0),
         map( [
-            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'adminnotification' => \Mage_AdminNotification_Helper_Data::class,
+            'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
             'admin/block' => \Mage_Admin_Helper_Block::class,
             'admin' => \Mage_Admin_Helper_Data::class,
             'admin/data' => \Mage_Admin_Helper_Data::class,
@@ -2933,32 +2918,30 @@
             'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class,
             'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class,
             'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class,
-            'api2' => \Mage_Api2_Helper_Data::class,
             'api2/data' => \Mage_Api2_Helper_Data::class,
-            'api' => \Mage_Api_Helper_Data::class,
+            'api2' => \Mage_Api2_Helper_Data::class,
             'api/data' => \Mage_Api_Helper_Data::class,
+            'api' => \Mage_Api_Helper_Data::class,
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
-            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
-            'captcha/data' => \Mage_Captcha_Helper_Data::class,
+            'bundle/data' => \Mage_Bundle_Helper_Data::class,
             'captcha' => \Mage_Captcha_Helper_Data::class,
-            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
+            'captcha/data' => \Mage_Captcha_Helper_Data::class,
             'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
+            'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
             'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
-            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class,
+            'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
             'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class,
             'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class,
             'catalog/category' => \Mage_Catalog_Helper_Category::class,
             'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class,
             'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class,
-            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/data' => \Mage_Catalog_Helper_Data::class,
+            'catalog' => \Mage_Catalog_Helper_Data::class,
             'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class,
             'catalog/image' => \Mage_Catalog_Helper_Image::class,
             'catalog/map' => \Mage_Catalog_Helper_Map::class,
@@ -2982,8 +2965,8 @@
             'cms/data' => \Mage_Cms_Helper_Data::class,
             'cms/page' => \Mage_Cms_Helper_Page::class,
             'cms/wysiwyg_images' => \Mage_Cms_Helper_Wysiwyg_Images::class,
-            'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class,
             'configurableswatches' => \Mage_ConfigurableSwatches_Helper_Data::class,
+            'configurableswatches/data' => \Mage_ConfigurableSwatches_Helper_Data::class,
             'configurableswatches/list_price' => \Mage_ConfigurableSwatches_Helper_List_Price::class,
             'configurableswatches/mediafallback' => \Mage_ConfigurableSwatches_Helper_Mediafallback::class,
             'configurableswatches/productimg' => \Mage_ConfigurableSwatches_Helper_Productimg::class,
@@ -2999,6 +2982,7 @@
             'core/hint' => \Mage_Core_Helper_Hint::class,
             'core/http' => \Mage_Core_Helper_Http::class,
             'core/js' => \Mage_Core_Helper_Js::class,
+            'core/security' => \Mage_Core_Helper_Security::class,
             'core/string' => \Mage_Core_Helper_String::class,
             'core/translate' => \Mage_Core_Helper_Translate::class,
             'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class,
@@ -3011,57 +2995,57 @@
             'customer' => \Mage_Customer_Helper_Data::class,
             'dataflow' => \Mage_Dataflow_Helper_Data::class,
             'dataflow/data' => \Mage_Dataflow_Helper_Data::class,
-            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory' => \Mage_Directory_Helper_Data::class,
+            'directory/data' => \Mage_Directory_Helper_Data::class,
             'directory/url' => \Mage_Directory_Helper_Url::class,
             'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class,
             'downloadable' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/data' => \Mage_Downloadable_Helper_Data::class,
             'downloadable/download' => \Mage_Downloadable_Helper_Download::class,
             'downloadable/file' => \Mage_Downloadable_Helper_File::class,
-            'eav' => \Mage_Eav_Helper_Data::class,
             'eav/data' => \Mage_Eav_Helper_Data::class,
+            'eav' => \Mage_Eav_Helper_Data::class,
             'giftmessage' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class,
             'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class,
             'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class,
             'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class,
             'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class,
-            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'importexport' => \Mage_ImportExport_Helper_Data::class,
-            'index/data' => \Mage_Index_Helper_Data::class,
+            'importexport/data' => \Mage_ImportExport_Helper_Data::class,
             'index' => \Mage_Index_Helper_Data::class,
+            'index/data' => \Mage_Index_Helper_Data::class,
             'install' => \Mage_Install_Helper_Data::class,
             'install/data' => \Mage_Install_Helper_Data::class,
             'log/data' => \Mage_Log_Helper_Data::class,
             'log' => \Mage_Log_Helper_Data::class,
             'media/data' => \Mage_Media_Helper_Data::class,
             'media' => \Mage_Media_Helper_Data::class,
-            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'newsletter' => \Mage_Newsletter_Helper_Data::class,
+            'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
             'oauth' => \Mage_Oauth_Helper_Data::class,
             'oauth/data' => \Mage_Oauth_Helper_Data::class,
             'pagecache' => \Mage_PageCache_Helper_Data::class,
             'pagecache/data' => \Mage_PageCache_Helper_Data::class,
-            'page' => \Mage_Page_Helper_Data::class,
             'page/data' => \Mage_Page_Helper_Data::class,
+            'page' => \Mage_Page_Helper_Data::class,
             'page/html' => \Mage_Page_Helper_Html::class,
             'page/layout' => \Mage_Page_Helper_Layout::class,
-            'payment' => \Mage_Payment_Helper_Data::class,
             'payment/data' => \Mage_Payment_Helper_Data::class,
-            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
+            'payment' => \Mage_Payment_Helper_Data::class,
             'paypaluk' => \Mage_PaypalUk_Helper_Data::class,
+            'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
             'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class,
             'paypal/data' => \Mage_Paypal_Helper_Data::class,
             'paypal' => \Mage_Paypal_Helper_Data::class,
             'paypal/hss' => \Mage_Paypal_Helper_Hss::class,
-            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent' => \Mage_Persistent_Helper_Data::class,
+            'persistent/data' => \Mage_Persistent_Helper_Data::class,
             'persistent/session' => \Mage_Persistent_Helper_Session::class,
-            'poll/data' => \Mage_Poll_Helper_Data::class,
             'poll' => \Mage_Poll_Helper_Data::class,
-            'productalert' => \Mage_ProductAlert_Helper_Data::class,
+            'poll/data' => \Mage_Poll_Helper_Data::class,
             'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
+            'productalert' => \Mage_ProductAlert_Helper_Data::class,
             'rating' => \Mage_Rating_Helper_Data::class,
             'rating/data' => \Mage_Rating_Helper_Data::class,
             'reports/data' => \Mage_Reports_Helper_Data::class,
@@ -3085,10 +3069,10 @@
             'sendfriend' => \Mage_Sendfriend_Helper_Data::class,
             'shipping' => \Mage_Shipping_Helper_Data::class,
             'shipping/data' => \Mage_Shipping_Helper_Data::class,
-            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'sitemap' => \Mage_Sitemap_Helper_Data::class,
-            'tag/data' => \Mage_Tag_Helper_Data::class,
+            'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
             'tag' => \Mage_Tag_Helper_Data::class,
+            'tag/data' => \Mage_Tag_Helper_Data::class,
             'tax' => \Mage_Tax_Helper_Data::class,
             'tax/data' => \Mage_Tax_Helper_Data::class,
             'uploader/data' => \Mage_Uploader_Helper_Data::class,
diff --git a/.phpstorm.meta.php/magento_models.meta.php b/.phpstorm.meta.php/magento_models.meta.php
index 5e62b2dcfce..afb980536e8 100644
--- a/.phpstorm.meta.php/magento_models.meta.php
+++ b/.phpstorm.meta.php/magento_models.meta.php
@@ -7,11 +7,10 @@
             'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class,
             'adminnotification/mysql4_inbox_collection' => \Mage_AdminNotification_Model_Mysql4_Inbox_Collection::class,
             'adminnotification/observer' => \Mage_AdminNotification_Model_Observer::class,
-            'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
             'adminnotification/resource_inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
-            'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
+            'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
             'adminnotification/resource_inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
-            'adminnotification/survey' => \Mage_AdminNotification_Model_Survey::class,
+            'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
             'admin/acl' => \Mage_Admin_Model_Acl::class,
             'admin/acl_assert_ip' => \Mage_Admin_Model_Acl_Assert_Ip::class,
             'admin/acl_assert_time' => \Mage_Admin_Model_Acl_Assert_Time::class,
@@ -40,38 +39,38 @@
             'admin/redirectpolicy' => \Mage_Admin_Model_Redirectpolicy::class,
             'admin/resource_acl' => \Mage_Admin_Model_Resource_Acl::class,
             'admin_resource/acl' => \Mage_Admin_Model_Resource_Acl::class,
-            'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
             'admin/resource_acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
+            'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
             'admin/resource_acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class,
             'admin_resource/acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class,
-            'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class,
             'admin/resource_block' => \Mage_Admin_Model_Resource_Block::class,
-            'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
+            'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class,
             'admin/resource_block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
+            'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
             'admin_resource/permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class,
             'admin/resource_permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class,
-            'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class,
             'admin/resource_role' => \Mage_Admin_Model_Resource_Role::class,
+            'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class,
             'admin/resource_role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class,
             'admin_resource/role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class,
-            'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class,
             'admin_resource/roles' => \Mage_Admin_Model_Resource_Roles::class,
-            'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
+            'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class,
             'admin_resource/roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
-            'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
+            'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
             'admin/resource_roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
+            'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
             'admin/resource_rules' => \Mage_Admin_Model_Resource_Rules::class,
             'admin_resource/rules' => \Mage_Admin_Model_Resource_Rules::class,
             'admin_resource/rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
             'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
-            'admin_resource/user' => \Mage_Admin_Model_Resource_User::class,
             'admin/resource_user' => \Mage_Admin_Model_Resource_User::class,
+            'admin_resource/user' => \Mage_Admin_Model_Resource_User::class,
             'admin/resource_user_collection' => \Mage_Admin_Model_Resource_User_Collection::class,
             'admin_resource/user_collection' => \Mage_Admin_Model_Resource_User_Collection::class,
-            'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class,
             'admin_resource/variable' => \Mage_Admin_Model_Resource_Variable::class,
-            'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
+            'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class,
             'admin/resource_variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
+            'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
             'admin/role' => \Mage_Admin_Model_Role::class,
             'admin/roles' => \Mage_Admin_Model_Roles::class,
             'admin/rules' => \Mage_Admin_Model_Rules::class,
@@ -106,6 +105,7 @@
             'adminhtml/system_config_backend_baseurl' => \Mage_Adminhtml_Model_System_Config_Backend_Baseurl::class,
             'adminhtml/system_config_backend_cache' => \Mage_Adminhtml_Model_System_Config_Backend_Cache::class,
             'adminhtml/system_config_backend_catalog_inventory_managestock' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock::class,
+            'adminhtml/system_config_backend_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Separator::class,
             'adminhtml/system_config_backend_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Type::class,
             'adminhtml/system_config_backend_category' => \Mage_Adminhtml_Model_System_Config_Backend_Category::class,
             'adminhtml/system_config_backend_cookie' => \Mage_Adminhtml_Model_System_Config_Backend_Cookie::class,
@@ -158,12 +158,14 @@
             'adminhtml/system_config_source_catalog_listMode' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListMode::class,
             'adminhtml/system_config_source_catalog_listPerPage' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListPerPage::class,
             'adminhtml/system_config_source_catalog_listSort' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort::class,
+            'adminhtml/system_config_source_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Separator::class,
             'adminhtml/system_config_source_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Type::class,
             'adminhtml/system_config_source_catalog_timeFormat' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_TimeFormat::class,
             'adminhtml/system_config_source_category' => \Mage_Adminhtml_Model_System_Config_Source_Category::class,
             'adminhtml/system_config_source_checktype' => \Mage_Adminhtml_Model_System_Config_Source_Checktype::class,
             'adminhtml/system_config_source_cms_page' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Page::class,
             'adminhtml/system_config_source_cms_wysiwyg_enabled' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Wysiwyg_Enabled::class,
+            'adminhtml/system_config_source_cookie_samesite' => \Mage_Adminhtml_Model_System_Config_Source_Cookie_Samesite::class,
             'adminhtml/system_config_source_country' => \Mage_Adminhtml_Model_System_Config_Source_Country::class,
             'adminhtml/system_config_source_country_full' => \Mage_Adminhtml_Model_System_Config_Source_Country_Full::class,
             'adminhtml/system_config_source_cron_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency::class,
@@ -190,6 +192,7 @@
             'adminhtml/system_config_source_locale_timezone' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Timezone::class,
             'adminhtml/system_config_source_locale_weekdaycodes' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdaycodes::class,
             'adminhtml/system_config_source_locale_weekdays' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdays::class,
+            'adminhtml/system_config_source_log_level' => \Mage_Adminhtml_Model_System_Config_Source_Log_Level::class,
             'adminhtml/system_config_source_nooptreq' => \Mage_Adminhtml_Model_System_Config_Source_Nooptreq::class,
             'adminhtml/system_config_source_notification_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Notification_Frequency::class,
             'adminhtml/system_config_source_order_status' => \Mage_Adminhtml_Model_System_Config_Source_Order_Status::class,
@@ -213,7 +216,6 @@
             'adminhtml/system_config_source_shipping_flatrate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Flatrate::class,
             'adminhtml/system_config_source_shipping_tablerate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Tablerate::class,
             'adminhtml/system_config_source_shipping_taxclass' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Taxclass::class,
-            'adminhtml/system_config_source_startdateenddate' => \Mage_Adminhtml_Model_System_Config_Source_Startdateenddate::class,
             'adminhtml/system_config_source_storage_media_database' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Database::class,
             'adminhtml/system_config_source_storage_media_storage' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Storage::class,
             'adminhtml/system_config_source_store' => \Mage_Adminhtml_Model_System_Config_Source_Store::class,
@@ -269,22 +271,22 @@
             'api2_resource/acl_filter_attribute' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute::class,
             'api2/resource_acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class,
             'api2_resource/acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class,
-            'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
             'api2_resource/acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
+            'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
             'api2/resource_acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class,
             'api2_resource/acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class,
             'api2_resource/acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class,
             'api2/resource_acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class,
             'api2/resource_acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class,
             'api2_resource/acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class,
-            'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class,
             'api2/resource_setup' => \Mage_Api2_Model_Resource_Setup::class,
+            'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class,
             'api2/resource_validator' => \Mage_Api2_Model_Resource_Validator::class,
             'api2_resource/validator' => \Mage_Api2_Model_Resource_Validator::class,
             'api2/resource_validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class,
             'api2_resource/validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class,
-            'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
             'api2/resource_validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
+            'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
             'api2/response' => \Mage_Api2_Model_Response::class,
             'api2/route_abstract' => \Mage_Api2_Model_Route_Abstract::class,
             'api2/route_apiType' => \Mage_Api2_Model_Route_ApiType::class,
@@ -316,8 +318,8 @@
             'api/mysql4_user_collection' => \Mage_Api_Model_Mysql4_User_Collection::class,
             'api/resource_abstract' => \Mage_Api_Model_Resource_Abstract::class,
             'api_resource/abstract' => \Mage_Api_Model_Resource_Abstract::class,
-            'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class,
             'api_resource/acl' => \Mage_Api_Model_Resource_Acl::class,
+            'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class,
             'api_resource/acl_role' => \Mage_Api_Model_Resource_Acl_Role::class,
             'api/resource_acl_role' => \Mage_Api_Model_Resource_Acl_Role::class,
             'api/resource_acl_role_collection' => \Mage_Api_Model_Resource_Acl_Role_Collection::class,
@@ -326,18 +328,18 @@
             'api_resource/permissions_collection' => \Mage_Api_Model_Resource_Permissions_Collection::class,
             'api_resource/role' => \Mage_Api_Model_Resource_Role::class,
             'api/resource_role' => \Mage_Api_Model_Resource_Role::class,
-            'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
             'api_resource/role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
+            'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
             'api/resource_roles' => \Mage_Api_Model_Resource_Roles::class,
             'api_resource/roles' => \Mage_Api_Model_Resource_Roles::class,
-            'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
             'api_resource/roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
-            'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
+            'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
             'api_resource/roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
-            'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class,
+            'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
             'api_resource/rules' => \Mage_Api_Model_Resource_Rules::class,
-            'api/resource_rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class,
+            'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class,
             'api_resource/rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class,
+            'api/resource_rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class,
             'api/resource_user' => \Mage_Api_Model_Resource_User::class,
             'api_resource/user' => \Mage_Api_Model_Resource_User::class,
             'api/resource_user_collection' => \Mage_Api_Model_Resource_User_Collection::class,
@@ -364,15 +366,6 @@
             'authorizenet/directpost_request' => \Mage_Authorizenet_Model_Directpost_Request::class,
             'authorizenet/directpost_response' => \Mage_Authorizenet_Model_Directpost_Response::class,
             'authorizenet/directpost_session' => \Mage_Authorizenet_Model_Directpost_Session::class,
-            'backup/backup' => \Mage_Backup_Model_Backup::class,
-            'backup/config_backend_cron' => \Mage_Backup_Model_Config_Backend_Cron::class,
-            'backup/config_source_type' => \Mage_Backup_Model_Config_Source_Type::class,
-            'backup/db' => \Mage_Backup_Model_Db::class,
-            'backup/fs_collection' => \Mage_Backup_Model_Fs_Collection::class,
-            'backup/mysql4_db' => \Mage_Backup_Model_Mysql4_Db::class,
-            'backup/observer' => \Mage_Backup_Model_Observer::class,
-            'backup/resource_db' => \Mage_Backup_Model_Resource_Db::class,
-            'backup/resource_helper_mysql4' => \Mage_Backup_Model_Resource_Helper_Mysql4::class,
             'bundle/catalogIndex_data_bundle' => \Mage_Bundle_Model_CatalogIndex_Data_Bundle::class,
             'bundle/mysql4_bundle' => \Mage_Bundle_Model_Mysql4_Bundle::class,
             'bundle/mysql4_indexer_price' => \Mage_Bundle_Model_Mysql4_Indexer_Price::class,
@@ -398,10 +391,10 @@
             'bundle_resource/option' => \Mage_Bundle_Model_Resource_Option::class,
             'bundle/resource_option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class,
             'bundle_resource/option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class,
-            'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
             'bundle_resource/price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
-            'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class,
+            'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
             'bundle_resource/selection' => \Mage_Bundle_Model_Resource_Selection::class,
+            'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class,
             'bundle_resource/selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class,
             'bundle/resource_selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class,
             'bundle/sales_order_pdf_items_abstract' => \Mage_Bundle_Model_Sales_Order_Pdf_Items_Abstract::class,
@@ -417,8 +410,8 @@
             'captcha/config_form_frontend' => \Mage_Captcha_Model_Config_Form_Frontend::class,
             'captcha/config_mode' => \Mage_Captcha_Model_Config_Mode::class,
             'captcha/observer' => \Mage_Captcha_Model_Observer::class,
-            'captcha_resource/log' => \Mage_Captcha_Model_Resource_Log::class,
             'captcha/resource_log' => \Mage_Captcha_Model_Resource_Log::class,
+            'captcha_resource/log' => \Mage_Captcha_Model_Resource_Log::class,
             'captcha/zend' => \Mage_Captcha_Model_Zend::class,
             'catalogindex/aggregation' => \Mage_CatalogIndex_Model_Aggregation::class,
             'catalogindex/attribute' => \Mage_CatalogIndex_Model_Attribute::class,
@@ -461,8 +454,8 @@
             'catalogindex/resource_data_abstract' => \Mage_CatalogIndex_Model_Resource_Data_Abstract::class,
             'catalogindex_resource/data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class,
             'catalogindex/resource_data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class,
-            'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
             'catalogindex_resource/data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
+            'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
             'catalogindex_resource/indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class,
             'catalogindex/resource_indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class,
             'catalogindex/resource_indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class,
@@ -494,20 +487,20 @@
             'cataloginventory/mysql4_stock_item_collection' => \Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection::class,
             'cataloginventory/mysql4_stock_status' => \Mage_CatalogInventory_Model_Mysql4_Stock_Status::class,
             'cataloginventory/observer' => \Mage_CatalogInventory_Model_Observer::class,
-            'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
             'cataloginventory_resource/indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
+            'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
             'cataloginventory/resource_indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class,
             'cataloginventory_resource/indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class,
-            'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
             'cataloginventory/resource_indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
+            'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
             'cataloginventory/resource_indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class,
             'cataloginventory_resource/indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class,
             'cataloginventory_resource/stock' => \Mage_CatalogInventory_Model_Resource_Stock::class,
             'cataloginventory/resource_stock' => \Mage_CatalogInventory_Model_Resource_Stock::class,
-            'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
             'cataloginventory/resource_stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
-            'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
+            'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
             'cataloginventory/resource_stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
+            'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
             'cataloginventory/resource_stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class,
             'cataloginventory_resource/stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class,
             'cataloginventory/source_backorders' => \Mage_CatalogInventory_Model_Source_Backorders::class,
@@ -530,8 +523,8 @@
             'catalogrule/observer' => \Mage_CatalogRule_Model_Observer::class,
             'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
             'catalogrule/resource_rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
-            'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
             'catalogrule_resource/rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
+            'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
             'catalogrule_resource/rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class,
             'catalogrule/resource_rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class,
             'catalogrule_resource/rule_product_price_collection' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price_Collection::class,
@@ -560,24 +553,24 @@
             'catalogsearch/query' => \Mage_CatalogSearch_Model_Query::class,
             'catalogsearch_resource/advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class,
             'catalogsearch/resource_advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class,
-            'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
             'catalogsearch_resource/advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
+            'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
             'catalogsearch_resource/fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class,
             'catalogsearch/resource_fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class,
             'catalogsearch_resource/fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class,
             'catalogsearch/resource_fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class,
-            'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
             'catalogsearch_resource/fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
-            'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
+            'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
             'catalogsearch/resource_helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
-            'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
+            'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
             'catalogsearch_resource/indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
-            'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class,
+            'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
             'catalogsearch_resource/query' => \Mage_CatalogSearch_Model_Resource_Query::class,
-            'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
+            'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class,
             'catalogsearch_resource/query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
-            'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
+            'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
             'catalogsearch/resource_search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
+            'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
             'catalogsearch/session' => \Mage_CatalogSearch_Model_Session::class,
             'catalogsearch/system_config_backend_sitemap' => \Mage_CatalogSearch_Model_System_Config_Backend_Sitemap::class,
             'catalog/abstract' => \Mage_Catalog_Model_Abstract::class,
@@ -720,144 +713,144 @@
             'catalog/product_website' => \Mage_Catalog_Model_Product_Website::class,
             'catalog/resource_abstract' => \Mage_Catalog_Model_Resource_Abstract::class,
             'catalog_resource/abstract' => \Mage_Catalog_Model_Resource_Abstract::class,
-            'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
             'catalog/resource_attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
-            'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class,
+            'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
             'catalog_resource/category' => \Mage_Catalog_Model_Resource_Category::class,
+            'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class,
             'catalog_resource/category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class,
             'catalog/resource_category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class,
-            'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
             'catalog/resource_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
-            'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
+            'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
             'catalog/resource_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
+            'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
             'catalog_resource/category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class,
             'catalog/resource_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class,
             'catalog_resource/category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class,
             'catalog/resource_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class,
             'catalog/resource_category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class,
             'catalog_resource/category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class,
-            'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
             'catalog_resource/category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
-            'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
+            'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
             'catalog/resource_category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
+            'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
             'catalog_resource/category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class,
             'catalog/resource_category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class,
             'catalog/resource_category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class,
             'catalog_resource/category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class,
-            'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
             'catalog_resource/collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
+            'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
             'catalog_resource/config' => \Mage_Catalog_Model_Resource_Config::class,
             'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class,
-            'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
             'catalog/resource_eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
+            'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
             'catalog_resource/eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class,
             'catalog/resource_eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class,
             'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
             'catalog_resource/eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
-            'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
             'catalog/resource_eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
-            'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
+            'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
             'catalog_resource/eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
+            'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
             'catalog_resource/eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
-            'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
+            'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
             'catalog_resource/eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
+            'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
             'catalog/resource_eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class,
             'catalog_resource/eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class,
             'catalog/resource_eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class,
             'catalog_resource/eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class,
             'catalog/resource_eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class,
             'catalog_resource/eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class,
-            'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
             'catalog/resource_eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
+            'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
             'catalog/resource_eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
             'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
             'catalog/resource_eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class,
             'catalog_resource/eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class,
-            'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
             'catalog_resource/eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
-            'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
+            'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
             'catalog_resource/eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
+            'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
             'catalog_resource/eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class,
             'catalog/resource_eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class,
-            'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
             'catalog_resource/eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
+            'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
             'catalog/resource_eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
             'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
-            'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
             'catalog/resource_eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
-            'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
+            'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
             'catalog/resource_eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
-            'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
+            'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
             'catalog_resource/eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
+            'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
             'catalog/resource_eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class,
             'catalog/resource_eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
+            'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
             'catalog/resource_eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class,
             'catalog/resource_eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class,
             'catalog/resource_eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class,
-            'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
             'catalog_resource/eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
-            'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
+            'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
             'catalog_resource/eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
-            'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
+            'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
             'catalog_resource/eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
+            'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
             'catalog/resource_eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class,
             'catalog/resource_eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class,
             'catalog/resource_eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class,
-            'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
             'catalog/resource_eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
-            'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
+            'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
             'catalog_resource/eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
+            'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
             'catalog_resource/eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class,
             'catalog/resource_eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class,
-            'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
             'catalog/resource_eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
-            'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
+            'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
             'catalog/resource_eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
+            'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
             'catalog/resource_eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class,
             'catalog_resource/eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class,
-            'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
             'catalog/resource_eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
+            'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
             'catalog_resource/eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class,
             'catalog/resource_eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class,
             'catalog_resource/eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class,
             'catalog/resource_eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class,
-            'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
             'catalog/resource_eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
-            'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
+            'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
             'catalog_resource/eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
-            'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
+            'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
             'catalog/resource_eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
+            'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
             'catalog/resource_eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
             'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
-            'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
             'catalog/resource_eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
+            'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
             'catalog/resource_eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class,
             'catalog_resource/eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class,
-            'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
             'catalog_resource/eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
-            'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
+            'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
             'catalog/resource_eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
-            'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
             'catalog/resource_eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
+            'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
             'catalog_resource/eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
+            'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
             'catalog/resource_eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class,
             'catalog_resource/eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class,
             'catalog/resource_eav_mysql4_sendfriend' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend::class,
@@ -866,16 +859,16 @@
             'catalog/resource_eav_mysql4_sendfriend_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection::class,
             'catalog_resource/eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class,
             'catalog/resource_eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class,
-            'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
             'catalog/resource_eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
-            'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
+            'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
             'catalog/resource_helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
+            'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
             'catalog_resource/layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class,
             'catalog/resource_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class,
             'catalog/resource_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class,
             'catalog_resource/layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class,
-            'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
             'catalog/resource_layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
+            'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
             'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class,
             'catalog_resource/product' => \Mage_Catalog_Model_Resource_Product::class,
             'catalog/resource_product_action' => \Mage_Catalog_Model_Resource_Product_Action::class,
@@ -886,42 +879,42 @@
             'catalog_resource/product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class,
             'catalog/resource_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class,
             'catalog_resource/product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class,
-            'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
             'catalog/resource_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
-            'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
+            'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
             'catalog_resource/product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
+            'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
             'catalog/resource_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class,
-            'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
             'catalog_resource/product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
-            'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
+            'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
             'catalog/resource_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
-            'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
+            'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
             'catalog_resource/product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
-            'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
+            'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
+            'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
             'catalog_resource/product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class,
             'catalog/resource_product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class,
-            'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
             'catalog/resource_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
+            'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
             'catalog/resource_product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class,
             'catalog_resource/product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class,
-            'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
             'catalog/resource_product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
+            'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
             'catalog/resource_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class,
             'catalog_resource/product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class,
-            'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
             'catalog_resource/product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
-            'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
+            'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
             'catalog/resource_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
+            'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
             'catalog/resource_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class,
             'catalog_resource/product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class,
-            'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
             'catalog_resource/product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
+            'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
             'catalog_resource/product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
             'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
-            'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
             'catalog_resource/product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
+            'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
             'catalog/resource_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class,
             'catalog_resource/product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class,
             'catalog_resource/product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class,
@@ -932,12 +925,12 @@
             'catalog_resource/product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class,
             'catalog/resource_product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
             'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
-            'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
             'catalog_resource/product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
-            'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
+            'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
             'catalog/resource_product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
-            'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
+            'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
             'catalog_resource/product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
+            'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
             'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
             'catalog_resource/product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
             'catalog_resource/product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class,
@@ -946,14 +939,14 @@
             'catalog/resource_product_status' => \Mage_Catalog_Model_Resource_Product_Status::class,
             'catalog_resource/product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class,
             'catalog/resource_product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class,
-            'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
             'catalog/resource_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
-            'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
             'catalog_resource/product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
             'catalog_resource/product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class,
             'catalog/resource_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class,
-            'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
             'catalog_resource/product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
+            'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
             'catalog/resource_setup' => \Mage_Catalog_Model_Resource_Setup::class,
             'catalog_resource/setup' => \Mage_Catalog_Model_Resource_Setup::class,
             'catalog_resource/url' => \Mage_Catalog_Model_Resource_Url::class,
@@ -999,12 +992,12 @@
             'checkout/observer' => \Mage_Checkout_Model_Observer::class,
             'checkout_resource/agreement' => \Mage_Checkout_Model_Resource_Agreement::class,
             'checkout/resource_agreement' => \Mage_Checkout_Model_Resource_Agreement::class,
-            'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
             'checkout/resource_agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
-            'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class,
+            'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
             'checkout_resource/cart' => \Mage_Checkout_Model_Resource_Cart::class,
-            'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class,
+            'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class,
             'checkout/resource_setup' => \Mage_Checkout_Model_Resource_Setup::class,
+            'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class,
             'checkout/session' => \Mage_Checkout_Model_Session::class,
             'checkout/type_abstract' => \Mage_Checkout_Model_Type_Abstract::class,
             'checkout/type_multishipping' => \Mage_Checkout_Model_Type_Multishipping::class,
@@ -1019,25 +1012,25 @@
             'cms/mysql4_page_service' => \Mage_Cms_Model_Mysql4_Page_Service::class,
             'cms/observer' => \Mage_Cms_Model_Observer::class,
             'cms/page' => \Mage_Cms_Model_Page::class,
-            'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class,
             'cms/resource_block' => \Mage_Cms_Model_Resource_Block::class,
+            'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class,
             'cms_resource/block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class,
             'cms/resource_block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class,
             'cms/resource_page' => \Mage_Cms_Model_Resource_Page::class,
             'cms_resource/page' => \Mage_Cms_Model_Resource_Page::class,
-            'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
             'cms_resource/page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
-            'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
+            'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
             'cms/resource_page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
+            'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
             'cms/template_filter' => \Mage_Cms_Model_Template_Filter::class,
             'cms/wysiwyg_config' => \Mage_Cms_Model_Wysiwyg_Config::class,
             'cms/wysiwyg_images_storage' => \Mage_Cms_Model_Wysiwyg_Images_Storage::class,
             'cms/wysiwyg_images_storage_collection' => \Mage_Cms_Model_Wysiwyg_Images_Storage_Collection::class,
             'configurableswatches/observer' => \Mage_ConfigurableSwatches_Model_Observer::class,
-            'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
             'configurableswatches_resource/catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
-            'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
+            'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
             'configurableswatches_resource/catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
+            'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
             'configurableswatches_resource/catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
             'configurableswatches/resource_catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
             'configurableswatches/system_config_source_catalog_product_configattribute' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute::class,
@@ -1144,152 +1137,152 @@
             'core/mysql4_website_collection' => \Mage_Core_Model_Mysql4_Website_Collection::class,
             'core/observer' => \Mage_Core_Model_Observer::class,
             'core/resource' => \Mage_Core_Model_Resource::class,
+            'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
             'core_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
             'core/resource_abstract' => \Mage_Core_Model_Resource_Abstract::class,
-            'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
+            'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
             'core/resource_cache' => \Mage_Core_Model_Resource_Cache::class,
             'core_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
-            'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
             'core_resource/config' => \Mage_Core_Model_Resource_Config::class,
             'payment_resource/config' => \Mage_Core_Model_Resource_Config::class,
             'core/resource_config' => \Mage_Core_Model_Resource_Config::class,
-            'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
             'core/resource_config_data' => \Mage_Core_Model_Resource_Config_Data::class,
+            'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
             'payment_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
-            'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'core_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
-            'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
-            'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
+            'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'payment_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
-            'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
+            'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
+            'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
             'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
             'core/resource_db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
-            'core/resource_design' => \Mage_Core_Model_Resource_Design::class,
+            'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
             'core_resource/design' => \Mage_Core_Model_Resource_Design::class,
+            'core/resource_design' => \Mage_Core_Model_Resource_Design::class,
             'payment_resource/design' => \Mage_Core_Model_Resource_Design::class,
-            'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
-            'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
             'payment_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
-            'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
+            'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
+            'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
             'payment_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
             'core/resource_design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
+            'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
             'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
             'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
             'core/resource_email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
-            'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
-            'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
             'payment_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
-            'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
+            'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
+            'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
             'core/resource_email_template' => \Mage_Core_Model_Resource_Email_Template::class,
             'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
-            'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
+            'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
             'core/resource_email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
+            'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
             'core_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
-            'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
-            'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
             'core_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
-            'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
-            'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
+            'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
             'core_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
             'payment_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
             'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
-            'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
+            'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
             'payment_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
             'core/resource_file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
-            'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
+            'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
             'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
             'core/resource_file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
-            'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
-            'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
             'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
+            'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
             'core/resource_file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
             'payment_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
-            'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class,
             'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
+            'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class,
             'payment_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
-            'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
             'core_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
-            'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
+            'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
             'core/resource_helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
+            'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
             'core_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
             'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
             'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
             'core/resource_iterator' => \Mage_Core_Model_Resource_Iterator::class,
-            'core/resource_language' => \Mage_Core_Model_Resource_Language::class,
-            'core_resource/language' => \Mage_Core_Model_Resource_Language::class,
             'payment_resource/language' => \Mage_Core_Model_Resource_Language::class,
+            'core_resource/language' => \Mage_Core_Model_Resource_Language::class,
+            'core/resource_language' => \Mage_Core_Model_Resource_Language::class,
             'payment_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
-            'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
             'core/resource_language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
-            'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
+            'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
             'core_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
             'core/resource_layout' => \Mage_Core_Model_Resource_Layout::class,
+            'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
             'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
-            'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class,
             'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
+            'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class,
             'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
-            'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'payment_resource/session' => \Mage_Core_Model_Resource_Session::class,
+            'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
             'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class,
             'payment_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
-            'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core/resource_setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
+            'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'payment_resource/store' => \Mage_Core_Model_Resource_Store::class,
             'core_resource/store' => \Mage_Core_Model_Resource_Store::class,
             'core/resource_store' => \Mage_Core_Model_Resource_Store::class,
-            'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
             'core/resource_store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
+            'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
             'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
-            'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'core/resource_store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'payment_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
-            'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
-            'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
+            'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'payment_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
-            'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
+            'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
+            'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
             'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class,
+            'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
             'core_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
             'core_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
-            'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
             'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class,
-            'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
-            'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
+            'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
             'payment_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
-            'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
+            'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
             'core/resource_type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
             'payment_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'core/resource_type_db' => \Mage_Core_Model_Resource_Type_Db::class,
-            'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'core_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
             'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
             'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
-            'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
-            'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
             'payment_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
             'payment_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
-            'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
             'core_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
-            'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
-            'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
+            'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
             'payment_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
+            'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
+            'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
             'core_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'core_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
-            'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
             'core/resource_variable' => \Mage_Core_Model_Resource_Variable::class,
+            'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
             'core/resource_variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
-            'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
             'core_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
+            'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
+            'core/resource_website' => \Mage_Core_Model_Resource_Website::class,
             'core_resource/website' => \Mage_Core_Model_Resource_Website::class,
             'payment_resource/website' => \Mage_Core_Model_Resource_Website::class,
-            'core/resource_website' => \Mage_Core_Model_Resource_Website::class,
-            'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core/resource_website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
+            'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core/session' => \Mage_Core_Model_Session::class,
             'core/session_abstract' => \Mage_Core_Model_Session_Abstract::class,
@@ -1319,10 +1312,10 @@
             'cron/mysql4_schedule' => \Mage_Cron_Model_Mysql4_Schedule::class,
             'cron/mysql4_schedule_collection' => \Mage_Cron_Model_Mysql4_Schedule_Collection::class,
             'cron/observer' => \Mage_Cron_Model_Observer::class,
-            'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class,
             'cron/resource_schedule' => \Mage_Cron_Model_Resource_Schedule::class,
-            'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
+            'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class,
             'cron/resource_schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
+            'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
             'cron/schedule' => \Mage_Cron_Model_Schedule::class,
             'currencysymbol/observer' => \Mage_CurrencySymbol_Model_Observer::class,
             'currencysymbol/system_currencysymbol' => \Mage_CurrencySymbol_Model_System_Currencysymbol::class,
@@ -1397,16 +1390,16 @@
             'customer_resource/address' => \Mage_Customer_Model_Resource_Address::class,
             'customer/resource_address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class,
             'customer_resource/address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class,
-            'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
             'customer_resource/address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
-            'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
+            'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
             'customer/resource_address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
-            'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
+            'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
             'customer/resource_address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
-            'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
+            'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
             'customer_resource/address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
-            'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
+            'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
             'customer_resource/address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
+            'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
             'customer/resource_attribute' => \Mage_Customer_Model_Resource_Attribute::class,
             'customer_resource/attribute' => \Mage_Customer_Model_Resource_Attribute::class,
             'customer_resource/attribute_collection' => \Mage_Customer_Model_Resource_Attribute_Collection::class,
@@ -1415,22 +1408,22 @@
             'customer_resource/customer' => \Mage_Customer_Model_Resource_Customer::class,
             'customer_resource/customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class,
             'customer/resource_customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class,
-            'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
             'customer/resource_flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
-            'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
+            'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
             'customer/resource_flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
-            'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
+            'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
             'customer/resource_form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
-            'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
+            'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
             'customer/resource_form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
+            'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
             'customer/resource_group' => \Mage_Customer_Model_Resource_Group::class,
             'customer_resource/group' => \Mage_Customer_Model_Resource_Group::class,
             'customer_resource/group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class,
             'customer/resource_group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class,
-            'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class,
             'customer_resource/setup' => \Mage_Customer_Model_Resource_Setup::class,
-            'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
+            'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class,
             'customer_resource/wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
+            'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
             'customer/session' => \Mage_Customer_Model_Session::class,
             'dataflow/batch' => \Mage_Dataflow_Model_Batch::class,
             'dataflow/batch_abstract' => \Mage_Dataflow_Model_Batch_Abstract::class,
@@ -1482,10 +1475,10 @@
             'dataflow/mysql4_session' => \Mage_Dataflow_Model_Mysql4_Session::class,
             'dataflow/profile' => \Mage_Dataflow_Model_Profile::class,
             'dataflow/profile_history' => \Mage_Dataflow_Model_Profile_History::class,
-            'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class,
             'dataflow/resource_batch' => \Mage_Dataflow_Model_Resource_Batch::class,
-            'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
+            'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class,
             'dataflow/resource_batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
+            'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
             'dataflow/resource_batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class,
             'dataflow_resource/batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class,
             'dataflow_resource/batch_export' => \Mage_Dataflow_Model_Resource_Batch_Export::class,
@@ -1496,12 +1489,12 @@
             'dataflow/resource_import' => \Mage_Dataflow_Model_Resource_Import::class,
             'dataflow_resource/import_collection' => \Mage_Dataflow_Model_Resource_Import_Collection::class,
             'dataflow/resource_import_collection' => \Mage_Dataflow_Model_Resource_Import_Collection::class,
-            'dataflow_resource/profile' => \Mage_Dataflow_Model_Resource_Profile::class,
             'dataflow/resource_profile' => \Mage_Dataflow_Model_Resource_Profile::class,
+            'dataflow_resource/profile' => \Mage_Dataflow_Model_Resource_Profile::class,
             'dataflow/resource_profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class,
             'dataflow_resource/profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class,
-            'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
             'dataflow_resource/profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
+            'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
             'dataflow_resource/profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class,
             'dataflow/resource_profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class,
             'dataflow_resource/session' => \Mage_Dataflow_Model_Resource_Session::class,
@@ -1535,8 +1528,8 @@
             'directory/resource_country' => \Mage_Directory_Model_Resource_Country::class,
             'directory_resource/country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class,
             'directory/resource_country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class,
-            'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
             'directory/resource_country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
+            'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
             'directory_resource/country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class,
             'directory/resource_country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class,
             'directory_resource/currency' => \Mage_Directory_Model_Resource_Currency::class,
@@ -1567,8 +1560,8 @@
             'downloadable/observer' => \Mage_Downloadable_Model_Observer::class,
             'downloadable/product_price' => \Mage_Downloadable_Model_Product_Price::class,
             'downloadable/product_type' => \Mage_Downloadable_Model_Product_Type::class,
-            'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
             'downloadable_resource/indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
+            'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
             'downloadable/resource_link' => \Mage_Downloadable_Model_Resource_Link::class,
             'downloadable_resource/link' => \Mage_Downloadable_Model_Resource_Link::class,
             'downloadable/resource_link_collection' => \Mage_Downloadable_Model_Resource_Link_Collection::class,
@@ -1577,12 +1570,12 @@
             'downloadable_resource/link_purchased' => \Mage_Downloadable_Model_Resource_Link_Purchased::class,
             'downloadable/resource_link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class,
             'downloadable_resource/link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class,
-            'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
             'downloadable/resource_link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
+            'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
             'downloadable/resource_link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
             'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
-            'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class,
             'downloadable/resource_sample' => \Mage_Downloadable_Model_Resource_Sample::class,
+            'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class,
             'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
             'downloadable/resource_sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
             'downloadable/sales_order_pdf_items_abstract' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Abstract::class,
@@ -1670,46 +1663,46 @@
             'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class,
             'eav_resource/attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class,
             'eav/resource_attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class,
-            'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class,
             'eav_resource/config' => \Mage_Eav_Model_Resource_Config::class,
+            'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class,
             'eav/resource_entity_attribute' => \Mage_Eav_Model_Resource_Entity_Attribute::class,
             'eav_resource/entity_attribute' => \Mage_Eav_Model_Resource_Entity_Attribute::class,
             'eav_resource/entity_attribute_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Collection::class,
             'eav/resource_entity_attribute_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Collection::class,
             'eav_resource/entity_attribute_group' => \Mage_Eav_Model_Resource_Entity_Attribute_Group::class,
             'eav/resource_entity_attribute_group' => \Mage_Eav_Model_Resource_Entity_Attribute_Group::class,
-            'eav/resource_entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class,
             'eav_resource/entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class,
+            'eav/resource_entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class,
             'eav/resource_entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
             'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
-            'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
-            'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
+            'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
-            'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
+            'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
+            'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
             'eav_resource/entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class,
             'eav/resource_entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class,
             'eav_resource/entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class,
             'eav/resource_entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class,
-            'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
             'eav_resource/entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
+            'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
             'eav/resource_form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class,
             'eav_resource/form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class,
-            'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
             'eav/resource_form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
+            'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
             'eav/resource_form_element' => \Mage_Eav_Model_Resource_Form_Element::class,
             'eav_resource/form_element' => \Mage_Eav_Model_Resource_Form_Element::class,
-            'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
             'eav_resource/form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
-            'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
+            'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
             'eav/resource_form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
+            'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
             'eav_resource/form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
             'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
             'eav/resource_form_type' => \Mage_Eav_Model_Resource_Form_Type::class,
             'eav_resource/form_type' => \Mage_Eav_Model_Resource_Form_Type::class,
-            'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class,
             'eav_resource/form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class,
+            'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class,
             'eav_resource/helper_mysql4' => \Mage_Eav_Model_Resource_Helper_Mysql4::class,
             'eav/resource_helper_mysql4' => \Mage_Eav_Model_Resource_Helper_Mysql4::class,
             'giftmessage/api' => \Mage_GiftMessage_Model_Api::class,
@@ -1721,12 +1714,12 @@
             'giftmessage/mysql4_message_collection' => \Mage_GiftMessage_Model_Mysql4_Message_Collection::class,
             'giftmessage/mysql4_setup' => \Mage_GiftMessage_Model_Mysql4_Setup::class,
             'giftmessage/observer' => \Mage_GiftMessage_Model_Observer::class,
-            'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class,
             'giftmessage/resource_message' => \Mage_GiftMessage_Model_Resource_Message::class,
-            'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
+            'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class,
             'giftmessage_resource/message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
-            'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
+            'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
             'giftmessage_resource/setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
+            'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
             'googleanalytics/observer' => \Mage_GoogleAnalytics_Model_Observer::class,
             'googleanalytics/system_config_source_type' => \Mage_GoogleAnalytics_Model_System_Config_Source_Type::class,
             'googlecheckout/payment' => \Mage_GoogleCheckout_Model_Payment::class,
@@ -1762,8 +1755,8 @@
             'importexport/product_attribute_backend_urlkey' => \Mage_ImportExport_Model_Product_Attribute_Backend_Urlkey::class,
             'importexport_resource/helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class,
             'importexport/resource_helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class,
-            'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
             'importexport_resource/import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
+            'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
             'importexport_resource/setup' => \Mage_ImportExport_Model_Resource_Setup::class,
             'importexport/resource_setup' => \Mage_ImportExport_Model_Resource_Setup::class,
             'importexport/source_export_entity' => \Mage_ImportExport_Model_Source_Export_Entity::class,
@@ -1785,16 +1778,16 @@
             'index/process' => \Mage_Index_Model_Process::class,
             'index_resource/abstract' => \Mage_Index_Model_Resource_Abstract::class,
             'index/resource_abstract' => \Mage_Index_Model_Resource_Abstract::class,
-            'index/resource_event' => \Mage_Index_Model_Resource_Event::class,
             'index_resource/event' => \Mage_Index_Model_Resource_Event::class,
+            'index/resource_event' => \Mage_Index_Model_Resource_Event::class,
             'index/resource_event_collection' => \Mage_Index_Model_Resource_Event_Collection::class,
             'index_resource/event_collection' => \Mage_Index_Model_Resource_Event_Collection::class,
             'index/resource_helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class,
             'index_resource/helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class,
-            'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
             'index/resource_lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
-            'index_resource/process' => \Mage_Index_Model_Resource_Process::class,
+            'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
             'index/resource_process' => \Mage_Index_Model_Resource_Process::class,
+            'index_resource/process' => \Mage_Index_Model_Resource_Process::class,
             'index/resource_process_collection' => \Mage_Index_Model_Resource_Process_Collection::class,
             'index_resource/process_collection' => \Mage_Index_Model_Resource_Process_Collection::class,
             'index/resource_setup' => \Mage_Index_Model_Resource_Setup::class,
@@ -1827,22 +1820,22 @@
             'log/mysql4_visitor_online_collection' => \Mage_Log_Model_Mysql4_Visitor_Online_Collection::class,
             'log_resource/aggregation' => \Mage_Log_Model_Resource_Aggregation::class,
             'log/resource_aggregation' => \Mage_Log_Model_Resource_Aggregation::class,
-            'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class,
             'log/resource_customer' => \Mage_Log_Model_Resource_Customer::class,
+            'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class,
             'log/resource_log' => \Mage_Log_Model_Resource_Log::class,
             'log_resource/log' => \Mage_Log_Model_Resource_Log::class,
             'log_resource/visitor' => \Mage_Log_Model_Resource_Visitor::class,
             'log/resource_visitor' => \Mage_Log_Model_Resource_Visitor::class,
             'log_resource/visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class,
             'log/resource_visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class,
-            'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
             'log_resource/visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
-            'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
+            'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
             'log_resource/visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
+            'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
             'log/visitor' => \Mage_Log_Model_Visitor::class,
             'log/visitor_online' => \Mage_Log_Model_Visitor_Online::class,
-            'media_resource/image' => \Mage_Media_Model_File_Image::class,
             'media/file_image' => \Mage_Media_Model_File_Image::class,
+            'media_resource/image' => \Mage_Media_Model_File_Image::class,
             'media/image' => \Mage_Media_Model_Image::class,
             'newsletter/message' => \Mage_Newsletter_Model_Message::class,
             'newsletter/mysql4_problem' => \Mage_Newsletter_Model_Mysql4_Problem::class,
@@ -1860,14 +1853,14 @@
             'newsletter_resource/problem' => \Mage_Newsletter_Model_Resource_Problem::class,
             'newsletter/resource_problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class,
             'newsletter_resource/problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class,
-            'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class,
             'newsletter/resource_queue' => \Mage_Newsletter_Model_Resource_Queue::class,
-            'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
+            'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class,
             'newsletter/resource_queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
-            'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
+            'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
             'newsletter/resource_subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
-            'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
+            'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
             'newsletter/resource_subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
+            'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
             'newsletter_resource/template' => \Mage_Newsletter_Model_Resource_Template::class,
             'newsletter/resource_template' => \Mage_Newsletter_Model_Resource_Template::class,
             'newsletter_resource/template_collection' => \Mage_Newsletter_Model_Resource_Template_Collection::class,
@@ -1880,20 +1873,20 @@
             'oauth/consumer_validator_keyLength' => \Mage_Oauth_Model_Consumer_Validator_KeyLength::class,
             'oauth/nonce' => \Mage_Oauth_Model_Nonce::class,
             'oauth/observer' => \Mage_Oauth_Model_Observer::class,
-            'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
             'oauth/resource_consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
+            'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
             'oauth/resource_consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class,
             'oauth_resource/consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class,
             'oauth_resource/nonce' => \Mage_Oauth_Model_Resource_Nonce::class,
             'oauth/resource_nonce' => \Mage_Oauth_Model_Resource_Nonce::class,
             'oauth_resource/nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class,
             'oauth/resource_nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class,
-            'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class,
             'oauth/resource_setup' => \Mage_Oauth_Model_Resource_Setup::class,
-            'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class,
+            'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class,
             'oauth_resource/token' => \Mage_Oauth_Model_Resource_Token::class,
-            'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
+            'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class,
             'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
+            'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
             'oauth/server' => \Mage_Oauth_Model_Server::class,
             'oauth/token' => \Mage_Oauth_Model_Token::class,
             'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class,
@@ -1910,8 +1903,8 @@
             'paygate/authorizenet_source_paymentAction' => \Mage_Paygate_Model_Authorizenet_Source_PaymentAction::class,
             'paygate/mysql4_authorizenet_debug' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug::class,
             'paygate/mysql4_authorizenet_debug_collection' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection::class,
-            'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
             'paygate/resource_authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
+            'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
             'paygate_resource/authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class,
             'paygate/resource_authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class,
             'payment/billing_agreementAbstract' => \Mage_Payment_Model_Billing_AgreementAbstract::class,
@@ -1974,12 +1967,12 @@
             'paypal/resource_cert' => \Mage_Paypal_Model_Resource_Cert::class,
             'paypal_resource/payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class,
             'paypal/resource_payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class,
-            'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
             'paypal/resource_payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
+            'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
             'paypal/resource_report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class,
             'paypal_resource/report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class,
-            'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
             'paypal/resource_report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
+            'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
             'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
             'paypal/resource_report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
             'paypal/resource_setup' => \Mage_Paypal_Model_Resource_Setup::class,
@@ -2004,8 +1997,8 @@
             'persistent/observer' => \Mage_Persistent_Model_Observer::class,
             'persistent/observer_session' => \Mage_Persistent_Model_Observer_Session::class,
             'persistent/persistent_config' => \Mage_Persistent_Model_Persistent_Config::class,
-            'persistent/resource_session' => \Mage_Persistent_Model_Resource_Session::class,
             'persistent_resource/session' => \Mage_Persistent_Model_Resource_Session::class,
+            'persistent/resource_session' => \Mage_Persistent_Model_Resource_Session::class,
             'persistent/session' => \Mage_Persistent_Model_Session::class,
             'poll/mysql4_poll' => \Mage_Poll_Model_Mysql4_Poll::class,
             'poll/mysql4_poll_answer' => \Mage_Poll_Model_Mysql4_Poll_Answer::class,
@@ -2015,16 +2008,16 @@
             'poll/poll' => \Mage_Poll_Model_Poll::class,
             'poll/poll_answer' => \Mage_Poll_Model_Poll_Answer::class,
             'poll/poll_vote' => \Mage_Poll_Model_Poll_Vote::class,
-            'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class,
             'poll_resource/poll' => \Mage_Poll_Model_Resource_Poll::class,
+            'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class,
             'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
             'poll/resource_poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
-            'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
             'poll_resource/poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
-            'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
+            'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
             'poll_resource/poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
-            'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
+            'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
             'poll/resource_poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
+            'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
             'productalert/email' => \Mage_ProductAlert_Model_Email::class,
             'productalert/mysql4_price' => \Mage_ProductAlert_Model_Mysql4_Price::class,
             'productalert/mysql4_price_collection' => \Mage_ProductAlert_Model_Mysql4_Price_Collection::class,
@@ -2034,20 +2027,20 @@
             'productalert/mysql4_stock_customer_collection' => \Mage_ProductAlert_Model_Mysql4_Stock_Customer_Collection::class,
             'productalert/observer' => \Mage_ProductAlert_Model_Observer::class,
             'productalert/price' => \Mage_ProductAlert_Model_Price::class,
-            'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
             'productalert_resource/abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
-            'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class,
+            'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
             'productalert_resource/price' => \Mage_ProductAlert_Model_Resource_Price::class,
-            'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
+            'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class,
             'productalert/resource_price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
-            'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
+            'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
             'productalert/resource_price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
+            'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
             'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
             'productalert/resource_stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
-            'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
             'productalert/resource_stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
-            'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
+            'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
             'productalert/resource_stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
+            'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
             'productalert/stock' => \Mage_ProductAlert_Model_Stock::class,
             'rating/mysql4_rating' => \Mage_Rating_Model_Mysql4_Rating::class,
             'rating/mysql4_rating_collection' => \Mage_Rating_Model_Mysql4_Rating_Collection::class,
@@ -2061,20 +2054,20 @@
             'rating/rating_entity' => \Mage_Rating_Model_Rating_Entity::class,
             'rating/rating_option' => \Mage_Rating_Model_Rating_Option::class,
             'rating/rating_option_vote' => \Mage_Rating_Model_Rating_Option_Vote::class,
-            'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class,
             'rating/resource_rating' => \Mage_Rating_Model_Resource_Rating::class,
+            'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class,
             'rating_resource/rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class,
             'rating/resource_rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class,
             'rating/resource_rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class,
             'rating_resource/rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class,
-            'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
             'rating/resource_rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
-            'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
+            'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
             'rating_resource/rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
+            'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
             'rating_resource/rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class,
             'rating/resource_rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class,
-            'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
             'rating/resource_rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
+            'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
             'reports/config' => \Mage_Reports_Model_Config::class,
             'reports/event' => \Mage_Reports_Model_Event::class,
             'reports/event_observer' => \Mage_Reports_Model_Event_Observer::class,
@@ -2120,6 +2113,7 @@
             'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class,
             'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class,
             'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class,
+            'reports/observer' => \Mage_Reports_Model_Observer::class,
             'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class,
             'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class,
             'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class,
@@ -2128,88 +2122,88 @@
             'reports_resource/accounts_collection' => \Mage_Reports_Model_Resource_Accounts_Collection::class,
             'reports/resource_coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class,
             'reports_resource/coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class,
-            'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
             'reports/resource_customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
-            'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
+            'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
             'reports/resource_customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
-            'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
+            'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
             'reports_resource/customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
-            'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
+            'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
             'reports/resource_entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
+            'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
             'reports_resource/event' => \Mage_Reports_Model_Resource_Event::class,
             'reports/resource_event' => \Mage_Reports_Model_Resource_Event::class,
             'reports_resource/event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
             'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
             'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
             'reports/resource_event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
-            'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
             'reports/resource_event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
-            'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
+            'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
             'reports_resource/helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
-            'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
+            'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
             'reports/resource_invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
-            'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
+            'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
             'reports_resource/order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
-            'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
+            'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
             'reports_resource/product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
+            'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
             'reports/resource_product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class,
             'reports_resource/product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class,
             'reports_resource/product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class,
             'reports/resource_product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class,
-            'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
             'reports/resource_product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
+            'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
             'reports_resource/product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class,
             'reports/resource_product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class,
-            'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
             'reports_resource/product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
-            'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
+            'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
             'reports/resource_product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
-            'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
+            'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
             'reports_resource/product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
-            'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
+            'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
             'reports/resource_product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
+            'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
             'reports_resource/product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class,
             'reports/resource_product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class,
-            'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
             'reports_resource/product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
-            'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
+            'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
             'reports_resource/product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
-            'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
+            'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
             'reports/resource_quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
-            'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class,
+            'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
             'reports_resource/refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class,
+            'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class,
             'reports/resource_report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class,
             'reports_resource/report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class,
             'reports/resource_report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class,
             'reports_resource/report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class,
-            'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
             'reports_resource/report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
+            'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
             'reports/resource_report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class,
             'reports_resource/report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class,
-            'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
             'reports/resource_report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
+            'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
             'reports_resource/review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
             'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
-            'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
             'reports_resource/review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
+            'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
             'reports_resource/review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class,
             'reports/resource_review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class,
             'reports_resource/shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class,
             'reports/resource_shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class,
-            'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
             'reports_resource/shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
+            'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
             'reports_resource/tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class,
             'reports/resource_tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class,
-            'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
             'reports/resource_tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
-            'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
+            'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
             'reports/resource_tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
-            'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
+            'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
             'reports/resource_tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
+            'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
             'reports_resource/wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class,
             'reports/resource_wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class,
-            'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
             'reports_resource/wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
+            'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
             'reports/session' => \Mage_Reports_Model_Session::class,
             'reports/test' => \Mage_Reports_Model_Test::class,
             'reports/totals' => \Mage_Reports_Model_Totals::class,
@@ -2226,14 +2220,14 @@
             'review/resource_review_collection' => \Mage_Review_Model_Resource_Review_Collection::class,
             'review_resource/review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class,
             'review/resource_review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class,
-            'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class,
             'review_resource/review_status' => \Mage_Review_Model_Resource_Review_Status::class,
-            'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
+            'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class,
             'review_resource/review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
+            'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
             'review/resource_review_summary' => \Mage_Review_Model_Resource_Review_Summary::class,
             'review_resource/review_summary' => \Mage_Review_Model_Resource_Review_Summary::class,
-            'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
             'review/resource_review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
+            'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
             'review/review' => \Mage_Review_Model_Review::class,
             'review/review_status' => \Mage_Review_Model_Review_Status::class,
             'review/review_summary' => \Mage_Review_Model_Review_Summary::class,
@@ -2256,14 +2250,14 @@
             'rule/mysql4_rule_collection' => \Mage_Rule_Model_Mysql4_Rule_Collection::class,
             'rule/renderer_actions' => \Mage_Rule_Model_Renderer_Actions::class,
             'rule/renderer_conditions' => \Mage_Rule_Model_Renderer_Conditions::class,
-            'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class,
             'rule/resource_abstract' => \Mage_Rule_Model_Resource_Abstract::class,
-            'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class,
+            'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class,
             'rule/resource_rule' => \Mage_Rule_Model_Resource_Rule::class,
-            'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
+            'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class,
             'rule_resource/rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
-            'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
+            'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
             'rule_resource/rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
+            'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
             'rule/resource_rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class,
             'rule_resource/rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class,
             'rule/rule' => \Mage_Rule_Model_Rule::class,
@@ -2292,24 +2286,24 @@
             'salesrule/resource_coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class,
             'salesrule/resource_coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class,
             'salesrule_resource/coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class,
-            'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
             'salesrule_resource/report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
-            'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
+            'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
             'salesrule_resource/report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
+            'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
             'salesrule_resource/report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class,
             'salesrule/resource_report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class,
             'salesrule_resource/report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class,
             'salesrule/resource_report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class,
             'salesrule_resource/report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class,
             'salesrule/resource_report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class,
-            'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class,
             'salesrule_resource/rule' => \Mage_SalesRule_Model_Resource_Rule::class,
-            'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
+            'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class,
             'salesrule_resource/rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
-            'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
+            'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
             'salesrule_resource/rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
-            'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
+            'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
             'salesrule/resource_rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
+            'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
             'salesrule_resource/rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class,
             'salesrule/resource_rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class,
             'salesrule_resource/rule_product_collection' => \Mage_SalesRule_Model_Resource_Rule_Product_Collection::class,
@@ -2354,14 +2348,14 @@
             'sales/email_template' => \Mage_Sales_Model_Email_Template::class,
             'sales/entity_order' => \Mage_Sales_Model_Entity_Order::class,
             'sales_entity/order' => \Mage_Sales_Model_Entity_Order::class,
-            'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
             'sales_entity/order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
-            'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
+            'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
             'sales/entity_order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
-            'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
+            'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
             'sales_entity/order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
-            'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
+            'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
             'sales_entity/order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
+            'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
             'sales/entity_order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class,
             'sales_entity/order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class,
             'sales/entity_order_attribute_backend_shipping' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Shipping::class,
@@ -2370,22 +2364,22 @@
             'sales/entity_order_collection' => \Mage_Sales_Model_Entity_Order_Collection::class,
             'sales_entity/order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class,
             'sales/entity_order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class,
-            'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales_entity/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
-            'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
+            'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales/entity_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
-            'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
+            'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
             'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
+            'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
             'sales/entity_order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class,
             'sales_entity/order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class,
             'sales/entity_order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class,
             'sales_entity/order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class,
             'sales_entity/order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class,
             'sales/entity_order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class,
-            'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
             'sales/entity_order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
-            'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
+            'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
             'sales_entity/order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
+            'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
             'sales/entity_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class,
             'sales_entity/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class,
             'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class,
@@ -2396,28 +2390,28 @@
             'sales/entity_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/entity_order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class,
             'sales_entity/order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class,
-            'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
             'sales/entity_order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
+            'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
             'sales_entity/order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class,
             'sales/entity_order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class,
             'sales_entity/order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class,
             'sales/entity_order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class,
-            'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
             'sales/entity_order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
+            'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
             'sales/entity_order_item' => \Mage_Sales_Model_Entity_Order_Item::class,
             'sales_entity/order_item' => \Mage_Sales_Model_Entity_Order_Item::class,
             'sales/entity_order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class,
             'sales_entity/order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class,
-            'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
             'sales/entity_order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
+            'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
             'sales_entity/order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class,
             'sales/entity_order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class,
             'sales_entity/order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class,
             'sales/entity_order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class,
-            'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
             'sales_entity/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
-            'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
+            'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
             'sales/entity_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
+            'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
             'sales/entity_order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class,
             'sales_entity/order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class,
             'sales/entity_order_shipment_comment' => \Mage_Sales_Model_Entity_Order_Shipment_Comment::class,
@@ -2426,66 +2420,66 @@
             'sales_entity/order_shipment_comment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Comment_Collection::class,
             'sales/entity_order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class,
             'sales_entity/order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class,
-            'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
             'sales/entity_order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
-            'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
+            'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
             'sales_entity/order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
-            'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
+            'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
             'sales_entity/order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
-            'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
+            'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
             'sales_entity/order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
-            'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
+            'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
             'sales_entity/order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
+            'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
             'sales_entity/quote' => \Mage_Sales_Model_Entity_Quote::class,
             'sales/entity_quote' => \Mage_Sales_Model_Entity_Quote::class,
-            'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
             'sales_entity/quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
+            'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
             'sales_entity/quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class,
             'sales/entity_quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class,
-            'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
             'sales/entity_quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
-            'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
+            'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
             'sales/entity_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
-            'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
+            'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
             'sales_entity/quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
-            'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
+            'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
             'sales/entity_quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
+            'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
             'sales_entity/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales/entity_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales_entity/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class,
             'sales/entity_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class,
-            'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
             'sales_entity/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
-            'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
             'sales/entity_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/entity_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales_entity/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales/entity_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class,
             'sales_entity/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class,
             'sales/entity_quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class,
             'sales_entity/quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class,
-            'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
             'sales_entity/quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
-            'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
+            'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
             'sales/entity_quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
-            'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
+            'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
             'sales_entity/quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
+            'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
             'sales/entity_quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class,
             'sales_entity/quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class,
             'sales/entity_quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class,
             'sales_entity/quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class,
-            'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
             'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
-            'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
+            'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
             'sales/entity_quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
-            'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
+            'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
             'sales/entity_quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
+            'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
             'sales_entity/quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class,
             'sales/entity_quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class,
-            'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
             'sales_entity/sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
-            'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class,
+            'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
             'sales_entity/setup' => \Mage_Sales_Model_Entity_Setup::class,
+            'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class,
             'sales/mysql4_abstract' => \Mage_Sales_Model_Mysql4_Abstract::class,
             'sales/mysql4_billing_agreement' => \Mage_Sales_Model_Mysql4_Billing_Agreement::class,
             'sales/mysql4_billing_agreement_collection' => \Mage_Sales_Model_Mysql4_Billing_Agreement_Collection::class,
@@ -2680,48 +2674,48 @@
             'sales/recurring_profile' => \Mage_Sales_Model_Recurring_Profile::class,
             'sales_resource/abstract' => \Mage_Sales_Model_Resource_Abstract::class,
             'sales/resource_abstract' => \Mage_Sales_Model_Resource_Abstract::class,
-            'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
             'sales_resource/billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
-            'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
+            'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
             'sales_resource/billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
-            'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
+            'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
             'sales/resource_collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
-            'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
+            'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
             'sales_resource/helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
-            'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class,
+            'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
             'sales_resource/order' => \Mage_Sales_Model_Resource_Order::class,
+            'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class,
             'sales_resource/order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class,
             'sales/resource_order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class,
-            'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
             'sales_resource/order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
+            'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
             'sales/resource_order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class,
             'sales_resource/order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class,
             'sales/resource_order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class,
             'sales_resource/order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class,
             'sales/resource_order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class,
             'sales_resource/order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class,
-            'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
             'sales/resource_order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
+            'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
             'sales_resource/order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class,
             'sales/resource_order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class,
             'sales/resource_order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class,
             'sales_resource/order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class,
-            'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
             'sales/resource_order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
+            'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
             'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
             'sales/resource_order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
             'sales/resource_order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
             'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
-            'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales_resource/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
+            'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales/resource_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class,
             'sales_resource/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class,
-            'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
             'sales/resource_order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
-            'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
+            'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
             'sales_resource/order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
-            'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
+            'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
             'sales/resource_order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
+            'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
             'sales/resource_order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
             'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
             'sales_resource/order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class,
@@ -2732,84 +2726,84 @@
             'sales/resource_order_grid_collection' => \Mage_Sales_Model_Resource_Order_Grid_Collection::class,
             'sales/resource_order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class,
             'sales_resource/order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class,
-            'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
             'sales/resource_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
-            'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
+            'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
             'sales_resource/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
+            'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
             'sales_resource/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class,
             'sales/resource_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class,
             'sales/resource_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class,
             'sales_resource/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/resource_order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class,
             'sales_resource/order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class,
-            'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
             'sales/resource_order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
+            'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
             'sales/resource_order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class,
             'sales_resource/order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class,
-            'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
             'sales/resource_order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
-            'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
+            'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
             'sales_resource/order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
+            'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
             'sales/resource_order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class,
             'sales_resource/order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class,
-            'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
             'sales_resource/order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
+            'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
             'sales/resource_order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class,
             'sales_resource/order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class,
-            'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
             'sales_resource/order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
+            'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
             'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
             'sales/resource_order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
-            'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
             'sales_resource/order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
-            'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
+            'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
             'sales_resource/order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
-            'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
+            'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
             'sales_resource/order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
-            'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
+            'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
             'sales/resource_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
+            'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
             'sales_resource/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class,
             'sales/resource_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class,
-            'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
             'sales/resource_order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
+            'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
             'sales/resource_order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
             'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
-            'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
             'sales/resource_order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
+            'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
             'sales_resource/order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class,
             'sales/resource_order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class,
-            'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
             'sales_resource/order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
-            'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
+            'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
             'sales_resource/order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
-            'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
+            'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
             'sales_resource/order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
+            'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
             'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
             'sales_resource/order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
             'sales_resource/order_status' => \Mage_Sales_Model_Resource_Order_Status::class,
             'sales/resource_order_status' => \Mage_Sales_Model_Resource_Order_Status::class,
             'sales_resource/order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class,
             'sales/resource_order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class,
-            'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
             'sales_resource/order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
-            'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
+            'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
             'sales_resource/order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
-            'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
+            'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
             'sales/resource_order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
-            'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
+            'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
             'sales_resource/order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
-            'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class,
+            'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
             'sales/resource_quote' => \Mage_Sales_Model_Resource_Quote::class,
+            'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class,
             'sales_resource/quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class,
             'sales/resource_quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class,
             'sales/resource_quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class,
             'sales_resource/quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class,
             'sales/resource_quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class,
             'sales_resource/quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class,
-            'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
             'sales/resource_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
-            'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
+            'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
             'sales/resource_quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
+            'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
             'sales_resource/quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
             'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
             'sales_resource/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class,
@@ -2818,82 +2812,82 @@
             'sales_resource/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class,
             'sales/resource_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class,
             'sales_resource/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class,
-            'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/resource_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
-            'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
+            'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/resource_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
+            'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales_resource/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
             'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
-            'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
             'sales/resource_quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
+            'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
             'sales_resource/quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class,
             'sales/resource_quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class,
-            'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
             'sales/resource_quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
-            'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
+            'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
             'sales_resource/quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
-            'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
+            'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
             'sales_resource/quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
+            'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
             'sales_resource/quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class,
             'sales/resource_quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class,
-            'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
             'sales/resource_quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
+            'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
             'sales/resource_quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class,
             'sales_resource/quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class,
-            'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
             'sales/resource_quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
-            'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
+            'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
             'sales/resource_quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
-            'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
+            'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
             'sales_resource/quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
-            'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
+            'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
             'sales/resource_quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
-            'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
+            'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
             'sales/resource_recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
+            'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
             'sales/resource_recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class,
             'sales_resource/recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class,
-            'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class,
             'sales/resource_report' => \Mage_Sales_Model_Resource_Report::class,
+            'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class,
             'sales/resource_report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class,
             'sales_resource/report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class,
-            'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
             'sales/resource_report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
-            'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
+            'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
             'sales/resource_report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
+            'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
             'sales_resource/report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
             'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
-            'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
             'sales_resource/report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
+            'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
             'sales/resource_report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class,
             'sales_resource/report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class,
             'sales_resource/report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class,
             'sales/resource_report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class,
             'sales/resource_report_order' => \Mage_Sales_Model_Resource_Report_Order::class,
             'sales_resource/report_order' => \Mage_Sales_Model_Resource_Report_Order::class,
-            'sales/resource_report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class,
             'sales_resource/report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class,
-            'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class,
+            'sales/resource_report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class,
             'sales/resource_report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class,
+            'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class,
             'sales_resource/report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class,
             'sales/resource_report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class,
-            'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
             'sales/resource_report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
-            'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
+            'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
             'sales_resource/report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
+            'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
             'sales_resource/report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class,
             'sales/resource_report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class,
             'sales_resource/report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class,
             'sales/resource_report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class,
-            'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
             'sales_resource/report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
+            'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
             'sales_resource/report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class,
             'sales/resource_report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class,
             'sales_resource/report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class,
             'sales/resource_report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class,
-            'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
             'sales/resource_sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
-            'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class,
+            'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
             'sales/resource_setup' => \Mage_Sales_Model_Resource_Setup::class,
+            'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class,
             'sales/service_order' => \Mage_Sales_Model_Service_Order::class,
             'sales/service_quote' => \Mage_Sales_Model_Service_Quote::class,
             'sales/status_list' => \Mage_Sales_Model_Status_List::class,
@@ -2903,8 +2897,8 @@
             'sendfriend/observer' => \Mage_Sendfriend_Model_Observer::class,
             'sendfriend_resource/sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class,
             'sendfriend/resource_sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class,
-            'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
             'sendfriend/resource_sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
+            'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
             'sendfriend/resource_setup' => \Mage_Sendfriend_Model_Resource_Setup::class,
             'sendfriend_resource/setup' => \Mage_Sendfriend_Model_Resource_Setup::class,
             'sendfriend/sendfriend' => \Mage_Sendfriend_Model_Sendfriend::class,
@@ -2944,16 +2938,16 @@
             'sitemap/observer' => \Mage_Sitemap_Model_Observer::class,
             'sitemap_resource/catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class,
             'sitemap/resource_catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class,
-            'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
             'sitemap/resource_catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
+            'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
             'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
             'sitemap_resource/catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
             'sitemap_resource/cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
             'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
             'sitemap_resource/sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class,
             'sitemap/resource_sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class,
-            'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
             'sitemap_resource/sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
+            'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
             'sitemap/sitemap' => \Mage_Sitemap_Model_Sitemap::class,
             'tag/api' => \Mage_Tag_Model_Api::class,
             'tag/api_v2' => \Mage_Tag_Model_Api_V2::class,
@@ -2966,21 +2960,21 @@
             'tag/mysql4_tag' => \Mage_Tag_Model_Mysql4_Tag::class,
             'tag/mysql4_tag_collection' => \Mage_Tag_Model_Mysql4_Tag_Collection::class,
             'tag/mysql4_tag_relation' => \Mage_Tag_Model_Mysql4_Tag_Relation::class,
-            'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag/resource_customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag_resource/customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
-            'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
+            'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag_resource/indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
-            'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
+            'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
             'tag_resource/popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
+            'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
             'tag_resource/product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class,
             'tag/resource_product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class,
             'tag_resource/tag' => \Mage_Tag_Model_Resource_Tag::class,
             'tag/resource_tag' => \Mage_Tag_Model_Resource_Tag::class,
-            'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
             'tag_resource/tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
-            'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
+            'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
             'tag_resource/tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
+            'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
             'tag/session' => \Mage_Tag_Model_Session::class,
             'tag/tag' => \Mage_Tag_Model_Tag::class,
             'tag/tag_relation' => \Mage_Tag_Model_Tag_Relation::class,
@@ -3019,16 +3013,16 @@
             'tax/resource_calculation_rate' => \Mage_Tax_Model_Resource_Calculation_Rate::class,
             'tax/resource_calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class,
             'tax_resource/calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class,
-            'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
             'tax/resource_calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
-            'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
+            'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
             'tax/resource_calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
-            'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
+            'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
             'tax/resource_calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
-            'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
+            'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
             'tax_resource/calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
-            'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class,
+            'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
             'tax/resource_class' => \Mage_Tax_Model_Resource_Class::class,
+            'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class,
             'tax/resource_class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class,
             'tax_resource/class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class,
             'tax_resource/report_collection' => \Mage_Tax_Model_Resource_Report_Collection::class,
@@ -3039,10 +3033,10 @@
             'tax/resource_report_tax_createdat' => \Mage_Tax_Model_Resource_Report_Tax_Createdat::class,
             'tax_resource/report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class,
             'tax/resource_report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class,
-            'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
             'tax/resource_report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
-            'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
+            'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
             'tax_resource/sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
+            'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
             'tax_resource/sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class,
             'tax/resource_sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class,
             'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class,
@@ -3131,8 +3125,8 @@
             'weee/observer' => \Mage_Weee_Model_Observer::class,
             'weee/resource_attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class,
             'weee_resource/attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class,
-            'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class,
             'weee/resource_setup' => \Mage_Weee_Model_Resource_Setup::class,
+            'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class,
             'weee/resource_tax' => \Mage_Weee_Model_Resource_Tax::class,
             'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class,
             'weee/tax' => \Mage_Weee_Model_Tax::class,
@@ -3144,12 +3138,12 @@
             'widget/mysql4_widget_instance' => \Mage_Widget_Model_Mysql4_Widget_Instance::class,
             'widget/mysql4_widget_instance_collection' => \Mage_Widget_Model_Mysql4_Widget_Instance_Collection::class,
             'widget/observer' => \Mage_Widget_Model_Observer::class,
-            'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class,
             'widget/resource_widget' => \Mage_Widget_Model_Resource_Widget::class,
+            'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class,
             'widget_resource/widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class,
             'widget/resource_widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class,
-            'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
             'widget_resource/widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
+            'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
             'widget/template_filter' => \Mage_Widget_Model_Template_Filter::class,
             'widget/widget' => \Mage_Widget_Model_Widget::class,
             'widget/widget_config' => \Mage_Widget_Model_Widget_Config::class,
@@ -3166,14 +3160,14 @@
             'wishlist/mysql4_wishlist' => \Mage_Wishlist_Model_Mysql4_Wishlist::class,
             'wishlist/mysql4_wishlist_collection' => \Mage_Wishlist_Model_Mysql4_Wishlist_Collection::class,
             'wishlist/observer' => \Mage_Wishlist_Model_Observer::class,
-            'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class,
             'wishlist_resource/item' => \Mage_Wishlist_Model_Resource_Item::class,
+            'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class,
             'wishlist_resource/item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class,
             'wishlist/resource_item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class,
-            'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
             'wishlist/resource_item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
-            'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
+            'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
             'wishlist_resource/item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
+            'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
             'wishlist_resource/product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class,
             'wishlist/resource_product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class,
             'wishlist/resource_wishlist' => \Mage_Wishlist_Model_Resource_Wishlist::class,
@@ -3182,7 +3176,6 @@
             'wishlist/resource_wishlist_collection' => \Mage_Wishlist_Model_Resource_Wishlist_Collection::class,
             'wishlist/session' => \Mage_Wishlist_Model_Session::class,
             'wishlist/wishlist' => \Mage_Wishlist_Model_Wishlist::class,
-            'varien/autoload' => \Varien_Autoload::class,
         ])
     );
     override( \Mage::getSingleton(0),
@@ -3192,11 +3185,10 @@
             'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class,
             'adminnotification/mysql4_inbox_collection' => \Mage_AdminNotification_Model_Mysql4_Inbox_Collection::class,
             'adminnotification/observer' => \Mage_AdminNotification_Model_Observer::class,
-            'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
             'adminnotification/resource_inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
-            'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
+            'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
             'adminnotification/resource_inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
-            'adminnotification/survey' => \Mage_AdminNotification_Model_Survey::class,
+            'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
             'admin/acl' => \Mage_Admin_Model_Acl::class,
             'admin/acl_assert_ip' => \Mage_Admin_Model_Acl_Assert_Ip::class,
             'admin/acl_assert_time' => \Mage_Admin_Model_Acl_Assert_Time::class,
@@ -3225,38 +3217,38 @@
             'admin/redirectpolicy' => \Mage_Admin_Model_Redirectpolicy::class,
             'admin/resource_acl' => \Mage_Admin_Model_Resource_Acl::class,
             'admin_resource/acl' => \Mage_Admin_Model_Resource_Acl::class,
-            'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
             'admin/resource_acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
+            'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
             'admin/resource_acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class,
             'admin_resource/acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class,
-            'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class,
             'admin/resource_block' => \Mage_Admin_Model_Resource_Block::class,
-            'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
+            'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class,
             'admin/resource_block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
+            'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
             'admin_resource/permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class,
             'admin/resource_permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class,
             'admin/resource_role' => \Mage_Admin_Model_Resource_Role::class,
             'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class,
             'admin/resource_role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class,
             'admin_resource/role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class,
-            'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class,
             'admin_resource/roles' => \Mage_Admin_Model_Resource_Roles::class,
-            'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
+            'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class,
             'admin_resource/roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
-            'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
+            'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
             'admin/resource_roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
+            'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
             'admin/resource_rules' => \Mage_Admin_Model_Resource_Rules::class,
             'admin_resource/rules' => \Mage_Admin_Model_Resource_Rules::class,
-            'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
             'admin_resource/rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
+            'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
             'admin_resource/user' => \Mage_Admin_Model_Resource_User::class,
             'admin/resource_user' => \Mage_Admin_Model_Resource_User::class,
             'admin/resource_user_collection' => \Mage_Admin_Model_Resource_User_Collection::class,
             'admin_resource/user_collection' => \Mage_Admin_Model_Resource_User_Collection::class,
-            'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class,
             'admin_resource/variable' => \Mage_Admin_Model_Resource_Variable::class,
-            'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
+            'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class,
             'admin/resource_variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
+            'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
             'admin/role' => \Mage_Admin_Model_Role::class,
             'admin/roles' => \Mage_Admin_Model_Roles::class,
             'admin/rules' => \Mage_Admin_Model_Rules::class,
@@ -3291,6 +3283,7 @@
             'adminhtml/system_config_backend_baseurl' => \Mage_Adminhtml_Model_System_Config_Backend_Baseurl::class,
             'adminhtml/system_config_backend_cache' => \Mage_Adminhtml_Model_System_Config_Backend_Cache::class,
             'adminhtml/system_config_backend_catalog_inventory_managestock' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock::class,
+            'adminhtml/system_config_backend_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Separator::class,
             'adminhtml/system_config_backend_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Type::class,
             'adminhtml/system_config_backend_category' => \Mage_Adminhtml_Model_System_Config_Backend_Category::class,
             'adminhtml/system_config_backend_cookie' => \Mage_Adminhtml_Model_System_Config_Backend_Cookie::class,
@@ -3343,12 +3336,14 @@
             'adminhtml/system_config_source_catalog_listMode' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListMode::class,
             'adminhtml/system_config_source_catalog_listPerPage' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListPerPage::class,
             'adminhtml/system_config_source_catalog_listSort' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort::class,
+            'adminhtml/system_config_source_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Separator::class,
             'adminhtml/system_config_source_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Type::class,
             'adminhtml/system_config_source_catalog_timeFormat' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_TimeFormat::class,
             'adminhtml/system_config_source_category' => \Mage_Adminhtml_Model_System_Config_Source_Category::class,
             'adminhtml/system_config_source_checktype' => \Mage_Adminhtml_Model_System_Config_Source_Checktype::class,
             'adminhtml/system_config_source_cms_page' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Page::class,
             'adminhtml/system_config_source_cms_wysiwyg_enabled' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Wysiwyg_Enabled::class,
+            'adminhtml/system_config_source_cookie_samesite' => \Mage_Adminhtml_Model_System_Config_Source_Cookie_Samesite::class,
             'adminhtml/system_config_source_country' => \Mage_Adminhtml_Model_System_Config_Source_Country::class,
             'adminhtml/system_config_source_country_full' => \Mage_Adminhtml_Model_System_Config_Source_Country_Full::class,
             'adminhtml/system_config_source_cron_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency::class,
@@ -3375,6 +3370,7 @@
             'adminhtml/system_config_source_locale_timezone' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Timezone::class,
             'adminhtml/system_config_source_locale_weekdaycodes' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdaycodes::class,
             'adminhtml/system_config_source_locale_weekdays' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdays::class,
+            'adminhtml/system_config_source_log_level' => \Mage_Adminhtml_Model_System_Config_Source_Log_Level::class,
             'adminhtml/system_config_source_nooptreq' => \Mage_Adminhtml_Model_System_Config_Source_Nooptreq::class,
             'adminhtml/system_config_source_notification_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Notification_Frequency::class,
             'adminhtml/system_config_source_order_status' => \Mage_Adminhtml_Model_System_Config_Source_Order_Status::class,
@@ -3398,7 +3394,6 @@
             'adminhtml/system_config_source_shipping_flatrate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Flatrate::class,
             'adminhtml/system_config_source_shipping_tablerate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Tablerate::class,
             'adminhtml/system_config_source_shipping_taxclass' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Taxclass::class,
-            'adminhtml/system_config_source_startdateenddate' => \Mage_Adminhtml_Model_System_Config_Source_Startdateenddate::class,
             'adminhtml/system_config_source_storage_media_database' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Database::class,
             'adminhtml/system_config_source_storage_media_storage' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Storage::class,
             'adminhtml/system_config_source_store' => \Mage_Adminhtml_Model_System_Config_Source_Store::class,
@@ -3454,22 +3449,22 @@
             'api2_resource/acl_filter_attribute' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute::class,
             'api2/resource_acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class,
             'api2_resource/acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class,
-            'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
             'api2_resource/acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
+            'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
             'api2/resource_acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class,
             'api2_resource/acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class,
             'api2_resource/acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class,
             'api2/resource_acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class,
             'api2/resource_acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class,
             'api2_resource/acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class,
-            'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class,
             'api2/resource_setup' => \Mage_Api2_Model_Resource_Setup::class,
+            'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class,
             'api2/resource_validator' => \Mage_Api2_Model_Resource_Validator::class,
             'api2_resource/validator' => \Mage_Api2_Model_Resource_Validator::class,
             'api2/resource_validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class,
             'api2_resource/validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class,
-            'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
             'api2/resource_validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
+            'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
             'api2/response' => \Mage_Api2_Model_Response::class,
             'api2/route_abstract' => \Mage_Api2_Model_Route_Abstract::class,
             'api2/route_apiType' => \Mage_Api2_Model_Route_ApiType::class,
@@ -3501,8 +3496,8 @@
             'api/mysql4_user_collection' => \Mage_Api_Model_Mysql4_User_Collection::class,
             'api/resource_abstract' => \Mage_Api_Model_Resource_Abstract::class,
             'api_resource/abstract' => \Mage_Api_Model_Resource_Abstract::class,
-            'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class,
             'api_resource/acl' => \Mage_Api_Model_Resource_Acl::class,
+            'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class,
             'api_resource/acl_role' => \Mage_Api_Model_Resource_Acl_Role::class,
             'api/resource_acl_role' => \Mage_Api_Model_Resource_Acl_Role::class,
             'api/resource_acl_role_collection' => \Mage_Api_Model_Resource_Acl_Role_Collection::class,
@@ -3511,14 +3506,14 @@
             'api_resource/permissions_collection' => \Mage_Api_Model_Resource_Permissions_Collection::class,
             'api_resource/role' => \Mage_Api_Model_Resource_Role::class,
             'api/resource_role' => \Mage_Api_Model_Resource_Role::class,
-            'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
             'api_resource/role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
+            'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
             'api/resource_roles' => \Mage_Api_Model_Resource_Roles::class,
             'api_resource/roles' => \Mage_Api_Model_Resource_Roles::class,
-            'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
             'api_resource/roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
-            'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
+            'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
             'api_resource/roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
+            'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
             'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class,
             'api_resource/rules' => \Mage_Api_Model_Resource_Rules::class,
             'api_resource/rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class,
@@ -3549,15 +3544,6 @@
             'authorizenet/directpost_request' => \Mage_Authorizenet_Model_Directpost_Request::class,
             'authorizenet/directpost_response' => \Mage_Authorizenet_Model_Directpost_Response::class,
             'authorizenet/directpost_session' => \Mage_Authorizenet_Model_Directpost_Session::class,
-            'backup/backup' => \Mage_Backup_Model_Backup::class,
-            'backup/config_backend_cron' => \Mage_Backup_Model_Config_Backend_Cron::class,
-            'backup/config_source_type' => \Mage_Backup_Model_Config_Source_Type::class,
-            'backup/db' => \Mage_Backup_Model_Db::class,
-            'backup/fs_collection' => \Mage_Backup_Model_Fs_Collection::class,
-            'backup/mysql4_db' => \Mage_Backup_Model_Mysql4_Db::class,
-            'backup/observer' => \Mage_Backup_Model_Observer::class,
-            'backup/resource_db' => \Mage_Backup_Model_Resource_Db::class,
-            'backup/resource_helper_mysql4' => \Mage_Backup_Model_Resource_Helper_Mysql4::class,
             'bundle/catalogIndex_data_bundle' => \Mage_Bundle_Model_CatalogIndex_Data_Bundle::class,
             'bundle/mysql4_bundle' => \Mage_Bundle_Model_Mysql4_Bundle::class,
             'bundle/mysql4_indexer_price' => \Mage_Bundle_Model_Mysql4_Indexer_Price::class,
@@ -3577,16 +3563,16 @@
             'bundle/resource_bundle' => \Mage_Bundle_Model_Resource_Bundle::class,
             'bundle/resource_indexer_price' => \Mage_Bundle_Model_Resource_Indexer_Price::class,
             'bundle_resource/indexer_price' => \Mage_Bundle_Model_Resource_Indexer_Price::class,
-            'bundle/resource_indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class,
             'bundle_resource/indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class,
+            'bundle/resource_indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class,
             'bundle/resource_option' => \Mage_Bundle_Model_Resource_Option::class,
             'bundle_resource/option' => \Mage_Bundle_Model_Resource_Option::class,
             'bundle/resource_option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class,
             'bundle_resource/option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class,
             'bundle_resource/price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
             'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
-            'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class,
             'bundle_resource/selection' => \Mage_Bundle_Model_Resource_Selection::class,
+            'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class,
             'bundle_resource/selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class,
             'bundle/resource_selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class,
             'bundle/sales_order_pdf_items_abstract' => \Mage_Bundle_Model_Sales_Order_Pdf_Items_Abstract::class,
@@ -3646,14 +3632,14 @@
             'catalogindex/resource_data_abstract' => \Mage_CatalogIndex_Model_Resource_Data_Abstract::class,
             'catalogindex_resource/data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class,
             'catalogindex/resource_data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class,
-            'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
             'catalogindex_resource/data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
+            'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
             'catalogindex_resource/indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class,
             'catalogindex/resource_indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class,
             'catalogindex/resource_indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class,
             'catalogindex_resource/indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class,
-            'catalogindex_resource/indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class,
             'catalogindex/resource_indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class,
+            'catalogindex_resource/indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class,
             'catalogindex_resource/indexer_minimalprice' => \Mage_CatalogIndex_Model_Resource_Indexer_Minimalprice::class,
             'catalogindex/resource_indexer_minimalprice' => \Mage_CatalogIndex_Model_Resource_Indexer_Minimalprice::class,
             'catalogindex/resource_indexer_price' => \Mage_CatalogIndex_Model_Resource_Indexer_Price::class,
@@ -3679,20 +3665,20 @@
             'cataloginventory/mysql4_stock_item_collection' => \Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection::class,
             'cataloginventory/mysql4_stock_status' => \Mage_CatalogInventory_Model_Mysql4_Stock_Status::class,
             'cataloginventory/observer' => \Mage_CatalogInventory_Model_Observer::class,
-            'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
             'cataloginventory_resource/indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
+            'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
             'cataloginventory/resource_indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class,
             'cataloginventory_resource/indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class,
-            'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
             'cataloginventory/resource_indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
+            'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
             'cataloginventory/resource_indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class,
             'cataloginventory_resource/indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class,
             'cataloginventory_resource/stock' => \Mage_CatalogInventory_Model_Resource_Stock::class,
             'cataloginventory/resource_stock' => \Mage_CatalogInventory_Model_Resource_Stock::class,
             'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
             'cataloginventory/resource_stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
-            'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
             'cataloginventory/resource_stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
+            'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
             'cataloginventory/resource_stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class,
             'cataloginventory_resource/stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class,
             'cataloginventory/source_backorders' => \Mage_CatalogInventory_Model_Source_Backorders::class,
@@ -3713,10 +3699,10 @@
             'catalogrule/mysql4_rule_product_price' => \Mage_CatalogRule_Model_Mysql4_Rule_Product_Price::class,
             'catalogrule/mysql4_rule_product_price_collection' => \Mage_CatalogRule_Model_Mysql4_Rule_Product_Price_Collection::class,
             'catalogrule/observer' => \Mage_CatalogRule_Model_Observer::class,
-            'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
             'catalogrule/resource_rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
-            'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
+            'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
             'catalogrule_resource/rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
+            'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
             'catalogrule_resource/rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class,
             'catalogrule/resource_rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class,
             'catalogrule_resource/rule_product_price_collection' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price_Collection::class,
@@ -3745,24 +3731,24 @@
             'catalogsearch/query' => \Mage_CatalogSearch_Model_Query::class,
             'catalogsearch_resource/advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class,
             'catalogsearch/resource_advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class,
-            'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
             'catalogsearch_resource/advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
+            'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
             'catalogsearch_resource/fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class,
             'catalogsearch/resource_fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class,
             'catalogsearch_resource/fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class,
             'catalogsearch/resource_fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class,
             'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
             'catalogsearch_resource/fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
-            'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
             'catalogsearch/resource_helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
-            'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
+            'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
             'catalogsearch_resource/indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
+            'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
             'catalogsearch_resource/query' => \Mage_CatalogSearch_Model_Resource_Query::class,
             'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class,
-            'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
             'catalogsearch_resource/query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
-            'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
+            'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
             'catalogsearch/resource_search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
+            'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
             'catalogsearch/session' => \Mage_CatalogSearch_Model_Session::class,
             'catalogsearch/system_config_backend_sitemap' => \Mage_CatalogSearch_Model_System_Config_Backend_Sitemap::class,
             'catalog/abstract' => \Mage_Catalog_Model_Abstract::class,
@@ -3905,144 +3891,144 @@
             'catalog/product_website' => \Mage_Catalog_Model_Product_Website::class,
             'catalog/resource_abstract' => \Mage_Catalog_Model_Resource_Abstract::class,
             'catalog_resource/abstract' => \Mage_Catalog_Model_Resource_Abstract::class,
-            'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
             'catalog/resource_attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
-            'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class,
+            'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
             'catalog_resource/category' => \Mage_Catalog_Model_Resource_Category::class,
+            'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class,
             'catalog_resource/category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class,
             'catalog/resource_category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class,
-            'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
             'catalog/resource_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
-            'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
+            'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
             'catalog/resource_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
+            'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
             'catalog_resource/category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class,
             'catalog/resource_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class,
             'catalog_resource/category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class,
             'catalog/resource_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class,
             'catalog/resource_category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class,
             'catalog_resource/category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class,
-            'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
             'catalog_resource/category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
-            'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
+            'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
             'catalog/resource_category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
+            'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
             'catalog_resource/category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class,
             'catalog/resource_category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class,
             'catalog/resource_category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class,
             'catalog_resource/category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class,
-            'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
             'catalog_resource/collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
-            'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class,
+            'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
             'catalog_resource/config' => \Mage_Catalog_Model_Resource_Config::class,
-            'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
+            'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class,
             'catalog/resource_eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
+            'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
             'catalog_resource/eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class,
             'catalog/resource_eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class,
-            'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
             'catalog_resource/eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
-            'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
+            'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
             'catalog/resource_eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
-            'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
+            'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
             'catalog_resource/eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
+            'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
             'catalog_resource/eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
-            'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
+            'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
             'catalog_resource/eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
+            'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
             'catalog/resource_eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class,
             'catalog_resource/eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class,
             'catalog/resource_eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class,
             'catalog_resource/eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class,
             'catalog/resource_eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class,
             'catalog_resource/eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class,
-            'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
             'catalog/resource_eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
-            'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
+            'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
             'catalog/resource_eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
+            'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
             'catalog/resource_eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class,
             'catalog_resource/eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class,
-            'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
             'catalog_resource/eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
+            'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
             'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
             'catalog_resource/eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
             'catalog_resource/eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class,
             'catalog/resource_eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class,
-            'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
             'catalog_resource/eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
-            'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
+            'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
             'catalog/resource_eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
-            'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
+            'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
             'catalog/resource_eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
-            'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
+            'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
             'catalog/resource_eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
+            'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
             'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
             'catalog_resource/eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
-            'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
             'catalog/resource_eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
+            'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class,
             'catalog/resource_eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
+            'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
             'catalog/resource_eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class,
             'catalog/resource_eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class,
             'catalog/resource_eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class,
-            'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
             'catalog_resource/eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
-            'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
+            'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
             'catalog_resource/eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
-            'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
+            'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
             'catalog_resource/eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
+            'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
             'catalog/resource_eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class,
             'catalog/resource_eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class,
             'catalog/resource_eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class,
-            'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
             'catalog/resource_eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
-            'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
+            'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
             'catalog_resource/eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
+            'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
             'catalog_resource/eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class,
             'catalog/resource_eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class,
             'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
             'catalog/resource_eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
-            'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
             'catalog/resource_eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
+            'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
             'catalog/resource_eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class,
             'catalog_resource/eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class,
-            'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
             'catalog/resource_eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
+            'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
             'catalog_resource/eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class,
             'catalog/resource_eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class,
             'catalog_resource/eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class,
             'catalog/resource_eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
             'catalog/resource_eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
-            'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
             'catalog_resource/eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
-            'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
+            'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
             'catalog/resource_eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
-            'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
+            'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
             'catalog/resource_eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
-            'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
+            'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
             'catalog/resource_eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
+            'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
             'catalog/resource_eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class,
             'catalog_resource/eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class,
-            'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
             'catalog_resource/eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
-            'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
+            'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
             'catalog/resource_eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
-            'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
             'catalog/resource_eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
+            'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
             'catalog_resource/eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
+            'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
             'catalog/resource_eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class,
             'catalog_resource/eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class,
             'catalog/resource_eav_mysql4_sendfriend' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend::class,
@@ -4051,98 +4037,98 @@
             'catalog/resource_eav_mysql4_sendfriend_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection::class,
             'catalog_resource/eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class,
             'catalog/resource_eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class,
-            'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
             'catalog/resource_eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
+            'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
             'catalog/resource_helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
             'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
             'catalog_resource/layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class,
             'catalog/resource_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class,
             'catalog/resource_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class,
             'catalog_resource/layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class,
-            'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
             'catalog/resource_layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
-            'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class,
+            'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
             'catalog_resource/product' => \Mage_Catalog_Model_Resource_Product::class,
+            'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class,
             'catalog/resource_product_action' => \Mage_Catalog_Model_Resource_Product_Action::class,
             'catalog_resource/product_action' => \Mage_Catalog_Model_Resource_Product_Action::class,
-            'catalog_resource/product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class,
             'catalog/resource_product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class,
+            'catalog_resource/product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class,
             'catalog/resource_product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class,
             'catalog_resource/product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class,
             'catalog/resource_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class,
             'catalog_resource/product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class,
-            'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
             'catalog/resource_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
+            'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
             'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
             'catalog_resource/product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
             'catalog/resource_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class,
-            'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
             'catalog_resource/product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
+            'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
             'catalog/resource_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
             'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
-            'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
-            'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
+            'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
+            'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
             'catalog_resource/product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class,
             'catalog/resource_product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class,
-            'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
             'catalog/resource_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
+            'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
             'catalog/resource_product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class,
             'catalog_resource/product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class,
-            'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
             'catalog/resource_product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
+            'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
             'catalog/resource_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class,
             'catalog_resource/product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class,
-            'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
             'catalog_resource/product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
-            'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
+            'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
             'catalog/resource_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
+            'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
             'catalog/resource_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class,
             'catalog_resource/product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class,
-            'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
             'catalog_resource/product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
-            'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
+            'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
             'catalog_resource/product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
-            'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
+            'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
             'catalog_resource/product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
+            'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
             'catalog/resource_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class,
             'catalog_resource/product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class,
             'catalog_resource/product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class,
             'catalog/resource_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class,
-            'catalog/resource_product_link' => \Mage_Catalog_Model_Resource_Product_Link::class,
             'catalog_resource/product_link' => \Mage_Catalog_Model_Resource_Product_Link::class,
+            'catalog/resource_product_link' => \Mage_Catalog_Model_Resource_Product_Link::class,
             'catalog/resource_product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class,
             'catalog_resource/product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class,
-            'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
             'catalog/resource_product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
-            'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
+            'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
             'catalog_resource/product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
-            'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
+            'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
             'catalog/resource_product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
-            'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
+            'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
             'catalog_resource/product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
-            'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
+            'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
             'catalog_resource/product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
+            'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
             'catalog_resource/product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class,
             'catalog/resource_product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class,
             'catalog_resource/product_status' => \Mage_Catalog_Model_Resource_Product_Status::class,
             'catalog/resource_product_status' => \Mage_Catalog_Model_Resource_Product_Status::class,
             'catalog_resource/product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class,
             'catalog/resource_product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class,
-            'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
             'catalog/resource_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
-            'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
             'catalog_resource/product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
             'catalog_resource/product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class,
             'catalog/resource_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class,
-            'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
             'catalog_resource/product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
+            'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
             'catalog/resource_setup' => \Mage_Catalog_Model_Resource_Setup::class,
             'catalog_resource/setup' => \Mage_Catalog_Model_Resource_Setup::class,
-            'catalog/resource_url' => \Mage_Catalog_Model_Resource_Url::class,
             'catalog_resource/url' => \Mage_Catalog_Model_Resource_Url::class,
+            'catalog/resource_url' => \Mage_Catalog_Model_Resource_Url::class,
             'catalog/session' => \Mage_Catalog_Model_Session::class,
             'catalog/system_config_backend_catalog_category_flat' => \Mage_Catalog_Model_System_Config_Backend_Catalog_Category_Flat::class,
             'catalog/system_config_backend_catalog_product_flat' => \Mage_Catalog_Model_System_Config_Backend_Catalog_Product_Flat::class,
@@ -4184,12 +4170,12 @@
             'checkout/observer' => \Mage_Checkout_Model_Observer::class,
             'checkout_resource/agreement' => \Mage_Checkout_Model_Resource_Agreement::class,
             'checkout/resource_agreement' => \Mage_Checkout_Model_Resource_Agreement::class,
-            'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
             'checkout/resource_agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
-            'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class,
+            'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
             'checkout_resource/cart' => \Mage_Checkout_Model_Resource_Cart::class,
-            'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class,
+            'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class,
             'checkout/resource_setup' => \Mage_Checkout_Model_Resource_Setup::class,
+            'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class,
             'checkout/session' => \Mage_Checkout_Model_Session::class,
             'checkout/type_abstract' => \Mage_Checkout_Model_Type_Abstract::class,
             'checkout/type_multishipping' => \Mage_Checkout_Model_Type_Multishipping::class,
@@ -4204,25 +4190,25 @@
             'cms/mysql4_page_service' => \Mage_Cms_Model_Mysql4_Page_Service::class,
             'cms/observer' => \Mage_Cms_Model_Observer::class,
             'cms/page' => \Mage_Cms_Model_Page::class,
-            'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class,
             'cms/resource_block' => \Mage_Cms_Model_Resource_Block::class,
+            'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class,
             'cms_resource/block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class,
             'cms/resource_block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class,
             'cms/resource_page' => \Mage_Cms_Model_Resource_Page::class,
             'cms_resource/page' => \Mage_Cms_Model_Resource_Page::class,
             'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
             'cms_resource/page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
-            'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
             'cms/resource_page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
+            'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
             'cms/template_filter' => \Mage_Cms_Model_Template_Filter::class,
             'cms/wysiwyg_config' => \Mage_Cms_Model_Wysiwyg_Config::class,
             'cms/wysiwyg_images_storage' => \Mage_Cms_Model_Wysiwyg_Images_Storage::class,
             'cms/wysiwyg_images_storage_collection' => \Mage_Cms_Model_Wysiwyg_Images_Storage_Collection::class,
             'configurableswatches/observer' => \Mage_ConfigurableSwatches_Model_Observer::class,
-            'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
             'configurableswatches_resource/catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
-            'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
+            'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
             'configurableswatches_resource/catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
+            'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
             'configurableswatches_resource/catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
             'configurableswatches/resource_catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
             'configurableswatches/system_config_source_catalog_product_configattribute' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute::class,
@@ -4329,152 +4315,152 @@
             'core/mysql4_website_collection' => \Mage_Core_Model_Mysql4_Website_Collection::class,
             'core/observer' => \Mage_Core_Model_Observer::class,
             'core/resource' => \Mage_Core_Model_Resource::class,
+            'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
             'core_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
             'core/resource_abstract' => \Mage_Core_Model_Resource_Abstract::class,
-            'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
+            'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
             'core/resource_cache' => \Mage_Core_Model_Resource_Cache::class,
             'core_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
-            'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
+            'core/resource_config' => \Mage_Core_Model_Resource_Config::class,
             'core_resource/config' => \Mage_Core_Model_Resource_Config::class,
             'payment_resource/config' => \Mage_Core_Model_Resource_Config::class,
-            'core/resource_config' => \Mage_Core_Model_Resource_Config::class,
-            'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
             'core/resource_config_data' => \Mage_Core_Model_Resource_Config_Data::class,
+            'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
             'payment_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
-            'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'core_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
+            'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
-            'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
-            'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
             'payment_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
+            'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
+            'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
             'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
-            'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
             'core/resource_db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
-            'core/resource_design' => \Mage_Core_Model_Resource_Design::class,
+            'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
             'core_resource/design' => \Mage_Core_Model_Resource_Design::class,
+            'core/resource_design' => \Mage_Core_Model_Resource_Design::class,
             'payment_resource/design' => \Mage_Core_Model_Resource_Design::class,
             'payment_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
-            'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
             'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
-            'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
+            'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
             'payment_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
             'core/resource_design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
-            'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
-            'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
+            'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
             'core/resource_email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
-            'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
-            'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
+            'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
+            'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
             'payment_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
-            'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
+            'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
+            'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
             'core/resource_email_template' => \Mage_Core_Model_Resource_Email_Template::class,
+            'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
             'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
-            'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
             'core/resource_email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
+            'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
             'core_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
             'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
             'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
             'core_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
-            'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
-            'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
             'core_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
             'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
-            'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
             'payment_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
+            'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
+            'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
             'payment_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
             'core/resource_file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
-            'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
-            'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
             'core/resource_file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
+            'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
             'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
-            'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
-            'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
             'core/resource_file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
-            'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
+            'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
+            'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
             'payment_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
+            'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
             'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class,
             'payment_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
-            'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
             'core_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
-            'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
+            'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
             'core/resource_helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
+            'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
             'core_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
-            'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
-            'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
             'core/resource_iterator' => \Mage_Core_Model_Resource_Iterator::class,
+            'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
+            'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
             'payment_resource/language' => \Mage_Core_Model_Resource_Language::class,
-            'core/resource_language' => \Mage_Core_Model_Resource_Language::class,
             'core_resource/language' => \Mage_Core_Model_Resource_Language::class,
+            'core/resource_language' => \Mage_Core_Model_Resource_Language::class,
             'payment_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
-            'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
             'core/resource_language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
-            'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
+            'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
             'core_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
             'core/resource_layout' => \Mage_Core_Model_Resource_Layout::class,
-            'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
+            'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
             'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class,
             'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
+            'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
+            'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
             'payment_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
-            'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
             'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
             'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class,
             'payment_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
-            'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core/resource_setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
-            'payment_resource/store' => \Mage_Core_Model_Resource_Store::class,
-            'core_resource/store' => \Mage_Core_Model_Resource_Store::class,
+            'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core/resource_store' => \Mage_Core_Model_Resource_Store::class,
-            'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
+            'core_resource/store' => \Mage_Core_Model_Resource_Store::class,
+            'payment_resource/store' => \Mage_Core_Model_Resource_Store::class,
             'core/resource_store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
             'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
-            'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
+            'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
             'core/resource_store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'payment_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
-            'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
-            'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
+            'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'payment_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
-            'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
-            'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class,
+            'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
+            'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
             'core_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
-            'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class,
+            'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class,
+            'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
             'core_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
+            'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class,
             'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
-            'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
-            'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
             'payment_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
-            'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
+            'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
             'core/resource_type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
             'payment_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
-            'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'core/resource_type_db' => \Mage_Core_Model_Resource_Type_Db::class,
+            'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
-            'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
-            'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
             'core_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
-            'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
-            'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
+            'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
             'payment_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
             'payment_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
-            'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
             'core_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
+            'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
             'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
             'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
             'payment_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
-            'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
-            'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'core_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
+            'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
+            'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'core_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
-            'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
             'core/resource_variable' => \Mage_Core_Model_Resource_Variable::class,
+            'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
             'core/resource_variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
-            'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
             'core_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
-            'core_resource/website' => \Mage_Core_Model_Resource_Website::class,
+            'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
             'payment_resource/website' => \Mage_Core_Model_Resource_Website::class,
+            'core_resource/website' => \Mage_Core_Model_Resource_Website::class,
             'core/resource_website' => \Mage_Core_Model_Resource_Website::class,
-            'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core/resource_website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
+            'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core/session' => \Mage_Core_Model_Session::class,
             'core/session_abstract' => \Mage_Core_Model_Session_Abstract::class,
@@ -4504,10 +4490,10 @@
             'cron/mysql4_schedule' => \Mage_Cron_Model_Mysql4_Schedule::class,
             'cron/mysql4_schedule_collection' => \Mage_Cron_Model_Mysql4_Schedule_Collection::class,
             'cron/observer' => \Mage_Cron_Model_Observer::class,
-            'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class,
             'cron/resource_schedule' => \Mage_Cron_Model_Resource_Schedule::class,
-            'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
+            'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class,
             'cron/resource_schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
+            'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
             'cron/schedule' => \Mage_Cron_Model_Schedule::class,
             'currencysymbol/observer' => \Mage_CurrencySymbol_Model_Observer::class,
             'currencysymbol/system_currencysymbol' => \Mage_CurrencySymbol_Model_System_Currencysymbol::class,
@@ -4584,14 +4570,14 @@
             'customer_resource/address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class,
             'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
             'customer_resource/address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
-            'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
             'customer/resource_address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
-            'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
+            'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
             'customer/resource_address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
-            'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
+            'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
             'customer_resource/address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
-            'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
+            'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
             'customer_resource/address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
+            'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
             'customer/resource_attribute' => \Mage_Customer_Model_Resource_Attribute::class,
             'customer_resource/attribute' => \Mage_Customer_Model_Resource_Attribute::class,
             'customer_resource/attribute_collection' => \Mage_Customer_Model_Resource_Attribute_Collection::class,
@@ -4600,20 +4586,20 @@
             'customer_resource/customer' => \Mage_Customer_Model_Resource_Customer::class,
             'customer_resource/customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class,
             'customer/resource_customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class,
-            'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
             'customer/resource_flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
-            'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
+            'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
             'customer/resource_flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
-            'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
+            'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
             'customer/resource_form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
+            'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
             'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
             'customer/resource_form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
             'customer/resource_group' => \Mage_Customer_Model_Resource_Group::class,
             'customer_resource/group' => \Mage_Customer_Model_Resource_Group::class,
             'customer_resource/group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class,
             'customer/resource_group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class,
-            'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class,
             'customer_resource/setup' => \Mage_Customer_Model_Resource_Setup::class,
+            'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class,
             'customer_resource/wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
             'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
             'customer/session' => \Mage_Customer_Model_Session::class,
@@ -4667,10 +4653,10 @@
             'dataflow/mysql4_session' => \Mage_Dataflow_Model_Mysql4_Session::class,
             'dataflow/profile' => \Mage_Dataflow_Model_Profile::class,
             'dataflow/profile_history' => \Mage_Dataflow_Model_Profile_History::class,
-            'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class,
             'dataflow/resource_batch' => \Mage_Dataflow_Model_Resource_Batch::class,
-            'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
+            'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class,
             'dataflow/resource_batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
+            'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
             'dataflow/resource_batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class,
             'dataflow_resource/batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class,
             'dataflow_resource/batch_export' => \Mage_Dataflow_Model_Resource_Batch_Export::class,
@@ -4685,12 +4671,12 @@
             'dataflow/resource_profile' => \Mage_Dataflow_Model_Resource_Profile::class,
             'dataflow/resource_profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class,
             'dataflow_resource/profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class,
-            'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
             'dataflow_resource/profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
+            'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
             'dataflow_resource/profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class,
             'dataflow/resource_profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class,
-            'dataflow/resource_session' => \Mage_Dataflow_Model_Resource_Session::class,
             'dataflow_resource/session' => \Mage_Dataflow_Model_Resource_Session::class,
+            'dataflow/resource_session' => \Mage_Dataflow_Model_Resource_Session::class,
             'dataflow/session' => \Mage_Dataflow_Model_Session::class,
             'dataflow/session_adapter_http' => \Mage_Dataflow_Model_Session_Adapter_Http::class,
             'dataflow/session_parser_csv' => \Mage_Dataflow_Model_Session_Parser_Csv::class,
@@ -4720,18 +4706,18 @@
             'directory/resource_country' => \Mage_Directory_Model_Resource_Country::class,
             'directory_resource/country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class,
             'directory/resource_country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class,
-            'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
             'directory/resource_country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
+            'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
             'directory_resource/country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class,
             'directory/resource_country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class,
             'directory_resource/currency' => \Mage_Directory_Model_Resource_Currency::class,
             'directory/resource_currency' => \Mage_Directory_Model_Resource_Currency::class,
-            'directory/resource_currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class,
             'directory_resource/currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class,
+            'directory/resource_currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class,
             'directory/resource_region' => \Mage_Directory_Model_Resource_Region::class,
             'directory_resource/region' => \Mage_Directory_Model_Resource_Region::class,
-            'directory/resource_region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class,
             'directory_resource/region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class,
+            'directory/resource_region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class,
             'downloadable/catalogIndex_data_downloadable' => \Mage_Downloadable_Model_CatalogIndex_Data_Downloadable::class,
             'downloadable/link' => \Mage_Downloadable_Model_Link::class,
             'downloadable/link_api' => \Mage_Downloadable_Model_Link_Api::class,
@@ -4752,8 +4738,8 @@
             'downloadable/observer' => \Mage_Downloadable_Model_Observer::class,
             'downloadable/product_price' => \Mage_Downloadable_Model_Product_Price::class,
             'downloadable/product_type' => \Mage_Downloadable_Model_Product_Type::class,
-            'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
             'downloadable_resource/indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
+            'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
             'downloadable/resource_link' => \Mage_Downloadable_Model_Resource_Link::class,
             'downloadable_resource/link' => \Mage_Downloadable_Model_Resource_Link::class,
             'downloadable/resource_link_collection' => \Mage_Downloadable_Model_Resource_Link_Collection::class,
@@ -4762,14 +4748,14 @@
             'downloadable_resource/link_purchased' => \Mage_Downloadable_Model_Resource_Link_Purchased::class,
             'downloadable/resource_link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class,
             'downloadable_resource/link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class,
-            'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
             'downloadable/resource_link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
-            'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
+            'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
             'downloadable/resource_link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
-            'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class,
+            'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
             'downloadable/resource_sample' => \Mage_Downloadable_Model_Resource_Sample::class,
-            'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
+            'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class,
             'downloadable/resource_sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
+            'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
             'downloadable/sales_order_pdf_items_abstract' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Abstract::class,
             'downloadable/sales_order_pdf_items_creditmemo' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Creditmemo::class,
             'downloadable/sales_order_pdf_items_invoice' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Invoice::class,
@@ -4851,8 +4837,8 @@
             'eav/mysql4_form_fieldset_collection' => \Mage_Eav_Model_Mysql4_Form_Fieldset_Collection::class,
             'eav/mysql4_form_type' => \Mage_Eav_Model_Mysql4_Form_Type::class,
             'eav/mysql4_form_type_collection' => \Mage_Eav_Model_Mysql4_Form_Type_Collection::class,
-            'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class,
             'eav_resource/attribute' => \Mage_Eav_Model_Resource_Attribute::class,
+            'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class,
             'eav_resource/attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class,
             'eav/resource_attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class,
             'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class,
@@ -4869,28 +4855,28 @@
             'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
             'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
-            'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
-            'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
+            'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
+            'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
             'eav_resource/entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class,
             'eav/resource_entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class,
             'eav_resource/entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class,
             'eav/resource_entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class,
-            'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
             'eav_resource/entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
+            'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
             'eav/resource_form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class,
             'eav_resource/form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class,
-            'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
             'eav/resource_form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
+            'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
             'eav/resource_form_element' => \Mage_Eav_Model_Resource_Form_Element::class,
             'eav_resource/form_element' => \Mage_Eav_Model_Resource_Form_Element::class,
-            'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
             'eav_resource/form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
-            'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
+            'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
             'eav/resource_form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
-            'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
+            'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
             'eav_resource/form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
+            'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
             'eav/resource_form_type' => \Mage_Eav_Model_Resource_Form_Type::class,
             'eav_resource/form_type' => \Mage_Eav_Model_Resource_Form_Type::class,
             'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class,
@@ -4906,12 +4892,12 @@
             'giftmessage/mysql4_message_collection' => \Mage_GiftMessage_Model_Mysql4_Message_Collection::class,
             'giftmessage/mysql4_setup' => \Mage_GiftMessage_Model_Mysql4_Setup::class,
             'giftmessage/observer' => \Mage_GiftMessage_Model_Observer::class,
-            'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class,
             'giftmessage/resource_message' => \Mage_GiftMessage_Model_Resource_Message::class,
-            'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
+            'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class,
             'giftmessage_resource/message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
-            'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
+            'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
             'giftmessage_resource/setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
+            'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
             'googleanalytics/observer' => \Mage_GoogleAnalytics_Model_Observer::class,
             'googleanalytics/system_config_source_type' => \Mage_GoogleAnalytics_Model_System_Config_Source_Type::class,
             'googlecheckout/payment' => \Mage_GoogleCheckout_Model_Payment::class,
@@ -4947,8 +4933,8 @@
             'importexport/product_attribute_backend_urlkey' => \Mage_ImportExport_Model_Product_Attribute_Backend_Urlkey::class,
             'importexport_resource/helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class,
             'importexport/resource_helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class,
-            'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
             'importexport_resource/import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
+            'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
             'importexport_resource/setup' => \Mage_ImportExport_Model_Resource_Setup::class,
             'importexport/resource_setup' => \Mage_ImportExport_Model_Resource_Setup::class,
             'importexport/source_export_entity' => \Mage_ImportExport_Model_Source_Export_Entity::class,
@@ -4970,16 +4956,16 @@
             'index/process' => \Mage_Index_Model_Process::class,
             'index_resource/abstract' => \Mage_Index_Model_Resource_Abstract::class,
             'index/resource_abstract' => \Mage_Index_Model_Resource_Abstract::class,
-            'index/resource_event' => \Mage_Index_Model_Resource_Event::class,
             'index_resource/event' => \Mage_Index_Model_Resource_Event::class,
+            'index/resource_event' => \Mage_Index_Model_Resource_Event::class,
             'index/resource_event_collection' => \Mage_Index_Model_Resource_Event_Collection::class,
             'index_resource/event_collection' => \Mage_Index_Model_Resource_Event_Collection::class,
             'index/resource_helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class,
             'index_resource/helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class,
-            'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
             'index/resource_lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
-            'index_resource/process' => \Mage_Index_Model_Resource_Process::class,
+            'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
             'index/resource_process' => \Mage_Index_Model_Resource_Process::class,
+            'index_resource/process' => \Mage_Index_Model_Resource_Process::class,
             'index/resource_process_collection' => \Mage_Index_Model_Resource_Process_Collection::class,
             'index_resource/process_collection' => \Mage_Index_Model_Resource_Process_Collection::class,
             'index/resource_setup' => \Mage_Index_Model_Resource_Setup::class,
@@ -5012,22 +4998,22 @@
             'log/mysql4_visitor_online_collection' => \Mage_Log_Model_Mysql4_Visitor_Online_Collection::class,
             'log_resource/aggregation' => \Mage_Log_Model_Resource_Aggregation::class,
             'log/resource_aggregation' => \Mage_Log_Model_Resource_Aggregation::class,
-            'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class,
             'log/resource_customer' => \Mage_Log_Model_Resource_Customer::class,
+            'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class,
             'log/resource_log' => \Mage_Log_Model_Resource_Log::class,
             'log_resource/log' => \Mage_Log_Model_Resource_Log::class,
             'log_resource/visitor' => \Mage_Log_Model_Resource_Visitor::class,
             'log/resource_visitor' => \Mage_Log_Model_Resource_Visitor::class,
             'log_resource/visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class,
             'log/resource_visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class,
-            'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
             'log_resource/visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
-            'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
+            'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
             'log_resource/visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
+            'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
             'log/visitor' => \Mage_Log_Model_Visitor::class,
             'log/visitor_online' => \Mage_Log_Model_Visitor_Online::class,
-            'media_resource/image' => \Mage_Media_Model_File_Image::class,
             'media/file_image' => \Mage_Media_Model_File_Image::class,
+            'media_resource/image' => \Mage_Media_Model_File_Image::class,
             'media/image' => \Mage_Media_Model_Image::class,
             'newsletter/message' => \Mage_Newsletter_Model_Message::class,
             'newsletter/mysql4_problem' => \Mage_Newsletter_Model_Mysql4_Problem::class,
@@ -5045,14 +5031,14 @@
             'newsletter_resource/problem' => \Mage_Newsletter_Model_Resource_Problem::class,
             'newsletter/resource_problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class,
             'newsletter_resource/problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class,
-            'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class,
             'newsletter/resource_queue' => \Mage_Newsletter_Model_Resource_Queue::class,
-            'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
+            'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class,
             'newsletter/resource_queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
-            'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
+            'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
             'newsletter/resource_subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
-            'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
+            'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
             'newsletter/resource_subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
+            'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
             'newsletter_resource/template' => \Mage_Newsletter_Model_Resource_Template::class,
             'newsletter/resource_template' => \Mage_Newsletter_Model_Resource_Template::class,
             'newsletter_resource/template_collection' => \Mage_Newsletter_Model_Resource_Template_Collection::class,
@@ -5065,20 +5051,20 @@
             'oauth/consumer_validator_keyLength' => \Mage_Oauth_Model_Consumer_Validator_KeyLength::class,
             'oauth/nonce' => \Mage_Oauth_Model_Nonce::class,
             'oauth/observer' => \Mage_Oauth_Model_Observer::class,
-            'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
             'oauth/resource_consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
+            'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
             'oauth/resource_consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class,
             'oauth_resource/consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class,
             'oauth_resource/nonce' => \Mage_Oauth_Model_Resource_Nonce::class,
             'oauth/resource_nonce' => \Mage_Oauth_Model_Resource_Nonce::class,
             'oauth_resource/nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class,
             'oauth/resource_nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class,
-            'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class,
             'oauth/resource_setup' => \Mage_Oauth_Model_Resource_Setup::class,
+            'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class,
             'oauth_resource/token' => \Mage_Oauth_Model_Resource_Token::class,
             'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class,
-            'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
             'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
+            'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
             'oauth/server' => \Mage_Oauth_Model_Server::class,
             'oauth/token' => \Mage_Oauth_Model_Token::class,
             'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class,
@@ -5095,8 +5081,8 @@
             'paygate/authorizenet_source_paymentAction' => \Mage_Paygate_Model_Authorizenet_Source_PaymentAction::class,
             'paygate/mysql4_authorizenet_debug' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug::class,
             'paygate/mysql4_authorizenet_debug_collection' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection::class,
-            'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
             'paygate/resource_authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
+            'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
             'paygate_resource/authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class,
             'paygate/resource_authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class,
             'payment/billing_agreementAbstract' => \Mage_Payment_Model_Billing_AgreementAbstract::class,
@@ -5159,14 +5145,14 @@
             'paypal/resource_cert' => \Mage_Paypal_Model_Resource_Cert::class,
             'paypal_resource/payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class,
             'paypal/resource_payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class,
-            'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
             'paypal/resource_payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
+            'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
             'paypal/resource_report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class,
             'paypal_resource/report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class,
-            'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
             'paypal/resource_report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
-            'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
+            'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
             'paypal/resource_report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
+            'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
             'paypal/resource_setup' => \Mage_Paypal_Model_Resource_Setup::class,
             'paypal_resource/setup' => \Mage_Paypal_Model_Resource_Setup::class,
             'paypal/session' => \Mage_Paypal_Model_Session::class,
@@ -5200,16 +5186,16 @@
             'poll/poll' => \Mage_Poll_Model_Poll::class,
             'poll/poll_answer' => \Mage_Poll_Model_Poll_Answer::class,
             'poll/poll_vote' => \Mage_Poll_Model_Poll_Vote::class,
-            'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class,
             'poll_resource/poll' => \Mage_Poll_Model_Resource_Poll::class,
-            'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
+            'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class,
             'poll/resource_poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
-            'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
+            'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
             'poll_resource/poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
-            'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
+            'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
             'poll_resource/poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
-            'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
+            'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
             'poll/resource_poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
+            'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
             'productalert/email' => \Mage_ProductAlert_Model_Email::class,
             'productalert/mysql4_price' => \Mage_ProductAlert_Model_Mysql4_Price::class,
             'productalert/mysql4_price_collection' => \Mage_ProductAlert_Model_Mysql4_Price_Collection::class,
@@ -5219,20 +5205,20 @@
             'productalert/mysql4_stock_customer_collection' => \Mage_ProductAlert_Model_Mysql4_Stock_Customer_Collection::class,
             'productalert/observer' => \Mage_ProductAlert_Model_Observer::class,
             'productalert/price' => \Mage_ProductAlert_Model_Price::class,
-            'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
             'productalert_resource/abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
-            'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class,
+            'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
             'productalert_resource/price' => \Mage_ProductAlert_Model_Resource_Price::class,
-            'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
+            'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class,
             'productalert/resource_price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
-            'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
+            'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
             'productalert/resource_price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
-            'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
+            'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
             'productalert/resource_stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
-            'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
+            'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
             'productalert/resource_stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
-            'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
+            'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
             'productalert/resource_stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
+            'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
             'productalert/stock' => \Mage_ProductAlert_Model_Stock::class,
             'rating/mysql4_rating' => \Mage_Rating_Model_Mysql4_Rating::class,
             'rating/mysql4_rating_collection' => \Mage_Rating_Model_Mysql4_Rating_Collection::class,
@@ -5246,20 +5232,20 @@
             'rating/rating_entity' => \Mage_Rating_Model_Rating_Entity::class,
             'rating/rating_option' => \Mage_Rating_Model_Rating_Option::class,
             'rating/rating_option_vote' => \Mage_Rating_Model_Rating_Option_Vote::class,
-            'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class,
             'rating/resource_rating' => \Mage_Rating_Model_Resource_Rating::class,
+            'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class,
             'rating_resource/rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class,
             'rating/resource_rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class,
             'rating/resource_rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class,
             'rating_resource/rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class,
-            'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
             'rating/resource_rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
-            'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
+            'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
             'rating_resource/rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
+            'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
             'rating_resource/rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class,
             'rating/resource_rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class,
-            'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
             'rating/resource_rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
+            'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
             'reports/config' => \Mage_Reports_Model_Config::class,
             'reports/event' => \Mage_Reports_Model_Event::class,
             'reports/event_observer' => \Mage_Reports_Model_Event_Observer::class,
@@ -5305,6 +5291,7 @@
             'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class,
             'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class,
             'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class,
+            'reports/observer' => \Mage_Reports_Model_Observer::class,
             'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class,
             'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class,
             'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class,
@@ -5313,52 +5300,52 @@
             'reports_resource/accounts_collection' => \Mage_Reports_Model_Resource_Accounts_Collection::class,
             'reports/resource_coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class,
             'reports_resource/coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class,
-            'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
             'reports/resource_customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
-            'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
+            'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
             'reports/resource_customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
-            'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
+            'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
             'reports_resource/customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
-            'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
+            'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
             'reports/resource_entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
+            'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
             'reports_resource/event' => \Mage_Reports_Model_Resource_Event::class,
             'reports/resource_event' => \Mage_Reports_Model_Resource_Event::class,
-            'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
             'reports_resource/event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
-            'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
+            'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
             'reports/resource_event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
-            'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
+            'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
             'reports/resource_event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
-            'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
+            'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
             'reports_resource/helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
-            'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
+            'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
             'reports/resource_invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
-            'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
+            'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
             'reports_resource/order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
-            'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
+            'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
             'reports_resource/product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
+            'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
             'reports/resource_product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class,
             'reports_resource/product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class,
             'reports_resource/product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class,
             'reports/resource_product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class,
-            'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
             'reports/resource_product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
+            'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
             'reports_resource/product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class,
             'reports/resource_product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class,
-            'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
             'reports_resource/product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
+            'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
             'reports/resource_product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
             'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
             'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
             'reports_resource/product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
-            'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
             'reports/resource_product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
+            'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
             'reports_resource/product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class,
             'reports/resource_product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class,
-            'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
             'reports_resource/product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
-            'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
+            'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
             'reports_resource/product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
+            'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
             'reports/resource_quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
             'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
             'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class,
@@ -5367,34 +5354,34 @@
             'reports_resource/report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class,
             'reports/resource_report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class,
             'reports_resource/report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class,
-            'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
             'reports_resource/report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
+            'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
             'reports/resource_report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class,
             'reports_resource/report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class,
-            'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
             'reports/resource_report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
-            'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
+            'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
             'reports_resource/review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
-            'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
+            'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
             'reports_resource/review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
+            'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
             'reports_resource/review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class,
             'reports/resource_review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class,
             'reports_resource/shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class,
             'reports/resource_shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class,
-            'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
             'reports_resource/shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
+            'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
             'reports_resource/tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class,
             'reports/resource_tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class,
             'reports/resource_tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
             'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
             'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
             'reports/resource_tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
-            'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
             'reports/resource_tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
+            'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
             'reports_resource/wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class,
             'reports/resource_wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class,
-            'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
             'reports_resource/wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
+            'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
             'reports/session' => \Mage_Reports_Model_Session::class,
             'reports/test' => \Mage_Reports_Model_Test::class,
             'reports/totals' => \Mage_Reports_Model_Totals::class,
@@ -5413,12 +5400,12 @@
             'review/resource_review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class,
             'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class,
             'review_resource/review_status' => \Mage_Review_Model_Resource_Review_Status::class,
-            'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
             'review_resource/review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
+            'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
             'review/resource_review_summary' => \Mage_Review_Model_Resource_Review_Summary::class,
             'review_resource/review_summary' => \Mage_Review_Model_Resource_Review_Summary::class,
-            'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
             'review/resource_review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
+            'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
             'review/review' => \Mage_Review_Model_Review::class,
             'review/review_status' => \Mage_Review_Model_Review_Status::class,
             'review/review_summary' => \Mage_Review_Model_Review_Summary::class,
@@ -5441,12 +5428,12 @@
             'rule/mysql4_rule_collection' => \Mage_Rule_Model_Mysql4_Rule_Collection::class,
             'rule/renderer_actions' => \Mage_Rule_Model_Renderer_Actions::class,
             'rule/renderer_conditions' => \Mage_Rule_Model_Renderer_Conditions::class,
-            'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class,
             'rule/resource_abstract' => \Mage_Rule_Model_Resource_Abstract::class,
-            'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class,
+            'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class,
             'rule/resource_rule' => \Mage_Rule_Model_Resource_Rule::class,
-            'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
+            'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class,
             'rule_resource/rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
+            'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
             'rule_resource/rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
             'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
             'rule/resource_rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class,
@@ -5473,28 +5460,28 @@
             'salesrule/quote_nominal_discount' => \Mage_SalesRule_Model_Quote_Nominal_Discount::class,
             'salesrule_resource/coupon' => \Mage_SalesRule_Model_Resource_Coupon::class,
             'salesrule/resource_coupon' => \Mage_SalesRule_Model_Resource_Coupon::class,
-            'salesrule_resource/coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class,
             'salesrule/resource_coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class,
+            'salesrule_resource/coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class,
             'salesrule/resource_coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class,
             'salesrule_resource/coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class,
-            'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
             'salesrule_resource/report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
-            'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
+            'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
             'salesrule_resource/report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
+            'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
             'salesrule_resource/report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class,
             'salesrule/resource_report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class,
             'salesrule_resource/report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class,
             'salesrule/resource_report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class,
             'salesrule_resource/report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class,
             'salesrule/resource_report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class,
-            'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class,
             'salesrule_resource/rule' => \Mage_SalesRule_Model_Resource_Rule::class,
-            'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
+            'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class,
             'salesrule_resource/rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
-            'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
+            'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
             'salesrule_resource/rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
-            'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
+            'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
             'salesrule/resource_rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
+            'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
             'salesrule_resource/rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class,
             'salesrule/resource_rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class,
             'salesrule/resource_rule_product_collection' => \Mage_SalesRule_Model_Resource_Rule_Product_Collection::class,
@@ -5539,14 +5526,14 @@
             'sales/email_template' => \Mage_Sales_Model_Email_Template::class,
             'sales/entity_order' => \Mage_Sales_Model_Entity_Order::class,
             'sales_entity/order' => \Mage_Sales_Model_Entity_Order::class,
-            'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
             'sales_entity/order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
-            'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
+            'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
             'sales/entity_order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
-            'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
+            'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
             'sales_entity/order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
-            'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
+            'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
             'sales_entity/order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
+            'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
             'sales_entity/order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class,
             'sales/entity_order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class,
             'sales/entity_order_attribute_backend_shipping' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Shipping::class,
@@ -5555,54 +5542,54 @@
             'sales/entity_order_collection' => \Mage_Sales_Model_Entity_Order_Collection::class,
             'sales_entity/order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class,
             'sales/entity_order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class,
-            'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales_entity/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
-            'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
+            'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales/entity_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
-            'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
+            'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
             'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
+            'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
             'sales/entity_order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class,
             'sales_entity/order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class,
             'sales/entity_order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class,
             'sales_entity/order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class,
             'sales_entity/order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class,
             'sales/entity_order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class,
-            'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
             'sales/entity_order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
-            'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
+            'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
             'sales_entity/order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
+            'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
             'sales/entity_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class,
             'sales_entity/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class,
-            'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class,
             'sales/entity_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class,
+            'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class,
             'sales/entity_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Order::class,
             'sales_entity/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Order::class,
             'sales_entity/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/entity_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/entity_order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class,
             'sales_entity/order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class,
-            'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
             'sales/entity_order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
+            'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
             'sales_entity/order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class,
             'sales/entity_order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class,
             'sales_entity/order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class,
             'sales/entity_order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class,
-            'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
             'sales/entity_order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
+            'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
             'sales/entity_order_item' => \Mage_Sales_Model_Entity_Order_Item::class,
             'sales_entity/order_item' => \Mage_Sales_Model_Entity_Order_Item::class,
             'sales/entity_order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class,
             'sales_entity/order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class,
-            'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
             'sales/entity_order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
+            'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
             'sales_entity/order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class,
             'sales/entity_order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class,
             'sales/entity_order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class,
             'sales_entity/order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class,
-            'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
             'sales_entity/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
-            'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
+            'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
             'sales/entity_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
+            'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
             'sales/entity_order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class,
             'sales_entity/order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class,
             'sales/entity_order_shipment_comment' => \Mage_Sales_Model_Entity_Order_Shipment_Comment::class,
@@ -5611,66 +5598,66 @@
             'sales_entity/order_shipment_comment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Comment_Collection::class,
             'sales_entity/order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class,
             'sales/entity_order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class,
-            'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
             'sales/entity_order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
-            'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
+            'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
             'sales_entity/order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
-            'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
+            'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
             'sales_entity/order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
-            'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
+            'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
             'sales_entity/order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
-            'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
+            'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
             'sales_entity/order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
+            'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
             'sales_entity/quote' => \Mage_Sales_Model_Entity_Quote::class,
             'sales/entity_quote' => \Mage_Sales_Model_Entity_Quote::class,
-            'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
             'sales_entity/quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
+            'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
             'sales_entity/quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class,
             'sales/entity_quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class,
-            'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
             'sales/entity_quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
-            'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
+            'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
             'sales/entity_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
-            'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
+            'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
             'sales_entity/quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
-            'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
+            'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
             'sales/entity_quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
+            'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
             'sales_entity/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales/entity_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales_entity/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class,
             'sales/entity_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class,
-            'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
             'sales_entity/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
-            'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
             'sales/entity_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/entity_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales_entity/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales/entity_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class,
             'sales_entity/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class,
             'sales_entity/quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class,
             'sales/entity_quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class,
-            'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
             'sales_entity/quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
-            'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
+            'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
             'sales/entity_quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
-            'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
+            'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
             'sales_entity/quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
+            'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
             'sales/entity_quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class,
             'sales_entity/quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class,
             'sales/entity_quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class,
             'sales_entity/quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class,
-            'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
             'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
-            'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
+            'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
             'sales/entity_quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
-            'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
+            'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
             'sales/entity_quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
+            'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
             'sales_entity/quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class,
             'sales/entity_quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class,
-            'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
             'sales_entity/sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
-            'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class,
+            'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
             'sales_entity/setup' => \Mage_Sales_Model_Entity_Setup::class,
+            'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class,
             'sales/mysql4_abstract' => \Mage_Sales_Model_Mysql4_Abstract::class,
             'sales/mysql4_billing_agreement' => \Mage_Sales_Model_Mysql4_Billing_Agreement::class,
             'sales/mysql4_billing_agreement_collection' => \Mage_Sales_Model_Mysql4_Billing_Agreement_Collection::class,
@@ -5865,50 +5852,50 @@
             'sales/recurring_profile' => \Mage_Sales_Model_Recurring_Profile::class,
             'sales_resource/abstract' => \Mage_Sales_Model_Resource_Abstract::class,
             'sales/resource_abstract' => \Mage_Sales_Model_Resource_Abstract::class,
-            'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
             'sales_resource/billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
-            'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
+            'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
             'sales_resource/billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
+            'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
             'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
             'sales/resource_collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
             'sales_resource/helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
             'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
-            'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class,
             'sales_resource/order' => \Mage_Sales_Model_Resource_Order::class,
+            'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class,
             'sales_resource/order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class,
             'sales/resource_order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class,
-            'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
             'sales_resource/order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
+            'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
             'sales/resource_order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class,
             'sales_resource/order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class,
             'sales/resource_order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class,
             'sales_resource/order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class,
             'sales/resource_order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class,
             'sales_resource/order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class,
-            'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
             'sales/resource_order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
+            'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
             'sales_resource/order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class,
             'sales/resource_order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class,
             'sales/resource_order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class,
             'sales_resource/order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class,
-            'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
             'sales/resource_order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
-            'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
+            'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
             'sales/resource_order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
-            'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
+            'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
             'sales/resource_order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
-            'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
+            'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
             'sales_resource/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
+            'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales/resource_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class,
             'sales_resource/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class,
-            'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
             'sales/resource_order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
-            'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
+            'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
             'sales_resource/order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
+            'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
             'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
             'sales/resource_order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
-            'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
             'sales/resource_order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
+            'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
             'sales_resource/order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class,
             'sales/resource_order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class,
             'sales_resource/order_creditmemo_item_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item_Collection::class,
@@ -5917,138 +5904,138 @@
             'sales/resource_order_grid_collection' => \Mage_Sales_Model_Resource_Order_Grid_Collection::class,
             'sales/resource_order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class,
             'sales_resource/order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class,
-            'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
             'sales/resource_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
-            'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
+            'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
             'sales_resource/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
+            'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
             'sales_resource/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class,
             'sales/resource_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class,
             'sales/resource_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class,
             'sales_resource/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/resource_order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class,
             'sales_resource/order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class,
-            'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
             'sales/resource_order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
+            'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
             'sales/resource_order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class,
             'sales_resource/order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class,
-            'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
             'sales/resource_order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
-            'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
+            'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
             'sales_resource/order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
+            'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
             'sales/resource_order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class,
             'sales_resource/order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class,
-            'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
             'sales_resource/order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
+            'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
             'sales/resource_order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class,
             'sales_resource/order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class,
-            'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
             'sales_resource/order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
-            'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
+            'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
             'sales/resource_order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
+            'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
             'sales_resource/order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
             'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
-            'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
             'sales_resource/order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
-            'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
+            'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
             'sales_resource/order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
-            'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
+            'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
             'sales/resource_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
+            'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
             'sales_resource/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class,
             'sales/resource_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class,
             'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
             'sales/resource_order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
-            'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
             'sales/resource_order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
-            'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
+            'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
             'sales/resource_order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
+            'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
             'sales_resource/order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class,
             'sales/resource_order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class,
-            'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
             'sales_resource/order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
-            'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
+            'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
             'sales_resource/order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
-            'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
+            'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
             'sales_resource/order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
-            'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
+            'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
             'sales_resource/order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
+            'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
             'sales_resource/order_status' => \Mage_Sales_Model_Resource_Order_Status::class,
             'sales/resource_order_status' => \Mage_Sales_Model_Resource_Order_Status::class,
             'sales_resource/order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class,
             'sales/resource_order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class,
-            'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
             'sales_resource/order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
-            'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
+            'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
             'sales_resource/order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
-            'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
+            'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
             'sales/resource_order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
-            'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
+            'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
             'sales_resource/order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
-            'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class,
+            'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
             'sales/resource_quote' => \Mage_Sales_Model_Resource_Quote::class,
+            'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class,
             'sales_resource/quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class,
             'sales/resource_quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class,
             'sales/resource_quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class,
             'sales_resource/quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class,
             'sales/resource_quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class,
             'sales_resource/quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class,
-            'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
             'sales/resource_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
+            'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
             'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
             'sales/resource_quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
-            'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
             'sales_resource/quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
+            'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
             'sales_resource/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales/resource_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales/resource_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class,
             'sales_resource/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class,
             'sales/resource_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class,
             'sales_resource/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class,
-            'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/resource_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales/resource_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
-            'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
             'sales_resource/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
-            'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
+            'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
             'sales/resource_quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
+            'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
             'sales_resource/quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class,
             'sales/resource_quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class,
-            'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
             'sales/resource_quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
-            'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
+            'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
             'sales_resource/quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
-            'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
+            'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
             'sales_resource/quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
+            'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
             'sales_resource/quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class,
             'sales/resource_quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class,
-            'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
             'sales/resource_quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
+            'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
             'sales/resource_quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class,
             'sales_resource/quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class,
-            'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
             'sales/resource_quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
-            'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
+            'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
             'sales/resource_quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
-            'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
+            'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
             'sales_resource/quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
-            'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
+            'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
             'sales/resource_quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
-            'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
+            'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
             'sales/resource_recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
+            'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
             'sales/resource_recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class,
             'sales_resource/recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class,
-            'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class,
             'sales/resource_report' => \Mage_Sales_Model_Resource_Report::class,
+            'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class,
             'sales/resource_report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class,
             'sales_resource/report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class,
-            'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
             'sales/resource_report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
+            'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
             'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
             'sales/resource_report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
-            'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
             'sales_resource/report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
-            'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
+            'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
             'sales_resource/report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
+            'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
             'sales/resource_report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class,
             'sales_resource/report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class,
             'sales_resource/report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class,
@@ -6061,24 +6048,24 @@
             'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class,
             'sales_resource/report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class,
             'sales/resource_report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class,
-            'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
             'sales/resource_report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
-            'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
+            'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
             'sales_resource/report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
+            'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
             'sales_resource/report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class,
             'sales/resource_report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class,
             'sales_resource/report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class,
             'sales/resource_report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class,
-            'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
             'sales_resource/report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
+            'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
             'sales_resource/report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class,
             'sales/resource_report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class,
             'sales_resource/report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class,
             'sales/resource_report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class,
-            'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
             'sales/resource_sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
-            'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class,
+            'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
             'sales/resource_setup' => \Mage_Sales_Model_Resource_Setup::class,
+            'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class,
             'sales/service_order' => \Mage_Sales_Model_Service_Order::class,
             'sales/service_quote' => \Mage_Sales_Model_Service_Quote::class,
             'sales/status_list' => \Mage_Sales_Model_Status_List::class,
@@ -6088,8 +6075,8 @@
             'sendfriend/observer' => \Mage_Sendfriend_Model_Observer::class,
             'sendfriend_resource/sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class,
             'sendfriend/resource_sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class,
-            'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
             'sendfriend/resource_sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
+            'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
             'sendfriend/resource_setup' => \Mage_Sendfriend_Model_Resource_Setup::class,
             'sendfriend_resource/setup' => \Mage_Sendfriend_Model_Resource_Setup::class,
             'sendfriend/sendfriend' => \Mage_Sendfriend_Model_Sendfriend::class,
@@ -6108,8 +6095,8 @@
             'shipping/rate_result_abstract' => \Mage_Shipping_Model_Rate_Result_Abstract::class,
             'shipping/rate_result_error' => \Mage_Shipping_Model_Rate_Result_Error::class,
             'shipping/rate_result_method' => \Mage_Shipping_Model_Rate_Result_Method::class,
-            'shipping/resource_carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class,
             'shipping_resource/carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class,
+            'shipping/resource_carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class,
             'shipping/resource_carrier_tablerate_collection' => \Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection::class,
             'shipping_resource/carrier_tablerate_collection' => \Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection::class,
             'shipping/shipment_request' => \Mage_Shipping_Model_Shipment_Request::class,
@@ -6129,16 +6116,16 @@
             'sitemap/observer' => \Mage_Sitemap_Model_Observer::class,
             'sitemap_resource/catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class,
             'sitemap/resource_catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class,
-            'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
             'sitemap/resource_catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
-            'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
+            'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
             'sitemap_resource/catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
-            'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
+            'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
             'sitemap_resource/cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
+            'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
             'sitemap_resource/sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class,
             'sitemap/resource_sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class,
-            'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
             'sitemap_resource/sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
+            'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
             'sitemap/sitemap' => \Mage_Sitemap_Model_Sitemap::class,
             'tag/api' => \Mage_Tag_Model_Api::class,
             'tag/api_v2' => \Mage_Tag_Model_Api_V2::class,
@@ -6151,21 +6138,21 @@
             'tag/mysql4_tag' => \Mage_Tag_Model_Mysql4_Tag::class,
             'tag/mysql4_tag_collection' => \Mage_Tag_Model_Mysql4_Tag_Collection::class,
             'tag/mysql4_tag_relation' => \Mage_Tag_Model_Mysql4_Tag_Relation::class,
-            'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag/resource_customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag_resource/customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
-            'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
+            'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag_resource/indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
-            'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
+            'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
             'tag_resource/popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
+            'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
             'tag_resource/product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class,
             'tag/resource_product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class,
             'tag_resource/tag' => \Mage_Tag_Model_Resource_Tag::class,
             'tag/resource_tag' => \Mage_Tag_Model_Resource_Tag::class,
-            'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
             'tag_resource/tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
-            'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
+            'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
             'tag_resource/tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
+            'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
             'tag/session' => \Mage_Tag_Model_Session::class,
             'tag/tag' => \Mage_Tag_Model_Tag::class,
             'tag/tag_relation' => \Mage_Tag_Model_Tag_Relation::class,
@@ -6204,16 +6191,16 @@
             'tax/resource_calculation_rate' => \Mage_Tax_Model_Resource_Calculation_Rate::class,
             'tax/resource_calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class,
             'tax_resource/calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class,
-            'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
             'tax/resource_calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
-            'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
+            'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
             'tax/resource_calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
-            'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
+            'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
             'tax/resource_calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
-            'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
+            'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
             'tax_resource/calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
-            'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class,
+            'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
             'tax/resource_class' => \Mage_Tax_Model_Resource_Class::class,
+            'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class,
             'tax/resource_class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class,
             'tax_resource/class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class,
             'tax_resource/report_collection' => \Mage_Tax_Model_Resource_Report_Collection::class,
@@ -6224,16 +6211,16 @@
             'tax/resource_report_tax_createdat' => \Mage_Tax_Model_Resource_Report_Tax_Createdat::class,
             'tax_resource/report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class,
             'tax/resource_report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class,
-            'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
             'tax/resource_report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
-            'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
+            'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
             'tax_resource/sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
+            'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
             'tax_resource/sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class,
             'tax/resource_sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class,
-            'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class,
             'tax/resource_sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class,
-            'tax_resource/sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class,
+            'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class,
             'tax/resource_sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class,
+            'tax_resource/sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class,
             'tax/resource_setup' => \Mage_Tax_Model_Resource_Setup::class,
             'tax_resource/setup' => \Mage_Tax_Model_Resource_Setup::class,
             'tax/sales_order_tax' => \Mage_Tax_Model_Sales_Order_Tax::class,
@@ -6316,10 +6303,10 @@
             'weee/observer' => \Mage_Weee_Model_Observer::class,
             'weee/resource_attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class,
             'weee_resource/attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class,
-            'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class,
             'weee/resource_setup' => \Mage_Weee_Model_Resource_Setup::class,
-            'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class,
+            'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class,
             'weee/resource_tax' => \Mage_Weee_Model_Resource_Tax::class,
+            'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class,
             'weee/tax' => \Mage_Weee_Model_Tax::class,
             'weee/total_creditmemo_weee' => \Mage_Weee_Model_Total_Creditmemo_Weee::class,
             'weee/total_invoice_weee' => \Mage_Weee_Model_Total_Invoice_Weee::class,
@@ -6329,12 +6316,12 @@
             'widget/mysql4_widget_instance' => \Mage_Widget_Model_Mysql4_Widget_Instance::class,
             'widget/mysql4_widget_instance_collection' => \Mage_Widget_Model_Mysql4_Widget_Instance_Collection::class,
             'widget/observer' => \Mage_Widget_Model_Observer::class,
-            'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class,
             'widget/resource_widget' => \Mage_Widget_Model_Resource_Widget::class,
+            'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class,
             'widget_resource/widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class,
             'widget/resource_widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class,
-            'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
             'widget_resource/widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
+            'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
             'widget/template_filter' => \Mage_Widget_Model_Template_Filter::class,
             'widget/widget' => \Mage_Widget_Model_Widget::class,
             'widget/widget_config' => \Mage_Widget_Model_Widget_Config::class,
@@ -6351,14 +6338,14 @@
             'wishlist/mysql4_wishlist' => \Mage_Wishlist_Model_Mysql4_Wishlist::class,
             'wishlist/mysql4_wishlist_collection' => \Mage_Wishlist_Model_Mysql4_Wishlist_Collection::class,
             'wishlist/observer' => \Mage_Wishlist_Model_Observer::class,
-            'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class,
             'wishlist_resource/item' => \Mage_Wishlist_Model_Resource_Item::class,
+            'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class,
             'wishlist_resource/item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class,
             'wishlist/resource_item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class,
             'wishlist/resource_item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
             'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
-            'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
             'wishlist_resource/item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
+            'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
             'wishlist_resource/product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class,
             'wishlist/resource_product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class,
             'wishlist/resource_wishlist' => \Mage_Wishlist_Model_Resource_Wishlist::class,
@@ -6367,7 +6354,6 @@
             'wishlist/resource_wishlist_collection' => \Mage_Wishlist_Model_Resource_Wishlist_Collection::class,
             'wishlist/session' => \Mage_Wishlist_Model_Session::class,
             'wishlist/wishlist' => \Mage_Wishlist_Model_Wishlist::class,
-            'varien/autoload' => \Varien_Autoload::class,
         ])
     );
 }
\ No newline at end of file
diff --git a/.phpstorm.meta.php/magento_models_methods.meta.php b/.phpstorm.meta.php/magento_models_methods.meta.php
index 79e27cc575a..8801d08ce0c 100644
--- a/.phpstorm.meta.php/magento_models_methods.meta.php
+++ b/.phpstorm.meta.php/magento_models_methods.meta.php
@@ -7,11 +7,10 @@
             'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class,
             'adminnotification/mysql4_inbox_collection' => \Mage_AdminNotification_Model_Mysql4_Inbox_Collection::class,
             'adminnotification/observer' => \Mage_AdminNotification_Model_Observer::class,
-            'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
             'adminnotification/resource_inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
-            'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
+            'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
             'adminnotification/resource_inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
-            'adminnotification/survey' => \Mage_AdminNotification_Model_Survey::class,
+            'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
             'admin/acl' => \Mage_Admin_Model_Acl::class,
             'admin/acl_assert_ip' => \Mage_Admin_Model_Acl_Assert_Ip::class,
             'admin/acl_assert_time' => \Mage_Admin_Model_Acl_Assert_Time::class,
@@ -40,38 +39,38 @@
             'admin/redirectpolicy' => \Mage_Admin_Model_Redirectpolicy::class,
             'admin/resource_acl' => \Mage_Admin_Model_Resource_Acl::class,
             'admin_resource/acl' => \Mage_Admin_Model_Resource_Acl::class,
-            'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
             'admin/resource_acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
+            'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
             'admin/resource_acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class,
             'admin_resource/acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class,
-            'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class,
             'admin/resource_block' => \Mage_Admin_Model_Resource_Block::class,
-            'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
+            'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class,
             'admin/resource_block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
+            'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
             'admin_resource/permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class,
             'admin/resource_permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class,
-            'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class,
             'admin/resource_role' => \Mage_Admin_Model_Resource_Role::class,
+            'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class,
             'admin/resource_role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class,
             'admin_resource/role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class,
-            'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class,
             'admin_resource/roles' => \Mage_Admin_Model_Resource_Roles::class,
-            'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
+            'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class,
             'admin_resource/roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
-            'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
+            'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
             'admin/resource_roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
+            'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
             'admin/resource_rules' => \Mage_Admin_Model_Resource_Rules::class,
             'admin_resource/rules' => \Mage_Admin_Model_Resource_Rules::class,
             'admin_resource/rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
             'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
-            'admin_resource/user' => \Mage_Admin_Model_Resource_User::class,
             'admin/resource_user' => \Mage_Admin_Model_Resource_User::class,
+            'admin_resource/user' => \Mage_Admin_Model_Resource_User::class,
             'admin/resource_user_collection' => \Mage_Admin_Model_Resource_User_Collection::class,
             'admin_resource/user_collection' => \Mage_Admin_Model_Resource_User_Collection::class,
-            'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class,
             'admin_resource/variable' => \Mage_Admin_Model_Resource_Variable::class,
-            'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
+            'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class,
             'admin/resource_variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
+            'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
             'admin/role' => \Mage_Admin_Model_Role::class,
             'admin/roles' => \Mage_Admin_Model_Roles::class,
             'admin/rules' => \Mage_Admin_Model_Rules::class,
@@ -106,6 +105,7 @@
             'adminhtml/system_config_backend_baseurl' => \Mage_Adminhtml_Model_System_Config_Backend_Baseurl::class,
             'adminhtml/system_config_backend_cache' => \Mage_Adminhtml_Model_System_Config_Backend_Cache::class,
             'adminhtml/system_config_backend_catalog_inventory_managestock' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock::class,
+            'adminhtml/system_config_backend_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Separator::class,
             'adminhtml/system_config_backend_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Type::class,
             'adminhtml/system_config_backend_category' => \Mage_Adminhtml_Model_System_Config_Backend_Category::class,
             'adminhtml/system_config_backend_cookie' => \Mage_Adminhtml_Model_System_Config_Backend_Cookie::class,
@@ -158,12 +158,14 @@
             'adminhtml/system_config_source_catalog_listMode' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListMode::class,
             'adminhtml/system_config_source_catalog_listPerPage' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListPerPage::class,
             'adminhtml/system_config_source_catalog_listSort' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort::class,
+            'adminhtml/system_config_source_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Separator::class,
             'adminhtml/system_config_source_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Type::class,
             'adminhtml/system_config_source_catalog_timeFormat' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_TimeFormat::class,
             'adminhtml/system_config_source_category' => \Mage_Adminhtml_Model_System_Config_Source_Category::class,
             'adminhtml/system_config_source_checktype' => \Mage_Adminhtml_Model_System_Config_Source_Checktype::class,
             'adminhtml/system_config_source_cms_page' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Page::class,
             'adminhtml/system_config_source_cms_wysiwyg_enabled' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Wysiwyg_Enabled::class,
+            'adminhtml/system_config_source_cookie_samesite' => \Mage_Adminhtml_Model_System_Config_Source_Cookie_Samesite::class,
             'adminhtml/system_config_source_country' => \Mage_Adminhtml_Model_System_Config_Source_Country::class,
             'adminhtml/system_config_source_country_full' => \Mage_Adminhtml_Model_System_Config_Source_Country_Full::class,
             'adminhtml/system_config_source_cron_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency::class,
@@ -190,6 +192,7 @@
             'adminhtml/system_config_source_locale_timezone' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Timezone::class,
             'adminhtml/system_config_source_locale_weekdaycodes' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdaycodes::class,
             'adminhtml/system_config_source_locale_weekdays' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdays::class,
+            'adminhtml/system_config_source_log_level' => \Mage_Adminhtml_Model_System_Config_Source_Log_Level::class,
             'adminhtml/system_config_source_nooptreq' => \Mage_Adminhtml_Model_System_Config_Source_Nooptreq::class,
             'adminhtml/system_config_source_notification_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Notification_Frequency::class,
             'adminhtml/system_config_source_order_status' => \Mage_Adminhtml_Model_System_Config_Source_Order_Status::class,
@@ -213,7 +216,6 @@
             'adminhtml/system_config_source_shipping_flatrate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Flatrate::class,
             'adminhtml/system_config_source_shipping_tablerate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Tablerate::class,
             'adminhtml/system_config_source_shipping_taxclass' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Taxclass::class,
-            'adminhtml/system_config_source_startdateenddate' => \Mage_Adminhtml_Model_System_Config_Source_Startdateenddate::class,
             'adminhtml/system_config_source_storage_media_database' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Database::class,
             'adminhtml/system_config_source_storage_media_storage' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Storage::class,
             'adminhtml/system_config_source_store' => \Mage_Adminhtml_Model_System_Config_Source_Store::class,
@@ -269,22 +271,22 @@
             'api2_resource/acl_filter_attribute' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute::class,
             'api2/resource_acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class,
             'api2_resource/acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class,
-            'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
             'api2_resource/acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
+            'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
             'api2/resource_acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class,
             'api2_resource/acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class,
             'api2_resource/acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class,
             'api2/resource_acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class,
             'api2/resource_acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class,
             'api2_resource/acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class,
-            'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class,
             'api2/resource_setup' => \Mage_Api2_Model_Resource_Setup::class,
+            'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class,
             'api2/resource_validator' => \Mage_Api2_Model_Resource_Validator::class,
             'api2_resource/validator' => \Mage_Api2_Model_Resource_Validator::class,
             'api2/resource_validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class,
             'api2_resource/validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class,
-            'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
             'api2/resource_validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
+            'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
             'api2/response' => \Mage_Api2_Model_Response::class,
             'api2/route_abstract' => \Mage_Api2_Model_Route_Abstract::class,
             'api2/route_apiType' => \Mage_Api2_Model_Route_ApiType::class,
@@ -316,8 +318,8 @@
             'api/mysql4_user_collection' => \Mage_Api_Model_Mysql4_User_Collection::class,
             'api/resource_abstract' => \Mage_Api_Model_Resource_Abstract::class,
             'api_resource/abstract' => \Mage_Api_Model_Resource_Abstract::class,
-            'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class,
             'api_resource/acl' => \Mage_Api_Model_Resource_Acl::class,
+            'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class,
             'api_resource/acl_role' => \Mage_Api_Model_Resource_Acl_Role::class,
             'api/resource_acl_role' => \Mage_Api_Model_Resource_Acl_Role::class,
             'api/resource_acl_role_collection' => \Mage_Api_Model_Resource_Acl_Role_Collection::class,
@@ -326,18 +328,18 @@
             'api_resource/permissions_collection' => \Mage_Api_Model_Resource_Permissions_Collection::class,
             'api_resource/role' => \Mage_Api_Model_Resource_Role::class,
             'api/resource_role' => \Mage_Api_Model_Resource_Role::class,
-            'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
             'api_resource/role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
+            'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
             'api/resource_roles' => \Mage_Api_Model_Resource_Roles::class,
             'api_resource/roles' => \Mage_Api_Model_Resource_Roles::class,
-            'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
             'api_resource/roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
-            'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
+            'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
             'api_resource/roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
-            'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class,
+            'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
             'api_resource/rules' => \Mage_Api_Model_Resource_Rules::class,
-            'api/resource_rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class,
+            'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class,
             'api_resource/rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class,
+            'api/resource_rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class,
             'api/resource_user' => \Mage_Api_Model_Resource_User::class,
             'api_resource/user' => \Mage_Api_Model_Resource_User::class,
             'api/resource_user_collection' => \Mage_Api_Model_Resource_User_Collection::class,
@@ -364,15 +366,6 @@
             'authorizenet/directpost_request' => \Mage_Authorizenet_Model_Directpost_Request::class,
             'authorizenet/directpost_response' => \Mage_Authorizenet_Model_Directpost_Response::class,
             'authorizenet/directpost_session' => \Mage_Authorizenet_Model_Directpost_Session::class,
-            'backup/backup' => \Mage_Backup_Model_Backup::class,
-            'backup/config_backend_cron' => \Mage_Backup_Model_Config_Backend_Cron::class,
-            'backup/config_source_type' => \Mage_Backup_Model_Config_Source_Type::class,
-            'backup/db' => \Mage_Backup_Model_Db::class,
-            'backup/fs_collection' => \Mage_Backup_Model_Fs_Collection::class,
-            'backup/mysql4_db' => \Mage_Backup_Model_Mysql4_Db::class,
-            'backup/observer' => \Mage_Backup_Model_Observer::class,
-            'backup/resource_db' => \Mage_Backup_Model_Resource_Db::class,
-            'backup/resource_helper_mysql4' => \Mage_Backup_Model_Resource_Helper_Mysql4::class,
             'bundle/catalogIndex_data_bundle' => \Mage_Bundle_Model_CatalogIndex_Data_Bundle::class,
             'bundle/mysql4_bundle' => \Mage_Bundle_Model_Mysql4_Bundle::class,
             'bundle/mysql4_indexer_price' => \Mage_Bundle_Model_Mysql4_Indexer_Price::class,
@@ -398,10 +391,10 @@
             'bundle_resource/option' => \Mage_Bundle_Model_Resource_Option::class,
             'bundle/resource_option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class,
             'bundle_resource/option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class,
-            'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
             'bundle_resource/price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
-            'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class,
+            'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
             'bundle_resource/selection' => \Mage_Bundle_Model_Resource_Selection::class,
+            'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class,
             'bundle_resource/selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class,
             'bundle/resource_selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class,
             'bundle/sales_order_pdf_items_abstract' => \Mage_Bundle_Model_Sales_Order_Pdf_Items_Abstract::class,
@@ -417,8 +410,8 @@
             'captcha/config_form_frontend' => \Mage_Captcha_Model_Config_Form_Frontend::class,
             'captcha/config_mode' => \Mage_Captcha_Model_Config_Mode::class,
             'captcha/observer' => \Mage_Captcha_Model_Observer::class,
-            'captcha_resource/log' => \Mage_Captcha_Model_Resource_Log::class,
             'captcha/resource_log' => \Mage_Captcha_Model_Resource_Log::class,
+            'captcha_resource/log' => \Mage_Captcha_Model_Resource_Log::class,
             'captcha/zend' => \Mage_Captcha_Model_Zend::class,
             'catalogindex/aggregation' => \Mage_CatalogIndex_Model_Aggregation::class,
             'catalogindex/attribute' => \Mage_CatalogIndex_Model_Attribute::class,
@@ -461,8 +454,8 @@
             'catalogindex/resource_data_abstract' => \Mage_CatalogIndex_Model_Resource_Data_Abstract::class,
             'catalogindex_resource/data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class,
             'catalogindex/resource_data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class,
-            'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
             'catalogindex_resource/data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
+            'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
             'catalogindex_resource/indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class,
             'catalogindex/resource_indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class,
             'catalogindex/resource_indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class,
@@ -494,20 +487,20 @@
             'cataloginventory/mysql4_stock_item_collection' => \Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection::class,
             'cataloginventory/mysql4_stock_status' => \Mage_CatalogInventory_Model_Mysql4_Stock_Status::class,
             'cataloginventory/observer' => \Mage_CatalogInventory_Model_Observer::class,
-            'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
             'cataloginventory_resource/indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
+            'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
             'cataloginventory/resource_indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class,
             'cataloginventory_resource/indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class,
-            'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
             'cataloginventory/resource_indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
+            'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
             'cataloginventory/resource_indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class,
             'cataloginventory_resource/indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class,
             'cataloginventory_resource/stock' => \Mage_CatalogInventory_Model_Resource_Stock::class,
             'cataloginventory/resource_stock' => \Mage_CatalogInventory_Model_Resource_Stock::class,
-            'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
             'cataloginventory/resource_stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
-            'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
+            'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
             'cataloginventory/resource_stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
+            'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
             'cataloginventory/resource_stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class,
             'cataloginventory_resource/stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class,
             'cataloginventory/source_backorders' => \Mage_CatalogInventory_Model_Source_Backorders::class,
@@ -530,8 +523,8 @@
             'catalogrule/observer' => \Mage_CatalogRule_Model_Observer::class,
             'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
             'catalogrule/resource_rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
-            'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
             'catalogrule_resource/rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
+            'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
             'catalogrule_resource/rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class,
             'catalogrule/resource_rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class,
             'catalogrule_resource/rule_product_price_collection' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price_Collection::class,
@@ -560,24 +553,24 @@
             'catalogsearch/query' => \Mage_CatalogSearch_Model_Query::class,
             'catalogsearch_resource/advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class,
             'catalogsearch/resource_advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class,
-            'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
             'catalogsearch_resource/advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
+            'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
             'catalogsearch_resource/fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class,
             'catalogsearch/resource_fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class,
             'catalogsearch_resource/fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class,
             'catalogsearch/resource_fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class,
-            'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
             'catalogsearch_resource/fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
-            'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
+            'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
             'catalogsearch/resource_helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
-            'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
+            'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
             'catalogsearch_resource/indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
-            'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class,
+            'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
             'catalogsearch_resource/query' => \Mage_CatalogSearch_Model_Resource_Query::class,
-            'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
+            'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class,
             'catalogsearch_resource/query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
-            'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
+            'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
             'catalogsearch/resource_search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
+            'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
             'catalogsearch/session' => \Mage_CatalogSearch_Model_Session::class,
             'catalogsearch/system_config_backend_sitemap' => \Mage_CatalogSearch_Model_System_Config_Backend_Sitemap::class,
             'catalog/abstract' => \Mage_Catalog_Model_Abstract::class,
@@ -720,144 +713,144 @@
             'catalog/product_website' => \Mage_Catalog_Model_Product_Website::class,
             'catalog/resource_abstract' => \Mage_Catalog_Model_Resource_Abstract::class,
             'catalog_resource/abstract' => \Mage_Catalog_Model_Resource_Abstract::class,
-            'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
             'catalog/resource_attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
-            'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class,
+            'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
             'catalog_resource/category' => \Mage_Catalog_Model_Resource_Category::class,
+            'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class,
             'catalog_resource/category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class,
             'catalog/resource_category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class,
-            'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
             'catalog/resource_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
-            'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
+            'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
             'catalog/resource_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
+            'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
             'catalog_resource/category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class,
             'catalog/resource_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class,
             'catalog_resource/category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class,
             'catalog/resource_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class,
             'catalog/resource_category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class,
             'catalog_resource/category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class,
-            'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
             'catalog_resource/category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
-            'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
+            'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
             'catalog/resource_category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
+            'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
             'catalog_resource/category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class,
             'catalog/resource_category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class,
             'catalog/resource_category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class,
             'catalog_resource/category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class,
-            'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
             'catalog_resource/collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
+            'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
             'catalog_resource/config' => \Mage_Catalog_Model_Resource_Config::class,
             'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class,
-            'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
             'catalog/resource_eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
+            'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
             'catalog_resource/eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class,
             'catalog/resource_eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class,
             'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
             'catalog_resource/eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
-            'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
             'catalog/resource_eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
-            'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
+            'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
             'catalog_resource/eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
+            'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
             'catalog_resource/eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
-            'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
+            'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
             'catalog_resource/eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
+            'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
             'catalog/resource_eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class,
             'catalog_resource/eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class,
             'catalog/resource_eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class,
             'catalog_resource/eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class,
             'catalog/resource_eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class,
             'catalog_resource/eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class,
-            'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
             'catalog/resource_eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
+            'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
             'catalog/resource_eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
             'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
             'catalog/resource_eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class,
             'catalog_resource/eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class,
-            'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
             'catalog_resource/eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
-            'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
+            'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
             'catalog_resource/eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
+            'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
             'catalog_resource/eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class,
             'catalog/resource_eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class,
-            'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
             'catalog_resource/eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
+            'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
             'catalog/resource_eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
             'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
-            'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
             'catalog/resource_eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
-            'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
+            'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
             'catalog/resource_eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
-            'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
+            'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
             'catalog_resource/eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
+            'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
             'catalog/resource_eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class,
             'catalog/resource_eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
+            'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
             'catalog/resource_eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class,
             'catalog/resource_eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class,
             'catalog/resource_eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class,
-            'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
             'catalog_resource/eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
-            'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
+            'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
             'catalog_resource/eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
-            'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
+            'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
             'catalog_resource/eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
+            'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
             'catalog/resource_eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class,
             'catalog/resource_eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class,
             'catalog/resource_eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class,
-            'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
             'catalog/resource_eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
-            'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
+            'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
             'catalog_resource/eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
+            'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
             'catalog_resource/eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class,
             'catalog/resource_eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class,
-            'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
             'catalog/resource_eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
-            'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
+            'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
             'catalog/resource_eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
+            'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
             'catalog/resource_eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class,
             'catalog_resource/eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class,
-            'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
             'catalog/resource_eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
+            'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
             'catalog_resource/eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class,
             'catalog/resource_eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class,
             'catalog_resource/eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class,
             'catalog/resource_eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class,
-            'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
             'catalog/resource_eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
-            'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
+            'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
             'catalog_resource/eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
-            'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
+            'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
             'catalog/resource_eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
+            'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
             'catalog/resource_eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
             'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
-            'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
             'catalog/resource_eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
+            'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
             'catalog/resource_eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class,
             'catalog_resource/eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class,
-            'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
             'catalog_resource/eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
-            'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
+            'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
             'catalog/resource_eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
-            'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
             'catalog/resource_eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
+            'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
             'catalog_resource/eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
+            'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
             'catalog/resource_eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class,
             'catalog_resource/eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class,
             'catalog/resource_eav_mysql4_sendfriend' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend::class,
@@ -866,16 +859,16 @@
             'catalog/resource_eav_mysql4_sendfriend_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection::class,
             'catalog_resource/eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class,
             'catalog/resource_eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class,
-            'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
             'catalog/resource_eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
-            'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
+            'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
             'catalog/resource_helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
+            'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
             'catalog_resource/layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class,
             'catalog/resource_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class,
             'catalog/resource_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class,
             'catalog_resource/layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class,
-            'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
             'catalog/resource_layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
+            'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
             'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class,
             'catalog_resource/product' => \Mage_Catalog_Model_Resource_Product::class,
             'catalog/resource_product_action' => \Mage_Catalog_Model_Resource_Product_Action::class,
@@ -886,42 +879,42 @@
             'catalog_resource/product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class,
             'catalog/resource_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class,
             'catalog_resource/product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class,
-            'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
             'catalog/resource_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
-            'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
+            'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
             'catalog_resource/product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
+            'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
             'catalog/resource_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class,
-            'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
             'catalog_resource/product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
-            'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
+            'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
             'catalog/resource_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
-            'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
+            'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
             'catalog_resource/product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
-            'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
+            'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
+            'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
             'catalog_resource/product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class,
             'catalog/resource_product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class,
-            'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
             'catalog/resource_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
+            'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
             'catalog/resource_product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class,
             'catalog_resource/product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class,
-            'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
             'catalog/resource_product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
+            'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
             'catalog/resource_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class,
             'catalog_resource/product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class,
-            'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
             'catalog_resource/product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
-            'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
+            'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
             'catalog/resource_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
+            'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
             'catalog/resource_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class,
             'catalog_resource/product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class,
-            'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
             'catalog_resource/product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
+            'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
             'catalog_resource/product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
             'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
-            'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
             'catalog_resource/product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
+            'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
             'catalog/resource_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class,
             'catalog_resource/product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class,
             'catalog_resource/product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class,
@@ -932,12 +925,12 @@
             'catalog_resource/product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class,
             'catalog/resource_product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
             'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
-            'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
             'catalog_resource/product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
-            'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
+            'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
             'catalog/resource_product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
-            'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
+            'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
             'catalog_resource/product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
+            'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
             'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
             'catalog_resource/product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
             'catalog_resource/product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class,
@@ -946,14 +939,14 @@
             'catalog/resource_product_status' => \Mage_Catalog_Model_Resource_Product_Status::class,
             'catalog_resource/product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class,
             'catalog/resource_product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class,
-            'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
             'catalog/resource_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
-            'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
             'catalog_resource/product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
             'catalog_resource/product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class,
             'catalog/resource_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class,
-            'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
             'catalog_resource/product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
+            'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
             'catalog/resource_setup' => \Mage_Catalog_Model_Resource_Setup::class,
             'catalog_resource/setup' => \Mage_Catalog_Model_Resource_Setup::class,
             'catalog_resource/url' => \Mage_Catalog_Model_Resource_Url::class,
@@ -999,12 +992,12 @@
             'checkout/observer' => \Mage_Checkout_Model_Observer::class,
             'checkout_resource/agreement' => \Mage_Checkout_Model_Resource_Agreement::class,
             'checkout/resource_agreement' => \Mage_Checkout_Model_Resource_Agreement::class,
-            'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
             'checkout/resource_agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
-            'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class,
+            'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
             'checkout_resource/cart' => \Mage_Checkout_Model_Resource_Cart::class,
-            'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class,
+            'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class,
             'checkout/resource_setup' => \Mage_Checkout_Model_Resource_Setup::class,
+            'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class,
             'checkout/session' => \Mage_Checkout_Model_Session::class,
             'checkout/type_abstract' => \Mage_Checkout_Model_Type_Abstract::class,
             'checkout/type_multishipping' => \Mage_Checkout_Model_Type_Multishipping::class,
@@ -1019,25 +1012,25 @@
             'cms/mysql4_page_service' => \Mage_Cms_Model_Mysql4_Page_Service::class,
             'cms/observer' => \Mage_Cms_Model_Observer::class,
             'cms/page' => \Mage_Cms_Model_Page::class,
-            'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class,
             'cms/resource_block' => \Mage_Cms_Model_Resource_Block::class,
+            'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class,
             'cms_resource/block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class,
             'cms/resource_block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class,
             'cms/resource_page' => \Mage_Cms_Model_Resource_Page::class,
             'cms_resource/page' => \Mage_Cms_Model_Resource_Page::class,
-            'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
             'cms_resource/page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
-            'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
+            'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
             'cms/resource_page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
+            'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
             'cms/template_filter' => \Mage_Cms_Model_Template_Filter::class,
             'cms/wysiwyg_config' => \Mage_Cms_Model_Wysiwyg_Config::class,
             'cms/wysiwyg_images_storage' => \Mage_Cms_Model_Wysiwyg_Images_Storage::class,
             'cms/wysiwyg_images_storage_collection' => \Mage_Cms_Model_Wysiwyg_Images_Storage_Collection::class,
             'configurableswatches/observer' => \Mage_ConfigurableSwatches_Model_Observer::class,
-            'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
             'configurableswatches_resource/catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
-            'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
+            'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
             'configurableswatches_resource/catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
+            'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
             'configurableswatches_resource/catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
             'configurableswatches/resource_catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
             'configurableswatches/system_config_source_catalog_product_configattribute' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute::class,
@@ -1144,152 +1137,152 @@
             'core/mysql4_website_collection' => \Mage_Core_Model_Mysql4_Website_Collection::class,
             'core/observer' => \Mage_Core_Model_Observer::class,
             'core/resource' => \Mage_Core_Model_Resource::class,
+            'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
             'core_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
             'core/resource_abstract' => \Mage_Core_Model_Resource_Abstract::class,
-            'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
+            'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
             'core/resource_cache' => \Mage_Core_Model_Resource_Cache::class,
             'core_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
-            'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
-            'core_resource/config' => \Mage_Core_Model_Resource_Config::class,
             'payment_resource/config' => \Mage_Core_Model_Resource_Config::class,
             'core/resource_config' => \Mage_Core_Model_Resource_Config::class,
-            'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
+            'core_resource/config' => \Mage_Core_Model_Resource_Config::class,
             'core/resource_config_data' => \Mage_Core_Model_Resource_Config_Data::class,
+            'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
             'payment_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
-            'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'core_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
-            'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
-            'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
+            'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'payment_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
-            'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
+            'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
+            'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
             'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
             'core/resource_db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
-            'core/resource_design' => \Mage_Core_Model_Resource_Design::class,
+            'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
             'core_resource/design' => \Mage_Core_Model_Resource_Design::class,
+            'core/resource_design' => \Mage_Core_Model_Resource_Design::class,
             'payment_resource/design' => \Mage_Core_Model_Resource_Design::class,
-            'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
             'payment_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
+            'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
             'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
-            'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
             'payment_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
             'core/resource_design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
+            'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
             'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
             'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
             'core/resource_email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
-            'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
-            'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
             'payment_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
-            'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
+            'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
+            'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
             'core/resource_email_template' => \Mage_Core_Model_Resource_Email_Template::class,
             'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
-            'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
+            'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
             'core/resource_email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
+            'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
             'core_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
-            'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
-            'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
             'core_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
-            'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
-            'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
+            'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
             'core_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
             'payment_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
             'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
-            'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
+            'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
             'payment_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
             'core/resource_file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
-            'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
+            'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
             'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
             'core/resource_file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
-            'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
             'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
-            'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
             'core/resource_file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
-            'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class,
-            'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
+            'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
             'payment_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
+            'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
+            'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class,
             'payment_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
-            'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
             'core_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
-            'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
+            'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
             'core/resource_helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
+            'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
             'core_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
             'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
             'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
             'core/resource_iterator' => \Mage_Core_Model_Resource_Iterator::class,
-            'core_resource/language' => \Mage_Core_Model_Resource_Language::class,
             'payment_resource/language' => \Mage_Core_Model_Resource_Language::class,
+            'core_resource/language' => \Mage_Core_Model_Resource_Language::class,
             'core/resource_language' => \Mage_Core_Model_Resource_Language::class,
             'payment_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
-            'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
             'core/resource_language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
-            'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
+            'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
             'core_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
             'core/resource_layout' => \Mage_Core_Model_Resource_Layout::class,
+            'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
             'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
-            'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class,
             'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
+            'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class,
             'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
-            'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'payment_resource/session' => \Mage_Core_Model_Resource_Session::class,
+            'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
             'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class,
             'payment_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
-            'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core/resource_setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
+            'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'payment_resource/store' => \Mage_Core_Model_Resource_Store::class,
             'core_resource/store' => \Mage_Core_Model_Resource_Store::class,
             'core/resource_store' => \Mage_Core_Model_Resource_Store::class,
-            'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
             'core/resource_store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
+            'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
             'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
-            'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'core/resource_store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'payment_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
-            'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
-            'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
+            'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'payment_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
+            'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
+            'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
             'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
-            'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class,
             'core_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
-            'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
-            'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class,
+            'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class,
             'core_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
-            'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
-            'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
+            'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class,
+            'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
             'payment_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
-            'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
+            'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
             'core/resource_type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
             'payment_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'core/resource_type_db' => \Mage_Core_Model_Resource_Type_Db::class,
-            'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'core_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
             'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
             'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
-            'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
-            'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
             'payment_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
             'payment_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
-            'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
             'core_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
-            'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
-            'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
+            'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
             'payment_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
+            'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
+            'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
             'core_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'core_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
-            'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
             'core/resource_variable' => \Mage_Core_Model_Resource_Variable::class,
+            'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
             'core/resource_variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
-            'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
             'core_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
+            'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
+            'core/resource_website' => \Mage_Core_Model_Resource_Website::class,
             'core_resource/website' => \Mage_Core_Model_Resource_Website::class,
             'payment_resource/website' => \Mage_Core_Model_Resource_Website::class,
-            'core/resource_website' => \Mage_Core_Model_Resource_Website::class,
-            'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core/resource_website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
+            'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core/session' => \Mage_Core_Model_Session::class,
             'core/session_abstract' => \Mage_Core_Model_Session_Abstract::class,
@@ -1319,10 +1312,10 @@
             'cron/mysql4_schedule' => \Mage_Cron_Model_Mysql4_Schedule::class,
             'cron/mysql4_schedule_collection' => \Mage_Cron_Model_Mysql4_Schedule_Collection::class,
             'cron/observer' => \Mage_Cron_Model_Observer::class,
-            'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class,
             'cron/resource_schedule' => \Mage_Cron_Model_Resource_Schedule::class,
-            'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
+            'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class,
             'cron/resource_schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
+            'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
             'cron/schedule' => \Mage_Cron_Model_Schedule::class,
             'currencysymbol/observer' => \Mage_CurrencySymbol_Model_Observer::class,
             'currencysymbol/system_currencysymbol' => \Mage_CurrencySymbol_Model_System_Currencysymbol::class,
@@ -1397,16 +1390,16 @@
             'customer_resource/address' => \Mage_Customer_Model_Resource_Address::class,
             'customer/resource_address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class,
             'customer_resource/address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class,
-            'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
             'customer_resource/address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
-            'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
+            'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
             'customer/resource_address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
-            'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
+            'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
             'customer/resource_address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
-            'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
+            'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
             'customer_resource/address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
-            'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
+            'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
             'customer_resource/address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
+            'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
             'customer/resource_attribute' => \Mage_Customer_Model_Resource_Attribute::class,
             'customer_resource/attribute' => \Mage_Customer_Model_Resource_Attribute::class,
             'customer_resource/attribute_collection' => \Mage_Customer_Model_Resource_Attribute_Collection::class,
@@ -1415,22 +1408,22 @@
             'customer_resource/customer' => \Mage_Customer_Model_Resource_Customer::class,
             'customer_resource/customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class,
             'customer/resource_customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class,
-            'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
             'customer/resource_flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
-            'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
+            'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
             'customer/resource_flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
-            'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
+            'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
             'customer/resource_form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
-            'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
+            'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
             'customer/resource_form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
+            'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
             'customer/resource_group' => \Mage_Customer_Model_Resource_Group::class,
             'customer_resource/group' => \Mage_Customer_Model_Resource_Group::class,
             'customer_resource/group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class,
             'customer/resource_group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class,
-            'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class,
             'customer_resource/setup' => \Mage_Customer_Model_Resource_Setup::class,
-            'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
+            'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class,
             'customer_resource/wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
+            'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
             'customer/session' => \Mage_Customer_Model_Session::class,
             'dataflow/batch' => \Mage_Dataflow_Model_Batch::class,
             'dataflow/batch_abstract' => \Mage_Dataflow_Model_Batch_Abstract::class,
@@ -1482,10 +1475,10 @@
             'dataflow/mysql4_session' => \Mage_Dataflow_Model_Mysql4_Session::class,
             'dataflow/profile' => \Mage_Dataflow_Model_Profile::class,
             'dataflow/profile_history' => \Mage_Dataflow_Model_Profile_History::class,
-            'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class,
             'dataflow/resource_batch' => \Mage_Dataflow_Model_Resource_Batch::class,
-            'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
+            'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class,
             'dataflow/resource_batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
+            'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
             'dataflow/resource_batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class,
             'dataflow_resource/batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class,
             'dataflow_resource/batch_export' => \Mage_Dataflow_Model_Resource_Batch_Export::class,
@@ -1496,12 +1489,12 @@
             'dataflow/resource_import' => \Mage_Dataflow_Model_Resource_Import::class,
             'dataflow_resource/import_collection' => \Mage_Dataflow_Model_Resource_Import_Collection::class,
             'dataflow/resource_import_collection' => \Mage_Dataflow_Model_Resource_Import_Collection::class,
-            'dataflow_resource/profile' => \Mage_Dataflow_Model_Resource_Profile::class,
             'dataflow/resource_profile' => \Mage_Dataflow_Model_Resource_Profile::class,
+            'dataflow_resource/profile' => \Mage_Dataflow_Model_Resource_Profile::class,
             'dataflow/resource_profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class,
             'dataflow_resource/profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class,
-            'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
             'dataflow_resource/profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
+            'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
             'dataflow_resource/profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class,
             'dataflow/resource_profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class,
             'dataflow_resource/session' => \Mage_Dataflow_Model_Resource_Session::class,
@@ -1535,8 +1528,8 @@
             'directory/resource_country' => \Mage_Directory_Model_Resource_Country::class,
             'directory_resource/country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class,
             'directory/resource_country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class,
-            'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
             'directory/resource_country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
+            'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
             'directory_resource/country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class,
             'directory/resource_country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class,
             'directory_resource/currency' => \Mage_Directory_Model_Resource_Currency::class,
@@ -1567,8 +1560,8 @@
             'downloadable/observer' => \Mage_Downloadable_Model_Observer::class,
             'downloadable/product_price' => \Mage_Downloadable_Model_Product_Price::class,
             'downloadable/product_type' => \Mage_Downloadable_Model_Product_Type::class,
-            'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
             'downloadable_resource/indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
+            'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
             'downloadable/resource_link' => \Mage_Downloadable_Model_Resource_Link::class,
             'downloadable_resource/link' => \Mage_Downloadable_Model_Resource_Link::class,
             'downloadable/resource_link_collection' => \Mage_Downloadable_Model_Resource_Link_Collection::class,
@@ -1577,12 +1570,12 @@
             'downloadable_resource/link_purchased' => \Mage_Downloadable_Model_Resource_Link_Purchased::class,
             'downloadable/resource_link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class,
             'downloadable_resource/link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class,
-            'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
             'downloadable/resource_link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
+            'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
             'downloadable/resource_link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
             'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
-            'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class,
             'downloadable/resource_sample' => \Mage_Downloadable_Model_Resource_Sample::class,
+            'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class,
             'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
             'downloadable/resource_sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
             'downloadable/sales_order_pdf_items_abstract' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Abstract::class,
@@ -1670,46 +1663,46 @@
             'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class,
             'eav_resource/attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class,
             'eav/resource_attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class,
-            'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class,
             'eav_resource/config' => \Mage_Eav_Model_Resource_Config::class,
+            'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class,
             'eav/resource_entity_attribute' => \Mage_Eav_Model_Resource_Entity_Attribute::class,
             'eav_resource/entity_attribute' => \Mage_Eav_Model_Resource_Entity_Attribute::class,
             'eav_resource/entity_attribute_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Collection::class,
             'eav/resource_entity_attribute_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Collection::class,
             'eav_resource/entity_attribute_group' => \Mage_Eav_Model_Resource_Entity_Attribute_Group::class,
             'eav/resource_entity_attribute_group' => \Mage_Eav_Model_Resource_Entity_Attribute_Group::class,
-            'eav/resource_entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class,
             'eav_resource/entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class,
+            'eav/resource_entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class,
             'eav/resource_entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
             'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
-            'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
-            'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
+            'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
-            'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
+            'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
+            'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
             'eav_resource/entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class,
             'eav/resource_entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class,
             'eav_resource/entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class,
             'eav/resource_entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class,
-            'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
             'eav_resource/entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
+            'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
             'eav/resource_form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class,
             'eav_resource/form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class,
-            'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
             'eav/resource_form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
+            'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
             'eav/resource_form_element' => \Mage_Eav_Model_Resource_Form_Element::class,
             'eav_resource/form_element' => \Mage_Eav_Model_Resource_Form_Element::class,
-            'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
             'eav_resource/form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
-            'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
+            'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
             'eav/resource_form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
+            'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
             'eav_resource/form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
             'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
             'eav/resource_form_type' => \Mage_Eav_Model_Resource_Form_Type::class,
             'eav_resource/form_type' => \Mage_Eav_Model_Resource_Form_Type::class,
-            'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class,
             'eav_resource/form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class,
+            'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class,
             'eav_resource/helper_mysql4' => \Mage_Eav_Model_Resource_Helper_Mysql4::class,
             'eav/resource_helper_mysql4' => \Mage_Eav_Model_Resource_Helper_Mysql4::class,
             'giftmessage/api' => \Mage_GiftMessage_Model_Api::class,
@@ -1721,12 +1714,12 @@
             'giftmessage/mysql4_message_collection' => \Mage_GiftMessage_Model_Mysql4_Message_Collection::class,
             'giftmessage/mysql4_setup' => \Mage_GiftMessage_Model_Mysql4_Setup::class,
             'giftmessage/observer' => \Mage_GiftMessage_Model_Observer::class,
-            'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class,
             'giftmessage/resource_message' => \Mage_GiftMessage_Model_Resource_Message::class,
-            'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
+            'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class,
             'giftmessage_resource/message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
-            'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
+            'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
             'giftmessage_resource/setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
+            'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
             'googleanalytics/observer' => \Mage_GoogleAnalytics_Model_Observer::class,
             'googleanalytics/system_config_source_type' => \Mage_GoogleAnalytics_Model_System_Config_Source_Type::class,
             'googlecheckout/payment' => \Mage_GoogleCheckout_Model_Payment::class,
@@ -1762,8 +1755,8 @@
             'importexport/product_attribute_backend_urlkey' => \Mage_ImportExport_Model_Product_Attribute_Backend_Urlkey::class,
             'importexport_resource/helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class,
             'importexport/resource_helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class,
-            'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
             'importexport_resource/import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
+            'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
             'importexport_resource/setup' => \Mage_ImportExport_Model_Resource_Setup::class,
             'importexport/resource_setup' => \Mage_ImportExport_Model_Resource_Setup::class,
             'importexport/source_export_entity' => \Mage_ImportExport_Model_Source_Export_Entity::class,
@@ -1785,16 +1778,16 @@
             'index/process' => \Mage_Index_Model_Process::class,
             'index_resource/abstract' => \Mage_Index_Model_Resource_Abstract::class,
             'index/resource_abstract' => \Mage_Index_Model_Resource_Abstract::class,
-            'index/resource_event' => \Mage_Index_Model_Resource_Event::class,
             'index_resource/event' => \Mage_Index_Model_Resource_Event::class,
+            'index/resource_event' => \Mage_Index_Model_Resource_Event::class,
             'index/resource_event_collection' => \Mage_Index_Model_Resource_Event_Collection::class,
             'index_resource/event_collection' => \Mage_Index_Model_Resource_Event_Collection::class,
             'index/resource_helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class,
             'index_resource/helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class,
-            'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
             'index/resource_lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
-            'index_resource/process' => \Mage_Index_Model_Resource_Process::class,
+            'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
             'index/resource_process' => \Mage_Index_Model_Resource_Process::class,
+            'index_resource/process' => \Mage_Index_Model_Resource_Process::class,
             'index/resource_process_collection' => \Mage_Index_Model_Resource_Process_Collection::class,
             'index_resource/process_collection' => \Mage_Index_Model_Resource_Process_Collection::class,
             'index/resource_setup' => \Mage_Index_Model_Resource_Setup::class,
@@ -1827,22 +1820,22 @@
             'log/mysql4_visitor_online_collection' => \Mage_Log_Model_Mysql4_Visitor_Online_Collection::class,
             'log_resource/aggregation' => \Mage_Log_Model_Resource_Aggregation::class,
             'log/resource_aggregation' => \Mage_Log_Model_Resource_Aggregation::class,
-            'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class,
             'log/resource_customer' => \Mage_Log_Model_Resource_Customer::class,
+            'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class,
             'log/resource_log' => \Mage_Log_Model_Resource_Log::class,
             'log_resource/log' => \Mage_Log_Model_Resource_Log::class,
             'log_resource/visitor' => \Mage_Log_Model_Resource_Visitor::class,
             'log/resource_visitor' => \Mage_Log_Model_Resource_Visitor::class,
             'log_resource/visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class,
             'log/resource_visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class,
-            'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
             'log_resource/visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
-            'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
+            'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
             'log_resource/visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
+            'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
             'log/visitor' => \Mage_Log_Model_Visitor::class,
             'log/visitor_online' => \Mage_Log_Model_Visitor_Online::class,
-            'media_resource/image' => \Mage_Media_Model_File_Image::class,
             'media/file_image' => \Mage_Media_Model_File_Image::class,
+            'media_resource/image' => \Mage_Media_Model_File_Image::class,
             'media/image' => \Mage_Media_Model_Image::class,
             'newsletter/message' => \Mage_Newsletter_Model_Message::class,
             'newsletter/mysql4_problem' => \Mage_Newsletter_Model_Mysql4_Problem::class,
@@ -1860,14 +1853,14 @@
             'newsletter_resource/problem' => \Mage_Newsletter_Model_Resource_Problem::class,
             'newsletter/resource_problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class,
             'newsletter_resource/problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class,
-            'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class,
             'newsletter/resource_queue' => \Mage_Newsletter_Model_Resource_Queue::class,
-            'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
+            'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class,
             'newsletter/resource_queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
-            'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
+            'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
             'newsletter/resource_subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
-            'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
+            'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
             'newsletter/resource_subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
+            'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
             'newsletter_resource/template' => \Mage_Newsletter_Model_Resource_Template::class,
             'newsletter/resource_template' => \Mage_Newsletter_Model_Resource_Template::class,
             'newsletter_resource/template_collection' => \Mage_Newsletter_Model_Resource_Template_Collection::class,
@@ -1880,20 +1873,20 @@
             'oauth/consumer_validator_keyLength' => \Mage_Oauth_Model_Consumer_Validator_KeyLength::class,
             'oauth/nonce' => \Mage_Oauth_Model_Nonce::class,
             'oauth/observer' => \Mage_Oauth_Model_Observer::class,
-            'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
             'oauth/resource_consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
+            'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
             'oauth/resource_consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class,
             'oauth_resource/consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class,
             'oauth_resource/nonce' => \Mage_Oauth_Model_Resource_Nonce::class,
             'oauth/resource_nonce' => \Mage_Oauth_Model_Resource_Nonce::class,
             'oauth_resource/nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class,
             'oauth/resource_nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class,
-            'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class,
             'oauth/resource_setup' => \Mage_Oauth_Model_Resource_Setup::class,
-            'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class,
+            'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class,
             'oauth_resource/token' => \Mage_Oauth_Model_Resource_Token::class,
-            'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
+            'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class,
             'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
+            'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
             'oauth/server' => \Mage_Oauth_Model_Server::class,
             'oauth/token' => \Mage_Oauth_Model_Token::class,
             'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class,
@@ -1910,8 +1903,8 @@
             'paygate/authorizenet_source_paymentAction' => \Mage_Paygate_Model_Authorizenet_Source_PaymentAction::class,
             'paygate/mysql4_authorizenet_debug' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug::class,
             'paygate/mysql4_authorizenet_debug_collection' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection::class,
-            'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
             'paygate/resource_authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
+            'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
             'paygate_resource/authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class,
             'paygate/resource_authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class,
             'payment/billing_agreementAbstract' => \Mage_Payment_Model_Billing_AgreementAbstract::class,
@@ -1974,12 +1967,12 @@
             'paypal/resource_cert' => \Mage_Paypal_Model_Resource_Cert::class,
             'paypal_resource/payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class,
             'paypal/resource_payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class,
-            'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
             'paypal/resource_payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
+            'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
             'paypal/resource_report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class,
             'paypal_resource/report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class,
-            'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
             'paypal/resource_report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
+            'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
             'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
             'paypal/resource_report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
             'paypal/resource_setup' => \Mage_Paypal_Model_Resource_Setup::class,
@@ -2004,8 +1997,8 @@
             'persistent/observer' => \Mage_Persistent_Model_Observer::class,
             'persistent/observer_session' => \Mage_Persistent_Model_Observer_Session::class,
             'persistent/persistent_config' => \Mage_Persistent_Model_Persistent_Config::class,
-            'persistent/resource_session' => \Mage_Persistent_Model_Resource_Session::class,
             'persistent_resource/session' => \Mage_Persistent_Model_Resource_Session::class,
+            'persistent/resource_session' => \Mage_Persistent_Model_Resource_Session::class,
             'persistent/session' => \Mage_Persistent_Model_Session::class,
             'poll/mysql4_poll' => \Mage_Poll_Model_Mysql4_Poll::class,
             'poll/mysql4_poll_answer' => \Mage_Poll_Model_Mysql4_Poll_Answer::class,
@@ -2015,16 +2008,16 @@
             'poll/poll' => \Mage_Poll_Model_Poll::class,
             'poll/poll_answer' => \Mage_Poll_Model_Poll_Answer::class,
             'poll/poll_vote' => \Mage_Poll_Model_Poll_Vote::class,
-            'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class,
             'poll_resource/poll' => \Mage_Poll_Model_Resource_Poll::class,
+            'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class,
             'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
             'poll/resource_poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
-            'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
             'poll_resource/poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
-            'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
+            'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
             'poll_resource/poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
-            'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
+            'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
             'poll/resource_poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
+            'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
             'productalert/email' => \Mage_ProductAlert_Model_Email::class,
             'productalert/mysql4_price' => \Mage_ProductAlert_Model_Mysql4_Price::class,
             'productalert/mysql4_price_collection' => \Mage_ProductAlert_Model_Mysql4_Price_Collection::class,
@@ -2034,20 +2027,20 @@
             'productalert/mysql4_stock_customer_collection' => \Mage_ProductAlert_Model_Mysql4_Stock_Customer_Collection::class,
             'productalert/observer' => \Mage_ProductAlert_Model_Observer::class,
             'productalert/price' => \Mage_ProductAlert_Model_Price::class,
-            'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
             'productalert_resource/abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
-            'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class,
+            'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
             'productalert_resource/price' => \Mage_ProductAlert_Model_Resource_Price::class,
-            'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
+            'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class,
             'productalert/resource_price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
-            'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
+            'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
             'productalert/resource_price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
+            'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
             'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
             'productalert/resource_stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
-            'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
             'productalert/resource_stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
-            'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
+            'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
             'productalert/resource_stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
+            'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
             'productalert/stock' => \Mage_ProductAlert_Model_Stock::class,
             'rating/mysql4_rating' => \Mage_Rating_Model_Mysql4_Rating::class,
             'rating/mysql4_rating_collection' => \Mage_Rating_Model_Mysql4_Rating_Collection::class,
@@ -2061,20 +2054,20 @@
             'rating/rating_entity' => \Mage_Rating_Model_Rating_Entity::class,
             'rating/rating_option' => \Mage_Rating_Model_Rating_Option::class,
             'rating/rating_option_vote' => \Mage_Rating_Model_Rating_Option_Vote::class,
-            'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class,
             'rating/resource_rating' => \Mage_Rating_Model_Resource_Rating::class,
+            'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class,
             'rating_resource/rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class,
             'rating/resource_rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class,
             'rating/resource_rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class,
             'rating_resource/rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class,
-            'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
             'rating/resource_rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
-            'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
+            'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
             'rating_resource/rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
+            'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
             'rating_resource/rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class,
             'rating/resource_rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class,
-            'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
             'rating/resource_rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
+            'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
             'reports/config' => \Mage_Reports_Model_Config::class,
             'reports/event' => \Mage_Reports_Model_Event::class,
             'reports/event_observer' => \Mage_Reports_Model_Event_Observer::class,
@@ -2120,6 +2113,7 @@
             'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class,
             'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class,
             'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class,
+            'reports/observer' => \Mage_Reports_Model_Observer::class,
             'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class,
             'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class,
             'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class,
@@ -2128,88 +2122,88 @@
             'reports_resource/accounts_collection' => \Mage_Reports_Model_Resource_Accounts_Collection::class,
             'reports/resource_coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class,
             'reports_resource/coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class,
-            'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
             'reports/resource_customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
-            'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
+            'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
             'reports/resource_customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
-            'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
+            'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
             'reports_resource/customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
-            'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
+            'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
             'reports/resource_entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
+            'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
             'reports_resource/event' => \Mage_Reports_Model_Resource_Event::class,
             'reports/resource_event' => \Mage_Reports_Model_Resource_Event::class,
             'reports_resource/event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
             'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
             'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
             'reports/resource_event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
-            'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
             'reports/resource_event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
-            'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
+            'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
             'reports_resource/helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
-            'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
+            'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
             'reports/resource_invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
-            'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
+            'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
             'reports_resource/order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
-            'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
+            'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
             'reports_resource/product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
+            'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
             'reports/resource_product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class,
             'reports_resource/product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class,
             'reports_resource/product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class,
             'reports/resource_product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class,
-            'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
             'reports/resource_product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
+            'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
             'reports_resource/product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class,
             'reports/resource_product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class,
-            'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
             'reports_resource/product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
-            'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
+            'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
             'reports/resource_product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
-            'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
+            'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
             'reports_resource/product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
-            'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
+            'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
             'reports/resource_product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
+            'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
             'reports_resource/product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class,
             'reports/resource_product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class,
-            'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
             'reports_resource/product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
-            'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
+            'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
             'reports_resource/product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
-            'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
+            'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
             'reports/resource_quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
-            'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class,
+            'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
             'reports_resource/refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class,
+            'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class,
             'reports/resource_report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class,
             'reports_resource/report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class,
             'reports/resource_report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class,
             'reports_resource/report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class,
-            'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
             'reports_resource/report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
+            'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
             'reports/resource_report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class,
             'reports_resource/report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class,
-            'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
             'reports/resource_report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
+            'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
             'reports_resource/review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
             'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
-            'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
             'reports_resource/review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
+            'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
             'reports_resource/review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class,
             'reports/resource_review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class,
             'reports_resource/shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class,
             'reports/resource_shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class,
-            'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
             'reports_resource/shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
+            'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
             'reports_resource/tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class,
             'reports/resource_tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class,
-            'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
             'reports/resource_tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
-            'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
+            'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
             'reports/resource_tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
-            'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
+            'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
             'reports/resource_tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
+            'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
             'reports_resource/wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class,
             'reports/resource_wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class,
-            'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
             'reports_resource/wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
+            'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
             'reports/session' => \Mage_Reports_Model_Session::class,
             'reports/test' => \Mage_Reports_Model_Test::class,
             'reports/totals' => \Mage_Reports_Model_Totals::class,
@@ -2226,14 +2220,14 @@
             'review/resource_review_collection' => \Mage_Review_Model_Resource_Review_Collection::class,
             'review_resource/review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class,
             'review/resource_review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class,
-            'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class,
             'review_resource/review_status' => \Mage_Review_Model_Resource_Review_Status::class,
-            'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
+            'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class,
             'review_resource/review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
+            'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
             'review/resource_review_summary' => \Mage_Review_Model_Resource_Review_Summary::class,
             'review_resource/review_summary' => \Mage_Review_Model_Resource_Review_Summary::class,
-            'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
             'review/resource_review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
+            'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
             'review/review' => \Mage_Review_Model_Review::class,
             'review/review_status' => \Mage_Review_Model_Review_Status::class,
             'review/review_summary' => \Mage_Review_Model_Review_Summary::class,
@@ -2256,14 +2250,14 @@
             'rule/mysql4_rule_collection' => \Mage_Rule_Model_Mysql4_Rule_Collection::class,
             'rule/renderer_actions' => \Mage_Rule_Model_Renderer_Actions::class,
             'rule/renderer_conditions' => \Mage_Rule_Model_Renderer_Conditions::class,
-            'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class,
             'rule/resource_abstract' => \Mage_Rule_Model_Resource_Abstract::class,
-            'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class,
+            'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class,
             'rule/resource_rule' => \Mage_Rule_Model_Resource_Rule::class,
-            'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
+            'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class,
             'rule_resource/rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
-            'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
+            'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
             'rule_resource/rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
+            'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
             'rule/resource_rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class,
             'rule_resource/rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class,
             'rule/rule' => \Mage_Rule_Model_Rule::class,
@@ -2292,24 +2286,24 @@
             'salesrule/resource_coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class,
             'salesrule/resource_coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class,
             'salesrule_resource/coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class,
-            'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
             'salesrule_resource/report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
-            'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
+            'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
             'salesrule_resource/report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
+            'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
             'salesrule_resource/report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class,
             'salesrule/resource_report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class,
             'salesrule_resource/report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class,
             'salesrule/resource_report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class,
             'salesrule_resource/report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class,
             'salesrule/resource_report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class,
-            'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class,
             'salesrule_resource/rule' => \Mage_SalesRule_Model_Resource_Rule::class,
-            'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
+            'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class,
             'salesrule_resource/rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
-            'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
+            'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
             'salesrule_resource/rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
-            'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
+            'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
             'salesrule/resource_rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
+            'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
             'salesrule_resource/rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class,
             'salesrule/resource_rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class,
             'salesrule_resource/rule_product_collection' => \Mage_SalesRule_Model_Resource_Rule_Product_Collection::class,
@@ -2354,14 +2348,14 @@
             'sales/email_template' => \Mage_Sales_Model_Email_Template::class,
             'sales/entity_order' => \Mage_Sales_Model_Entity_Order::class,
             'sales_entity/order' => \Mage_Sales_Model_Entity_Order::class,
-            'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
             'sales_entity/order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
-            'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
+            'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
             'sales/entity_order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
-            'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
+            'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
             'sales_entity/order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
-            'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
+            'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
             'sales_entity/order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
+            'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
             'sales/entity_order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class,
             'sales_entity/order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class,
             'sales/entity_order_attribute_backend_shipping' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Shipping::class,
@@ -2370,22 +2364,22 @@
             'sales/entity_order_collection' => \Mage_Sales_Model_Entity_Order_Collection::class,
             'sales_entity/order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class,
             'sales/entity_order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class,
-            'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales_entity/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
-            'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
+            'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales/entity_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
-            'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
+            'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
             'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
+            'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
             'sales/entity_order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class,
             'sales_entity/order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class,
             'sales/entity_order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class,
             'sales_entity/order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class,
             'sales_entity/order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class,
             'sales/entity_order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class,
-            'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
             'sales/entity_order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
-            'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
+            'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
             'sales_entity/order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
+            'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
             'sales/entity_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class,
             'sales_entity/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class,
             'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class,
@@ -2396,28 +2390,28 @@
             'sales/entity_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/entity_order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class,
             'sales_entity/order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class,
-            'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
             'sales/entity_order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
+            'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
             'sales_entity/order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class,
             'sales/entity_order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class,
             'sales_entity/order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class,
             'sales/entity_order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class,
-            'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
             'sales/entity_order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
+            'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
             'sales/entity_order_item' => \Mage_Sales_Model_Entity_Order_Item::class,
             'sales_entity/order_item' => \Mage_Sales_Model_Entity_Order_Item::class,
             'sales/entity_order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class,
             'sales_entity/order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class,
-            'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
             'sales/entity_order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
+            'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
             'sales_entity/order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class,
             'sales/entity_order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class,
             'sales_entity/order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class,
             'sales/entity_order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class,
-            'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
             'sales_entity/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
-            'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
+            'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
             'sales/entity_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
+            'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
             'sales/entity_order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class,
             'sales_entity/order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class,
             'sales/entity_order_shipment_comment' => \Mage_Sales_Model_Entity_Order_Shipment_Comment::class,
@@ -2426,66 +2420,66 @@
             'sales_entity/order_shipment_comment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Comment_Collection::class,
             'sales/entity_order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class,
             'sales_entity/order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class,
-            'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
             'sales/entity_order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
-            'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
+            'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
             'sales_entity/order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
-            'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
+            'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
             'sales_entity/order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
-            'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
+            'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
             'sales_entity/order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
-            'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
+            'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
             'sales_entity/order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
+            'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
             'sales_entity/quote' => \Mage_Sales_Model_Entity_Quote::class,
             'sales/entity_quote' => \Mage_Sales_Model_Entity_Quote::class,
-            'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
             'sales_entity/quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
+            'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
             'sales_entity/quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class,
             'sales/entity_quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class,
-            'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
             'sales/entity_quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
-            'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
+            'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
             'sales/entity_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
-            'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
+            'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
             'sales_entity/quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
-            'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
+            'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
             'sales/entity_quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
+            'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
             'sales_entity/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales/entity_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales_entity/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class,
             'sales/entity_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class,
-            'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
             'sales_entity/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
-            'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
             'sales/entity_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/entity_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales_entity/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales/entity_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class,
             'sales_entity/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class,
             'sales/entity_quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class,
             'sales_entity/quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class,
-            'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
             'sales_entity/quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
-            'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
+            'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
             'sales/entity_quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
-            'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
+            'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
             'sales_entity/quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
+            'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
             'sales/entity_quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class,
             'sales_entity/quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class,
             'sales/entity_quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class,
             'sales_entity/quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class,
-            'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
             'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
-            'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
+            'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
             'sales/entity_quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
-            'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
+            'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
             'sales/entity_quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
+            'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
             'sales_entity/quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class,
             'sales/entity_quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class,
-            'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
             'sales_entity/sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
-            'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class,
+            'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
             'sales_entity/setup' => \Mage_Sales_Model_Entity_Setup::class,
+            'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class,
             'sales/mysql4_abstract' => \Mage_Sales_Model_Mysql4_Abstract::class,
             'sales/mysql4_billing_agreement' => \Mage_Sales_Model_Mysql4_Billing_Agreement::class,
             'sales/mysql4_billing_agreement_collection' => \Mage_Sales_Model_Mysql4_Billing_Agreement_Collection::class,
@@ -2680,48 +2674,48 @@
             'sales/recurring_profile' => \Mage_Sales_Model_Recurring_Profile::class,
             'sales_resource/abstract' => \Mage_Sales_Model_Resource_Abstract::class,
             'sales/resource_abstract' => \Mage_Sales_Model_Resource_Abstract::class,
-            'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
             'sales_resource/billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
-            'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
+            'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
             'sales_resource/billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
-            'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
+            'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
             'sales/resource_collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
-            'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
+            'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
             'sales_resource/helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
-            'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class,
+            'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
             'sales_resource/order' => \Mage_Sales_Model_Resource_Order::class,
+            'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class,
             'sales_resource/order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class,
             'sales/resource_order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class,
-            'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
             'sales_resource/order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
+            'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
             'sales/resource_order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class,
             'sales_resource/order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class,
             'sales/resource_order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class,
             'sales_resource/order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class,
             'sales/resource_order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class,
             'sales_resource/order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class,
-            'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
             'sales/resource_order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
+            'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
             'sales_resource/order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class,
             'sales/resource_order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class,
             'sales/resource_order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class,
             'sales_resource/order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class,
-            'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
             'sales/resource_order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
+            'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
             'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
             'sales/resource_order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
             'sales/resource_order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
             'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
-            'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales_resource/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
+            'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales/resource_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class,
             'sales_resource/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class,
-            'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
             'sales/resource_order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
-            'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
+            'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
             'sales_resource/order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
-            'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
+            'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
             'sales/resource_order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
+            'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
             'sales/resource_order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
             'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
             'sales_resource/order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class,
@@ -2732,84 +2726,84 @@
             'sales/resource_order_grid_collection' => \Mage_Sales_Model_Resource_Order_Grid_Collection::class,
             'sales/resource_order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class,
             'sales_resource/order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class,
-            'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
             'sales/resource_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
-            'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
+            'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
             'sales_resource/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
+            'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
             'sales_resource/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class,
             'sales/resource_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class,
             'sales/resource_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class,
             'sales_resource/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/resource_order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class,
             'sales_resource/order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class,
-            'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
             'sales/resource_order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
+            'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
             'sales/resource_order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class,
             'sales_resource/order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class,
-            'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
             'sales/resource_order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
-            'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
+            'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
             'sales_resource/order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
+            'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
             'sales/resource_order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class,
             'sales_resource/order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class,
-            'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
             'sales_resource/order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
+            'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
             'sales/resource_order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class,
             'sales_resource/order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class,
-            'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
             'sales_resource/order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
+            'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
             'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
             'sales/resource_order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
-            'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
             'sales_resource/order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
-            'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
+            'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
             'sales_resource/order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
-            'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
+            'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
             'sales_resource/order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
-            'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
+            'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
             'sales/resource_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
+            'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
             'sales_resource/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class,
             'sales/resource_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class,
-            'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
             'sales/resource_order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
+            'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
             'sales/resource_order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
             'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
-            'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
             'sales/resource_order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
+            'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
             'sales_resource/order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class,
             'sales/resource_order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class,
-            'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
             'sales_resource/order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
-            'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
+            'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
             'sales_resource/order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
-            'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
+            'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
             'sales_resource/order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
+            'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
             'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
             'sales_resource/order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
             'sales_resource/order_status' => \Mage_Sales_Model_Resource_Order_Status::class,
             'sales/resource_order_status' => \Mage_Sales_Model_Resource_Order_Status::class,
             'sales_resource/order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class,
             'sales/resource_order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class,
-            'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
             'sales_resource/order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
-            'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
+            'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
             'sales_resource/order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
-            'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
+            'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
             'sales/resource_order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
-            'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
+            'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
             'sales_resource/order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
-            'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class,
+            'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
             'sales/resource_quote' => \Mage_Sales_Model_Resource_Quote::class,
+            'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class,
             'sales_resource/quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class,
             'sales/resource_quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class,
             'sales/resource_quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class,
             'sales_resource/quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class,
             'sales/resource_quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class,
             'sales_resource/quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class,
-            'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
             'sales/resource_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
-            'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
+            'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
             'sales/resource_quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
+            'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
             'sales_resource/quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
             'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
             'sales_resource/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class,
@@ -2818,82 +2812,82 @@
             'sales_resource/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class,
             'sales/resource_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class,
             'sales_resource/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class,
-            'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/resource_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
-            'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
+            'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/resource_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
+            'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales_resource/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
             'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
-            'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
             'sales/resource_quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
+            'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
             'sales_resource/quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class,
             'sales/resource_quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class,
-            'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
             'sales/resource_quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
-            'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
+            'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
             'sales_resource/quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
-            'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
+            'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
             'sales_resource/quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
+            'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
             'sales_resource/quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class,
             'sales/resource_quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class,
-            'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
             'sales/resource_quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
+            'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
             'sales/resource_quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class,
             'sales_resource/quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class,
-            'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
             'sales/resource_quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
-            'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
+            'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
             'sales/resource_quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
-            'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
+            'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
             'sales_resource/quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
-            'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
+            'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
             'sales/resource_quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
-            'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
+            'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
             'sales/resource_recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
+            'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
             'sales/resource_recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class,
             'sales_resource/recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class,
-            'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class,
             'sales/resource_report' => \Mage_Sales_Model_Resource_Report::class,
+            'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class,
             'sales/resource_report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class,
             'sales_resource/report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class,
-            'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
             'sales/resource_report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
-            'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
+            'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
             'sales/resource_report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
+            'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
             'sales_resource/report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
             'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
-            'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
             'sales_resource/report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
+            'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
             'sales/resource_report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class,
             'sales_resource/report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class,
             'sales_resource/report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class,
             'sales/resource_report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class,
             'sales/resource_report_order' => \Mage_Sales_Model_Resource_Report_Order::class,
             'sales_resource/report_order' => \Mage_Sales_Model_Resource_Report_Order::class,
-            'sales/resource_report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class,
             'sales_resource/report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class,
-            'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class,
+            'sales/resource_report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class,
             'sales/resource_report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class,
+            'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class,
             'sales_resource/report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class,
             'sales/resource_report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class,
-            'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
             'sales/resource_report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
-            'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
+            'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
             'sales_resource/report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
+            'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
             'sales_resource/report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class,
             'sales/resource_report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class,
             'sales_resource/report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class,
             'sales/resource_report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class,
-            'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
             'sales_resource/report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
+            'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
             'sales_resource/report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class,
             'sales/resource_report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class,
             'sales_resource/report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class,
             'sales/resource_report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class,
-            'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
             'sales/resource_sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
-            'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class,
+            'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
             'sales/resource_setup' => \Mage_Sales_Model_Resource_Setup::class,
+            'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class,
             'sales/service_order' => \Mage_Sales_Model_Service_Order::class,
             'sales/service_quote' => \Mage_Sales_Model_Service_Quote::class,
             'sales/status_list' => \Mage_Sales_Model_Status_List::class,
@@ -2903,8 +2897,8 @@
             'sendfriend/observer' => \Mage_Sendfriend_Model_Observer::class,
             'sendfriend_resource/sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class,
             'sendfriend/resource_sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class,
-            'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
             'sendfriend/resource_sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
+            'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
             'sendfriend/resource_setup' => \Mage_Sendfriend_Model_Resource_Setup::class,
             'sendfriend_resource/setup' => \Mage_Sendfriend_Model_Resource_Setup::class,
             'sendfriend/sendfriend' => \Mage_Sendfriend_Model_Sendfriend::class,
@@ -2944,16 +2938,16 @@
             'sitemap/observer' => \Mage_Sitemap_Model_Observer::class,
             'sitemap_resource/catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class,
             'sitemap/resource_catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class,
-            'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
             'sitemap/resource_catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
+            'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
             'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
             'sitemap_resource/catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
             'sitemap_resource/cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
             'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
             'sitemap_resource/sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class,
             'sitemap/resource_sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class,
-            'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
             'sitemap_resource/sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
+            'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
             'sitemap/sitemap' => \Mage_Sitemap_Model_Sitemap::class,
             'tag/api' => \Mage_Tag_Model_Api::class,
             'tag/api_v2' => \Mage_Tag_Model_Api_V2::class,
@@ -2966,21 +2960,21 @@
             'tag/mysql4_tag' => \Mage_Tag_Model_Mysql4_Tag::class,
             'tag/mysql4_tag_collection' => \Mage_Tag_Model_Mysql4_Tag_Collection::class,
             'tag/mysql4_tag_relation' => \Mage_Tag_Model_Mysql4_Tag_Relation::class,
-            'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag/resource_customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag_resource/customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
-            'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
+            'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag_resource/indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
-            'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
+            'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
             'tag_resource/popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
+            'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
             'tag_resource/product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class,
             'tag/resource_product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class,
             'tag_resource/tag' => \Mage_Tag_Model_Resource_Tag::class,
             'tag/resource_tag' => \Mage_Tag_Model_Resource_Tag::class,
-            'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
             'tag_resource/tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
-            'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
+            'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
             'tag_resource/tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
+            'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
             'tag/session' => \Mage_Tag_Model_Session::class,
             'tag/tag' => \Mage_Tag_Model_Tag::class,
             'tag/tag_relation' => \Mage_Tag_Model_Tag_Relation::class,
@@ -3019,16 +3013,16 @@
             'tax/resource_calculation_rate' => \Mage_Tax_Model_Resource_Calculation_Rate::class,
             'tax/resource_calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class,
             'tax_resource/calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class,
-            'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
             'tax/resource_calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
-            'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
+            'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
             'tax/resource_calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
-            'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
+            'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
             'tax/resource_calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
-            'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
+            'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
             'tax_resource/calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
-            'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class,
+            'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
             'tax/resource_class' => \Mage_Tax_Model_Resource_Class::class,
+            'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class,
             'tax/resource_class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class,
             'tax_resource/class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class,
             'tax_resource/report_collection' => \Mage_Tax_Model_Resource_Report_Collection::class,
@@ -3039,10 +3033,10 @@
             'tax/resource_report_tax_createdat' => \Mage_Tax_Model_Resource_Report_Tax_Createdat::class,
             'tax_resource/report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class,
             'tax/resource_report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class,
-            'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
             'tax/resource_report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
-            'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
+            'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
             'tax_resource/sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
+            'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
             'tax_resource/sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class,
             'tax/resource_sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class,
             'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class,
@@ -3131,8 +3125,8 @@
             'weee/observer' => \Mage_Weee_Model_Observer::class,
             'weee/resource_attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class,
             'weee_resource/attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class,
-            'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class,
             'weee/resource_setup' => \Mage_Weee_Model_Resource_Setup::class,
+            'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class,
             'weee/resource_tax' => \Mage_Weee_Model_Resource_Tax::class,
             'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class,
             'weee/tax' => \Mage_Weee_Model_Tax::class,
@@ -3144,12 +3138,12 @@
             'widget/mysql4_widget_instance' => \Mage_Widget_Model_Mysql4_Widget_Instance::class,
             'widget/mysql4_widget_instance_collection' => \Mage_Widget_Model_Mysql4_Widget_Instance_Collection::class,
             'widget/observer' => \Mage_Widget_Model_Observer::class,
-            'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class,
             'widget/resource_widget' => \Mage_Widget_Model_Resource_Widget::class,
+            'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class,
             'widget_resource/widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class,
             'widget/resource_widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class,
-            'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
             'widget_resource/widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
+            'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
             'widget/template_filter' => \Mage_Widget_Model_Template_Filter::class,
             'widget/widget' => \Mage_Widget_Model_Widget::class,
             'widget/widget_config' => \Mage_Widget_Model_Widget_Config::class,
@@ -3166,14 +3160,14 @@
             'wishlist/mysql4_wishlist' => \Mage_Wishlist_Model_Mysql4_Wishlist::class,
             'wishlist/mysql4_wishlist_collection' => \Mage_Wishlist_Model_Mysql4_Wishlist_Collection::class,
             'wishlist/observer' => \Mage_Wishlist_Model_Observer::class,
-            'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class,
             'wishlist_resource/item' => \Mage_Wishlist_Model_Resource_Item::class,
+            'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class,
             'wishlist_resource/item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class,
             'wishlist/resource_item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class,
-            'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
             'wishlist/resource_item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
-            'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
+            'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
             'wishlist_resource/item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
+            'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
             'wishlist_resource/product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class,
             'wishlist/resource_product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class,
             'wishlist/resource_wishlist' => \Mage_Wishlist_Model_Resource_Wishlist::class,
@@ -3182,7 +3176,6 @@
             'wishlist/resource_wishlist_collection' => \Mage_Wishlist_Model_Resource_Wishlist_Collection::class,
             'wishlist/session' => \Mage_Wishlist_Model_Session::class,
             'wishlist/wishlist' => \Mage_Wishlist_Model_Wishlist::class,
-            'varien/autoload' => \Varien_Autoload::class,
         ])
     );
     override( \Mage_Catalog_Block_Product_Abstract::_getSingletonModel(0),
@@ -3192,11 +3185,10 @@
             'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class,
             'adminnotification/mysql4_inbox_collection' => \Mage_AdminNotification_Model_Mysql4_Inbox_Collection::class,
             'adminnotification/observer' => \Mage_AdminNotification_Model_Observer::class,
-            'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
             'adminnotification/resource_inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
-            'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
+            'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
             'adminnotification/resource_inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
-            'adminnotification/survey' => \Mage_AdminNotification_Model_Survey::class,
+            'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
             'admin/acl' => \Mage_Admin_Model_Acl::class,
             'admin/acl_assert_ip' => \Mage_Admin_Model_Acl_Assert_Ip::class,
             'admin/acl_assert_time' => \Mage_Admin_Model_Acl_Assert_Time::class,
@@ -3225,38 +3217,38 @@
             'admin/redirectpolicy' => \Mage_Admin_Model_Redirectpolicy::class,
             'admin/resource_acl' => \Mage_Admin_Model_Resource_Acl::class,
             'admin_resource/acl' => \Mage_Admin_Model_Resource_Acl::class,
-            'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
             'admin/resource_acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
+            'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
             'admin/resource_acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class,
             'admin_resource/acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class,
-            'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class,
             'admin/resource_block' => \Mage_Admin_Model_Resource_Block::class,
-            'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
+            'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class,
             'admin/resource_block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
+            'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
             'admin_resource/permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class,
             'admin/resource_permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class,
             'admin/resource_role' => \Mage_Admin_Model_Resource_Role::class,
             'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class,
             'admin/resource_role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class,
             'admin_resource/role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class,
-            'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class,
             'admin_resource/roles' => \Mage_Admin_Model_Resource_Roles::class,
-            'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
+            'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class,
             'admin_resource/roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
-            'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
+            'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
             'admin/resource_roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
+            'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
             'admin/resource_rules' => \Mage_Admin_Model_Resource_Rules::class,
             'admin_resource/rules' => \Mage_Admin_Model_Resource_Rules::class,
-            'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
             'admin_resource/rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
+            'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
             'admin_resource/user' => \Mage_Admin_Model_Resource_User::class,
             'admin/resource_user' => \Mage_Admin_Model_Resource_User::class,
             'admin/resource_user_collection' => \Mage_Admin_Model_Resource_User_Collection::class,
             'admin_resource/user_collection' => \Mage_Admin_Model_Resource_User_Collection::class,
-            'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class,
             'admin_resource/variable' => \Mage_Admin_Model_Resource_Variable::class,
-            'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
+            'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class,
             'admin/resource_variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
+            'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
             'admin/role' => \Mage_Admin_Model_Role::class,
             'admin/roles' => \Mage_Admin_Model_Roles::class,
             'admin/rules' => \Mage_Admin_Model_Rules::class,
@@ -3291,6 +3283,7 @@
             'adminhtml/system_config_backend_baseurl' => \Mage_Adminhtml_Model_System_Config_Backend_Baseurl::class,
             'adminhtml/system_config_backend_cache' => \Mage_Adminhtml_Model_System_Config_Backend_Cache::class,
             'adminhtml/system_config_backend_catalog_inventory_managestock' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock::class,
+            'adminhtml/system_config_backend_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Separator::class,
             'adminhtml/system_config_backend_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Type::class,
             'adminhtml/system_config_backend_category' => \Mage_Adminhtml_Model_System_Config_Backend_Category::class,
             'adminhtml/system_config_backend_cookie' => \Mage_Adminhtml_Model_System_Config_Backend_Cookie::class,
@@ -3343,12 +3336,14 @@
             'adminhtml/system_config_source_catalog_listMode' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListMode::class,
             'adminhtml/system_config_source_catalog_listPerPage' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListPerPage::class,
             'adminhtml/system_config_source_catalog_listSort' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort::class,
+            'adminhtml/system_config_source_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Separator::class,
             'adminhtml/system_config_source_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Type::class,
             'adminhtml/system_config_source_catalog_timeFormat' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_TimeFormat::class,
             'adminhtml/system_config_source_category' => \Mage_Adminhtml_Model_System_Config_Source_Category::class,
             'adminhtml/system_config_source_checktype' => \Mage_Adminhtml_Model_System_Config_Source_Checktype::class,
             'adminhtml/system_config_source_cms_page' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Page::class,
             'adminhtml/system_config_source_cms_wysiwyg_enabled' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Wysiwyg_Enabled::class,
+            'adminhtml/system_config_source_cookie_samesite' => \Mage_Adminhtml_Model_System_Config_Source_Cookie_Samesite::class,
             'adminhtml/system_config_source_country' => \Mage_Adminhtml_Model_System_Config_Source_Country::class,
             'adminhtml/system_config_source_country_full' => \Mage_Adminhtml_Model_System_Config_Source_Country_Full::class,
             'adminhtml/system_config_source_cron_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency::class,
@@ -3375,6 +3370,7 @@
             'adminhtml/system_config_source_locale_timezone' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Timezone::class,
             'adminhtml/system_config_source_locale_weekdaycodes' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdaycodes::class,
             'adminhtml/system_config_source_locale_weekdays' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdays::class,
+            'adminhtml/system_config_source_log_level' => \Mage_Adminhtml_Model_System_Config_Source_Log_Level::class,
             'adminhtml/system_config_source_nooptreq' => \Mage_Adminhtml_Model_System_Config_Source_Nooptreq::class,
             'adminhtml/system_config_source_notification_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Notification_Frequency::class,
             'adminhtml/system_config_source_order_status' => \Mage_Adminhtml_Model_System_Config_Source_Order_Status::class,
@@ -3398,7 +3394,6 @@
             'adminhtml/system_config_source_shipping_flatrate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Flatrate::class,
             'adminhtml/system_config_source_shipping_tablerate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Tablerate::class,
             'adminhtml/system_config_source_shipping_taxclass' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Taxclass::class,
-            'adminhtml/system_config_source_startdateenddate' => \Mage_Adminhtml_Model_System_Config_Source_Startdateenddate::class,
             'adminhtml/system_config_source_storage_media_database' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Database::class,
             'adminhtml/system_config_source_storage_media_storage' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Storage::class,
             'adminhtml/system_config_source_store' => \Mage_Adminhtml_Model_System_Config_Source_Store::class,
@@ -3454,22 +3449,22 @@
             'api2_resource/acl_filter_attribute' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute::class,
             'api2/resource_acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class,
             'api2_resource/acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class,
-            'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
             'api2_resource/acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
+            'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
             'api2/resource_acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class,
             'api2_resource/acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class,
             'api2_resource/acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class,
             'api2/resource_acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class,
             'api2/resource_acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class,
             'api2_resource/acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class,
-            'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class,
             'api2/resource_setup' => \Mage_Api2_Model_Resource_Setup::class,
+            'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class,
             'api2/resource_validator' => \Mage_Api2_Model_Resource_Validator::class,
             'api2_resource/validator' => \Mage_Api2_Model_Resource_Validator::class,
             'api2/resource_validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class,
             'api2_resource/validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class,
-            'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
             'api2/resource_validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
+            'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
             'api2/response' => \Mage_Api2_Model_Response::class,
             'api2/route_abstract' => \Mage_Api2_Model_Route_Abstract::class,
             'api2/route_apiType' => \Mage_Api2_Model_Route_ApiType::class,
@@ -3501,8 +3496,8 @@
             'api/mysql4_user_collection' => \Mage_Api_Model_Mysql4_User_Collection::class,
             'api/resource_abstract' => \Mage_Api_Model_Resource_Abstract::class,
             'api_resource/abstract' => \Mage_Api_Model_Resource_Abstract::class,
-            'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class,
             'api_resource/acl' => \Mage_Api_Model_Resource_Acl::class,
+            'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class,
             'api_resource/acl_role' => \Mage_Api_Model_Resource_Acl_Role::class,
             'api/resource_acl_role' => \Mage_Api_Model_Resource_Acl_Role::class,
             'api/resource_acl_role_collection' => \Mage_Api_Model_Resource_Acl_Role_Collection::class,
@@ -3511,14 +3506,14 @@
             'api_resource/permissions_collection' => \Mage_Api_Model_Resource_Permissions_Collection::class,
             'api_resource/role' => \Mage_Api_Model_Resource_Role::class,
             'api/resource_role' => \Mage_Api_Model_Resource_Role::class,
-            'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
             'api_resource/role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
+            'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
             'api/resource_roles' => \Mage_Api_Model_Resource_Roles::class,
             'api_resource/roles' => \Mage_Api_Model_Resource_Roles::class,
-            'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
             'api_resource/roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
-            'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
+            'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
             'api_resource/roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
+            'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
             'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class,
             'api_resource/rules' => \Mage_Api_Model_Resource_Rules::class,
             'api_resource/rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class,
@@ -3549,15 +3544,6 @@
             'authorizenet/directpost_request' => \Mage_Authorizenet_Model_Directpost_Request::class,
             'authorizenet/directpost_response' => \Mage_Authorizenet_Model_Directpost_Response::class,
             'authorizenet/directpost_session' => \Mage_Authorizenet_Model_Directpost_Session::class,
-            'backup/backup' => \Mage_Backup_Model_Backup::class,
-            'backup/config_backend_cron' => \Mage_Backup_Model_Config_Backend_Cron::class,
-            'backup/config_source_type' => \Mage_Backup_Model_Config_Source_Type::class,
-            'backup/db' => \Mage_Backup_Model_Db::class,
-            'backup/fs_collection' => \Mage_Backup_Model_Fs_Collection::class,
-            'backup/mysql4_db' => \Mage_Backup_Model_Mysql4_Db::class,
-            'backup/observer' => \Mage_Backup_Model_Observer::class,
-            'backup/resource_db' => \Mage_Backup_Model_Resource_Db::class,
-            'backup/resource_helper_mysql4' => \Mage_Backup_Model_Resource_Helper_Mysql4::class,
             'bundle/catalogIndex_data_bundle' => \Mage_Bundle_Model_CatalogIndex_Data_Bundle::class,
             'bundle/mysql4_bundle' => \Mage_Bundle_Model_Mysql4_Bundle::class,
             'bundle/mysql4_indexer_price' => \Mage_Bundle_Model_Mysql4_Indexer_Price::class,
@@ -3577,16 +3563,16 @@
             'bundle/resource_bundle' => \Mage_Bundle_Model_Resource_Bundle::class,
             'bundle/resource_indexer_price' => \Mage_Bundle_Model_Resource_Indexer_Price::class,
             'bundle_resource/indexer_price' => \Mage_Bundle_Model_Resource_Indexer_Price::class,
-            'bundle/resource_indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class,
             'bundle_resource/indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class,
+            'bundle/resource_indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class,
             'bundle/resource_option' => \Mage_Bundle_Model_Resource_Option::class,
             'bundle_resource/option' => \Mage_Bundle_Model_Resource_Option::class,
             'bundle/resource_option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class,
             'bundle_resource/option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class,
             'bundle_resource/price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
             'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
-            'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class,
             'bundle_resource/selection' => \Mage_Bundle_Model_Resource_Selection::class,
+            'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class,
             'bundle_resource/selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class,
             'bundle/resource_selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class,
             'bundle/sales_order_pdf_items_abstract' => \Mage_Bundle_Model_Sales_Order_Pdf_Items_Abstract::class,
@@ -3646,14 +3632,14 @@
             'catalogindex/resource_data_abstract' => \Mage_CatalogIndex_Model_Resource_Data_Abstract::class,
             'catalogindex_resource/data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class,
             'catalogindex/resource_data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class,
-            'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
             'catalogindex_resource/data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
+            'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
             'catalogindex_resource/indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class,
             'catalogindex/resource_indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class,
             'catalogindex/resource_indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class,
             'catalogindex_resource/indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class,
-            'catalogindex_resource/indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class,
             'catalogindex/resource_indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class,
+            'catalogindex_resource/indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class,
             'catalogindex_resource/indexer_minimalprice' => \Mage_CatalogIndex_Model_Resource_Indexer_Minimalprice::class,
             'catalogindex/resource_indexer_minimalprice' => \Mage_CatalogIndex_Model_Resource_Indexer_Minimalprice::class,
             'catalogindex/resource_indexer_price' => \Mage_CatalogIndex_Model_Resource_Indexer_Price::class,
@@ -3679,20 +3665,20 @@
             'cataloginventory/mysql4_stock_item_collection' => \Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection::class,
             'cataloginventory/mysql4_stock_status' => \Mage_CatalogInventory_Model_Mysql4_Stock_Status::class,
             'cataloginventory/observer' => \Mage_CatalogInventory_Model_Observer::class,
-            'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
             'cataloginventory_resource/indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
+            'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
             'cataloginventory/resource_indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class,
             'cataloginventory_resource/indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class,
-            'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
             'cataloginventory/resource_indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
+            'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
             'cataloginventory/resource_indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class,
             'cataloginventory_resource/indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class,
             'cataloginventory_resource/stock' => \Mage_CatalogInventory_Model_Resource_Stock::class,
             'cataloginventory/resource_stock' => \Mage_CatalogInventory_Model_Resource_Stock::class,
             'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
             'cataloginventory/resource_stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
-            'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
             'cataloginventory/resource_stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
+            'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
             'cataloginventory/resource_stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class,
             'cataloginventory_resource/stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class,
             'cataloginventory/source_backorders' => \Mage_CatalogInventory_Model_Source_Backorders::class,
@@ -3713,10 +3699,10 @@
             'catalogrule/mysql4_rule_product_price' => \Mage_CatalogRule_Model_Mysql4_Rule_Product_Price::class,
             'catalogrule/mysql4_rule_product_price_collection' => \Mage_CatalogRule_Model_Mysql4_Rule_Product_Price_Collection::class,
             'catalogrule/observer' => \Mage_CatalogRule_Model_Observer::class,
-            'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
             'catalogrule/resource_rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
-            'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
+            'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
             'catalogrule_resource/rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
+            'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
             'catalogrule_resource/rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class,
             'catalogrule/resource_rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class,
             'catalogrule_resource/rule_product_price_collection' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price_Collection::class,
@@ -3745,24 +3731,24 @@
             'catalogsearch/query' => \Mage_CatalogSearch_Model_Query::class,
             'catalogsearch_resource/advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class,
             'catalogsearch/resource_advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class,
-            'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
             'catalogsearch_resource/advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
+            'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
             'catalogsearch_resource/fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class,
             'catalogsearch/resource_fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class,
             'catalogsearch_resource/fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class,
             'catalogsearch/resource_fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class,
             'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
             'catalogsearch_resource/fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
-            'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
             'catalogsearch/resource_helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
-            'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
+            'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
             'catalogsearch_resource/indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
+            'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
             'catalogsearch_resource/query' => \Mage_CatalogSearch_Model_Resource_Query::class,
             'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class,
-            'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
             'catalogsearch_resource/query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
-            'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
+            'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
             'catalogsearch/resource_search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
+            'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
             'catalogsearch/session' => \Mage_CatalogSearch_Model_Session::class,
             'catalogsearch/system_config_backend_sitemap' => \Mage_CatalogSearch_Model_System_Config_Backend_Sitemap::class,
             'catalog/abstract' => \Mage_Catalog_Model_Abstract::class,
@@ -3905,144 +3891,144 @@
             'catalog/product_website' => \Mage_Catalog_Model_Product_Website::class,
             'catalog/resource_abstract' => \Mage_Catalog_Model_Resource_Abstract::class,
             'catalog_resource/abstract' => \Mage_Catalog_Model_Resource_Abstract::class,
-            'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
             'catalog/resource_attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
-            'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class,
+            'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
             'catalog_resource/category' => \Mage_Catalog_Model_Resource_Category::class,
+            'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class,
             'catalog_resource/category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class,
             'catalog/resource_category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class,
-            'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
             'catalog/resource_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
-            'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
+            'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
             'catalog/resource_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
+            'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
             'catalog_resource/category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class,
             'catalog/resource_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class,
             'catalog_resource/category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class,
             'catalog/resource_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class,
             'catalog/resource_category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class,
             'catalog_resource/category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class,
-            'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
             'catalog_resource/category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
-            'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
+            'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
             'catalog/resource_category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
+            'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
             'catalog_resource/category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class,
             'catalog/resource_category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class,
             'catalog/resource_category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class,
             'catalog_resource/category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class,
-            'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
             'catalog_resource/collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
-            'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class,
+            'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
             'catalog_resource/config' => \Mage_Catalog_Model_Resource_Config::class,
-            'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
+            'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class,
             'catalog/resource_eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
+            'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
             'catalog_resource/eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class,
             'catalog/resource_eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class,
-            'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
             'catalog_resource/eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
-            'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
+            'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
             'catalog/resource_eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
-            'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
+            'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
             'catalog_resource/eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
+            'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
             'catalog_resource/eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
-            'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
+            'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
             'catalog_resource/eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
+            'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
             'catalog/resource_eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class,
             'catalog_resource/eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class,
             'catalog/resource_eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class,
             'catalog_resource/eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class,
             'catalog/resource_eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class,
             'catalog_resource/eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class,
-            'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
             'catalog/resource_eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
-            'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
+            'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
             'catalog/resource_eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
+            'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
             'catalog/resource_eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class,
             'catalog_resource/eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class,
-            'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
             'catalog_resource/eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
+            'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
             'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
             'catalog_resource/eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
             'catalog_resource/eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class,
             'catalog/resource_eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class,
-            'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
             'catalog_resource/eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
-            'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
+            'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
             'catalog/resource_eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
-            'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
+            'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
             'catalog/resource_eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
-            'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
+            'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
             'catalog/resource_eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
+            'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
             'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
             'catalog_resource/eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
-            'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
             'catalog/resource_eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
+            'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class,
             'catalog/resource_eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
+            'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
             'catalog/resource_eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class,
             'catalog/resource_eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class,
             'catalog/resource_eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class,
-            'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
             'catalog_resource/eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
-            'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
+            'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
             'catalog_resource/eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
-            'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
+            'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
             'catalog_resource/eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
+            'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
             'catalog/resource_eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class,
             'catalog/resource_eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class,
             'catalog/resource_eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class,
-            'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
             'catalog/resource_eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
-            'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
+            'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
             'catalog_resource/eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
+            'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
             'catalog_resource/eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class,
             'catalog/resource_eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class,
             'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
             'catalog/resource_eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
-            'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
             'catalog/resource_eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
+            'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
             'catalog/resource_eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class,
             'catalog_resource/eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class,
-            'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
             'catalog/resource_eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
+            'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
             'catalog_resource/eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class,
             'catalog/resource_eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class,
             'catalog_resource/eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class,
             'catalog/resource_eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
             'catalog/resource_eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
-            'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
             'catalog_resource/eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
-            'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
+            'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
             'catalog/resource_eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
-            'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
+            'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
             'catalog/resource_eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
-            'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
+            'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
             'catalog/resource_eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
+            'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
             'catalog/resource_eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class,
             'catalog_resource/eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class,
-            'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
             'catalog_resource/eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
-            'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
+            'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
             'catalog/resource_eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
-            'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
             'catalog/resource_eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
+            'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
             'catalog_resource/eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
+            'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
             'catalog/resource_eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class,
             'catalog_resource/eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class,
             'catalog/resource_eav_mysql4_sendfriend' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend::class,
@@ -4051,98 +4037,98 @@
             'catalog/resource_eav_mysql4_sendfriend_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection::class,
             'catalog_resource/eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class,
             'catalog/resource_eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class,
-            'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
             'catalog/resource_eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
+            'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
             'catalog/resource_helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
             'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
             'catalog_resource/layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class,
             'catalog/resource_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class,
             'catalog/resource_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class,
             'catalog_resource/layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class,
-            'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
             'catalog/resource_layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
-            'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class,
+            'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
             'catalog_resource/product' => \Mage_Catalog_Model_Resource_Product::class,
+            'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class,
             'catalog/resource_product_action' => \Mage_Catalog_Model_Resource_Product_Action::class,
             'catalog_resource/product_action' => \Mage_Catalog_Model_Resource_Product_Action::class,
-            'catalog_resource/product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class,
             'catalog/resource_product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class,
+            'catalog_resource/product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class,
             'catalog/resource_product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class,
             'catalog_resource/product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class,
             'catalog/resource_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class,
             'catalog_resource/product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class,
-            'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
             'catalog/resource_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
+            'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
             'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
             'catalog_resource/product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
             'catalog/resource_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class,
-            'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
             'catalog_resource/product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
+            'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
             'catalog/resource_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
             'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
-            'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
-            'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
+            'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
+            'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
             'catalog_resource/product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class,
             'catalog/resource_product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class,
-            'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
             'catalog/resource_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
+            'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
             'catalog/resource_product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class,
             'catalog_resource/product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class,
-            'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
             'catalog/resource_product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
+            'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
             'catalog/resource_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class,
             'catalog_resource/product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class,
-            'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
             'catalog_resource/product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
-            'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
+            'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
             'catalog/resource_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
+            'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
             'catalog/resource_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class,
             'catalog_resource/product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class,
-            'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
             'catalog_resource/product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
-            'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
+            'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
             'catalog_resource/product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
-            'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
+            'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
             'catalog_resource/product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
+            'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
             'catalog/resource_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class,
             'catalog_resource/product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class,
             'catalog_resource/product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class,
             'catalog/resource_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class,
-            'catalog/resource_product_link' => \Mage_Catalog_Model_Resource_Product_Link::class,
             'catalog_resource/product_link' => \Mage_Catalog_Model_Resource_Product_Link::class,
+            'catalog/resource_product_link' => \Mage_Catalog_Model_Resource_Product_Link::class,
             'catalog/resource_product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class,
             'catalog_resource/product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class,
-            'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
             'catalog/resource_product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
-            'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
+            'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
             'catalog_resource/product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
-            'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
+            'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
             'catalog/resource_product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
-            'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
+            'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
             'catalog_resource/product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
-            'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
+            'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
             'catalog_resource/product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
+            'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
             'catalog_resource/product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class,
             'catalog/resource_product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class,
             'catalog_resource/product_status' => \Mage_Catalog_Model_Resource_Product_Status::class,
             'catalog/resource_product_status' => \Mage_Catalog_Model_Resource_Product_Status::class,
             'catalog_resource/product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class,
             'catalog/resource_product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class,
-            'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
             'catalog/resource_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
-            'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
             'catalog_resource/product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
             'catalog_resource/product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class,
             'catalog/resource_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class,
-            'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
             'catalog_resource/product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
+            'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
             'catalog/resource_setup' => \Mage_Catalog_Model_Resource_Setup::class,
             'catalog_resource/setup' => \Mage_Catalog_Model_Resource_Setup::class,
-            'catalog/resource_url' => \Mage_Catalog_Model_Resource_Url::class,
             'catalog_resource/url' => \Mage_Catalog_Model_Resource_Url::class,
+            'catalog/resource_url' => \Mage_Catalog_Model_Resource_Url::class,
             'catalog/session' => \Mage_Catalog_Model_Session::class,
             'catalog/system_config_backend_catalog_category_flat' => \Mage_Catalog_Model_System_Config_Backend_Catalog_Category_Flat::class,
             'catalog/system_config_backend_catalog_product_flat' => \Mage_Catalog_Model_System_Config_Backend_Catalog_Product_Flat::class,
@@ -4184,12 +4170,12 @@
             'checkout/observer' => \Mage_Checkout_Model_Observer::class,
             'checkout_resource/agreement' => \Mage_Checkout_Model_Resource_Agreement::class,
             'checkout/resource_agreement' => \Mage_Checkout_Model_Resource_Agreement::class,
-            'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
             'checkout/resource_agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
-            'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class,
+            'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
             'checkout_resource/cart' => \Mage_Checkout_Model_Resource_Cart::class,
-            'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class,
+            'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class,
             'checkout/resource_setup' => \Mage_Checkout_Model_Resource_Setup::class,
+            'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class,
             'checkout/session' => \Mage_Checkout_Model_Session::class,
             'checkout/type_abstract' => \Mage_Checkout_Model_Type_Abstract::class,
             'checkout/type_multishipping' => \Mage_Checkout_Model_Type_Multishipping::class,
@@ -4204,25 +4190,25 @@
             'cms/mysql4_page_service' => \Mage_Cms_Model_Mysql4_Page_Service::class,
             'cms/observer' => \Mage_Cms_Model_Observer::class,
             'cms/page' => \Mage_Cms_Model_Page::class,
-            'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class,
             'cms/resource_block' => \Mage_Cms_Model_Resource_Block::class,
+            'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class,
             'cms_resource/block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class,
             'cms/resource_block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class,
             'cms/resource_page' => \Mage_Cms_Model_Resource_Page::class,
             'cms_resource/page' => \Mage_Cms_Model_Resource_Page::class,
             'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
             'cms_resource/page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
-            'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
             'cms/resource_page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
+            'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
             'cms/template_filter' => \Mage_Cms_Model_Template_Filter::class,
             'cms/wysiwyg_config' => \Mage_Cms_Model_Wysiwyg_Config::class,
             'cms/wysiwyg_images_storage' => \Mage_Cms_Model_Wysiwyg_Images_Storage::class,
             'cms/wysiwyg_images_storage_collection' => \Mage_Cms_Model_Wysiwyg_Images_Storage_Collection::class,
             'configurableswatches/observer' => \Mage_ConfigurableSwatches_Model_Observer::class,
-            'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
             'configurableswatches_resource/catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
-            'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
+            'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
             'configurableswatches_resource/catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
+            'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
             'configurableswatches_resource/catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
             'configurableswatches/resource_catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
             'configurableswatches/system_config_source_catalog_product_configattribute' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute::class,
@@ -4329,152 +4315,152 @@
             'core/mysql4_website_collection' => \Mage_Core_Model_Mysql4_Website_Collection::class,
             'core/observer' => \Mage_Core_Model_Observer::class,
             'core/resource' => \Mage_Core_Model_Resource::class,
+            'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
             'core_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
             'core/resource_abstract' => \Mage_Core_Model_Resource_Abstract::class,
-            'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
+            'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
             'core/resource_cache' => \Mage_Core_Model_Resource_Cache::class,
             'core_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
-            'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
             'core_resource/config' => \Mage_Core_Model_Resource_Config::class,
             'payment_resource/config' => \Mage_Core_Model_Resource_Config::class,
             'core/resource_config' => \Mage_Core_Model_Resource_Config::class,
-            'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
             'core/resource_config_data' => \Mage_Core_Model_Resource_Config_Data::class,
+            'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
             'payment_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
-            'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'core_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
+            'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
-            'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
-            'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
             'payment_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
+            'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
+            'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
             'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
-            'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
             'core/resource_db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
-            'core/resource_design' => \Mage_Core_Model_Resource_Design::class,
+            'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
             'core_resource/design' => \Mage_Core_Model_Resource_Design::class,
+            'core/resource_design' => \Mage_Core_Model_Resource_Design::class,
             'payment_resource/design' => \Mage_Core_Model_Resource_Design::class,
-            'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
-            'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
             'payment_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
-            'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
+            'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
+            'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
             'payment_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
             'core/resource_design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
-            'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
-            'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
+            'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
             'core/resource_email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
-            'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
-            'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
+            'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
+            'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
             'payment_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
-            'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
+            'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
+            'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
             'core/resource_email_template' => \Mage_Core_Model_Resource_Email_Template::class,
+            'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
             'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
-            'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
             'core/resource_email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
+            'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
             'core_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
             'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
             'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
             'core_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
-            'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
-            'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
             'core_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
             'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
-            'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
             'payment_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
+            'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
+            'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
             'payment_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
             'core/resource_file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
-            'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
-            'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
             'core/resource_file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
+            'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
             'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
-            'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
             'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
+            'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
             'core/resource_file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
             'payment_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
-            'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class,
             'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
+            'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class,
             'payment_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
-            'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
             'core_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
-            'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
+            'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
             'core/resource_helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
+            'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
             'core_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
-            'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
-            'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
             'core/resource_iterator' => \Mage_Core_Model_Resource_Iterator::class,
-            'core/resource_language' => \Mage_Core_Model_Resource_Language::class,
-            'core_resource/language' => \Mage_Core_Model_Resource_Language::class,
+            'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
+            'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
             'payment_resource/language' => \Mage_Core_Model_Resource_Language::class,
+            'core_resource/language' => \Mage_Core_Model_Resource_Language::class,
+            'core/resource_language' => \Mage_Core_Model_Resource_Language::class,
             'payment_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
-            'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
             'core/resource_language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
-            'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
+            'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
             'core_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
             'core/resource_layout' => \Mage_Core_Model_Resource_Layout::class,
-            'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
+            'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
             'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class,
             'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
+            'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
+            'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
             'payment_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
-            'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
             'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
             'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class,
             'payment_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
-            'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core/resource_setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
-            'payment_resource/store' => \Mage_Core_Model_Resource_Store::class,
-            'core_resource/store' => \Mage_Core_Model_Resource_Store::class,
+            'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core/resource_store' => \Mage_Core_Model_Resource_Store::class,
-            'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
+            'core_resource/store' => \Mage_Core_Model_Resource_Store::class,
+            'payment_resource/store' => \Mage_Core_Model_Resource_Store::class,
             'core/resource_store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
             'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
-            'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
+            'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
             'core/resource_store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'payment_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
-            'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
-            'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
+            'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'payment_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
-            'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
+            'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
+            'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
             'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class,
+            'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
             'core_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
             'core_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
-            'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
             'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class,
-            'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
-            'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
+            'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
             'payment_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
-            'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
+            'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
             'core/resource_type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
             'payment_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
-            'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'core/resource_type_db' => \Mage_Core_Model_Resource_Type_Db::class,
+            'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
-            'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
-            'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
             'core_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
-            'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
-            'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
+            'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
             'payment_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
             'payment_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
-            'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
             'core_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
+            'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
             'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
             'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
             'payment_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
-            'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
-            'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'core_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
+            'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
+            'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'core_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
-            'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
             'core/resource_variable' => \Mage_Core_Model_Resource_Variable::class,
+            'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
             'core/resource_variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
-            'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
             'core_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
-            'core_resource/website' => \Mage_Core_Model_Resource_Website::class,
+            'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
             'payment_resource/website' => \Mage_Core_Model_Resource_Website::class,
+            'core_resource/website' => \Mage_Core_Model_Resource_Website::class,
             'core/resource_website' => \Mage_Core_Model_Resource_Website::class,
-            'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core/resource_website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
+            'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core/session' => \Mage_Core_Model_Session::class,
             'core/session_abstract' => \Mage_Core_Model_Session_Abstract::class,
@@ -4504,10 +4490,10 @@
             'cron/mysql4_schedule' => \Mage_Cron_Model_Mysql4_Schedule::class,
             'cron/mysql4_schedule_collection' => \Mage_Cron_Model_Mysql4_Schedule_Collection::class,
             'cron/observer' => \Mage_Cron_Model_Observer::class,
-            'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class,
             'cron/resource_schedule' => \Mage_Cron_Model_Resource_Schedule::class,
-            'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
+            'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class,
             'cron/resource_schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
+            'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
             'cron/schedule' => \Mage_Cron_Model_Schedule::class,
             'currencysymbol/observer' => \Mage_CurrencySymbol_Model_Observer::class,
             'currencysymbol/system_currencysymbol' => \Mage_CurrencySymbol_Model_System_Currencysymbol::class,
@@ -4584,14 +4570,14 @@
             'customer_resource/address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class,
             'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
             'customer_resource/address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
-            'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
             'customer/resource_address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
-            'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
+            'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
             'customer/resource_address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
-            'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
+            'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
             'customer_resource/address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
-            'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
+            'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
             'customer_resource/address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
+            'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
             'customer/resource_attribute' => \Mage_Customer_Model_Resource_Attribute::class,
             'customer_resource/attribute' => \Mage_Customer_Model_Resource_Attribute::class,
             'customer_resource/attribute_collection' => \Mage_Customer_Model_Resource_Attribute_Collection::class,
@@ -4600,20 +4586,20 @@
             'customer_resource/customer' => \Mage_Customer_Model_Resource_Customer::class,
             'customer_resource/customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class,
             'customer/resource_customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class,
-            'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
             'customer/resource_flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
-            'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
+            'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
             'customer/resource_flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
-            'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
+            'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
             'customer/resource_form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
+            'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
             'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
             'customer/resource_form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
             'customer/resource_group' => \Mage_Customer_Model_Resource_Group::class,
             'customer_resource/group' => \Mage_Customer_Model_Resource_Group::class,
             'customer_resource/group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class,
             'customer/resource_group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class,
-            'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class,
             'customer_resource/setup' => \Mage_Customer_Model_Resource_Setup::class,
+            'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class,
             'customer_resource/wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
             'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
             'customer/session' => \Mage_Customer_Model_Session::class,
@@ -4667,10 +4653,10 @@
             'dataflow/mysql4_session' => \Mage_Dataflow_Model_Mysql4_Session::class,
             'dataflow/profile' => \Mage_Dataflow_Model_Profile::class,
             'dataflow/profile_history' => \Mage_Dataflow_Model_Profile_History::class,
-            'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class,
             'dataflow/resource_batch' => \Mage_Dataflow_Model_Resource_Batch::class,
-            'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
+            'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class,
             'dataflow/resource_batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
+            'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
             'dataflow/resource_batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class,
             'dataflow_resource/batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class,
             'dataflow_resource/batch_export' => \Mage_Dataflow_Model_Resource_Batch_Export::class,
@@ -4685,12 +4671,12 @@
             'dataflow/resource_profile' => \Mage_Dataflow_Model_Resource_Profile::class,
             'dataflow/resource_profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class,
             'dataflow_resource/profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class,
-            'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
             'dataflow_resource/profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
+            'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
             'dataflow_resource/profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class,
             'dataflow/resource_profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class,
-            'dataflow/resource_session' => \Mage_Dataflow_Model_Resource_Session::class,
             'dataflow_resource/session' => \Mage_Dataflow_Model_Resource_Session::class,
+            'dataflow/resource_session' => \Mage_Dataflow_Model_Resource_Session::class,
             'dataflow/session' => \Mage_Dataflow_Model_Session::class,
             'dataflow/session_adapter_http' => \Mage_Dataflow_Model_Session_Adapter_Http::class,
             'dataflow/session_parser_csv' => \Mage_Dataflow_Model_Session_Parser_Csv::class,
@@ -4720,18 +4706,18 @@
             'directory/resource_country' => \Mage_Directory_Model_Resource_Country::class,
             'directory_resource/country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class,
             'directory/resource_country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class,
-            'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
             'directory/resource_country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
+            'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
             'directory_resource/country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class,
             'directory/resource_country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class,
             'directory_resource/currency' => \Mage_Directory_Model_Resource_Currency::class,
             'directory/resource_currency' => \Mage_Directory_Model_Resource_Currency::class,
-            'directory/resource_currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class,
             'directory_resource/currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class,
+            'directory/resource_currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class,
             'directory/resource_region' => \Mage_Directory_Model_Resource_Region::class,
             'directory_resource/region' => \Mage_Directory_Model_Resource_Region::class,
-            'directory/resource_region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class,
             'directory_resource/region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class,
+            'directory/resource_region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class,
             'downloadable/catalogIndex_data_downloadable' => \Mage_Downloadable_Model_CatalogIndex_Data_Downloadable::class,
             'downloadable/link' => \Mage_Downloadable_Model_Link::class,
             'downloadable/link_api' => \Mage_Downloadable_Model_Link_Api::class,
@@ -4752,8 +4738,8 @@
             'downloadable/observer' => \Mage_Downloadable_Model_Observer::class,
             'downloadable/product_price' => \Mage_Downloadable_Model_Product_Price::class,
             'downloadable/product_type' => \Mage_Downloadable_Model_Product_Type::class,
-            'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
             'downloadable_resource/indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
+            'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
             'downloadable/resource_link' => \Mage_Downloadable_Model_Resource_Link::class,
             'downloadable_resource/link' => \Mage_Downloadable_Model_Resource_Link::class,
             'downloadable/resource_link_collection' => \Mage_Downloadable_Model_Resource_Link_Collection::class,
@@ -4762,14 +4748,14 @@
             'downloadable_resource/link_purchased' => \Mage_Downloadable_Model_Resource_Link_Purchased::class,
             'downloadable/resource_link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class,
             'downloadable_resource/link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class,
-            'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
             'downloadable/resource_link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
-            'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
+            'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
             'downloadable/resource_link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
-            'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class,
+            'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
             'downloadable/resource_sample' => \Mage_Downloadable_Model_Resource_Sample::class,
-            'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
+            'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class,
             'downloadable/resource_sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
+            'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
             'downloadable/sales_order_pdf_items_abstract' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Abstract::class,
             'downloadable/sales_order_pdf_items_creditmemo' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Creditmemo::class,
             'downloadable/sales_order_pdf_items_invoice' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Invoice::class,
@@ -4851,8 +4837,8 @@
             'eav/mysql4_form_fieldset_collection' => \Mage_Eav_Model_Mysql4_Form_Fieldset_Collection::class,
             'eav/mysql4_form_type' => \Mage_Eav_Model_Mysql4_Form_Type::class,
             'eav/mysql4_form_type_collection' => \Mage_Eav_Model_Mysql4_Form_Type_Collection::class,
-            'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class,
             'eav_resource/attribute' => \Mage_Eav_Model_Resource_Attribute::class,
+            'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class,
             'eav_resource/attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class,
             'eav/resource_attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class,
             'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class,
@@ -4869,28 +4855,28 @@
             'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
             'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
-            'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
-            'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
+            'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
+            'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
             'eav_resource/entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class,
             'eav/resource_entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class,
             'eav_resource/entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class,
             'eav/resource_entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class,
-            'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
             'eav_resource/entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
+            'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
             'eav/resource_form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class,
             'eav_resource/form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class,
-            'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
             'eav/resource_form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
+            'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
             'eav/resource_form_element' => \Mage_Eav_Model_Resource_Form_Element::class,
             'eav_resource/form_element' => \Mage_Eav_Model_Resource_Form_Element::class,
-            'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
             'eav_resource/form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
-            'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
+            'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
             'eav/resource_form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
-            'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
+            'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
             'eav_resource/form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
+            'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
             'eav/resource_form_type' => \Mage_Eav_Model_Resource_Form_Type::class,
             'eav_resource/form_type' => \Mage_Eav_Model_Resource_Form_Type::class,
             'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class,
@@ -4906,12 +4892,12 @@
             'giftmessage/mysql4_message_collection' => \Mage_GiftMessage_Model_Mysql4_Message_Collection::class,
             'giftmessage/mysql4_setup' => \Mage_GiftMessage_Model_Mysql4_Setup::class,
             'giftmessage/observer' => \Mage_GiftMessage_Model_Observer::class,
-            'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class,
             'giftmessage/resource_message' => \Mage_GiftMessage_Model_Resource_Message::class,
-            'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
+            'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class,
             'giftmessage_resource/message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
-            'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
+            'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
             'giftmessage_resource/setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
+            'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
             'googleanalytics/observer' => \Mage_GoogleAnalytics_Model_Observer::class,
             'googleanalytics/system_config_source_type' => \Mage_GoogleAnalytics_Model_System_Config_Source_Type::class,
             'googlecheckout/payment' => \Mage_GoogleCheckout_Model_Payment::class,
@@ -4947,8 +4933,8 @@
             'importexport/product_attribute_backend_urlkey' => \Mage_ImportExport_Model_Product_Attribute_Backend_Urlkey::class,
             'importexport_resource/helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class,
             'importexport/resource_helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class,
-            'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
             'importexport_resource/import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
+            'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
             'importexport_resource/setup' => \Mage_ImportExport_Model_Resource_Setup::class,
             'importexport/resource_setup' => \Mage_ImportExport_Model_Resource_Setup::class,
             'importexport/source_export_entity' => \Mage_ImportExport_Model_Source_Export_Entity::class,
@@ -4970,16 +4956,16 @@
             'index/process' => \Mage_Index_Model_Process::class,
             'index_resource/abstract' => \Mage_Index_Model_Resource_Abstract::class,
             'index/resource_abstract' => \Mage_Index_Model_Resource_Abstract::class,
-            'index/resource_event' => \Mage_Index_Model_Resource_Event::class,
             'index_resource/event' => \Mage_Index_Model_Resource_Event::class,
+            'index/resource_event' => \Mage_Index_Model_Resource_Event::class,
             'index/resource_event_collection' => \Mage_Index_Model_Resource_Event_Collection::class,
             'index_resource/event_collection' => \Mage_Index_Model_Resource_Event_Collection::class,
             'index/resource_helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class,
             'index_resource/helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class,
-            'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
             'index/resource_lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
-            'index_resource/process' => \Mage_Index_Model_Resource_Process::class,
+            'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
             'index/resource_process' => \Mage_Index_Model_Resource_Process::class,
+            'index_resource/process' => \Mage_Index_Model_Resource_Process::class,
             'index/resource_process_collection' => \Mage_Index_Model_Resource_Process_Collection::class,
             'index_resource/process_collection' => \Mage_Index_Model_Resource_Process_Collection::class,
             'index/resource_setup' => \Mage_Index_Model_Resource_Setup::class,
@@ -5012,22 +4998,22 @@
             'log/mysql4_visitor_online_collection' => \Mage_Log_Model_Mysql4_Visitor_Online_Collection::class,
             'log_resource/aggregation' => \Mage_Log_Model_Resource_Aggregation::class,
             'log/resource_aggregation' => \Mage_Log_Model_Resource_Aggregation::class,
-            'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class,
             'log/resource_customer' => \Mage_Log_Model_Resource_Customer::class,
+            'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class,
             'log/resource_log' => \Mage_Log_Model_Resource_Log::class,
             'log_resource/log' => \Mage_Log_Model_Resource_Log::class,
             'log_resource/visitor' => \Mage_Log_Model_Resource_Visitor::class,
             'log/resource_visitor' => \Mage_Log_Model_Resource_Visitor::class,
             'log_resource/visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class,
             'log/resource_visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class,
-            'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
             'log_resource/visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
-            'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
+            'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
             'log_resource/visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
+            'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
             'log/visitor' => \Mage_Log_Model_Visitor::class,
             'log/visitor_online' => \Mage_Log_Model_Visitor_Online::class,
-            'media_resource/image' => \Mage_Media_Model_File_Image::class,
             'media/file_image' => \Mage_Media_Model_File_Image::class,
+            'media_resource/image' => \Mage_Media_Model_File_Image::class,
             'media/image' => \Mage_Media_Model_Image::class,
             'newsletter/message' => \Mage_Newsletter_Model_Message::class,
             'newsletter/mysql4_problem' => \Mage_Newsletter_Model_Mysql4_Problem::class,
@@ -5045,14 +5031,14 @@
             'newsletter_resource/problem' => \Mage_Newsletter_Model_Resource_Problem::class,
             'newsletter/resource_problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class,
             'newsletter_resource/problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class,
-            'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class,
             'newsletter/resource_queue' => \Mage_Newsletter_Model_Resource_Queue::class,
-            'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
+            'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class,
             'newsletter/resource_queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
-            'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
+            'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
             'newsletter/resource_subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
-            'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
+            'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
             'newsletter/resource_subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
+            'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
             'newsletter_resource/template' => \Mage_Newsletter_Model_Resource_Template::class,
             'newsletter/resource_template' => \Mage_Newsletter_Model_Resource_Template::class,
             'newsletter_resource/template_collection' => \Mage_Newsletter_Model_Resource_Template_Collection::class,
@@ -5065,20 +5051,20 @@
             'oauth/consumer_validator_keyLength' => \Mage_Oauth_Model_Consumer_Validator_KeyLength::class,
             'oauth/nonce' => \Mage_Oauth_Model_Nonce::class,
             'oauth/observer' => \Mage_Oauth_Model_Observer::class,
-            'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
             'oauth/resource_consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
+            'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
             'oauth/resource_consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class,
             'oauth_resource/consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class,
             'oauth_resource/nonce' => \Mage_Oauth_Model_Resource_Nonce::class,
             'oauth/resource_nonce' => \Mage_Oauth_Model_Resource_Nonce::class,
             'oauth_resource/nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class,
             'oauth/resource_nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class,
-            'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class,
             'oauth/resource_setup' => \Mage_Oauth_Model_Resource_Setup::class,
+            'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class,
             'oauth_resource/token' => \Mage_Oauth_Model_Resource_Token::class,
             'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class,
-            'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
             'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
+            'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
             'oauth/server' => \Mage_Oauth_Model_Server::class,
             'oauth/token' => \Mage_Oauth_Model_Token::class,
             'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class,
@@ -5095,8 +5081,8 @@
             'paygate/authorizenet_source_paymentAction' => \Mage_Paygate_Model_Authorizenet_Source_PaymentAction::class,
             'paygate/mysql4_authorizenet_debug' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug::class,
             'paygate/mysql4_authorizenet_debug_collection' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection::class,
-            'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
             'paygate/resource_authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
+            'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
             'paygate_resource/authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class,
             'paygate/resource_authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class,
             'payment/billing_agreementAbstract' => \Mage_Payment_Model_Billing_AgreementAbstract::class,
@@ -5159,14 +5145,14 @@
             'paypal/resource_cert' => \Mage_Paypal_Model_Resource_Cert::class,
             'paypal_resource/payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class,
             'paypal/resource_payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class,
-            'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
             'paypal/resource_payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
+            'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
             'paypal/resource_report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class,
             'paypal_resource/report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class,
-            'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
             'paypal/resource_report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
-            'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
+            'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
             'paypal/resource_report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
+            'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
             'paypal/resource_setup' => \Mage_Paypal_Model_Resource_Setup::class,
             'paypal_resource/setup' => \Mage_Paypal_Model_Resource_Setup::class,
             'paypal/session' => \Mage_Paypal_Model_Session::class,
@@ -5200,16 +5186,16 @@
             'poll/poll' => \Mage_Poll_Model_Poll::class,
             'poll/poll_answer' => \Mage_Poll_Model_Poll_Answer::class,
             'poll/poll_vote' => \Mage_Poll_Model_Poll_Vote::class,
-            'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class,
             'poll_resource/poll' => \Mage_Poll_Model_Resource_Poll::class,
-            'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
+            'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class,
             'poll/resource_poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
-            'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
+            'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
             'poll_resource/poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
-            'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
+            'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
             'poll_resource/poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
-            'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
+            'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
             'poll/resource_poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
+            'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
             'productalert/email' => \Mage_ProductAlert_Model_Email::class,
             'productalert/mysql4_price' => \Mage_ProductAlert_Model_Mysql4_Price::class,
             'productalert/mysql4_price_collection' => \Mage_ProductAlert_Model_Mysql4_Price_Collection::class,
@@ -5219,20 +5205,20 @@
             'productalert/mysql4_stock_customer_collection' => \Mage_ProductAlert_Model_Mysql4_Stock_Customer_Collection::class,
             'productalert/observer' => \Mage_ProductAlert_Model_Observer::class,
             'productalert/price' => \Mage_ProductAlert_Model_Price::class,
-            'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
             'productalert_resource/abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
-            'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class,
+            'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
             'productalert_resource/price' => \Mage_ProductAlert_Model_Resource_Price::class,
-            'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
+            'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class,
             'productalert/resource_price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
-            'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
+            'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
             'productalert/resource_price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
-            'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
+            'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
             'productalert/resource_stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
-            'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
+            'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
             'productalert/resource_stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
-            'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
+            'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
             'productalert/resource_stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
+            'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
             'productalert/stock' => \Mage_ProductAlert_Model_Stock::class,
             'rating/mysql4_rating' => \Mage_Rating_Model_Mysql4_Rating::class,
             'rating/mysql4_rating_collection' => \Mage_Rating_Model_Mysql4_Rating_Collection::class,
@@ -5246,20 +5232,20 @@
             'rating/rating_entity' => \Mage_Rating_Model_Rating_Entity::class,
             'rating/rating_option' => \Mage_Rating_Model_Rating_Option::class,
             'rating/rating_option_vote' => \Mage_Rating_Model_Rating_Option_Vote::class,
-            'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class,
             'rating/resource_rating' => \Mage_Rating_Model_Resource_Rating::class,
+            'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class,
             'rating_resource/rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class,
             'rating/resource_rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class,
             'rating/resource_rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class,
             'rating_resource/rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class,
-            'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
             'rating/resource_rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
-            'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
+            'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
             'rating_resource/rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
+            'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
             'rating_resource/rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class,
             'rating/resource_rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class,
-            'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
             'rating/resource_rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
+            'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
             'reports/config' => \Mage_Reports_Model_Config::class,
             'reports/event' => \Mage_Reports_Model_Event::class,
             'reports/event_observer' => \Mage_Reports_Model_Event_Observer::class,
@@ -5305,6 +5291,7 @@
             'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class,
             'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class,
             'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class,
+            'reports/observer' => \Mage_Reports_Model_Observer::class,
             'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class,
             'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class,
             'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class,
@@ -5313,52 +5300,52 @@
             'reports_resource/accounts_collection' => \Mage_Reports_Model_Resource_Accounts_Collection::class,
             'reports/resource_coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class,
             'reports_resource/coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class,
-            'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
             'reports/resource_customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
-            'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
+            'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
             'reports/resource_customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
-            'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
+            'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
             'reports_resource/customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
-            'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
+            'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
             'reports/resource_entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
+            'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
             'reports_resource/event' => \Mage_Reports_Model_Resource_Event::class,
             'reports/resource_event' => \Mage_Reports_Model_Resource_Event::class,
-            'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
             'reports_resource/event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
-            'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
+            'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
             'reports/resource_event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
-            'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
+            'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
             'reports/resource_event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
-            'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
+            'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
             'reports_resource/helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
-            'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
+            'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
             'reports/resource_invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
-            'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
+            'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
             'reports_resource/order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
-            'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
+            'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
             'reports_resource/product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
+            'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
             'reports/resource_product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class,
             'reports_resource/product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class,
             'reports_resource/product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class,
             'reports/resource_product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class,
-            'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
             'reports/resource_product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
+            'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
             'reports_resource/product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class,
             'reports/resource_product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class,
-            'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
             'reports_resource/product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
+            'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
             'reports/resource_product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
             'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
             'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
             'reports_resource/product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
-            'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
             'reports/resource_product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
+            'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
             'reports_resource/product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class,
             'reports/resource_product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class,
-            'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
             'reports_resource/product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
-            'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
+            'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
             'reports_resource/product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
+            'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
             'reports/resource_quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
             'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
             'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class,
@@ -5367,34 +5354,34 @@
             'reports_resource/report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class,
             'reports/resource_report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class,
             'reports_resource/report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class,
-            'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
             'reports_resource/report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
+            'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
             'reports/resource_report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class,
             'reports_resource/report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class,
-            'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
             'reports/resource_report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
-            'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
+            'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
             'reports_resource/review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
-            'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
+            'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
             'reports_resource/review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
+            'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
             'reports_resource/review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class,
             'reports/resource_review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class,
             'reports_resource/shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class,
             'reports/resource_shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class,
-            'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
             'reports_resource/shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
+            'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
             'reports_resource/tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class,
             'reports/resource_tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class,
             'reports/resource_tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
             'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
             'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
             'reports/resource_tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
-            'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
             'reports/resource_tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
+            'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
             'reports_resource/wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class,
             'reports/resource_wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class,
-            'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
             'reports_resource/wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
+            'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
             'reports/session' => \Mage_Reports_Model_Session::class,
             'reports/test' => \Mage_Reports_Model_Test::class,
             'reports/totals' => \Mage_Reports_Model_Totals::class,
@@ -5413,12 +5400,12 @@
             'review/resource_review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class,
             'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class,
             'review_resource/review_status' => \Mage_Review_Model_Resource_Review_Status::class,
-            'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
             'review_resource/review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
+            'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
             'review/resource_review_summary' => \Mage_Review_Model_Resource_Review_Summary::class,
             'review_resource/review_summary' => \Mage_Review_Model_Resource_Review_Summary::class,
-            'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
             'review/resource_review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
+            'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
             'review/review' => \Mage_Review_Model_Review::class,
             'review/review_status' => \Mage_Review_Model_Review_Status::class,
             'review/review_summary' => \Mage_Review_Model_Review_Summary::class,
@@ -5441,12 +5428,12 @@
             'rule/mysql4_rule_collection' => \Mage_Rule_Model_Mysql4_Rule_Collection::class,
             'rule/renderer_actions' => \Mage_Rule_Model_Renderer_Actions::class,
             'rule/renderer_conditions' => \Mage_Rule_Model_Renderer_Conditions::class,
-            'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class,
             'rule/resource_abstract' => \Mage_Rule_Model_Resource_Abstract::class,
-            'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class,
+            'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class,
             'rule/resource_rule' => \Mage_Rule_Model_Resource_Rule::class,
-            'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
+            'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class,
             'rule_resource/rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
+            'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
             'rule_resource/rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
             'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
             'rule/resource_rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class,
@@ -5473,28 +5460,28 @@
             'salesrule/quote_nominal_discount' => \Mage_SalesRule_Model_Quote_Nominal_Discount::class,
             'salesrule_resource/coupon' => \Mage_SalesRule_Model_Resource_Coupon::class,
             'salesrule/resource_coupon' => \Mage_SalesRule_Model_Resource_Coupon::class,
-            'salesrule_resource/coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class,
             'salesrule/resource_coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class,
+            'salesrule_resource/coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class,
             'salesrule/resource_coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class,
             'salesrule_resource/coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class,
-            'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
             'salesrule_resource/report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
-            'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
+            'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
             'salesrule_resource/report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
+            'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
             'salesrule_resource/report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class,
             'salesrule/resource_report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class,
             'salesrule_resource/report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class,
             'salesrule/resource_report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class,
             'salesrule_resource/report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class,
             'salesrule/resource_report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class,
-            'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class,
             'salesrule_resource/rule' => \Mage_SalesRule_Model_Resource_Rule::class,
-            'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
+            'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class,
             'salesrule_resource/rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
-            'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
+            'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
             'salesrule_resource/rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
-            'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
+            'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
             'salesrule/resource_rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
+            'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
             'salesrule_resource/rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class,
             'salesrule/resource_rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class,
             'salesrule/resource_rule_product_collection' => \Mage_SalesRule_Model_Resource_Rule_Product_Collection::class,
@@ -5539,14 +5526,14 @@
             'sales/email_template' => \Mage_Sales_Model_Email_Template::class,
             'sales/entity_order' => \Mage_Sales_Model_Entity_Order::class,
             'sales_entity/order' => \Mage_Sales_Model_Entity_Order::class,
-            'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
             'sales_entity/order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
-            'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
+            'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
             'sales/entity_order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
-            'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
+            'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
             'sales_entity/order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
-            'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
+            'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
             'sales_entity/order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
+            'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
             'sales_entity/order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class,
             'sales/entity_order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class,
             'sales/entity_order_attribute_backend_shipping' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Shipping::class,
@@ -5555,54 +5542,54 @@
             'sales/entity_order_collection' => \Mage_Sales_Model_Entity_Order_Collection::class,
             'sales_entity/order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class,
             'sales/entity_order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class,
-            'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales_entity/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
-            'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
+            'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales/entity_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
-            'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
+            'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
             'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
+            'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
             'sales/entity_order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class,
             'sales_entity/order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class,
             'sales/entity_order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class,
             'sales_entity/order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class,
             'sales_entity/order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class,
             'sales/entity_order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class,
-            'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
             'sales/entity_order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
-            'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
+            'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
             'sales_entity/order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
+            'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
             'sales/entity_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class,
             'sales_entity/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class,
-            'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class,
             'sales/entity_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class,
+            'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class,
             'sales/entity_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Order::class,
             'sales_entity/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Order::class,
             'sales_entity/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/entity_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/entity_order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class,
             'sales_entity/order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class,
-            'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
             'sales/entity_order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
+            'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
             'sales_entity/order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class,
             'sales/entity_order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class,
             'sales_entity/order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class,
             'sales/entity_order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class,
-            'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
             'sales/entity_order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
+            'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
             'sales/entity_order_item' => \Mage_Sales_Model_Entity_Order_Item::class,
             'sales_entity/order_item' => \Mage_Sales_Model_Entity_Order_Item::class,
             'sales/entity_order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class,
             'sales_entity/order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class,
-            'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
             'sales/entity_order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
+            'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
             'sales_entity/order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class,
             'sales/entity_order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class,
             'sales/entity_order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class,
             'sales_entity/order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class,
-            'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
             'sales_entity/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
-            'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
+            'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
             'sales/entity_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
+            'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
             'sales/entity_order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class,
             'sales_entity/order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class,
             'sales/entity_order_shipment_comment' => \Mage_Sales_Model_Entity_Order_Shipment_Comment::class,
@@ -5611,66 +5598,66 @@
             'sales_entity/order_shipment_comment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Comment_Collection::class,
             'sales_entity/order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class,
             'sales/entity_order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class,
-            'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
             'sales/entity_order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
-            'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
+            'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
             'sales_entity/order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
-            'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
+            'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
             'sales_entity/order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
-            'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
+            'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
             'sales_entity/order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
-            'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
+            'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
             'sales_entity/order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
+            'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
             'sales_entity/quote' => \Mage_Sales_Model_Entity_Quote::class,
             'sales/entity_quote' => \Mage_Sales_Model_Entity_Quote::class,
-            'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
             'sales_entity/quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
+            'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
             'sales_entity/quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class,
             'sales/entity_quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class,
-            'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
             'sales/entity_quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
-            'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
+            'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
             'sales/entity_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
-            'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
+            'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
             'sales_entity/quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
-            'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
+            'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
             'sales/entity_quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
+            'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
             'sales_entity/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales/entity_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales_entity/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class,
             'sales/entity_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class,
-            'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
             'sales_entity/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
-            'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
             'sales/entity_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/entity_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales_entity/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales/entity_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class,
             'sales_entity/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class,
             'sales_entity/quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class,
             'sales/entity_quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class,
-            'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
             'sales_entity/quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
-            'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
+            'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
             'sales/entity_quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
-            'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
+            'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
             'sales_entity/quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
+            'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
             'sales/entity_quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class,
             'sales_entity/quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class,
             'sales/entity_quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class,
             'sales_entity/quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class,
-            'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
             'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
-            'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
+            'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
             'sales/entity_quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
-            'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
+            'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
             'sales/entity_quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
+            'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
             'sales_entity/quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class,
             'sales/entity_quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class,
-            'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
             'sales_entity/sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
-            'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class,
+            'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
             'sales_entity/setup' => \Mage_Sales_Model_Entity_Setup::class,
+            'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class,
             'sales/mysql4_abstract' => \Mage_Sales_Model_Mysql4_Abstract::class,
             'sales/mysql4_billing_agreement' => \Mage_Sales_Model_Mysql4_Billing_Agreement::class,
             'sales/mysql4_billing_agreement_collection' => \Mage_Sales_Model_Mysql4_Billing_Agreement_Collection::class,
@@ -5865,50 +5852,50 @@
             'sales/recurring_profile' => \Mage_Sales_Model_Recurring_Profile::class,
             'sales_resource/abstract' => \Mage_Sales_Model_Resource_Abstract::class,
             'sales/resource_abstract' => \Mage_Sales_Model_Resource_Abstract::class,
-            'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
             'sales_resource/billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
-            'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
+            'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
             'sales_resource/billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
+            'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
             'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
             'sales/resource_collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
             'sales_resource/helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
             'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
-            'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class,
             'sales_resource/order' => \Mage_Sales_Model_Resource_Order::class,
+            'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class,
             'sales_resource/order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class,
             'sales/resource_order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class,
-            'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
             'sales_resource/order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
+            'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
             'sales/resource_order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class,
             'sales_resource/order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class,
             'sales/resource_order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class,
             'sales_resource/order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class,
             'sales/resource_order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class,
             'sales_resource/order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class,
-            'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
             'sales/resource_order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
+            'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
             'sales_resource/order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class,
             'sales/resource_order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class,
             'sales/resource_order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class,
             'sales_resource/order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class,
-            'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
             'sales/resource_order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
-            'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
+            'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
             'sales/resource_order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
-            'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
+            'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
             'sales/resource_order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
-            'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
+            'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
             'sales_resource/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
+            'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales/resource_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class,
             'sales_resource/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class,
-            'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
             'sales/resource_order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
-            'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
+            'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
             'sales_resource/order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
+            'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
             'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
             'sales/resource_order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
-            'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
             'sales/resource_order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
+            'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
             'sales_resource/order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class,
             'sales/resource_order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class,
             'sales_resource/order_creditmemo_item_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item_Collection::class,
@@ -5917,138 +5904,138 @@
             'sales/resource_order_grid_collection' => \Mage_Sales_Model_Resource_Order_Grid_Collection::class,
             'sales/resource_order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class,
             'sales_resource/order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class,
-            'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
             'sales/resource_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
-            'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
+            'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
             'sales_resource/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
+            'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
             'sales_resource/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class,
             'sales/resource_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class,
             'sales/resource_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class,
             'sales_resource/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/resource_order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class,
             'sales_resource/order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class,
-            'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
             'sales/resource_order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
+            'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
             'sales/resource_order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class,
             'sales_resource/order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class,
-            'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
             'sales/resource_order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
-            'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
+            'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
             'sales_resource/order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
+            'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
             'sales/resource_order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class,
             'sales_resource/order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class,
-            'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
             'sales_resource/order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
+            'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
             'sales/resource_order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class,
             'sales_resource/order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class,
-            'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
             'sales_resource/order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
-            'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
+            'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
             'sales/resource_order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
+            'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
             'sales_resource/order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
             'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
-            'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
             'sales_resource/order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
-            'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
+            'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
             'sales_resource/order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
-            'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
+            'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
             'sales/resource_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
+            'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
             'sales_resource/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class,
             'sales/resource_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class,
             'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
             'sales/resource_order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
-            'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
             'sales/resource_order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
-            'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
+            'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
             'sales/resource_order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
+            'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
             'sales_resource/order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class,
             'sales/resource_order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class,
-            'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
             'sales_resource/order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
-            'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
+            'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
             'sales_resource/order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
-            'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
+            'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
             'sales_resource/order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
-            'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
+            'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
             'sales_resource/order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
+            'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
             'sales_resource/order_status' => \Mage_Sales_Model_Resource_Order_Status::class,
             'sales/resource_order_status' => \Mage_Sales_Model_Resource_Order_Status::class,
             'sales_resource/order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class,
             'sales/resource_order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class,
-            'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
             'sales_resource/order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
-            'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
+            'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
             'sales_resource/order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
-            'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
+            'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
             'sales/resource_order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
-            'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
+            'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
             'sales_resource/order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
-            'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class,
+            'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
             'sales/resource_quote' => \Mage_Sales_Model_Resource_Quote::class,
+            'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class,
             'sales_resource/quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class,
             'sales/resource_quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class,
             'sales/resource_quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class,
             'sales_resource/quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class,
             'sales/resource_quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class,
             'sales_resource/quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class,
-            'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
             'sales/resource_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
+            'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
             'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
             'sales/resource_quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
-            'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
             'sales_resource/quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
+            'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
             'sales_resource/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales/resource_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales/resource_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class,
             'sales_resource/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class,
             'sales/resource_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class,
             'sales_resource/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class,
-            'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/resource_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales/resource_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
-            'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
             'sales_resource/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
-            'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
+            'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
             'sales/resource_quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
+            'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
             'sales_resource/quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class,
             'sales/resource_quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class,
-            'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
             'sales/resource_quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
-            'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
+            'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
             'sales_resource/quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
-            'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
+            'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
             'sales_resource/quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
+            'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
             'sales_resource/quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class,
             'sales/resource_quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class,
-            'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
             'sales/resource_quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
+            'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
             'sales/resource_quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class,
             'sales_resource/quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class,
-            'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
             'sales/resource_quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
-            'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
+            'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
             'sales/resource_quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
-            'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
+            'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
             'sales_resource/quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
-            'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
+            'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
             'sales/resource_quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
-            'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
+            'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
             'sales/resource_recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
+            'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
             'sales/resource_recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class,
             'sales_resource/recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class,
-            'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class,
             'sales/resource_report' => \Mage_Sales_Model_Resource_Report::class,
+            'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class,
             'sales/resource_report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class,
             'sales_resource/report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class,
-            'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
             'sales/resource_report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
+            'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
             'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
             'sales/resource_report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
-            'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
             'sales_resource/report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
-            'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
+            'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
             'sales_resource/report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
+            'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
             'sales/resource_report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class,
             'sales_resource/report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class,
             'sales_resource/report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class,
@@ -6061,24 +6048,24 @@
             'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class,
             'sales_resource/report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class,
             'sales/resource_report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class,
-            'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
             'sales/resource_report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
-            'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
+            'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
             'sales_resource/report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
+            'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
             'sales_resource/report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class,
             'sales/resource_report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class,
             'sales_resource/report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class,
             'sales/resource_report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class,
-            'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
             'sales_resource/report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
+            'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
             'sales_resource/report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class,
             'sales/resource_report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class,
             'sales_resource/report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class,
             'sales/resource_report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class,
-            'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
             'sales/resource_sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
-            'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class,
+            'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
             'sales/resource_setup' => \Mage_Sales_Model_Resource_Setup::class,
+            'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class,
             'sales/service_order' => \Mage_Sales_Model_Service_Order::class,
             'sales/service_quote' => \Mage_Sales_Model_Service_Quote::class,
             'sales/status_list' => \Mage_Sales_Model_Status_List::class,
@@ -6088,8 +6075,8 @@
             'sendfriend/observer' => \Mage_Sendfriend_Model_Observer::class,
             'sendfriend_resource/sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class,
             'sendfriend/resource_sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class,
-            'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
             'sendfriend/resource_sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
+            'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
             'sendfriend/resource_setup' => \Mage_Sendfriend_Model_Resource_Setup::class,
             'sendfriend_resource/setup' => \Mage_Sendfriend_Model_Resource_Setup::class,
             'sendfriend/sendfriend' => \Mage_Sendfriend_Model_Sendfriend::class,
@@ -6108,8 +6095,8 @@
             'shipping/rate_result_abstract' => \Mage_Shipping_Model_Rate_Result_Abstract::class,
             'shipping/rate_result_error' => \Mage_Shipping_Model_Rate_Result_Error::class,
             'shipping/rate_result_method' => \Mage_Shipping_Model_Rate_Result_Method::class,
-            'shipping/resource_carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class,
             'shipping_resource/carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class,
+            'shipping/resource_carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class,
             'shipping/resource_carrier_tablerate_collection' => \Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection::class,
             'shipping_resource/carrier_tablerate_collection' => \Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection::class,
             'shipping/shipment_request' => \Mage_Shipping_Model_Shipment_Request::class,
@@ -6129,16 +6116,16 @@
             'sitemap/observer' => \Mage_Sitemap_Model_Observer::class,
             'sitemap_resource/catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class,
             'sitemap/resource_catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class,
-            'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
             'sitemap/resource_catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
-            'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
+            'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
             'sitemap_resource/catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
-            'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
+            'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
             'sitemap_resource/cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
+            'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
             'sitemap_resource/sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class,
             'sitemap/resource_sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class,
-            'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
             'sitemap_resource/sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
+            'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
             'sitemap/sitemap' => \Mage_Sitemap_Model_Sitemap::class,
             'tag/api' => \Mage_Tag_Model_Api::class,
             'tag/api_v2' => \Mage_Tag_Model_Api_V2::class,
@@ -6151,21 +6138,21 @@
             'tag/mysql4_tag' => \Mage_Tag_Model_Mysql4_Tag::class,
             'tag/mysql4_tag_collection' => \Mage_Tag_Model_Mysql4_Tag_Collection::class,
             'tag/mysql4_tag_relation' => \Mage_Tag_Model_Mysql4_Tag_Relation::class,
-            'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag/resource_customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag_resource/customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
-            'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
+            'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag_resource/indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
-            'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
+            'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
             'tag_resource/popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
+            'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
             'tag_resource/product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class,
             'tag/resource_product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class,
             'tag_resource/tag' => \Mage_Tag_Model_Resource_Tag::class,
             'tag/resource_tag' => \Mage_Tag_Model_Resource_Tag::class,
-            'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
             'tag_resource/tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
-            'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
+            'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
             'tag_resource/tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
+            'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
             'tag/session' => \Mage_Tag_Model_Session::class,
             'tag/tag' => \Mage_Tag_Model_Tag::class,
             'tag/tag_relation' => \Mage_Tag_Model_Tag_Relation::class,
@@ -6204,16 +6191,16 @@
             'tax/resource_calculation_rate' => \Mage_Tax_Model_Resource_Calculation_Rate::class,
             'tax/resource_calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class,
             'tax_resource/calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class,
-            'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
             'tax/resource_calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
-            'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
+            'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
             'tax/resource_calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
-            'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
+            'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
             'tax/resource_calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
-            'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
+            'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
             'tax_resource/calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
-            'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class,
+            'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
             'tax/resource_class' => \Mage_Tax_Model_Resource_Class::class,
+            'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class,
             'tax/resource_class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class,
             'tax_resource/class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class,
             'tax_resource/report_collection' => \Mage_Tax_Model_Resource_Report_Collection::class,
@@ -6224,16 +6211,16 @@
             'tax/resource_report_tax_createdat' => \Mage_Tax_Model_Resource_Report_Tax_Createdat::class,
             'tax_resource/report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class,
             'tax/resource_report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class,
-            'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
             'tax/resource_report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
-            'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
+            'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
             'tax_resource/sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
+            'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
             'tax_resource/sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class,
             'tax/resource_sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class,
-            'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class,
             'tax/resource_sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class,
-            'tax_resource/sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class,
+            'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class,
             'tax/resource_sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class,
+            'tax_resource/sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class,
             'tax/resource_setup' => \Mage_Tax_Model_Resource_Setup::class,
             'tax_resource/setup' => \Mage_Tax_Model_Resource_Setup::class,
             'tax/sales_order_tax' => \Mage_Tax_Model_Sales_Order_Tax::class,
@@ -6316,10 +6303,10 @@
             'weee/observer' => \Mage_Weee_Model_Observer::class,
             'weee/resource_attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class,
             'weee_resource/attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class,
-            'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class,
             'weee/resource_setup' => \Mage_Weee_Model_Resource_Setup::class,
-            'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class,
+            'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class,
             'weee/resource_tax' => \Mage_Weee_Model_Resource_Tax::class,
+            'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class,
             'weee/tax' => \Mage_Weee_Model_Tax::class,
             'weee/total_creditmemo_weee' => \Mage_Weee_Model_Total_Creditmemo_Weee::class,
             'weee/total_invoice_weee' => \Mage_Weee_Model_Total_Invoice_Weee::class,
@@ -6329,12 +6316,12 @@
             'widget/mysql4_widget_instance' => \Mage_Widget_Model_Mysql4_Widget_Instance::class,
             'widget/mysql4_widget_instance_collection' => \Mage_Widget_Model_Mysql4_Widget_Instance_Collection::class,
             'widget/observer' => \Mage_Widget_Model_Observer::class,
-            'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class,
             'widget/resource_widget' => \Mage_Widget_Model_Resource_Widget::class,
+            'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class,
             'widget_resource/widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class,
             'widget/resource_widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class,
-            'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
             'widget_resource/widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
+            'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
             'widget/template_filter' => \Mage_Widget_Model_Template_Filter::class,
             'widget/widget' => \Mage_Widget_Model_Widget::class,
             'widget/widget_config' => \Mage_Widget_Model_Widget_Config::class,
@@ -6351,14 +6338,14 @@
             'wishlist/mysql4_wishlist' => \Mage_Wishlist_Model_Mysql4_Wishlist::class,
             'wishlist/mysql4_wishlist_collection' => \Mage_Wishlist_Model_Mysql4_Wishlist_Collection::class,
             'wishlist/observer' => \Mage_Wishlist_Model_Observer::class,
-            'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class,
             'wishlist_resource/item' => \Mage_Wishlist_Model_Resource_Item::class,
+            'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class,
             'wishlist_resource/item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class,
             'wishlist/resource_item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class,
             'wishlist/resource_item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
             'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
-            'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
             'wishlist_resource/item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
+            'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
             'wishlist_resource/product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class,
             'wishlist/resource_product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class,
             'wishlist/resource_wishlist' => \Mage_Wishlist_Model_Resource_Wishlist::class,
@@ -6367,7 +6354,6 @@
             'wishlist/resource_wishlist_collection' => \Mage_Wishlist_Model_Resource_Wishlist_Collection::class,
             'wishlist/session' => \Mage_Wishlist_Model_Session::class,
             'wishlist/wishlist' => \Mage_Wishlist_Model_Wishlist::class,
-            'varien/autoload' => \Varien_Autoload::class,
         ])
     );
     override( \Mage_Checkout_Helper_Cart::_getSingletonModel(0),
@@ -6377,11 +6363,10 @@
             'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class,
             'adminnotification/mysql4_inbox_collection' => \Mage_AdminNotification_Model_Mysql4_Inbox_Collection::class,
             'adminnotification/observer' => \Mage_AdminNotification_Model_Observer::class,
-            'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
             'adminnotification/resource_inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
-            'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
+            'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
             'adminnotification/resource_inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
-            'adminnotification/survey' => \Mage_AdminNotification_Model_Survey::class,
+            'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
             'admin/acl' => \Mage_Admin_Model_Acl::class,
             'admin/acl_assert_ip' => \Mage_Admin_Model_Acl_Assert_Ip::class,
             'admin/acl_assert_time' => \Mage_Admin_Model_Acl_Assert_Time::class,
@@ -6410,38 +6395,38 @@
             'admin/redirectpolicy' => \Mage_Admin_Model_Redirectpolicy::class,
             'admin/resource_acl' => \Mage_Admin_Model_Resource_Acl::class,
             'admin_resource/acl' => \Mage_Admin_Model_Resource_Acl::class,
-            'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
             'admin/resource_acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
+            'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
             'admin/resource_acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class,
             'admin_resource/acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class,
-            'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class,
             'admin/resource_block' => \Mage_Admin_Model_Resource_Block::class,
-            'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
+            'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class,
             'admin/resource_block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
+            'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
             'admin_resource/permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class,
             'admin/resource_permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class,
-            'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class,
             'admin/resource_role' => \Mage_Admin_Model_Resource_Role::class,
+            'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class,
             'admin/resource_role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class,
             'admin_resource/role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class,
-            'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class,
             'admin_resource/roles' => \Mage_Admin_Model_Resource_Roles::class,
-            'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
+            'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class,
             'admin_resource/roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
-            'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
+            'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
             'admin/resource_roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
+            'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
             'admin/resource_rules' => \Mage_Admin_Model_Resource_Rules::class,
             'admin_resource/rules' => \Mage_Admin_Model_Resource_Rules::class,
             'admin_resource/rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
             'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
-            'admin_resource/user' => \Mage_Admin_Model_Resource_User::class,
             'admin/resource_user' => \Mage_Admin_Model_Resource_User::class,
+            'admin_resource/user' => \Mage_Admin_Model_Resource_User::class,
             'admin/resource_user_collection' => \Mage_Admin_Model_Resource_User_Collection::class,
             'admin_resource/user_collection' => \Mage_Admin_Model_Resource_User_Collection::class,
-            'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class,
             'admin_resource/variable' => \Mage_Admin_Model_Resource_Variable::class,
-            'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
+            'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class,
             'admin/resource_variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
+            'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
             'admin/role' => \Mage_Admin_Model_Role::class,
             'admin/roles' => \Mage_Admin_Model_Roles::class,
             'admin/rules' => \Mage_Admin_Model_Rules::class,
@@ -6476,6 +6461,7 @@
             'adminhtml/system_config_backend_baseurl' => \Mage_Adminhtml_Model_System_Config_Backend_Baseurl::class,
             'adminhtml/system_config_backend_cache' => \Mage_Adminhtml_Model_System_Config_Backend_Cache::class,
             'adminhtml/system_config_backend_catalog_inventory_managestock' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock::class,
+            'adminhtml/system_config_backend_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Separator::class,
             'adminhtml/system_config_backend_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Type::class,
             'adminhtml/system_config_backend_category' => \Mage_Adminhtml_Model_System_Config_Backend_Category::class,
             'adminhtml/system_config_backend_cookie' => \Mage_Adminhtml_Model_System_Config_Backend_Cookie::class,
@@ -6528,12 +6514,14 @@
             'adminhtml/system_config_source_catalog_listMode' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListMode::class,
             'adminhtml/system_config_source_catalog_listPerPage' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListPerPage::class,
             'adminhtml/system_config_source_catalog_listSort' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort::class,
+            'adminhtml/system_config_source_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Separator::class,
             'adminhtml/system_config_source_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Type::class,
             'adminhtml/system_config_source_catalog_timeFormat' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_TimeFormat::class,
             'adminhtml/system_config_source_category' => \Mage_Adminhtml_Model_System_Config_Source_Category::class,
             'adminhtml/system_config_source_checktype' => \Mage_Adminhtml_Model_System_Config_Source_Checktype::class,
             'adminhtml/system_config_source_cms_page' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Page::class,
             'adminhtml/system_config_source_cms_wysiwyg_enabled' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Wysiwyg_Enabled::class,
+            'adminhtml/system_config_source_cookie_samesite' => \Mage_Adminhtml_Model_System_Config_Source_Cookie_Samesite::class,
             'adminhtml/system_config_source_country' => \Mage_Adminhtml_Model_System_Config_Source_Country::class,
             'adminhtml/system_config_source_country_full' => \Mage_Adminhtml_Model_System_Config_Source_Country_Full::class,
             'adminhtml/system_config_source_cron_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency::class,
@@ -6560,6 +6548,7 @@
             'adminhtml/system_config_source_locale_timezone' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Timezone::class,
             'adminhtml/system_config_source_locale_weekdaycodes' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdaycodes::class,
             'adminhtml/system_config_source_locale_weekdays' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdays::class,
+            'adminhtml/system_config_source_log_level' => \Mage_Adminhtml_Model_System_Config_Source_Log_Level::class,
             'adminhtml/system_config_source_nooptreq' => \Mage_Adminhtml_Model_System_Config_Source_Nooptreq::class,
             'adminhtml/system_config_source_notification_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Notification_Frequency::class,
             'adminhtml/system_config_source_order_status' => \Mage_Adminhtml_Model_System_Config_Source_Order_Status::class,
@@ -6583,7 +6572,6 @@
             'adminhtml/system_config_source_shipping_flatrate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Flatrate::class,
             'adminhtml/system_config_source_shipping_tablerate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Tablerate::class,
             'adminhtml/system_config_source_shipping_taxclass' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Taxclass::class,
-            'adminhtml/system_config_source_startdateenddate' => \Mage_Adminhtml_Model_System_Config_Source_Startdateenddate::class,
             'adminhtml/system_config_source_storage_media_database' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Database::class,
             'adminhtml/system_config_source_storage_media_storage' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Storage::class,
             'adminhtml/system_config_source_store' => \Mage_Adminhtml_Model_System_Config_Source_Store::class,
@@ -6639,22 +6627,22 @@
             'api2_resource/acl_filter_attribute' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute::class,
             'api2/resource_acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class,
             'api2_resource/acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class,
-            'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
             'api2_resource/acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
+            'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
             'api2/resource_acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class,
             'api2_resource/acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class,
             'api2_resource/acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class,
             'api2/resource_acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class,
             'api2/resource_acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class,
             'api2_resource/acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class,
-            'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class,
             'api2/resource_setup' => \Mage_Api2_Model_Resource_Setup::class,
+            'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class,
             'api2/resource_validator' => \Mage_Api2_Model_Resource_Validator::class,
             'api2_resource/validator' => \Mage_Api2_Model_Resource_Validator::class,
             'api2/resource_validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class,
             'api2_resource/validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class,
-            'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
             'api2/resource_validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
+            'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
             'api2/response' => \Mage_Api2_Model_Response::class,
             'api2/route_abstract' => \Mage_Api2_Model_Route_Abstract::class,
             'api2/route_apiType' => \Mage_Api2_Model_Route_ApiType::class,
@@ -6686,8 +6674,8 @@
             'api/mysql4_user_collection' => \Mage_Api_Model_Mysql4_User_Collection::class,
             'api/resource_abstract' => \Mage_Api_Model_Resource_Abstract::class,
             'api_resource/abstract' => \Mage_Api_Model_Resource_Abstract::class,
-            'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class,
             'api_resource/acl' => \Mage_Api_Model_Resource_Acl::class,
+            'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class,
             'api_resource/acl_role' => \Mage_Api_Model_Resource_Acl_Role::class,
             'api/resource_acl_role' => \Mage_Api_Model_Resource_Acl_Role::class,
             'api/resource_acl_role_collection' => \Mage_Api_Model_Resource_Acl_Role_Collection::class,
@@ -6696,18 +6684,18 @@
             'api_resource/permissions_collection' => \Mage_Api_Model_Resource_Permissions_Collection::class,
             'api_resource/role' => \Mage_Api_Model_Resource_Role::class,
             'api/resource_role' => \Mage_Api_Model_Resource_Role::class,
-            'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
             'api_resource/role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
+            'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
             'api/resource_roles' => \Mage_Api_Model_Resource_Roles::class,
             'api_resource/roles' => \Mage_Api_Model_Resource_Roles::class,
-            'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
             'api_resource/roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
-            'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
+            'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
             'api_resource/roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
-            'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class,
+            'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
             'api_resource/rules' => \Mage_Api_Model_Resource_Rules::class,
-            'api/resource_rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class,
+            'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class,
             'api_resource/rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class,
+            'api/resource_rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class,
             'api/resource_user' => \Mage_Api_Model_Resource_User::class,
             'api_resource/user' => \Mage_Api_Model_Resource_User::class,
             'api/resource_user_collection' => \Mage_Api_Model_Resource_User_Collection::class,
@@ -6734,15 +6722,6 @@
             'authorizenet/directpost_request' => \Mage_Authorizenet_Model_Directpost_Request::class,
             'authorizenet/directpost_response' => \Mage_Authorizenet_Model_Directpost_Response::class,
             'authorizenet/directpost_session' => \Mage_Authorizenet_Model_Directpost_Session::class,
-            'backup/backup' => \Mage_Backup_Model_Backup::class,
-            'backup/config_backend_cron' => \Mage_Backup_Model_Config_Backend_Cron::class,
-            'backup/config_source_type' => \Mage_Backup_Model_Config_Source_Type::class,
-            'backup/db' => \Mage_Backup_Model_Db::class,
-            'backup/fs_collection' => \Mage_Backup_Model_Fs_Collection::class,
-            'backup/mysql4_db' => \Mage_Backup_Model_Mysql4_Db::class,
-            'backup/observer' => \Mage_Backup_Model_Observer::class,
-            'backup/resource_db' => \Mage_Backup_Model_Resource_Db::class,
-            'backup/resource_helper_mysql4' => \Mage_Backup_Model_Resource_Helper_Mysql4::class,
             'bundle/catalogIndex_data_bundle' => \Mage_Bundle_Model_CatalogIndex_Data_Bundle::class,
             'bundle/mysql4_bundle' => \Mage_Bundle_Model_Mysql4_Bundle::class,
             'bundle/mysql4_indexer_price' => \Mage_Bundle_Model_Mysql4_Indexer_Price::class,
@@ -6768,10 +6747,10 @@
             'bundle_resource/option' => \Mage_Bundle_Model_Resource_Option::class,
             'bundle/resource_option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class,
             'bundle_resource/option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class,
-            'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
             'bundle_resource/price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
-            'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class,
+            'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
             'bundle_resource/selection' => \Mage_Bundle_Model_Resource_Selection::class,
+            'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class,
             'bundle_resource/selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class,
             'bundle/resource_selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class,
             'bundle/sales_order_pdf_items_abstract' => \Mage_Bundle_Model_Sales_Order_Pdf_Items_Abstract::class,
@@ -6787,8 +6766,8 @@
             'captcha/config_form_frontend' => \Mage_Captcha_Model_Config_Form_Frontend::class,
             'captcha/config_mode' => \Mage_Captcha_Model_Config_Mode::class,
             'captcha/observer' => \Mage_Captcha_Model_Observer::class,
-            'captcha_resource/log' => \Mage_Captcha_Model_Resource_Log::class,
             'captcha/resource_log' => \Mage_Captcha_Model_Resource_Log::class,
+            'captcha_resource/log' => \Mage_Captcha_Model_Resource_Log::class,
             'captcha/zend' => \Mage_Captcha_Model_Zend::class,
             'catalogindex/aggregation' => \Mage_CatalogIndex_Model_Aggregation::class,
             'catalogindex/attribute' => \Mage_CatalogIndex_Model_Attribute::class,
@@ -6831,8 +6810,8 @@
             'catalogindex/resource_data_abstract' => \Mage_CatalogIndex_Model_Resource_Data_Abstract::class,
             'catalogindex_resource/data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class,
             'catalogindex/resource_data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class,
-            'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
             'catalogindex_resource/data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
+            'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
             'catalogindex_resource/indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class,
             'catalogindex/resource_indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class,
             'catalogindex/resource_indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class,
@@ -6864,20 +6843,20 @@
             'cataloginventory/mysql4_stock_item_collection' => \Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection::class,
             'cataloginventory/mysql4_stock_status' => \Mage_CatalogInventory_Model_Mysql4_Stock_Status::class,
             'cataloginventory/observer' => \Mage_CatalogInventory_Model_Observer::class,
-            'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
             'cataloginventory_resource/indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
+            'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
             'cataloginventory/resource_indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class,
             'cataloginventory_resource/indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class,
-            'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
             'cataloginventory/resource_indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
+            'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
             'cataloginventory/resource_indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class,
             'cataloginventory_resource/indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class,
             'cataloginventory_resource/stock' => \Mage_CatalogInventory_Model_Resource_Stock::class,
             'cataloginventory/resource_stock' => \Mage_CatalogInventory_Model_Resource_Stock::class,
-            'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
             'cataloginventory/resource_stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
-            'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
+            'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
             'cataloginventory/resource_stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
+            'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
             'cataloginventory/resource_stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class,
             'cataloginventory_resource/stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class,
             'cataloginventory/source_backorders' => \Mage_CatalogInventory_Model_Source_Backorders::class,
@@ -6900,8 +6879,8 @@
             'catalogrule/observer' => \Mage_CatalogRule_Model_Observer::class,
             'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
             'catalogrule/resource_rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
-            'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
             'catalogrule_resource/rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
+            'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
             'catalogrule_resource/rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class,
             'catalogrule/resource_rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class,
             'catalogrule_resource/rule_product_price_collection' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price_Collection::class,
@@ -6930,24 +6909,24 @@
             'catalogsearch/query' => \Mage_CatalogSearch_Model_Query::class,
             'catalogsearch_resource/advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class,
             'catalogsearch/resource_advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class,
-            'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
             'catalogsearch_resource/advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
+            'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
             'catalogsearch_resource/fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class,
             'catalogsearch/resource_fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class,
             'catalogsearch_resource/fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class,
             'catalogsearch/resource_fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class,
-            'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
             'catalogsearch_resource/fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
-            'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
+            'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
             'catalogsearch/resource_helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
-            'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
+            'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
             'catalogsearch_resource/indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
-            'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class,
+            'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
             'catalogsearch_resource/query' => \Mage_CatalogSearch_Model_Resource_Query::class,
-            'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
+            'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class,
             'catalogsearch_resource/query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
-            'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
+            'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
             'catalogsearch/resource_search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
+            'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
             'catalogsearch/session' => \Mage_CatalogSearch_Model_Session::class,
             'catalogsearch/system_config_backend_sitemap' => \Mage_CatalogSearch_Model_System_Config_Backend_Sitemap::class,
             'catalog/abstract' => \Mage_Catalog_Model_Abstract::class,
@@ -7090,144 +7069,144 @@
             'catalog/product_website' => \Mage_Catalog_Model_Product_Website::class,
             'catalog/resource_abstract' => \Mage_Catalog_Model_Resource_Abstract::class,
             'catalog_resource/abstract' => \Mage_Catalog_Model_Resource_Abstract::class,
-            'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
             'catalog/resource_attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
-            'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class,
+            'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
             'catalog_resource/category' => \Mage_Catalog_Model_Resource_Category::class,
+            'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class,
             'catalog_resource/category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class,
             'catalog/resource_category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class,
-            'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
             'catalog/resource_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
-            'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
+            'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
             'catalog/resource_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
+            'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
             'catalog_resource/category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class,
             'catalog/resource_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class,
             'catalog_resource/category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class,
             'catalog/resource_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class,
             'catalog/resource_category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class,
             'catalog_resource/category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class,
-            'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
             'catalog_resource/category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
-            'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
+            'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
             'catalog/resource_category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
+            'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
             'catalog_resource/category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class,
             'catalog/resource_category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class,
             'catalog/resource_category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class,
             'catalog_resource/category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class,
-            'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
             'catalog_resource/collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
+            'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
             'catalog_resource/config' => \Mage_Catalog_Model_Resource_Config::class,
             'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class,
-            'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
             'catalog/resource_eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
+            'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
             'catalog_resource/eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class,
             'catalog/resource_eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class,
             'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
             'catalog_resource/eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
-            'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
             'catalog/resource_eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
-            'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
+            'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
             'catalog_resource/eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
+            'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
             'catalog_resource/eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
-            'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
+            'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
             'catalog_resource/eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
+            'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
             'catalog/resource_eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class,
             'catalog_resource/eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class,
             'catalog/resource_eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class,
             'catalog_resource/eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class,
             'catalog/resource_eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class,
             'catalog_resource/eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class,
-            'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
             'catalog/resource_eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
+            'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
             'catalog/resource_eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
             'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
             'catalog/resource_eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class,
             'catalog_resource/eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class,
-            'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
             'catalog_resource/eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
-            'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
+            'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
             'catalog_resource/eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
+            'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
             'catalog_resource/eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class,
             'catalog/resource_eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class,
-            'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
             'catalog_resource/eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
+            'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
             'catalog/resource_eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
             'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
-            'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
             'catalog/resource_eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
-            'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
+            'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
             'catalog/resource_eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
-            'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
+            'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
             'catalog_resource/eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
+            'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
             'catalog/resource_eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class,
             'catalog/resource_eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
+            'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
             'catalog/resource_eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class,
             'catalog/resource_eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class,
             'catalog/resource_eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class,
-            'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
             'catalog_resource/eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
-            'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
+            'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
             'catalog_resource/eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
-            'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
+            'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
             'catalog_resource/eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
+            'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
             'catalog/resource_eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class,
             'catalog/resource_eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class,
             'catalog/resource_eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class,
-            'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
             'catalog/resource_eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
-            'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
+            'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
             'catalog_resource/eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
+            'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
             'catalog_resource/eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class,
             'catalog/resource_eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class,
-            'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
             'catalog/resource_eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
-            'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
+            'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
             'catalog/resource_eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
+            'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
             'catalog/resource_eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class,
             'catalog_resource/eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class,
-            'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
             'catalog/resource_eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
+            'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
             'catalog_resource/eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class,
             'catalog/resource_eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class,
             'catalog_resource/eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class,
             'catalog/resource_eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class,
-            'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
             'catalog/resource_eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
-            'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
+            'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
             'catalog_resource/eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
-            'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
+            'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
             'catalog/resource_eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
+            'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
             'catalog/resource_eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
             'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
-            'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
             'catalog/resource_eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
+            'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
             'catalog/resource_eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class,
             'catalog_resource/eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class,
-            'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
             'catalog_resource/eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
-            'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
+            'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
             'catalog/resource_eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
-            'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
             'catalog/resource_eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
+            'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
             'catalog_resource/eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
+            'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
             'catalog/resource_eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class,
             'catalog_resource/eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class,
             'catalog/resource_eav_mysql4_sendfriend' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend::class,
@@ -7236,16 +7215,16 @@
             'catalog/resource_eav_mysql4_sendfriend_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection::class,
             'catalog_resource/eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class,
             'catalog/resource_eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class,
-            'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
             'catalog/resource_eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
-            'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
+            'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
             'catalog/resource_helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
+            'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
             'catalog_resource/layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class,
             'catalog/resource_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class,
             'catalog/resource_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class,
             'catalog_resource/layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class,
-            'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
             'catalog/resource_layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
+            'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
             'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class,
             'catalog_resource/product' => \Mage_Catalog_Model_Resource_Product::class,
             'catalog/resource_product_action' => \Mage_Catalog_Model_Resource_Product_Action::class,
@@ -7256,42 +7235,42 @@
             'catalog_resource/product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class,
             'catalog/resource_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class,
             'catalog_resource/product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class,
-            'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
             'catalog/resource_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
-            'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
+            'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
             'catalog_resource/product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
+            'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
             'catalog/resource_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class,
-            'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
             'catalog_resource/product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
-            'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
+            'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
             'catalog/resource_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
-            'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
+            'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
             'catalog_resource/product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
-            'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
+            'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
+            'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
             'catalog_resource/product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class,
             'catalog/resource_product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class,
-            'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
             'catalog/resource_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
+            'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
             'catalog/resource_product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class,
             'catalog_resource/product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class,
-            'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
             'catalog/resource_product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
+            'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
             'catalog/resource_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class,
             'catalog_resource/product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class,
-            'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
             'catalog_resource/product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
-            'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
+            'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
             'catalog/resource_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
+            'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
             'catalog/resource_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class,
             'catalog_resource/product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class,
-            'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
             'catalog_resource/product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
+            'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
             'catalog_resource/product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
             'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
-            'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
             'catalog_resource/product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
+            'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
             'catalog/resource_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class,
             'catalog_resource/product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class,
             'catalog_resource/product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class,
@@ -7302,12 +7281,12 @@
             'catalog_resource/product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class,
             'catalog/resource_product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
             'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
-            'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
             'catalog_resource/product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
-            'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
+            'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
             'catalog/resource_product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
-            'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
+            'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
             'catalog_resource/product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
+            'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
             'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
             'catalog_resource/product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
             'catalog_resource/product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class,
@@ -7316,14 +7295,14 @@
             'catalog/resource_product_status' => \Mage_Catalog_Model_Resource_Product_Status::class,
             'catalog_resource/product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class,
             'catalog/resource_product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class,
-            'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
             'catalog/resource_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
-            'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
             'catalog_resource/product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
             'catalog_resource/product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class,
             'catalog/resource_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class,
-            'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
             'catalog_resource/product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
+            'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
             'catalog/resource_setup' => \Mage_Catalog_Model_Resource_Setup::class,
             'catalog_resource/setup' => \Mage_Catalog_Model_Resource_Setup::class,
             'catalog_resource/url' => \Mage_Catalog_Model_Resource_Url::class,
@@ -7369,12 +7348,12 @@
             'checkout/observer' => \Mage_Checkout_Model_Observer::class,
             'checkout_resource/agreement' => \Mage_Checkout_Model_Resource_Agreement::class,
             'checkout/resource_agreement' => \Mage_Checkout_Model_Resource_Agreement::class,
-            'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
             'checkout/resource_agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
-            'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class,
+            'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
             'checkout_resource/cart' => \Mage_Checkout_Model_Resource_Cart::class,
-            'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class,
+            'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class,
             'checkout/resource_setup' => \Mage_Checkout_Model_Resource_Setup::class,
+            'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class,
             'checkout/session' => \Mage_Checkout_Model_Session::class,
             'checkout/type_abstract' => \Mage_Checkout_Model_Type_Abstract::class,
             'checkout/type_multishipping' => \Mage_Checkout_Model_Type_Multishipping::class,
@@ -7389,25 +7368,25 @@
             'cms/mysql4_page_service' => \Mage_Cms_Model_Mysql4_Page_Service::class,
             'cms/observer' => \Mage_Cms_Model_Observer::class,
             'cms/page' => \Mage_Cms_Model_Page::class,
-            'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class,
             'cms/resource_block' => \Mage_Cms_Model_Resource_Block::class,
+            'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class,
             'cms_resource/block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class,
             'cms/resource_block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class,
             'cms/resource_page' => \Mage_Cms_Model_Resource_Page::class,
             'cms_resource/page' => \Mage_Cms_Model_Resource_Page::class,
-            'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
             'cms_resource/page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
-            'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
+            'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
             'cms/resource_page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
+            'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
             'cms/template_filter' => \Mage_Cms_Model_Template_Filter::class,
             'cms/wysiwyg_config' => \Mage_Cms_Model_Wysiwyg_Config::class,
             'cms/wysiwyg_images_storage' => \Mage_Cms_Model_Wysiwyg_Images_Storage::class,
             'cms/wysiwyg_images_storage_collection' => \Mage_Cms_Model_Wysiwyg_Images_Storage_Collection::class,
             'configurableswatches/observer' => \Mage_ConfigurableSwatches_Model_Observer::class,
-            'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
             'configurableswatches_resource/catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
-            'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
+            'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
             'configurableswatches_resource/catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
+            'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
             'configurableswatches_resource/catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
             'configurableswatches/resource_catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
             'configurableswatches/system_config_source_catalog_product_configattribute' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute::class,
@@ -7514,152 +7493,152 @@
             'core/mysql4_website_collection' => \Mage_Core_Model_Mysql4_Website_Collection::class,
             'core/observer' => \Mage_Core_Model_Observer::class,
             'core/resource' => \Mage_Core_Model_Resource::class,
+            'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
             'core_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
             'core/resource_abstract' => \Mage_Core_Model_Resource_Abstract::class,
-            'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
+            'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
             'core/resource_cache' => \Mage_Core_Model_Resource_Cache::class,
             'core_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
-            'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
+            'core/resource_config' => \Mage_Core_Model_Resource_Config::class,
             'core_resource/config' => \Mage_Core_Model_Resource_Config::class,
             'payment_resource/config' => \Mage_Core_Model_Resource_Config::class,
-            'core/resource_config' => \Mage_Core_Model_Resource_Config::class,
-            'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
             'core/resource_config_data' => \Mage_Core_Model_Resource_Config_Data::class,
+            'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
             'payment_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
-            'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'core_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
-            'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
-            'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
+            'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'payment_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
-            'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
+            'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
+            'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
             'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
             'core/resource_db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
-            'core/resource_design' => \Mage_Core_Model_Resource_Design::class,
+            'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
             'core_resource/design' => \Mage_Core_Model_Resource_Design::class,
+            'core/resource_design' => \Mage_Core_Model_Resource_Design::class,
             'payment_resource/design' => \Mage_Core_Model_Resource_Design::class,
             'payment_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
-            'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
             'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
-            'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
+            'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
             'payment_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
             'core/resource_design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
+            'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
             'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
             'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
             'core/resource_email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
-            'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
-            'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
             'payment_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
-            'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
+            'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
+            'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
             'core/resource_email_template' => \Mage_Core_Model_Resource_Email_Template::class,
             'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
-            'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
+            'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
             'core/resource_email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
+            'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
             'core_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
-            'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
-            'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
             'core_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
-            'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
-            'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
+            'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
             'core_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
             'payment_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
             'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
-            'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
+            'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
             'payment_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
             'core/resource_file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
-            'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
+            'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
             'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
             'core/resource_file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
-            'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
-            'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
-            'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
             'core/resource_file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
-            'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
+            'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
+            'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
             'payment_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
+            'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
             'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class,
             'payment_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
-            'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
             'core_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
-            'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
+            'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
             'core/resource_helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
+            'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
             'core_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
             'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
             'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
             'core/resource_iterator' => \Mage_Core_Model_Resource_Iterator::class,
             'payment_resource/language' => \Mage_Core_Model_Resource_Language::class,
-            'core/resource_language' => \Mage_Core_Model_Resource_Language::class,
             'core_resource/language' => \Mage_Core_Model_Resource_Language::class,
+            'core/resource_language' => \Mage_Core_Model_Resource_Language::class,
             'payment_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
-            'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
             'core/resource_language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
-            'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
+            'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
             'core_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
             'core/resource_layout' => \Mage_Core_Model_Resource_Layout::class,
+            'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
             'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
-            'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class,
             'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
+            'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class,
             'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
-            'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'payment_resource/session' => \Mage_Core_Model_Resource_Session::class,
+            'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
             'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class,
             'payment_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
-            'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core/resource_setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
+            'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'payment_resource/store' => \Mage_Core_Model_Resource_Store::class,
             'core_resource/store' => \Mage_Core_Model_Resource_Store::class,
             'core/resource_store' => \Mage_Core_Model_Resource_Store::class,
-            'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
             'core/resource_store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
+            'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
             'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
-            'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'core/resource_store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'payment_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
-            'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
-            'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
+            'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'payment_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
-            'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
-            'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class,
+            'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
+            'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
             'core_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
-            'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class,
+            'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class,
+            'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
             'core_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
+            'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class,
             'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
-            'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
-            'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
             'payment_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
-            'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
+            'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
             'core/resource_type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
             'payment_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'core/resource_type_db' => \Mage_Core_Model_Resource_Type_Db::class,
-            'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'core_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
             'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
             'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
-            'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
-            'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
             'payment_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
             'payment_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
-            'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
             'core_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
-            'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
-            'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
+            'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
             'payment_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
+            'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
+            'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
             'core_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'core_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
-            'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
             'core/resource_variable' => \Mage_Core_Model_Resource_Variable::class,
+            'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
             'core/resource_variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
-            'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
             'core_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
+            'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
+            'core/resource_website' => \Mage_Core_Model_Resource_Website::class,
             'core_resource/website' => \Mage_Core_Model_Resource_Website::class,
             'payment_resource/website' => \Mage_Core_Model_Resource_Website::class,
-            'core/resource_website' => \Mage_Core_Model_Resource_Website::class,
-            'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core/resource_website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
+            'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core/session' => \Mage_Core_Model_Session::class,
             'core/session_abstract' => \Mage_Core_Model_Session_Abstract::class,
@@ -7689,10 +7668,10 @@
             'cron/mysql4_schedule' => \Mage_Cron_Model_Mysql4_Schedule::class,
             'cron/mysql4_schedule_collection' => \Mage_Cron_Model_Mysql4_Schedule_Collection::class,
             'cron/observer' => \Mage_Cron_Model_Observer::class,
-            'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class,
             'cron/resource_schedule' => \Mage_Cron_Model_Resource_Schedule::class,
-            'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
+            'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class,
             'cron/resource_schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
+            'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
             'cron/schedule' => \Mage_Cron_Model_Schedule::class,
             'currencysymbol/observer' => \Mage_CurrencySymbol_Model_Observer::class,
             'currencysymbol/system_currencysymbol' => \Mage_CurrencySymbol_Model_System_Currencysymbol::class,
@@ -7767,16 +7746,16 @@
             'customer_resource/address' => \Mage_Customer_Model_Resource_Address::class,
             'customer/resource_address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class,
             'customer_resource/address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class,
-            'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
             'customer_resource/address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
-            'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
+            'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
             'customer/resource_address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
-            'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
+            'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
             'customer/resource_address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
-            'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
+            'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
             'customer_resource/address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
-            'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
+            'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
             'customer_resource/address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
+            'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
             'customer/resource_attribute' => \Mage_Customer_Model_Resource_Attribute::class,
             'customer_resource/attribute' => \Mage_Customer_Model_Resource_Attribute::class,
             'customer_resource/attribute_collection' => \Mage_Customer_Model_Resource_Attribute_Collection::class,
@@ -7785,22 +7764,22 @@
             'customer_resource/customer' => \Mage_Customer_Model_Resource_Customer::class,
             'customer_resource/customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class,
             'customer/resource_customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class,
-            'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
             'customer/resource_flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
-            'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
+            'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
             'customer/resource_flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
-            'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
+            'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
             'customer/resource_form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
-            'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
+            'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
             'customer/resource_form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
+            'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
             'customer/resource_group' => \Mage_Customer_Model_Resource_Group::class,
             'customer_resource/group' => \Mage_Customer_Model_Resource_Group::class,
             'customer_resource/group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class,
             'customer/resource_group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class,
-            'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class,
             'customer_resource/setup' => \Mage_Customer_Model_Resource_Setup::class,
-            'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
+            'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class,
             'customer_resource/wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
+            'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
             'customer/session' => \Mage_Customer_Model_Session::class,
             'dataflow/batch' => \Mage_Dataflow_Model_Batch::class,
             'dataflow/batch_abstract' => \Mage_Dataflow_Model_Batch_Abstract::class,
@@ -7852,10 +7831,10 @@
             'dataflow/mysql4_session' => \Mage_Dataflow_Model_Mysql4_Session::class,
             'dataflow/profile' => \Mage_Dataflow_Model_Profile::class,
             'dataflow/profile_history' => \Mage_Dataflow_Model_Profile_History::class,
-            'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class,
             'dataflow/resource_batch' => \Mage_Dataflow_Model_Resource_Batch::class,
-            'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
+            'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class,
             'dataflow/resource_batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
+            'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
             'dataflow/resource_batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class,
             'dataflow_resource/batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class,
             'dataflow_resource/batch_export' => \Mage_Dataflow_Model_Resource_Batch_Export::class,
@@ -7866,12 +7845,12 @@
             'dataflow/resource_import' => \Mage_Dataflow_Model_Resource_Import::class,
             'dataflow_resource/import_collection' => \Mage_Dataflow_Model_Resource_Import_Collection::class,
             'dataflow/resource_import_collection' => \Mage_Dataflow_Model_Resource_Import_Collection::class,
-            'dataflow_resource/profile' => \Mage_Dataflow_Model_Resource_Profile::class,
             'dataflow/resource_profile' => \Mage_Dataflow_Model_Resource_Profile::class,
+            'dataflow_resource/profile' => \Mage_Dataflow_Model_Resource_Profile::class,
             'dataflow/resource_profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class,
             'dataflow_resource/profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class,
-            'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
             'dataflow_resource/profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
+            'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
             'dataflow_resource/profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class,
             'dataflow/resource_profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class,
             'dataflow_resource/session' => \Mage_Dataflow_Model_Resource_Session::class,
@@ -7905,8 +7884,8 @@
             'directory/resource_country' => \Mage_Directory_Model_Resource_Country::class,
             'directory_resource/country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class,
             'directory/resource_country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class,
-            'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
             'directory/resource_country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
+            'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
             'directory_resource/country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class,
             'directory/resource_country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class,
             'directory_resource/currency' => \Mage_Directory_Model_Resource_Currency::class,
@@ -7937,8 +7916,8 @@
             'downloadable/observer' => \Mage_Downloadable_Model_Observer::class,
             'downloadable/product_price' => \Mage_Downloadable_Model_Product_Price::class,
             'downloadable/product_type' => \Mage_Downloadable_Model_Product_Type::class,
-            'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
             'downloadable_resource/indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
+            'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
             'downloadable/resource_link' => \Mage_Downloadable_Model_Resource_Link::class,
             'downloadable_resource/link' => \Mage_Downloadable_Model_Resource_Link::class,
             'downloadable/resource_link_collection' => \Mage_Downloadable_Model_Resource_Link_Collection::class,
@@ -7947,12 +7926,12 @@
             'downloadable_resource/link_purchased' => \Mage_Downloadable_Model_Resource_Link_Purchased::class,
             'downloadable/resource_link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class,
             'downloadable_resource/link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class,
-            'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
             'downloadable/resource_link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
+            'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
             'downloadable/resource_link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
             'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
-            'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class,
             'downloadable/resource_sample' => \Mage_Downloadable_Model_Resource_Sample::class,
+            'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class,
             'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
             'downloadable/resource_sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
             'downloadable/sales_order_pdf_items_abstract' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Abstract::class,
@@ -8040,46 +8019,46 @@
             'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class,
             'eav_resource/attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class,
             'eav/resource_attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class,
-            'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class,
             'eav_resource/config' => \Mage_Eav_Model_Resource_Config::class,
+            'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class,
             'eav/resource_entity_attribute' => \Mage_Eav_Model_Resource_Entity_Attribute::class,
             'eav_resource/entity_attribute' => \Mage_Eav_Model_Resource_Entity_Attribute::class,
             'eav_resource/entity_attribute_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Collection::class,
             'eav/resource_entity_attribute_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Collection::class,
             'eav_resource/entity_attribute_group' => \Mage_Eav_Model_Resource_Entity_Attribute_Group::class,
             'eav/resource_entity_attribute_group' => \Mage_Eav_Model_Resource_Entity_Attribute_Group::class,
-            'eav/resource_entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class,
             'eav_resource/entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class,
+            'eav/resource_entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class,
             'eav/resource_entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
             'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
-            'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
-            'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
+            'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
-            'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
+            'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
+            'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
             'eav_resource/entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class,
             'eav/resource_entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class,
             'eav_resource/entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class,
             'eav/resource_entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class,
-            'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
             'eav_resource/entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
+            'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
             'eav/resource_form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class,
             'eav_resource/form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class,
-            'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
             'eav/resource_form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
+            'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
             'eav/resource_form_element' => \Mage_Eav_Model_Resource_Form_Element::class,
             'eav_resource/form_element' => \Mage_Eav_Model_Resource_Form_Element::class,
-            'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
             'eav_resource/form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
-            'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
+            'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
             'eav/resource_form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
+            'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
             'eav_resource/form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
             'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
             'eav/resource_form_type' => \Mage_Eav_Model_Resource_Form_Type::class,
             'eav_resource/form_type' => \Mage_Eav_Model_Resource_Form_Type::class,
-            'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class,
             'eav_resource/form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class,
+            'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class,
             'eav_resource/helper_mysql4' => \Mage_Eav_Model_Resource_Helper_Mysql4::class,
             'eav/resource_helper_mysql4' => \Mage_Eav_Model_Resource_Helper_Mysql4::class,
             'giftmessage/api' => \Mage_GiftMessage_Model_Api::class,
@@ -8091,12 +8070,12 @@
             'giftmessage/mysql4_message_collection' => \Mage_GiftMessage_Model_Mysql4_Message_Collection::class,
             'giftmessage/mysql4_setup' => \Mage_GiftMessage_Model_Mysql4_Setup::class,
             'giftmessage/observer' => \Mage_GiftMessage_Model_Observer::class,
-            'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class,
             'giftmessage/resource_message' => \Mage_GiftMessage_Model_Resource_Message::class,
-            'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
+            'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class,
             'giftmessage_resource/message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
-            'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
+            'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
             'giftmessage_resource/setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
+            'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
             'googleanalytics/observer' => \Mage_GoogleAnalytics_Model_Observer::class,
             'googleanalytics/system_config_source_type' => \Mage_GoogleAnalytics_Model_System_Config_Source_Type::class,
             'googlecheckout/payment' => \Mage_GoogleCheckout_Model_Payment::class,
@@ -8132,8 +8111,8 @@
             'importexport/product_attribute_backend_urlkey' => \Mage_ImportExport_Model_Product_Attribute_Backend_Urlkey::class,
             'importexport_resource/helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class,
             'importexport/resource_helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class,
-            'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
             'importexport_resource/import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
+            'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
             'importexport_resource/setup' => \Mage_ImportExport_Model_Resource_Setup::class,
             'importexport/resource_setup' => \Mage_ImportExport_Model_Resource_Setup::class,
             'importexport/source_export_entity' => \Mage_ImportExport_Model_Source_Export_Entity::class,
@@ -8155,16 +8134,16 @@
             'index/process' => \Mage_Index_Model_Process::class,
             'index_resource/abstract' => \Mage_Index_Model_Resource_Abstract::class,
             'index/resource_abstract' => \Mage_Index_Model_Resource_Abstract::class,
-            'index/resource_event' => \Mage_Index_Model_Resource_Event::class,
             'index_resource/event' => \Mage_Index_Model_Resource_Event::class,
+            'index/resource_event' => \Mage_Index_Model_Resource_Event::class,
             'index/resource_event_collection' => \Mage_Index_Model_Resource_Event_Collection::class,
             'index_resource/event_collection' => \Mage_Index_Model_Resource_Event_Collection::class,
             'index/resource_helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class,
             'index_resource/helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class,
-            'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
             'index/resource_lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
-            'index_resource/process' => \Mage_Index_Model_Resource_Process::class,
+            'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
             'index/resource_process' => \Mage_Index_Model_Resource_Process::class,
+            'index_resource/process' => \Mage_Index_Model_Resource_Process::class,
             'index/resource_process_collection' => \Mage_Index_Model_Resource_Process_Collection::class,
             'index_resource/process_collection' => \Mage_Index_Model_Resource_Process_Collection::class,
             'index/resource_setup' => \Mage_Index_Model_Resource_Setup::class,
@@ -8197,22 +8176,22 @@
             'log/mysql4_visitor_online_collection' => \Mage_Log_Model_Mysql4_Visitor_Online_Collection::class,
             'log_resource/aggregation' => \Mage_Log_Model_Resource_Aggregation::class,
             'log/resource_aggregation' => \Mage_Log_Model_Resource_Aggregation::class,
-            'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class,
             'log/resource_customer' => \Mage_Log_Model_Resource_Customer::class,
+            'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class,
             'log/resource_log' => \Mage_Log_Model_Resource_Log::class,
             'log_resource/log' => \Mage_Log_Model_Resource_Log::class,
             'log_resource/visitor' => \Mage_Log_Model_Resource_Visitor::class,
             'log/resource_visitor' => \Mage_Log_Model_Resource_Visitor::class,
             'log_resource/visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class,
             'log/resource_visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class,
-            'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
             'log_resource/visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
-            'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
+            'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
             'log_resource/visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
+            'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
             'log/visitor' => \Mage_Log_Model_Visitor::class,
             'log/visitor_online' => \Mage_Log_Model_Visitor_Online::class,
-            'media_resource/image' => \Mage_Media_Model_File_Image::class,
             'media/file_image' => \Mage_Media_Model_File_Image::class,
+            'media_resource/image' => \Mage_Media_Model_File_Image::class,
             'media/image' => \Mage_Media_Model_Image::class,
             'newsletter/message' => \Mage_Newsletter_Model_Message::class,
             'newsletter/mysql4_problem' => \Mage_Newsletter_Model_Mysql4_Problem::class,
@@ -8230,14 +8209,14 @@
             'newsletter_resource/problem' => \Mage_Newsletter_Model_Resource_Problem::class,
             'newsletter/resource_problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class,
             'newsletter_resource/problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class,
-            'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class,
             'newsletter/resource_queue' => \Mage_Newsletter_Model_Resource_Queue::class,
-            'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
+            'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class,
             'newsletter/resource_queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
-            'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
+            'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
             'newsletter/resource_subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
-            'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
+            'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
             'newsletter/resource_subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
+            'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
             'newsletter_resource/template' => \Mage_Newsletter_Model_Resource_Template::class,
             'newsletter/resource_template' => \Mage_Newsletter_Model_Resource_Template::class,
             'newsletter_resource/template_collection' => \Mage_Newsletter_Model_Resource_Template_Collection::class,
@@ -8250,20 +8229,20 @@
             'oauth/consumer_validator_keyLength' => \Mage_Oauth_Model_Consumer_Validator_KeyLength::class,
             'oauth/nonce' => \Mage_Oauth_Model_Nonce::class,
             'oauth/observer' => \Mage_Oauth_Model_Observer::class,
-            'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
             'oauth/resource_consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
+            'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
             'oauth/resource_consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class,
             'oauth_resource/consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class,
             'oauth_resource/nonce' => \Mage_Oauth_Model_Resource_Nonce::class,
             'oauth/resource_nonce' => \Mage_Oauth_Model_Resource_Nonce::class,
             'oauth_resource/nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class,
             'oauth/resource_nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class,
-            'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class,
             'oauth/resource_setup' => \Mage_Oauth_Model_Resource_Setup::class,
-            'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class,
+            'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class,
             'oauth_resource/token' => \Mage_Oauth_Model_Resource_Token::class,
-            'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
+            'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class,
             'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
+            'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
             'oauth/server' => \Mage_Oauth_Model_Server::class,
             'oauth/token' => \Mage_Oauth_Model_Token::class,
             'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class,
@@ -8280,8 +8259,8 @@
             'paygate/authorizenet_source_paymentAction' => \Mage_Paygate_Model_Authorizenet_Source_PaymentAction::class,
             'paygate/mysql4_authorizenet_debug' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug::class,
             'paygate/mysql4_authorizenet_debug_collection' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection::class,
-            'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
             'paygate/resource_authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
+            'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
             'paygate_resource/authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class,
             'paygate/resource_authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class,
             'payment/billing_agreementAbstract' => \Mage_Payment_Model_Billing_AgreementAbstract::class,
@@ -8344,12 +8323,12 @@
             'paypal/resource_cert' => \Mage_Paypal_Model_Resource_Cert::class,
             'paypal_resource/payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class,
             'paypal/resource_payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class,
-            'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
             'paypal/resource_payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
+            'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
             'paypal/resource_report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class,
             'paypal_resource/report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class,
-            'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
             'paypal/resource_report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
+            'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
             'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
             'paypal/resource_report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
             'paypal/resource_setup' => \Mage_Paypal_Model_Resource_Setup::class,
@@ -8374,8 +8353,8 @@
             'persistent/observer' => \Mage_Persistent_Model_Observer::class,
             'persistent/observer_session' => \Mage_Persistent_Model_Observer_Session::class,
             'persistent/persistent_config' => \Mage_Persistent_Model_Persistent_Config::class,
-            'persistent/resource_session' => \Mage_Persistent_Model_Resource_Session::class,
             'persistent_resource/session' => \Mage_Persistent_Model_Resource_Session::class,
+            'persistent/resource_session' => \Mage_Persistent_Model_Resource_Session::class,
             'persistent/session' => \Mage_Persistent_Model_Session::class,
             'poll/mysql4_poll' => \Mage_Poll_Model_Mysql4_Poll::class,
             'poll/mysql4_poll_answer' => \Mage_Poll_Model_Mysql4_Poll_Answer::class,
@@ -8385,16 +8364,16 @@
             'poll/poll' => \Mage_Poll_Model_Poll::class,
             'poll/poll_answer' => \Mage_Poll_Model_Poll_Answer::class,
             'poll/poll_vote' => \Mage_Poll_Model_Poll_Vote::class,
-            'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class,
             'poll_resource/poll' => \Mage_Poll_Model_Resource_Poll::class,
+            'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class,
             'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
             'poll/resource_poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
-            'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
             'poll_resource/poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
-            'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
+            'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
             'poll_resource/poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
-            'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
+            'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
             'poll/resource_poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
+            'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
             'productalert/email' => \Mage_ProductAlert_Model_Email::class,
             'productalert/mysql4_price' => \Mage_ProductAlert_Model_Mysql4_Price::class,
             'productalert/mysql4_price_collection' => \Mage_ProductAlert_Model_Mysql4_Price_Collection::class,
@@ -8404,20 +8383,20 @@
             'productalert/mysql4_stock_customer_collection' => \Mage_ProductAlert_Model_Mysql4_Stock_Customer_Collection::class,
             'productalert/observer' => \Mage_ProductAlert_Model_Observer::class,
             'productalert/price' => \Mage_ProductAlert_Model_Price::class,
-            'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
             'productalert_resource/abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
-            'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class,
+            'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
             'productalert_resource/price' => \Mage_ProductAlert_Model_Resource_Price::class,
-            'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
+            'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class,
             'productalert/resource_price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
-            'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
+            'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
             'productalert/resource_price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
+            'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
             'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
             'productalert/resource_stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
-            'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
             'productalert/resource_stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
-            'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
+            'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
             'productalert/resource_stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
+            'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
             'productalert/stock' => \Mage_ProductAlert_Model_Stock::class,
             'rating/mysql4_rating' => \Mage_Rating_Model_Mysql4_Rating::class,
             'rating/mysql4_rating_collection' => \Mage_Rating_Model_Mysql4_Rating_Collection::class,
@@ -8431,20 +8410,20 @@
             'rating/rating_entity' => \Mage_Rating_Model_Rating_Entity::class,
             'rating/rating_option' => \Mage_Rating_Model_Rating_Option::class,
             'rating/rating_option_vote' => \Mage_Rating_Model_Rating_Option_Vote::class,
-            'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class,
             'rating/resource_rating' => \Mage_Rating_Model_Resource_Rating::class,
+            'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class,
             'rating_resource/rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class,
             'rating/resource_rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class,
             'rating/resource_rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class,
             'rating_resource/rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class,
-            'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
             'rating/resource_rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
-            'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
+            'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
             'rating_resource/rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
+            'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
             'rating_resource/rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class,
             'rating/resource_rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class,
-            'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
             'rating/resource_rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
+            'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
             'reports/config' => \Mage_Reports_Model_Config::class,
             'reports/event' => \Mage_Reports_Model_Event::class,
             'reports/event_observer' => \Mage_Reports_Model_Event_Observer::class,
@@ -8490,6 +8469,7 @@
             'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class,
             'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class,
             'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class,
+            'reports/observer' => \Mage_Reports_Model_Observer::class,
             'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class,
             'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class,
             'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class,
@@ -8498,88 +8478,88 @@
             'reports_resource/accounts_collection' => \Mage_Reports_Model_Resource_Accounts_Collection::class,
             'reports/resource_coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class,
             'reports_resource/coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class,
-            'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
             'reports/resource_customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
-            'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
+            'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
             'reports/resource_customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
-            'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
+            'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
             'reports_resource/customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
-            'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
+            'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
             'reports/resource_entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
+            'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
             'reports_resource/event' => \Mage_Reports_Model_Resource_Event::class,
             'reports/resource_event' => \Mage_Reports_Model_Resource_Event::class,
             'reports_resource/event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
             'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
             'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
             'reports/resource_event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
-            'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
             'reports/resource_event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
-            'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
+            'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
             'reports_resource/helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
-            'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
+            'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
             'reports/resource_invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
-            'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
+            'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
             'reports_resource/order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
-            'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
+            'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
             'reports_resource/product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
+            'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
             'reports/resource_product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class,
             'reports_resource/product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class,
             'reports_resource/product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class,
             'reports/resource_product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class,
-            'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
             'reports/resource_product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
+            'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
             'reports_resource/product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class,
             'reports/resource_product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class,
-            'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
             'reports_resource/product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
-            'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
+            'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
             'reports/resource_product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
-            'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
+            'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
             'reports_resource/product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
-            'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
+            'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
             'reports/resource_product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
+            'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
             'reports_resource/product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class,
             'reports/resource_product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class,
-            'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
             'reports_resource/product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
-            'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
+            'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
             'reports_resource/product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
-            'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
+            'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
             'reports/resource_quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
-            'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class,
+            'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
             'reports_resource/refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class,
+            'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class,
             'reports/resource_report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class,
             'reports_resource/report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class,
             'reports/resource_report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class,
             'reports_resource/report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class,
-            'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
             'reports_resource/report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
+            'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
             'reports/resource_report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class,
             'reports_resource/report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class,
-            'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
             'reports/resource_report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
+            'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
             'reports_resource/review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
             'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
-            'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
             'reports_resource/review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
+            'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
             'reports_resource/review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class,
             'reports/resource_review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class,
             'reports_resource/shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class,
             'reports/resource_shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class,
-            'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
             'reports_resource/shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
+            'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
             'reports_resource/tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class,
             'reports/resource_tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class,
-            'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
             'reports/resource_tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
-            'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
+            'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
             'reports/resource_tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
-            'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
+            'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
             'reports/resource_tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
+            'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
             'reports_resource/wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class,
             'reports/resource_wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class,
-            'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
             'reports_resource/wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
+            'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
             'reports/session' => \Mage_Reports_Model_Session::class,
             'reports/test' => \Mage_Reports_Model_Test::class,
             'reports/totals' => \Mage_Reports_Model_Totals::class,
@@ -8596,14 +8576,14 @@
             'review/resource_review_collection' => \Mage_Review_Model_Resource_Review_Collection::class,
             'review_resource/review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class,
             'review/resource_review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class,
-            'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class,
             'review_resource/review_status' => \Mage_Review_Model_Resource_Review_Status::class,
-            'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
+            'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class,
             'review_resource/review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
+            'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
             'review/resource_review_summary' => \Mage_Review_Model_Resource_Review_Summary::class,
             'review_resource/review_summary' => \Mage_Review_Model_Resource_Review_Summary::class,
-            'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
             'review/resource_review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
+            'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
             'review/review' => \Mage_Review_Model_Review::class,
             'review/review_status' => \Mage_Review_Model_Review_Status::class,
             'review/review_summary' => \Mage_Review_Model_Review_Summary::class,
@@ -8626,14 +8606,14 @@
             'rule/mysql4_rule_collection' => \Mage_Rule_Model_Mysql4_Rule_Collection::class,
             'rule/renderer_actions' => \Mage_Rule_Model_Renderer_Actions::class,
             'rule/renderer_conditions' => \Mage_Rule_Model_Renderer_Conditions::class,
-            'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class,
             'rule/resource_abstract' => \Mage_Rule_Model_Resource_Abstract::class,
-            'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class,
+            'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class,
             'rule/resource_rule' => \Mage_Rule_Model_Resource_Rule::class,
-            'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
+            'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class,
             'rule_resource/rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
-            'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
+            'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
             'rule_resource/rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
+            'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
             'rule/resource_rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class,
             'rule_resource/rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class,
             'rule/rule' => \Mage_Rule_Model_Rule::class,
@@ -8662,24 +8642,24 @@
             'salesrule/resource_coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class,
             'salesrule/resource_coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class,
             'salesrule_resource/coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class,
-            'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
             'salesrule_resource/report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
-            'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
+            'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
             'salesrule_resource/report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
+            'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
             'salesrule_resource/report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class,
             'salesrule/resource_report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class,
             'salesrule_resource/report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class,
             'salesrule/resource_report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class,
             'salesrule_resource/report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class,
             'salesrule/resource_report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class,
-            'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class,
             'salesrule_resource/rule' => \Mage_SalesRule_Model_Resource_Rule::class,
-            'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
+            'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class,
             'salesrule_resource/rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
-            'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
+            'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
             'salesrule_resource/rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
-            'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
+            'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
             'salesrule/resource_rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
+            'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
             'salesrule_resource/rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class,
             'salesrule/resource_rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class,
             'salesrule_resource/rule_product_collection' => \Mage_SalesRule_Model_Resource_Rule_Product_Collection::class,
@@ -8724,14 +8704,14 @@
             'sales/email_template' => \Mage_Sales_Model_Email_Template::class,
             'sales/entity_order' => \Mage_Sales_Model_Entity_Order::class,
             'sales_entity/order' => \Mage_Sales_Model_Entity_Order::class,
-            'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
             'sales_entity/order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
-            'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
+            'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
             'sales/entity_order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
-            'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
+            'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
             'sales_entity/order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
-            'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
+            'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
             'sales_entity/order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
+            'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
             'sales/entity_order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class,
             'sales_entity/order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class,
             'sales/entity_order_attribute_backend_shipping' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Shipping::class,
@@ -8740,22 +8720,22 @@
             'sales/entity_order_collection' => \Mage_Sales_Model_Entity_Order_Collection::class,
             'sales_entity/order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class,
             'sales/entity_order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class,
-            'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales_entity/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
-            'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
+            'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales/entity_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
-            'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
+            'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
             'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
+            'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
             'sales/entity_order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class,
             'sales_entity/order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class,
             'sales/entity_order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class,
             'sales_entity/order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class,
             'sales_entity/order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class,
             'sales/entity_order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class,
-            'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
             'sales/entity_order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
-            'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
+            'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
             'sales_entity/order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
+            'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
             'sales/entity_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class,
             'sales_entity/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class,
             'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class,
@@ -8766,28 +8746,28 @@
             'sales/entity_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/entity_order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class,
             'sales_entity/order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class,
-            'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
             'sales/entity_order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
+            'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
             'sales_entity/order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class,
             'sales/entity_order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class,
             'sales_entity/order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class,
             'sales/entity_order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class,
-            'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
             'sales/entity_order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
+            'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
             'sales/entity_order_item' => \Mage_Sales_Model_Entity_Order_Item::class,
             'sales_entity/order_item' => \Mage_Sales_Model_Entity_Order_Item::class,
             'sales/entity_order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class,
             'sales_entity/order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class,
-            'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
             'sales/entity_order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
+            'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
             'sales_entity/order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class,
             'sales/entity_order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class,
             'sales_entity/order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class,
             'sales/entity_order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class,
-            'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
             'sales_entity/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
-            'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
+            'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
             'sales/entity_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
+            'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
             'sales/entity_order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class,
             'sales_entity/order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class,
             'sales/entity_order_shipment_comment' => \Mage_Sales_Model_Entity_Order_Shipment_Comment::class,
@@ -8796,66 +8776,66 @@
             'sales_entity/order_shipment_comment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Comment_Collection::class,
             'sales/entity_order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class,
             'sales_entity/order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class,
-            'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
             'sales/entity_order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
-            'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
+            'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
             'sales_entity/order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
-            'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
+            'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
             'sales_entity/order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
-            'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
+            'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
             'sales_entity/order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
-            'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
+            'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
             'sales_entity/order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
+            'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
             'sales_entity/quote' => \Mage_Sales_Model_Entity_Quote::class,
             'sales/entity_quote' => \Mage_Sales_Model_Entity_Quote::class,
-            'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
             'sales_entity/quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
+            'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
             'sales_entity/quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class,
             'sales/entity_quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class,
-            'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
             'sales/entity_quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
-            'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
+            'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
             'sales/entity_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
-            'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
+            'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
             'sales_entity/quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
-            'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
+            'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
             'sales/entity_quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
+            'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
             'sales_entity/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales/entity_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales_entity/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class,
             'sales/entity_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class,
-            'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
             'sales_entity/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
-            'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
             'sales/entity_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/entity_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales_entity/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales/entity_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class,
             'sales_entity/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class,
             'sales/entity_quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class,
             'sales_entity/quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class,
-            'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
             'sales_entity/quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
-            'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
+            'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
             'sales/entity_quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
-            'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
+            'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
             'sales_entity/quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
+            'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
             'sales/entity_quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class,
             'sales_entity/quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class,
             'sales/entity_quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class,
             'sales_entity/quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class,
-            'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
             'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
-            'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
+            'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
             'sales/entity_quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
-            'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
+            'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
             'sales/entity_quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
+            'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
             'sales_entity/quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class,
             'sales/entity_quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class,
-            'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
             'sales_entity/sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
-            'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class,
+            'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
             'sales_entity/setup' => \Mage_Sales_Model_Entity_Setup::class,
+            'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class,
             'sales/mysql4_abstract' => \Mage_Sales_Model_Mysql4_Abstract::class,
             'sales/mysql4_billing_agreement' => \Mage_Sales_Model_Mysql4_Billing_Agreement::class,
             'sales/mysql4_billing_agreement_collection' => \Mage_Sales_Model_Mysql4_Billing_Agreement_Collection::class,
@@ -9050,48 +9030,48 @@
             'sales/recurring_profile' => \Mage_Sales_Model_Recurring_Profile::class,
             'sales_resource/abstract' => \Mage_Sales_Model_Resource_Abstract::class,
             'sales/resource_abstract' => \Mage_Sales_Model_Resource_Abstract::class,
-            'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
             'sales_resource/billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
-            'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
+            'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
             'sales_resource/billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
-            'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
+            'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
             'sales/resource_collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
-            'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
+            'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
             'sales_resource/helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
-            'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class,
+            'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
             'sales_resource/order' => \Mage_Sales_Model_Resource_Order::class,
+            'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class,
             'sales_resource/order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class,
             'sales/resource_order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class,
-            'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
             'sales_resource/order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
+            'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
             'sales/resource_order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class,
             'sales_resource/order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class,
             'sales/resource_order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class,
             'sales_resource/order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class,
             'sales/resource_order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class,
             'sales_resource/order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class,
-            'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
             'sales/resource_order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
+            'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
             'sales_resource/order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class,
             'sales/resource_order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class,
             'sales/resource_order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class,
             'sales_resource/order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class,
-            'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
             'sales/resource_order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
+            'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
             'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
             'sales/resource_order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
             'sales/resource_order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
             'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
-            'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales_resource/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
+            'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales/resource_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class,
             'sales_resource/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class,
-            'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
             'sales/resource_order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
-            'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
+            'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
             'sales_resource/order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
-            'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
+            'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
             'sales/resource_order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
+            'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
             'sales/resource_order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
             'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
             'sales_resource/order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class,
@@ -9102,84 +9082,84 @@
             'sales/resource_order_grid_collection' => \Mage_Sales_Model_Resource_Order_Grid_Collection::class,
             'sales/resource_order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class,
             'sales_resource/order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class,
-            'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
             'sales/resource_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
-            'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
+            'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
             'sales_resource/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
+            'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
             'sales_resource/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class,
             'sales/resource_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class,
             'sales/resource_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class,
             'sales_resource/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/resource_order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class,
             'sales_resource/order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class,
-            'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
             'sales/resource_order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
+            'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
             'sales/resource_order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class,
             'sales_resource/order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class,
-            'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
             'sales/resource_order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
-            'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
+            'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
             'sales_resource/order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
+            'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
             'sales/resource_order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class,
             'sales_resource/order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class,
-            'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
             'sales_resource/order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
+            'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
             'sales/resource_order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class,
             'sales_resource/order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class,
-            'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
             'sales_resource/order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
+            'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
             'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
             'sales/resource_order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
-            'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
             'sales_resource/order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
-            'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
+            'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
             'sales_resource/order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
-            'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
+            'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
             'sales_resource/order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
-            'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
+            'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
             'sales/resource_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
+            'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
             'sales_resource/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class,
             'sales/resource_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class,
-            'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
             'sales/resource_order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
+            'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
             'sales/resource_order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
             'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
-            'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
             'sales/resource_order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
+            'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
             'sales_resource/order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class,
             'sales/resource_order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class,
-            'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
             'sales_resource/order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
-            'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
+            'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
             'sales_resource/order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
-            'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
+            'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
             'sales_resource/order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
+            'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
             'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
             'sales_resource/order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
             'sales_resource/order_status' => \Mage_Sales_Model_Resource_Order_Status::class,
             'sales/resource_order_status' => \Mage_Sales_Model_Resource_Order_Status::class,
             'sales_resource/order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class,
             'sales/resource_order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class,
-            'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
             'sales_resource/order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
-            'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
+            'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
             'sales_resource/order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
-            'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
+            'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
             'sales/resource_order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
-            'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
+            'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
             'sales_resource/order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
-            'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class,
+            'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
             'sales/resource_quote' => \Mage_Sales_Model_Resource_Quote::class,
+            'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class,
             'sales_resource/quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class,
             'sales/resource_quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class,
             'sales/resource_quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class,
             'sales_resource/quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class,
             'sales/resource_quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class,
             'sales_resource/quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class,
-            'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
             'sales/resource_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
-            'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
+            'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
             'sales/resource_quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
+            'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
             'sales_resource/quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
             'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
             'sales_resource/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class,
@@ -9188,82 +9168,82 @@
             'sales_resource/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class,
             'sales/resource_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class,
             'sales_resource/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class,
-            'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/resource_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
-            'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
+            'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/resource_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
+            'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales_resource/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
             'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
-            'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
             'sales/resource_quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
+            'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
             'sales_resource/quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class,
             'sales/resource_quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class,
-            'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
             'sales/resource_quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
-            'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
+            'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
             'sales_resource/quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
-            'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
+            'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
             'sales_resource/quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
+            'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
             'sales_resource/quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class,
             'sales/resource_quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class,
-            'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
             'sales/resource_quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
+            'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
             'sales/resource_quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class,
             'sales_resource/quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class,
-            'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
             'sales/resource_quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
-            'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
+            'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
             'sales/resource_quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
-            'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
+            'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
             'sales_resource/quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
-            'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
+            'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
             'sales/resource_quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
-            'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
+            'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
             'sales/resource_recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
+            'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
             'sales/resource_recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class,
             'sales_resource/recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class,
-            'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class,
             'sales/resource_report' => \Mage_Sales_Model_Resource_Report::class,
+            'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class,
             'sales/resource_report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class,
             'sales_resource/report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class,
-            'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
             'sales/resource_report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
-            'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
+            'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
             'sales/resource_report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
+            'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
             'sales_resource/report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
             'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
-            'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
             'sales_resource/report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
+            'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
             'sales/resource_report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class,
             'sales_resource/report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class,
             'sales_resource/report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class,
             'sales/resource_report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class,
             'sales/resource_report_order' => \Mage_Sales_Model_Resource_Report_Order::class,
             'sales_resource/report_order' => \Mage_Sales_Model_Resource_Report_Order::class,
-            'sales/resource_report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class,
             'sales_resource/report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class,
-            'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class,
+            'sales/resource_report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class,
             'sales/resource_report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class,
+            'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class,
             'sales_resource/report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class,
             'sales/resource_report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class,
-            'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
             'sales/resource_report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
-            'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
+            'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
             'sales_resource/report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
+            'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
             'sales_resource/report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class,
             'sales/resource_report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class,
             'sales_resource/report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class,
             'sales/resource_report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class,
-            'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
             'sales_resource/report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
+            'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
             'sales_resource/report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class,
             'sales/resource_report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class,
             'sales_resource/report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class,
             'sales/resource_report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class,
-            'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
             'sales/resource_sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
-            'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class,
+            'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
             'sales/resource_setup' => \Mage_Sales_Model_Resource_Setup::class,
+            'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class,
             'sales/service_order' => \Mage_Sales_Model_Service_Order::class,
             'sales/service_quote' => \Mage_Sales_Model_Service_Quote::class,
             'sales/status_list' => \Mage_Sales_Model_Status_List::class,
@@ -9273,8 +9253,8 @@
             'sendfriend/observer' => \Mage_Sendfriend_Model_Observer::class,
             'sendfriend_resource/sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class,
             'sendfriend/resource_sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class,
-            'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
             'sendfriend/resource_sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
+            'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
             'sendfriend/resource_setup' => \Mage_Sendfriend_Model_Resource_Setup::class,
             'sendfriend_resource/setup' => \Mage_Sendfriend_Model_Resource_Setup::class,
             'sendfriend/sendfriend' => \Mage_Sendfriend_Model_Sendfriend::class,
@@ -9314,16 +9294,16 @@
             'sitemap/observer' => \Mage_Sitemap_Model_Observer::class,
             'sitemap_resource/catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class,
             'sitemap/resource_catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class,
-            'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
             'sitemap/resource_catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
+            'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
             'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
             'sitemap_resource/catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
             'sitemap_resource/cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
             'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
             'sitemap_resource/sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class,
             'sitemap/resource_sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class,
-            'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
             'sitemap_resource/sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
+            'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
             'sitemap/sitemap' => \Mage_Sitemap_Model_Sitemap::class,
             'tag/api' => \Mage_Tag_Model_Api::class,
             'tag/api_v2' => \Mage_Tag_Model_Api_V2::class,
@@ -9336,21 +9316,21 @@
             'tag/mysql4_tag' => \Mage_Tag_Model_Mysql4_Tag::class,
             'tag/mysql4_tag_collection' => \Mage_Tag_Model_Mysql4_Tag_Collection::class,
             'tag/mysql4_tag_relation' => \Mage_Tag_Model_Mysql4_Tag_Relation::class,
-            'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag/resource_customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag_resource/customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
-            'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
+            'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag_resource/indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
-            'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
+            'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
             'tag_resource/popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
+            'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
             'tag_resource/product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class,
             'tag/resource_product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class,
             'tag_resource/tag' => \Mage_Tag_Model_Resource_Tag::class,
             'tag/resource_tag' => \Mage_Tag_Model_Resource_Tag::class,
-            'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
             'tag_resource/tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
-            'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
+            'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
             'tag_resource/tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
+            'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
             'tag/session' => \Mage_Tag_Model_Session::class,
             'tag/tag' => \Mage_Tag_Model_Tag::class,
             'tag/tag_relation' => \Mage_Tag_Model_Tag_Relation::class,
@@ -9389,16 +9369,16 @@
             'tax/resource_calculation_rate' => \Mage_Tax_Model_Resource_Calculation_Rate::class,
             'tax/resource_calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class,
             'tax_resource/calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class,
-            'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
             'tax/resource_calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
-            'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
+            'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
             'tax/resource_calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
-            'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
+            'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
             'tax/resource_calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
-            'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
+            'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
             'tax_resource/calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
-            'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class,
+            'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
             'tax/resource_class' => \Mage_Tax_Model_Resource_Class::class,
+            'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class,
             'tax/resource_class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class,
             'tax_resource/class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class,
             'tax_resource/report_collection' => \Mage_Tax_Model_Resource_Report_Collection::class,
@@ -9409,10 +9389,10 @@
             'tax/resource_report_tax_createdat' => \Mage_Tax_Model_Resource_Report_Tax_Createdat::class,
             'tax_resource/report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class,
             'tax/resource_report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class,
-            'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
             'tax/resource_report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
-            'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
+            'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
             'tax_resource/sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
+            'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
             'tax_resource/sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class,
             'tax/resource_sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class,
             'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class,
@@ -9501,8 +9481,8 @@
             'weee/observer' => \Mage_Weee_Model_Observer::class,
             'weee/resource_attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class,
             'weee_resource/attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class,
-            'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class,
             'weee/resource_setup' => \Mage_Weee_Model_Resource_Setup::class,
+            'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class,
             'weee/resource_tax' => \Mage_Weee_Model_Resource_Tax::class,
             'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class,
             'weee/tax' => \Mage_Weee_Model_Tax::class,
@@ -9514,12 +9494,12 @@
             'widget/mysql4_widget_instance' => \Mage_Widget_Model_Mysql4_Widget_Instance::class,
             'widget/mysql4_widget_instance_collection' => \Mage_Widget_Model_Mysql4_Widget_Instance_Collection::class,
             'widget/observer' => \Mage_Widget_Model_Observer::class,
-            'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class,
             'widget/resource_widget' => \Mage_Widget_Model_Resource_Widget::class,
+            'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class,
             'widget_resource/widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class,
             'widget/resource_widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class,
-            'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
             'widget_resource/widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
+            'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
             'widget/template_filter' => \Mage_Widget_Model_Template_Filter::class,
             'widget/widget' => \Mage_Widget_Model_Widget::class,
             'widget/widget_config' => \Mage_Widget_Model_Widget_Config::class,
@@ -9536,14 +9516,14 @@
             'wishlist/mysql4_wishlist' => \Mage_Wishlist_Model_Mysql4_Wishlist::class,
             'wishlist/mysql4_wishlist_collection' => \Mage_Wishlist_Model_Mysql4_Wishlist_Collection::class,
             'wishlist/observer' => \Mage_Wishlist_Model_Observer::class,
-            'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class,
             'wishlist_resource/item' => \Mage_Wishlist_Model_Resource_Item::class,
+            'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class,
             'wishlist_resource/item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class,
             'wishlist/resource_item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class,
-            'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
             'wishlist/resource_item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
-            'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
+            'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
             'wishlist_resource/item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
+            'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
             'wishlist_resource/product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class,
             'wishlist/resource_product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class,
             'wishlist/resource_wishlist' => \Mage_Wishlist_Model_Resource_Wishlist::class,
@@ -9552,7 +9532,6 @@
             'wishlist/resource_wishlist_collection' => \Mage_Wishlist_Model_Resource_Wishlist_Collection::class,
             'wishlist/session' => \Mage_Wishlist_Model_Session::class,
             'wishlist/wishlist' => \Mage_Wishlist_Model_Wishlist::class,
-            'varien/autoload' => \Varien_Autoload::class,
         ])
     );
     override( \Mage_Core_Model_Factory::getModel(0),
@@ -9562,11 +9541,10 @@
             'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class,
             'adminnotification/mysql4_inbox_collection' => \Mage_AdminNotification_Model_Mysql4_Inbox_Collection::class,
             'adminnotification/observer' => \Mage_AdminNotification_Model_Observer::class,
-            'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
             'adminnotification/resource_inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
-            'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
+            'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
             'adminnotification/resource_inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
-            'adminnotification/survey' => \Mage_AdminNotification_Model_Survey::class,
+            'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
             'admin/acl' => \Mage_Admin_Model_Acl::class,
             'admin/acl_assert_ip' => \Mage_Admin_Model_Acl_Assert_Ip::class,
             'admin/acl_assert_time' => \Mage_Admin_Model_Acl_Assert_Time::class,
@@ -9595,38 +9573,38 @@
             'admin/redirectpolicy' => \Mage_Admin_Model_Redirectpolicy::class,
             'admin/resource_acl' => \Mage_Admin_Model_Resource_Acl::class,
             'admin_resource/acl' => \Mage_Admin_Model_Resource_Acl::class,
-            'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
             'admin/resource_acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
+            'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
             'admin/resource_acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class,
             'admin_resource/acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class,
-            'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class,
             'admin/resource_block' => \Mage_Admin_Model_Resource_Block::class,
-            'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
+            'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class,
             'admin/resource_block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
+            'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
             'admin_resource/permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class,
             'admin/resource_permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class,
             'admin/resource_role' => \Mage_Admin_Model_Resource_Role::class,
             'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class,
             'admin/resource_role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class,
             'admin_resource/role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class,
-            'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class,
             'admin_resource/roles' => \Mage_Admin_Model_Resource_Roles::class,
-            'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
+            'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class,
             'admin_resource/roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
-            'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
+            'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
             'admin/resource_roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
+            'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
             'admin/resource_rules' => \Mage_Admin_Model_Resource_Rules::class,
             'admin_resource/rules' => \Mage_Admin_Model_Resource_Rules::class,
-            'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
             'admin_resource/rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
+            'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
             'admin_resource/user' => \Mage_Admin_Model_Resource_User::class,
             'admin/resource_user' => \Mage_Admin_Model_Resource_User::class,
             'admin/resource_user_collection' => \Mage_Admin_Model_Resource_User_Collection::class,
             'admin_resource/user_collection' => \Mage_Admin_Model_Resource_User_Collection::class,
-            'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class,
             'admin_resource/variable' => \Mage_Admin_Model_Resource_Variable::class,
-            'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
+            'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class,
             'admin/resource_variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
+            'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
             'admin/role' => \Mage_Admin_Model_Role::class,
             'admin/roles' => \Mage_Admin_Model_Roles::class,
             'admin/rules' => \Mage_Admin_Model_Rules::class,
@@ -9661,6 +9639,7 @@
             'adminhtml/system_config_backend_baseurl' => \Mage_Adminhtml_Model_System_Config_Backend_Baseurl::class,
             'adminhtml/system_config_backend_cache' => \Mage_Adminhtml_Model_System_Config_Backend_Cache::class,
             'adminhtml/system_config_backend_catalog_inventory_managestock' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock::class,
+            'adminhtml/system_config_backend_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Separator::class,
             'adminhtml/system_config_backend_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Type::class,
             'adminhtml/system_config_backend_category' => \Mage_Adminhtml_Model_System_Config_Backend_Category::class,
             'adminhtml/system_config_backend_cookie' => \Mage_Adminhtml_Model_System_Config_Backend_Cookie::class,
@@ -9713,12 +9692,14 @@
             'adminhtml/system_config_source_catalog_listMode' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListMode::class,
             'adminhtml/system_config_source_catalog_listPerPage' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListPerPage::class,
             'adminhtml/system_config_source_catalog_listSort' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort::class,
+            'adminhtml/system_config_source_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Separator::class,
             'adminhtml/system_config_source_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Type::class,
             'adminhtml/system_config_source_catalog_timeFormat' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_TimeFormat::class,
             'adminhtml/system_config_source_category' => \Mage_Adminhtml_Model_System_Config_Source_Category::class,
             'adminhtml/system_config_source_checktype' => \Mage_Adminhtml_Model_System_Config_Source_Checktype::class,
             'adminhtml/system_config_source_cms_page' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Page::class,
             'adminhtml/system_config_source_cms_wysiwyg_enabled' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Wysiwyg_Enabled::class,
+            'adminhtml/system_config_source_cookie_samesite' => \Mage_Adminhtml_Model_System_Config_Source_Cookie_Samesite::class,
             'adminhtml/system_config_source_country' => \Mage_Adminhtml_Model_System_Config_Source_Country::class,
             'adminhtml/system_config_source_country_full' => \Mage_Adminhtml_Model_System_Config_Source_Country_Full::class,
             'adminhtml/system_config_source_cron_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency::class,
@@ -9745,6 +9726,7 @@
             'adminhtml/system_config_source_locale_timezone' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Timezone::class,
             'adminhtml/system_config_source_locale_weekdaycodes' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdaycodes::class,
             'adminhtml/system_config_source_locale_weekdays' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdays::class,
+            'adminhtml/system_config_source_log_level' => \Mage_Adminhtml_Model_System_Config_Source_Log_Level::class,
             'adminhtml/system_config_source_nooptreq' => \Mage_Adminhtml_Model_System_Config_Source_Nooptreq::class,
             'adminhtml/system_config_source_notification_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Notification_Frequency::class,
             'adminhtml/system_config_source_order_status' => \Mage_Adminhtml_Model_System_Config_Source_Order_Status::class,
@@ -9768,7 +9750,6 @@
             'adminhtml/system_config_source_shipping_flatrate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Flatrate::class,
             'adminhtml/system_config_source_shipping_tablerate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Tablerate::class,
             'adminhtml/system_config_source_shipping_taxclass' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Taxclass::class,
-            'adminhtml/system_config_source_startdateenddate' => \Mage_Adminhtml_Model_System_Config_Source_Startdateenddate::class,
             'adminhtml/system_config_source_storage_media_database' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Database::class,
             'adminhtml/system_config_source_storage_media_storage' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Storage::class,
             'adminhtml/system_config_source_store' => \Mage_Adminhtml_Model_System_Config_Source_Store::class,
@@ -9824,22 +9805,22 @@
             'api2_resource/acl_filter_attribute' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute::class,
             'api2/resource_acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class,
             'api2_resource/acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class,
-            'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
             'api2_resource/acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
+            'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
             'api2/resource_acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class,
             'api2_resource/acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class,
             'api2_resource/acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class,
             'api2/resource_acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class,
             'api2/resource_acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class,
             'api2_resource/acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class,
-            'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class,
             'api2/resource_setup' => \Mage_Api2_Model_Resource_Setup::class,
+            'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class,
             'api2/resource_validator' => \Mage_Api2_Model_Resource_Validator::class,
             'api2_resource/validator' => \Mage_Api2_Model_Resource_Validator::class,
             'api2/resource_validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class,
             'api2_resource/validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class,
-            'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
             'api2/resource_validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
+            'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
             'api2/response' => \Mage_Api2_Model_Response::class,
             'api2/route_abstract' => \Mage_Api2_Model_Route_Abstract::class,
             'api2/route_apiType' => \Mage_Api2_Model_Route_ApiType::class,
@@ -9871,8 +9852,8 @@
             'api/mysql4_user_collection' => \Mage_Api_Model_Mysql4_User_Collection::class,
             'api/resource_abstract' => \Mage_Api_Model_Resource_Abstract::class,
             'api_resource/abstract' => \Mage_Api_Model_Resource_Abstract::class,
-            'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class,
             'api_resource/acl' => \Mage_Api_Model_Resource_Acl::class,
+            'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class,
             'api_resource/acl_role' => \Mage_Api_Model_Resource_Acl_Role::class,
             'api/resource_acl_role' => \Mage_Api_Model_Resource_Acl_Role::class,
             'api/resource_acl_role_collection' => \Mage_Api_Model_Resource_Acl_Role_Collection::class,
@@ -9881,14 +9862,14 @@
             'api_resource/permissions_collection' => \Mage_Api_Model_Resource_Permissions_Collection::class,
             'api_resource/role' => \Mage_Api_Model_Resource_Role::class,
             'api/resource_role' => \Mage_Api_Model_Resource_Role::class,
-            'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
             'api_resource/role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
+            'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
             'api/resource_roles' => \Mage_Api_Model_Resource_Roles::class,
             'api_resource/roles' => \Mage_Api_Model_Resource_Roles::class,
-            'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
             'api_resource/roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
-            'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
+            'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
             'api_resource/roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
+            'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
             'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class,
             'api_resource/rules' => \Mage_Api_Model_Resource_Rules::class,
             'api_resource/rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class,
@@ -9919,15 +9900,6 @@
             'authorizenet/directpost_request' => \Mage_Authorizenet_Model_Directpost_Request::class,
             'authorizenet/directpost_response' => \Mage_Authorizenet_Model_Directpost_Response::class,
             'authorizenet/directpost_session' => \Mage_Authorizenet_Model_Directpost_Session::class,
-            'backup/backup' => \Mage_Backup_Model_Backup::class,
-            'backup/config_backend_cron' => \Mage_Backup_Model_Config_Backend_Cron::class,
-            'backup/config_source_type' => \Mage_Backup_Model_Config_Source_Type::class,
-            'backup/db' => \Mage_Backup_Model_Db::class,
-            'backup/fs_collection' => \Mage_Backup_Model_Fs_Collection::class,
-            'backup/mysql4_db' => \Mage_Backup_Model_Mysql4_Db::class,
-            'backup/observer' => \Mage_Backup_Model_Observer::class,
-            'backup/resource_db' => \Mage_Backup_Model_Resource_Db::class,
-            'backup/resource_helper_mysql4' => \Mage_Backup_Model_Resource_Helper_Mysql4::class,
             'bundle/catalogIndex_data_bundle' => \Mage_Bundle_Model_CatalogIndex_Data_Bundle::class,
             'bundle/mysql4_bundle' => \Mage_Bundle_Model_Mysql4_Bundle::class,
             'bundle/mysql4_indexer_price' => \Mage_Bundle_Model_Mysql4_Indexer_Price::class,
@@ -9947,16 +9919,16 @@
             'bundle/resource_bundle' => \Mage_Bundle_Model_Resource_Bundle::class,
             'bundle/resource_indexer_price' => \Mage_Bundle_Model_Resource_Indexer_Price::class,
             'bundle_resource/indexer_price' => \Mage_Bundle_Model_Resource_Indexer_Price::class,
-            'bundle/resource_indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class,
             'bundle_resource/indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class,
+            'bundle/resource_indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class,
             'bundle/resource_option' => \Mage_Bundle_Model_Resource_Option::class,
             'bundle_resource/option' => \Mage_Bundle_Model_Resource_Option::class,
             'bundle/resource_option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class,
             'bundle_resource/option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class,
             'bundle_resource/price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
             'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
-            'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class,
             'bundle_resource/selection' => \Mage_Bundle_Model_Resource_Selection::class,
+            'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class,
             'bundle_resource/selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class,
             'bundle/resource_selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class,
             'bundle/sales_order_pdf_items_abstract' => \Mage_Bundle_Model_Sales_Order_Pdf_Items_Abstract::class,
@@ -10016,14 +9988,14 @@
             'catalogindex/resource_data_abstract' => \Mage_CatalogIndex_Model_Resource_Data_Abstract::class,
             'catalogindex_resource/data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class,
             'catalogindex/resource_data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class,
-            'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
             'catalogindex_resource/data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
+            'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
             'catalogindex_resource/indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class,
             'catalogindex/resource_indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class,
             'catalogindex/resource_indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class,
             'catalogindex_resource/indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class,
-            'catalogindex_resource/indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class,
             'catalogindex/resource_indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class,
+            'catalogindex_resource/indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class,
             'catalogindex_resource/indexer_minimalprice' => \Mage_CatalogIndex_Model_Resource_Indexer_Minimalprice::class,
             'catalogindex/resource_indexer_minimalprice' => \Mage_CatalogIndex_Model_Resource_Indexer_Minimalprice::class,
             'catalogindex/resource_indexer_price' => \Mage_CatalogIndex_Model_Resource_Indexer_Price::class,
@@ -10049,20 +10021,20 @@
             'cataloginventory/mysql4_stock_item_collection' => \Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection::class,
             'cataloginventory/mysql4_stock_status' => \Mage_CatalogInventory_Model_Mysql4_Stock_Status::class,
             'cataloginventory/observer' => \Mage_CatalogInventory_Model_Observer::class,
-            'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
             'cataloginventory_resource/indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
+            'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
             'cataloginventory/resource_indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class,
             'cataloginventory_resource/indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class,
-            'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
             'cataloginventory/resource_indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
+            'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
             'cataloginventory/resource_indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class,
             'cataloginventory_resource/indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class,
             'cataloginventory_resource/stock' => \Mage_CatalogInventory_Model_Resource_Stock::class,
             'cataloginventory/resource_stock' => \Mage_CatalogInventory_Model_Resource_Stock::class,
             'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
             'cataloginventory/resource_stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
-            'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
             'cataloginventory/resource_stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
+            'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
             'cataloginventory/resource_stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class,
             'cataloginventory_resource/stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class,
             'cataloginventory/source_backorders' => \Mage_CatalogInventory_Model_Source_Backorders::class,
@@ -10083,10 +10055,10 @@
             'catalogrule/mysql4_rule_product_price' => \Mage_CatalogRule_Model_Mysql4_Rule_Product_Price::class,
             'catalogrule/mysql4_rule_product_price_collection' => \Mage_CatalogRule_Model_Mysql4_Rule_Product_Price_Collection::class,
             'catalogrule/observer' => \Mage_CatalogRule_Model_Observer::class,
-            'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
             'catalogrule/resource_rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
-            'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
+            'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
             'catalogrule_resource/rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
+            'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
             'catalogrule_resource/rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class,
             'catalogrule/resource_rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class,
             'catalogrule_resource/rule_product_price_collection' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price_Collection::class,
@@ -10115,24 +10087,24 @@
             'catalogsearch/query' => \Mage_CatalogSearch_Model_Query::class,
             'catalogsearch_resource/advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class,
             'catalogsearch/resource_advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class,
-            'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
             'catalogsearch_resource/advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
+            'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
             'catalogsearch_resource/fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class,
             'catalogsearch/resource_fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class,
             'catalogsearch_resource/fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class,
             'catalogsearch/resource_fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class,
             'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
             'catalogsearch_resource/fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
-            'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
             'catalogsearch/resource_helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
-            'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
+            'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
             'catalogsearch_resource/indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
+            'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
             'catalogsearch_resource/query' => \Mage_CatalogSearch_Model_Resource_Query::class,
             'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class,
-            'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
             'catalogsearch_resource/query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
-            'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
+            'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
             'catalogsearch/resource_search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
+            'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
             'catalogsearch/session' => \Mage_CatalogSearch_Model_Session::class,
             'catalogsearch/system_config_backend_sitemap' => \Mage_CatalogSearch_Model_System_Config_Backend_Sitemap::class,
             'catalog/abstract' => \Mage_Catalog_Model_Abstract::class,
@@ -10275,144 +10247,144 @@
             'catalog/product_website' => \Mage_Catalog_Model_Product_Website::class,
             'catalog/resource_abstract' => \Mage_Catalog_Model_Resource_Abstract::class,
             'catalog_resource/abstract' => \Mage_Catalog_Model_Resource_Abstract::class,
-            'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
             'catalog/resource_attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
-            'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class,
+            'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
             'catalog_resource/category' => \Mage_Catalog_Model_Resource_Category::class,
+            'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class,
             'catalog_resource/category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class,
             'catalog/resource_category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class,
-            'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
             'catalog/resource_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
-            'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
+            'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
             'catalog/resource_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
+            'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
             'catalog_resource/category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class,
             'catalog/resource_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class,
             'catalog_resource/category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class,
             'catalog/resource_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class,
             'catalog/resource_category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class,
             'catalog_resource/category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class,
-            'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
             'catalog_resource/category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
-            'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
+            'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
             'catalog/resource_category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
+            'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
             'catalog_resource/category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class,
             'catalog/resource_category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class,
             'catalog/resource_category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class,
             'catalog_resource/category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class,
-            'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
             'catalog_resource/collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
-            'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class,
+            'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
             'catalog_resource/config' => \Mage_Catalog_Model_Resource_Config::class,
-            'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
+            'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class,
             'catalog/resource_eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
+            'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
             'catalog_resource/eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class,
             'catalog/resource_eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class,
-            'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
             'catalog_resource/eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
-            'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
+            'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
             'catalog/resource_eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
-            'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
+            'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
             'catalog_resource/eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
+            'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
             'catalog_resource/eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
-            'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
+            'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
             'catalog_resource/eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
+            'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
             'catalog/resource_eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class,
             'catalog_resource/eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class,
             'catalog/resource_eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class,
             'catalog_resource/eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class,
             'catalog/resource_eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class,
             'catalog_resource/eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class,
-            'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
             'catalog/resource_eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
-            'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
+            'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
             'catalog/resource_eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
+            'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
             'catalog/resource_eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class,
             'catalog_resource/eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class,
-            'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
             'catalog_resource/eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
+            'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
             'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
             'catalog_resource/eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
             'catalog_resource/eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class,
             'catalog/resource_eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class,
-            'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
             'catalog_resource/eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
-            'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
+            'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
             'catalog/resource_eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
-            'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
+            'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
             'catalog/resource_eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
-            'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
+            'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
             'catalog/resource_eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
+            'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
             'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
             'catalog_resource/eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
-            'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
             'catalog/resource_eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
+            'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class,
             'catalog/resource_eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
+            'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
             'catalog/resource_eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class,
             'catalog/resource_eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class,
             'catalog/resource_eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class,
-            'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
             'catalog_resource/eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
-            'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
+            'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
             'catalog_resource/eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
-            'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
+            'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
             'catalog_resource/eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
+            'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
             'catalog/resource_eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class,
             'catalog/resource_eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class,
             'catalog/resource_eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class,
-            'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
             'catalog/resource_eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
-            'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
+            'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
             'catalog_resource/eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
+            'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
             'catalog_resource/eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class,
             'catalog/resource_eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class,
             'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
             'catalog/resource_eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
-            'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
             'catalog/resource_eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
+            'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
             'catalog/resource_eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class,
             'catalog_resource/eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class,
-            'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
             'catalog/resource_eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
+            'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
             'catalog_resource/eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class,
             'catalog/resource_eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class,
             'catalog_resource/eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class,
             'catalog/resource_eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
             'catalog/resource_eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
-            'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
             'catalog_resource/eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
-            'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
+            'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
             'catalog/resource_eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
-            'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
+            'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
             'catalog/resource_eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
-            'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
+            'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
             'catalog/resource_eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
+            'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
             'catalog/resource_eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class,
             'catalog_resource/eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class,
-            'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
             'catalog_resource/eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
-            'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
+            'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
             'catalog/resource_eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
-            'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
             'catalog/resource_eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
+            'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
             'catalog_resource/eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
+            'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
             'catalog/resource_eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class,
             'catalog_resource/eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class,
             'catalog/resource_eav_mysql4_sendfriend' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend::class,
@@ -10421,98 +10393,98 @@
             'catalog/resource_eav_mysql4_sendfriend_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection::class,
             'catalog_resource/eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class,
             'catalog/resource_eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class,
-            'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
             'catalog/resource_eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
+            'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
             'catalog/resource_helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
             'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
             'catalog_resource/layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class,
             'catalog/resource_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class,
             'catalog/resource_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class,
             'catalog_resource/layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class,
-            'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
             'catalog/resource_layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
-            'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class,
+            'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
             'catalog_resource/product' => \Mage_Catalog_Model_Resource_Product::class,
+            'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class,
             'catalog/resource_product_action' => \Mage_Catalog_Model_Resource_Product_Action::class,
             'catalog_resource/product_action' => \Mage_Catalog_Model_Resource_Product_Action::class,
-            'catalog_resource/product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class,
             'catalog/resource_product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class,
+            'catalog_resource/product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class,
             'catalog/resource_product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class,
             'catalog_resource/product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class,
             'catalog/resource_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class,
             'catalog_resource/product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class,
-            'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
             'catalog/resource_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
+            'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
             'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
             'catalog_resource/product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
             'catalog/resource_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class,
-            'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
             'catalog_resource/product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
+            'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
             'catalog/resource_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
             'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
-            'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
-            'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
+            'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
+            'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
             'catalog_resource/product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class,
             'catalog/resource_product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class,
-            'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
             'catalog/resource_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
+            'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
             'catalog/resource_product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class,
             'catalog_resource/product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class,
-            'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
             'catalog/resource_product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
+            'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
             'catalog/resource_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class,
             'catalog_resource/product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class,
-            'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
             'catalog_resource/product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
-            'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
+            'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
             'catalog/resource_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
+            'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
             'catalog/resource_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class,
             'catalog_resource/product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class,
-            'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
             'catalog_resource/product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
-            'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
+            'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
             'catalog_resource/product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
-            'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
+            'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
             'catalog_resource/product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
+            'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
             'catalog/resource_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class,
             'catalog_resource/product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class,
             'catalog_resource/product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class,
             'catalog/resource_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class,
-            'catalog/resource_product_link' => \Mage_Catalog_Model_Resource_Product_Link::class,
             'catalog_resource/product_link' => \Mage_Catalog_Model_Resource_Product_Link::class,
+            'catalog/resource_product_link' => \Mage_Catalog_Model_Resource_Product_Link::class,
             'catalog/resource_product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class,
             'catalog_resource/product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class,
-            'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
             'catalog/resource_product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
-            'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
+            'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
             'catalog_resource/product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
-            'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
+            'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
             'catalog/resource_product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
-            'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
+            'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
             'catalog_resource/product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
-            'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
+            'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
             'catalog_resource/product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
+            'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
             'catalog_resource/product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class,
             'catalog/resource_product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class,
             'catalog_resource/product_status' => \Mage_Catalog_Model_Resource_Product_Status::class,
             'catalog/resource_product_status' => \Mage_Catalog_Model_Resource_Product_Status::class,
             'catalog_resource/product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class,
             'catalog/resource_product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class,
-            'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
             'catalog/resource_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
-            'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
             'catalog_resource/product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
             'catalog_resource/product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class,
             'catalog/resource_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class,
-            'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
             'catalog_resource/product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
+            'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
             'catalog/resource_setup' => \Mage_Catalog_Model_Resource_Setup::class,
             'catalog_resource/setup' => \Mage_Catalog_Model_Resource_Setup::class,
-            'catalog/resource_url' => \Mage_Catalog_Model_Resource_Url::class,
             'catalog_resource/url' => \Mage_Catalog_Model_Resource_Url::class,
+            'catalog/resource_url' => \Mage_Catalog_Model_Resource_Url::class,
             'catalog/session' => \Mage_Catalog_Model_Session::class,
             'catalog/system_config_backend_catalog_category_flat' => \Mage_Catalog_Model_System_Config_Backend_Catalog_Category_Flat::class,
             'catalog/system_config_backend_catalog_product_flat' => \Mage_Catalog_Model_System_Config_Backend_Catalog_Product_Flat::class,
@@ -10554,12 +10526,12 @@
             'checkout/observer' => \Mage_Checkout_Model_Observer::class,
             'checkout_resource/agreement' => \Mage_Checkout_Model_Resource_Agreement::class,
             'checkout/resource_agreement' => \Mage_Checkout_Model_Resource_Agreement::class,
-            'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
             'checkout/resource_agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
-            'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class,
+            'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
             'checkout_resource/cart' => \Mage_Checkout_Model_Resource_Cart::class,
-            'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class,
+            'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class,
             'checkout/resource_setup' => \Mage_Checkout_Model_Resource_Setup::class,
+            'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class,
             'checkout/session' => \Mage_Checkout_Model_Session::class,
             'checkout/type_abstract' => \Mage_Checkout_Model_Type_Abstract::class,
             'checkout/type_multishipping' => \Mage_Checkout_Model_Type_Multishipping::class,
@@ -10574,25 +10546,25 @@
             'cms/mysql4_page_service' => \Mage_Cms_Model_Mysql4_Page_Service::class,
             'cms/observer' => \Mage_Cms_Model_Observer::class,
             'cms/page' => \Mage_Cms_Model_Page::class,
-            'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class,
             'cms/resource_block' => \Mage_Cms_Model_Resource_Block::class,
+            'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class,
             'cms_resource/block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class,
             'cms/resource_block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class,
             'cms/resource_page' => \Mage_Cms_Model_Resource_Page::class,
             'cms_resource/page' => \Mage_Cms_Model_Resource_Page::class,
             'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
             'cms_resource/page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
-            'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
             'cms/resource_page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
+            'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
             'cms/template_filter' => \Mage_Cms_Model_Template_Filter::class,
             'cms/wysiwyg_config' => \Mage_Cms_Model_Wysiwyg_Config::class,
             'cms/wysiwyg_images_storage' => \Mage_Cms_Model_Wysiwyg_Images_Storage::class,
             'cms/wysiwyg_images_storage_collection' => \Mage_Cms_Model_Wysiwyg_Images_Storage_Collection::class,
             'configurableswatches/observer' => \Mage_ConfigurableSwatches_Model_Observer::class,
-            'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
             'configurableswatches_resource/catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
-            'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
+            'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
             'configurableswatches_resource/catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
+            'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
             'configurableswatches_resource/catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
             'configurableswatches/resource_catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
             'configurableswatches/system_config_source_catalog_product_configattribute' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute::class,
@@ -10699,152 +10671,152 @@
             'core/mysql4_website_collection' => \Mage_Core_Model_Mysql4_Website_Collection::class,
             'core/observer' => \Mage_Core_Model_Observer::class,
             'core/resource' => \Mage_Core_Model_Resource::class,
+            'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
             'core_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
             'core/resource_abstract' => \Mage_Core_Model_Resource_Abstract::class,
-            'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
+            'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
             'core/resource_cache' => \Mage_Core_Model_Resource_Cache::class,
             'core_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
-            'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
-            'core_resource/config' => \Mage_Core_Model_Resource_Config::class,
             'payment_resource/config' => \Mage_Core_Model_Resource_Config::class,
             'core/resource_config' => \Mage_Core_Model_Resource_Config::class,
-            'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
+            'core_resource/config' => \Mage_Core_Model_Resource_Config::class,
             'core/resource_config_data' => \Mage_Core_Model_Resource_Config_Data::class,
+            'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
             'payment_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
-            'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'core_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
+            'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
-            'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
-            'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
             'payment_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
+            'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
+            'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
             'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
-            'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
             'core/resource_db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
-            'core/resource_design' => \Mage_Core_Model_Resource_Design::class,
+            'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
             'core_resource/design' => \Mage_Core_Model_Resource_Design::class,
+            'core/resource_design' => \Mage_Core_Model_Resource_Design::class,
             'payment_resource/design' => \Mage_Core_Model_Resource_Design::class,
-            'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
             'payment_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
+            'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
             'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
-            'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
             'payment_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
             'core/resource_design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
-            'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
-            'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
+            'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
             'core/resource_email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
-            'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
-            'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
+            'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
+            'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
             'payment_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
-            'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
+            'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
+            'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
             'core/resource_email_template' => \Mage_Core_Model_Resource_Email_Template::class,
+            'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
             'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
-            'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
             'core/resource_email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
+            'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
             'core_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
             'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
             'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
             'core_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
-            'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
-            'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
             'core_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
             'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
-            'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
             'payment_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
+            'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
+            'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
             'payment_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
             'core/resource_file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
-            'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
-            'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
             'core/resource_file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
+            'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
             'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
             'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
-            'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
             'core/resource_file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
-            'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class,
-            'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
+            'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
             'payment_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
+            'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
+            'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class,
             'payment_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
-            'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
             'core_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
-            'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
+            'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
             'core/resource_helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
+            'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
             'core_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
-            'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
-            'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
             'core/resource_iterator' => \Mage_Core_Model_Resource_Iterator::class,
-            'core_resource/language' => \Mage_Core_Model_Resource_Language::class,
+            'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
+            'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
             'payment_resource/language' => \Mage_Core_Model_Resource_Language::class,
+            'core_resource/language' => \Mage_Core_Model_Resource_Language::class,
             'core/resource_language' => \Mage_Core_Model_Resource_Language::class,
             'payment_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
-            'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
             'core/resource_language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
-            'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
+            'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
             'core_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
             'core/resource_layout' => \Mage_Core_Model_Resource_Layout::class,
-            'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
+            'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
             'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class,
             'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
+            'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
+            'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
             'payment_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
-            'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
             'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
             'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class,
             'payment_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
-            'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core/resource_setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
-            'payment_resource/store' => \Mage_Core_Model_Resource_Store::class,
-            'core_resource/store' => \Mage_Core_Model_Resource_Store::class,
+            'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core/resource_store' => \Mage_Core_Model_Resource_Store::class,
-            'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
+            'core_resource/store' => \Mage_Core_Model_Resource_Store::class,
+            'payment_resource/store' => \Mage_Core_Model_Resource_Store::class,
             'core/resource_store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
             'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
-            'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
+            'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
             'core/resource_store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'payment_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
-            'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
-            'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
+            'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'payment_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
+            'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
+            'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
             'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
-            'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class,
             'core_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
-            'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
-            'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class,
+            'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class,
             'core_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
-            'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
-            'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
+            'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class,
+            'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
             'payment_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
-            'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
+            'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
             'core/resource_type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
             'payment_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
-            'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'core/resource_type_db' => \Mage_Core_Model_Resource_Type_Db::class,
+            'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
-            'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
-            'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
             'core_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
-            'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
-            'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
+            'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
             'payment_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
             'payment_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
-            'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
             'core_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
+            'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
             'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
             'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
             'payment_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
-            'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
-            'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'core_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
+            'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
+            'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'core_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
-            'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
             'core/resource_variable' => \Mage_Core_Model_Resource_Variable::class,
+            'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
             'core/resource_variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
-            'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
             'core_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
-            'core_resource/website' => \Mage_Core_Model_Resource_Website::class,
+            'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
             'payment_resource/website' => \Mage_Core_Model_Resource_Website::class,
+            'core_resource/website' => \Mage_Core_Model_Resource_Website::class,
             'core/resource_website' => \Mage_Core_Model_Resource_Website::class,
-            'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core/resource_website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
+            'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core/session' => \Mage_Core_Model_Session::class,
             'core/session_abstract' => \Mage_Core_Model_Session_Abstract::class,
@@ -10874,10 +10846,10 @@
             'cron/mysql4_schedule' => \Mage_Cron_Model_Mysql4_Schedule::class,
             'cron/mysql4_schedule_collection' => \Mage_Cron_Model_Mysql4_Schedule_Collection::class,
             'cron/observer' => \Mage_Cron_Model_Observer::class,
-            'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class,
             'cron/resource_schedule' => \Mage_Cron_Model_Resource_Schedule::class,
-            'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
+            'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class,
             'cron/resource_schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
+            'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
             'cron/schedule' => \Mage_Cron_Model_Schedule::class,
             'currencysymbol/observer' => \Mage_CurrencySymbol_Model_Observer::class,
             'currencysymbol/system_currencysymbol' => \Mage_CurrencySymbol_Model_System_Currencysymbol::class,
@@ -10954,14 +10926,14 @@
             'customer_resource/address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class,
             'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
             'customer_resource/address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
-            'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
             'customer/resource_address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
-            'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
+            'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
             'customer/resource_address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
-            'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
+            'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
             'customer_resource/address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
-            'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
+            'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
             'customer_resource/address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
+            'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
             'customer/resource_attribute' => \Mage_Customer_Model_Resource_Attribute::class,
             'customer_resource/attribute' => \Mage_Customer_Model_Resource_Attribute::class,
             'customer_resource/attribute_collection' => \Mage_Customer_Model_Resource_Attribute_Collection::class,
@@ -10970,20 +10942,20 @@
             'customer_resource/customer' => \Mage_Customer_Model_Resource_Customer::class,
             'customer_resource/customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class,
             'customer/resource_customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class,
-            'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
             'customer/resource_flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
-            'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
+            'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
             'customer/resource_flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
-            'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
+            'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
             'customer/resource_form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
+            'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
             'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
             'customer/resource_form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
             'customer/resource_group' => \Mage_Customer_Model_Resource_Group::class,
             'customer_resource/group' => \Mage_Customer_Model_Resource_Group::class,
             'customer_resource/group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class,
             'customer/resource_group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class,
-            'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class,
             'customer_resource/setup' => \Mage_Customer_Model_Resource_Setup::class,
+            'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class,
             'customer_resource/wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
             'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
             'customer/session' => \Mage_Customer_Model_Session::class,
@@ -11037,10 +11009,10 @@
             'dataflow/mysql4_session' => \Mage_Dataflow_Model_Mysql4_Session::class,
             'dataflow/profile' => \Mage_Dataflow_Model_Profile::class,
             'dataflow/profile_history' => \Mage_Dataflow_Model_Profile_History::class,
-            'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class,
             'dataflow/resource_batch' => \Mage_Dataflow_Model_Resource_Batch::class,
-            'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
+            'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class,
             'dataflow/resource_batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
+            'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
             'dataflow/resource_batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class,
             'dataflow_resource/batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class,
             'dataflow_resource/batch_export' => \Mage_Dataflow_Model_Resource_Batch_Export::class,
@@ -11055,12 +11027,12 @@
             'dataflow/resource_profile' => \Mage_Dataflow_Model_Resource_Profile::class,
             'dataflow/resource_profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class,
             'dataflow_resource/profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class,
-            'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
             'dataflow_resource/profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
+            'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
             'dataflow_resource/profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class,
             'dataflow/resource_profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class,
-            'dataflow/resource_session' => \Mage_Dataflow_Model_Resource_Session::class,
             'dataflow_resource/session' => \Mage_Dataflow_Model_Resource_Session::class,
+            'dataflow/resource_session' => \Mage_Dataflow_Model_Resource_Session::class,
             'dataflow/session' => \Mage_Dataflow_Model_Session::class,
             'dataflow/session_adapter_http' => \Mage_Dataflow_Model_Session_Adapter_Http::class,
             'dataflow/session_parser_csv' => \Mage_Dataflow_Model_Session_Parser_Csv::class,
@@ -11090,18 +11062,18 @@
             'directory/resource_country' => \Mage_Directory_Model_Resource_Country::class,
             'directory_resource/country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class,
             'directory/resource_country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class,
-            'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
             'directory/resource_country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
+            'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
             'directory_resource/country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class,
             'directory/resource_country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class,
             'directory_resource/currency' => \Mage_Directory_Model_Resource_Currency::class,
             'directory/resource_currency' => \Mage_Directory_Model_Resource_Currency::class,
-            'directory/resource_currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class,
             'directory_resource/currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class,
+            'directory/resource_currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class,
             'directory/resource_region' => \Mage_Directory_Model_Resource_Region::class,
             'directory_resource/region' => \Mage_Directory_Model_Resource_Region::class,
-            'directory/resource_region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class,
             'directory_resource/region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class,
+            'directory/resource_region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class,
             'downloadable/catalogIndex_data_downloadable' => \Mage_Downloadable_Model_CatalogIndex_Data_Downloadable::class,
             'downloadable/link' => \Mage_Downloadable_Model_Link::class,
             'downloadable/link_api' => \Mage_Downloadable_Model_Link_Api::class,
@@ -11122,8 +11094,8 @@
             'downloadable/observer' => \Mage_Downloadable_Model_Observer::class,
             'downloadable/product_price' => \Mage_Downloadable_Model_Product_Price::class,
             'downloadable/product_type' => \Mage_Downloadable_Model_Product_Type::class,
-            'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
             'downloadable_resource/indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
+            'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
             'downloadable/resource_link' => \Mage_Downloadable_Model_Resource_Link::class,
             'downloadable_resource/link' => \Mage_Downloadable_Model_Resource_Link::class,
             'downloadable/resource_link_collection' => \Mage_Downloadable_Model_Resource_Link_Collection::class,
@@ -11132,14 +11104,14 @@
             'downloadable_resource/link_purchased' => \Mage_Downloadable_Model_Resource_Link_Purchased::class,
             'downloadable/resource_link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class,
             'downloadable_resource/link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class,
-            'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
             'downloadable/resource_link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
-            'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
+            'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
             'downloadable/resource_link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
-            'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class,
+            'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
             'downloadable/resource_sample' => \Mage_Downloadable_Model_Resource_Sample::class,
-            'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
+            'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class,
             'downloadable/resource_sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
+            'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
             'downloadable/sales_order_pdf_items_abstract' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Abstract::class,
             'downloadable/sales_order_pdf_items_creditmemo' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Creditmemo::class,
             'downloadable/sales_order_pdf_items_invoice' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Invoice::class,
@@ -11221,8 +11193,8 @@
             'eav/mysql4_form_fieldset_collection' => \Mage_Eav_Model_Mysql4_Form_Fieldset_Collection::class,
             'eav/mysql4_form_type' => \Mage_Eav_Model_Mysql4_Form_Type::class,
             'eav/mysql4_form_type_collection' => \Mage_Eav_Model_Mysql4_Form_Type_Collection::class,
-            'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class,
             'eav_resource/attribute' => \Mage_Eav_Model_Resource_Attribute::class,
+            'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class,
             'eav_resource/attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class,
             'eav/resource_attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class,
             'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class,
@@ -11239,28 +11211,28 @@
             'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
             'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
-            'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
-            'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
+            'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
+            'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
             'eav_resource/entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class,
             'eav/resource_entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class,
             'eav_resource/entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class,
             'eav/resource_entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class,
-            'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
             'eav_resource/entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
+            'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
             'eav/resource_form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class,
             'eav_resource/form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class,
-            'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
             'eav/resource_form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
+            'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
             'eav/resource_form_element' => \Mage_Eav_Model_Resource_Form_Element::class,
             'eav_resource/form_element' => \Mage_Eav_Model_Resource_Form_Element::class,
-            'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
             'eav_resource/form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
-            'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
+            'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
             'eav/resource_form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
-            'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
+            'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
             'eav_resource/form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
+            'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
             'eav/resource_form_type' => \Mage_Eav_Model_Resource_Form_Type::class,
             'eav_resource/form_type' => \Mage_Eav_Model_Resource_Form_Type::class,
             'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class,
@@ -11276,12 +11248,12 @@
             'giftmessage/mysql4_message_collection' => \Mage_GiftMessage_Model_Mysql4_Message_Collection::class,
             'giftmessage/mysql4_setup' => \Mage_GiftMessage_Model_Mysql4_Setup::class,
             'giftmessage/observer' => \Mage_GiftMessage_Model_Observer::class,
-            'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class,
             'giftmessage/resource_message' => \Mage_GiftMessage_Model_Resource_Message::class,
-            'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
+            'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class,
             'giftmessage_resource/message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
-            'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
+            'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
             'giftmessage_resource/setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
+            'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
             'googleanalytics/observer' => \Mage_GoogleAnalytics_Model_Observer::class,
             'googleanalytics/system_config_source_type' => \Mage_GoogleAnalytics_Model_System_Config_Source_Type::class,
             'googlecheckout/payment' => \Mage_GoogleCheckout_Model_Payment::class,
@@ -11317,8 +11289,8 @@
             'importexport/product_attribute_backend_urlkey' => \Mage_ImportExport_Model_Product_Attribute_Backend_Urlkey::class,
             'importexport_resource/helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class,
             'importexport/resource_helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class,
-            'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
             'importexport_resource/import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
+            'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
             'importexport_resource/setup' => \Mage_ImportExport_Model_Resource_Setup::class,
             'importexport/resource_setup' => \Mage_ImportExport_Model_Resource_Setup::class,
             'importexport/source_export_entity' => \Mage_ImportExport_Model_Source_Export_Entity::class,
@@ -11340,16 +11312,16 @@
             'index/process' => \Mage_Index_Model_Process::class,
             'index_resource/abstract' => \Mage_Index_Model_Resource_Abstract::class,
             'index/resource_abstract' => \Mage_Index_Model_Resource_Abstract::class,
-            'index/resource_event' => \Mage_Index_Model_Resource_Event::class,
             'index_resource/event' => \Mage_Index_Model_Resource_Event::class,
+            'index/resource_event' => \Mage_Index_Model_Resource_Event::class,
             'index/resource_event_collection' => \Mage_Index_Model_Resource_Event_Collection::class,
             'index_resource/event_collection' => \Mage_Index_Model_Resource_Event_Collection::class,
             'index/resource_helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class,
             'index_resource/helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class,
-            'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
             'index/resource_lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
-            'index_resource/process' => \Mage_Index_Model_Resource_Process::class,
+            'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
             'index/resource_process' => \Mage_Index_Model_Resource_Process::class,
+            'index_resource/process' => \Mage_Index_Model_Resource_Process::class,
             'index/resource_process_collection' => \Mage_Index_Model_Resource_Process_Collection::class,
             'index_resource/process_collection' => \Mage_Index_Model_Resource_Process_Collection::class,
             'index/resource_setup' => \Mage_Index_Model_Resource_Setup::class,
@@ -11382,22 +11354,22 @@
             'log/mysql4_visitor_online_collection' => \Mage_Log_Model_Mysql4_Visitor_Online_Collection::class,
             'log_resource/aggregation' => \Mage_Log_Model_Resource_Aggregation::class,
             'log/resource_aggregation' => \Mage_Log_Model_Resource_Aggregation::class,
-            'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class,
             'log/resource_customer' => \Mage_Log_Model_Resource_Customer::class,
+            'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class,
             'log/resource_log' => \Mage_Log_Model_Resource_Log::class,
             'log_resource/log' => \Mage_Log_Model_Resource_Log::class,
             'log_resource/visitor' => \Mage_Log_Model_Resource_Visitor::class,
             'log/resource_visitor' => \Mage_Log_Model_Resource_Visitor::class,
             'log_resource/visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class,
             'log/resource_visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class,
-            'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
             'log_resource/visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
-            'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
+            'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
             'log_resource/visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
+            'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
             'log/visitor' => \Mage_Log_Model_Visitor::class,
             'log/visitor_online' => \Mage_Log_Model_Visitor_Online::class,
-            'media_resource/image' => \Mage_Media_Model_File_Image::class,
             'media/file_image' => \Mage_Media_Model_File_Image::class,
+            'media_resource/image' => \Mage_Media_Model_File_Image::class,
             'media/image' => \Mage_Media_Model_Image::class,
             'newsletter/message' => \Mage_Newsletter_Model_Message::class,
             'newsletter/mysql4_problem' => \Mage_Newsletter_Model_Mysql4_Problem::class,
@@ -11415,14 +11387,14 @@
             'newsletter_resource/problem' => \Mage_Newsletter_Model_Resource_Problem::class,
             'newsletter/resource_problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class,
             'newsletter_resource/problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class,
-            'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class,
             'newsletter/resource_queue' => \Mage_Newsletter_Model_Resource_Queue::class,
-            'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
+            'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class,
             'newsletter/resource_queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
-            'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
+            'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
             'newsletter/resource_subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
-            'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
+            'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
             'newsletter/resource_subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
+            'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
             'newsletter_resource/template' => \Mage_Newsletter_Model_Resource_Template::class,
             'newsletter/resource_template' => \Mage_Newsletter_Model_Resource_Template::class,
             'newsletter_resource/template_collection' => \Mage_Newsletter_Model_Resource_Template_Collection::class,
@@ -11435,20 +11407,20 @@
             'oauth/consumer_validator_keyLength' => \Mage_Oauth_Model_Consumer_Validator_KeyLength::class,
             'oauth/nonce' => \Mage_Oauth_Model_Nonce::class,
             'oauth/observer' => \Mage_Oauth_Model_Observer::class,
-            'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
             'oauth/resource_consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
+            'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
             'oauth/resource_consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class,
             'oauth_resource/consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class,
             'oauth_resource/nonce' => \Mage_Oauth_Model_Resource_Nonce::class,
             'oauth/resource_nonce' => \Mage_Oauth_Model_Resource_Nonce::class,
             'oauth_resource/nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class,
             'oauth/resource_nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class,
-            'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class,
             'oauth/resource_setup' => \Mage_Oauth_Model_Resource_Setup::class,
+            'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class,
             'oauth_resource/token' => \Mage_Oauth_Model_Resource_Token::class,
             'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class,
-            'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
             'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
+            'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
             'oauth/server' => \Mage_Oauth_Model_Server::class,
             'oauth/token' => \Mage_Oauth_Model_Token::class,
             'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class,
@@ -11465,8 +11437,8 @@
             'paygate/authorizenet_source_paymentAction' => \Mage_Paygate_Model_Authorizenet_Source_PaymentAction::class,
             'paygate/mysql4_authorizenet_debug' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug::class,
             'paygate/mysql4_authorizenet_debug_collection' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection::class,
-            'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
             'paygate/resource_authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
+            'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
             'paygate_resource/authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class,
             'paygate/resource_authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class,
             'payment/billing_agreementAbstract' => \Mage_Payment_Model_Billing_AgreementAbstract::class,
@@ -11529,14 +11501,14 @@
             'paypal/resource_cert' => \Mage_Paypal_Model_Resource_Cert::class,
             'paypal_resource/payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class,
             'paypal/resource_payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class,
-            'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
             'paypal/resource_payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
+            'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
             'paypal/resource_report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class,
             'paypal_resource/report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class,
-            'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
             'paypal/resource_report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
-            'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
+            'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
             'paypal/resource_report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
+            'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
             'paypal/resource_setup' => \Mage_Paypal_Model_Resource_Setup::class,
             'paypal_resource/setup' => \Mage_Paypal_Model_Resource_Setup::class,
             'paypal/session' => \Mage_Paypal_Model_Session::class,
@@ -11570,16 +11542,16 @@
             'poll/poll' => \Mage_Poll_Model_Poll::class,
             'poll/poll_answer' => \Mage_Poll_Model_Poll_Answer::class,
             'poll/poll_vote' => \Mage_Poll_Model_Poll_Vote::class,
-            'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class,
             'poll_resource/poll' => \Mage_Poll_Model_Resource_Poll::class,
-            'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
+            'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class,
             'poll/resource_poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
-            'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
+            'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
             'poll_resource/poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
-            'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
+            'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
             'poll_resource/poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
-            'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
+            'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
             'poll/resource_poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
+            'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
             'productalert/email' => \Mage_ProductAlert_Model_Email::class,
             'productalert/mysql4_price' => \Mage_ProductAlert_Model_Mysql4_Price::class,
             'productalert/mysql4_price_collection' => \Mage_ProductAlert_Model_Mysql4_Price_Collection::class,
@@ -11589,20 +11561,20 @@
             'productalert/mysql4_stock_customer_collection' => \Mage_ProductAlert_Model_Mysql4_Stock_Customer_Collection::class,
             'productalert/observer' => \Mage_ProductAlert_Model_Observer::class,
             'productalert/price' => \Mage_ProductAlert_Model_Price::class,
-            'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
             'productalert_resource/abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
-            'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class,
+            'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
             'productalert_resource/price' => \Mage_ProductAlert_Model_Resource_Price::class,
-            'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
+            'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class,
             'productalert/resource_price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
-            'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
+            'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
             'productalert/resource_price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
-            'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
+            'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
             'productalert/resource_stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
-            'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
+            'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
             'productalert/resource_stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
-            'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
+            'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
             'productalert/resource_stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
+            'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
             'productalert/stock' => \Mage_ProductAlert_Model_Stock::class,
             'rating/mysql4_rating' => \Mage_Rating_Model_Mysql4_Rating::class,
             'rating/mysql4_rating_collection' => \Mage_Rating_Model_Mysql4_Rating_Collection::class,
@@ -11616,20 +11588,20 @@
             'rating/rating_entity' => \Mage_Rating_Model_Rating_Entity::class,
             'rating/rating_option' => \Mage_Rating_Model_Rating_Option::class,
             'rating/rating_option_vote' => \Mage_Rating_Model_Rating_Option_Vote::class,
-            'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class,
             'rating/resource_rating' => \Mage_Rating_Model_Resource_Rating::class,
+            'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class,
             'rating_resource/rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class,
             'rating/resource_rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class,
             'rating/resource_rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class,
             'rating_resource/rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class,
-            'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
             'rating/resource_rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
-            'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
+            'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
             'rating_resource/rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
+            'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
             'rating_resource/rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class,
             'rating/resource_rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class,
-            'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
             'rating/resource_rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
+            'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
             'reports/config' => \Mage_Reports_Model_Config::class,
             'reports/event' => \Mage_Reports_Model_Event::class,
             'reports/event_observer' => \Mage_Reports_Model_Event_Observer::class,
@@ -11675,6 +11647,7 @@
             'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class,
             'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class,
             'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class,
+            'reports/observer' => \Mage_Reports_Model_Observer::class,
             'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class,
             'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class,
             'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class,
@@ -11683,52 +11656,52 @@
             'reports_resource/accounts_collection' => \Mage_Reports_Model_Resource_Accounts_Collection::class,
             'reports/resource_coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class,
             'reports_resource/coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class,
-            'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
             'reports/resource_customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
-            'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
+            'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
             'reports/resource_customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
-            'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
+            'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
             'reports_resource/customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
-            'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
+            'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
             'reports/resource_entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
+            'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
             'reports_resource/event' => \Mage_Reports_Model_Resource_Event::class,
             'reports/resource_event' => \Mage_Reports_Model_Resource_Event::class,
-            'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
             'reports_resource/event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
-            'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
+            'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
             'reports/resource_event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
-            'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
+            'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
             'reports/resource_event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
-            'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
+            'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
             'reports_resource/helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
-            'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
+            'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
             'reports/resource_invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
-            'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
+            'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
             'reports_resource/order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
-            'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
+            'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
             'reports_resource/product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
+            'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
             'reports/resource_product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class,
             'reports_resource/product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class,
             'reports_resource/product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class,
             'reports/resource_product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class,
-            'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
             'reports/resource_product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
+            'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
             'reports_resource/product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class,
             'reports/resource_product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class,
-            'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
             'reports_resource/product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
+            'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
             'reports/resource_product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
             'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
             'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
             'reports_resource/product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
-            'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
             'reports/resource_product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
+            'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
             'reports_resource/product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class,
             'reports/resource_product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class,
-            'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
             'reports_resource/product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
-            'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
+            'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
             'reports_resource/product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
+            'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
             'reports/resource_quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
             'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
             'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class,
@@ -11737,34 +11710,34 @@
             'reports_resource/report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class,
             'reports/resource_report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class,
             'reports_resource/report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class,
-            'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
             'reports_resource/report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
+            'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
             'reports/resource_report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class,
             'reports_resource/report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class,
-            'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
             'reports/resource_report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
-            'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
+            'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
             'reports_resource/review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
-            'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
+            'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
             'reports_resource/review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
+            'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
             'reports_resource/review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class,
             'reports/resource_review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class,
             'reports_resource/shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class,
             'reports/resource_shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class,
-            'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
             'reports_resource/shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
+            'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
             'reports_resource/tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class,
             'reports/resource_tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class,
             'reports/resource_tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
             'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
             'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
             'reports/resource_tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
-            'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
             'reports/resource_tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
+            'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
             'reports_resource/wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class,
             'reports/resource_wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class,
-            'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
             'reports_resource/wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
+            'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
             'reports/session' => \Mage_Reports_Model_Session::class,
             'reports/test' => \Mage_Reports_Model_Test::class,
             'reports/totals' => \Mage_Reports_Model_Totals::class,
@@ -11783,12 +11756,12 @@
             'review/resource_review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class,
             'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class,
             'review_resource/review_status' => \Mage_Review_Model_Resource_Review_Status::class,
-            'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
             'review_resource/review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
+            'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
             'review/resource_review_summary' => \Mage_Review_Model_Resource_Review_Summary::class,
             'review_resource/review_summary' => \Mage_Review_Model_Resource_Review_Summary::class,
-            'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
             'review/resource_review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
+            'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
             'review/review' => \Mage_Review_Model_Review::class,
             'review/review_status' => \Mage_Review_Model_Review_Status::class,
             'review/review_summary' => \Mage_Review_Model_Review_Summary::class,
@@ -11811,12 +11784,12 @@
             'rule/mysql4_rule_collection' => \Mage_Rule_Model_Mysql4_Rule_Collection::class,
             'rule/renderer_actions' => \Mage_Rule_Model_Renderer_Actions::class,
             'rule/renderer_conditions' => \Mage_Rule_Model_Renderer_Conditions::class,
-            'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class,
             'rule/resource_abstract' => \Mage_Rule_Model_Resource_Abstract::class,
-            'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class,
+            'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class,
             'rule/resource_rule' => \Mage_Rule_Model_Resource_Rule::class,
-            'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
+            'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class,
             'rule_resource/rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
+            'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
             'rule_resource/rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
             'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
             'rule/resource_rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class,
@@ -11843,28 +11816,28 @@
             'salesrule/quote_nominal_discount' => \Mage_SalesRule_Model_Quote_Nominal_Discount::class,
             'salesrule_resource/coupon' => \Mage_SalesRule_Model_Resource_Coupon::class,
             'salesrule/resource_coupon' => \Mage_SalesRule_Model_Resource_Coupon::class,
-            'salesrule_resource/coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class,
             'salesrule/resource_coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class,
+            'salesrule_resource/coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class,
             'salesrule/resource_coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class,
             'salesrule_resource/coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class,
-            'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
             'salesrule_resource/report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
-            'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
+            'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
             'salesrule_resource/report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
+            'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
             'salesrule_resource/report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class,
             'salesrule/resource_report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class,
             'salesrule_resource/report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class,
             'salesrule/resource_report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class,
             'salesrule_resource/report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class,
             'salesrule/resource_report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class,
-            'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class,
             'salesrule_resource/rule' => \Mage_SalesRule_Model_Resource_Rule::class,
-            'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
+            'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class,
             'salesrule_resource/rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
-            'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
+            'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
             'salesrule_resource/rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
-            'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
+            'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
             'salesrule/resource_rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
+            'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
             'salesrule_resource/rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class,
             'salesrule/resource_rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class,
             'salesrule/resource_rule_product_collection' => \Mage_SalesRule_Model_Resource_Rule_Product_Collection::class,
@@ -11909,14 +11882,14 @@
             'sales/email_template' => \Mage_Sales_Model_Email_Template::class,
             'sales/entity_order' => \Mage_Sales_Model_Entity_Order::class,
             'sales_entity/order' => \Mage_Sales_Model_Entity_Order::class,
-            'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
             'sales_entity/order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
-            'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
+            'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
             'sales/entity_order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
-            'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
+            'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
             'sales_entity/order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
-            'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
+            'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
             'sales_entity/order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
+            'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
             'sales_entity/order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class,
             'sales/entity_order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class,
             'sales/entity_order_attribute_backend_shipping' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Shipping::class,
@@ -11925,54 +11898,54 @@
             'sales/entity_order_collection' => \Mage_Sales_Model_Entity_Order_Collection::class,
             'sales_entity/order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class,
             'sales/entity_order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class,
-            'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales_entity/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
-            'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
+            'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales/entity_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
-            'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
+            'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
             'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
+            'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
             'sales/entity_order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class,
             'sales_entity/order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class,
             'sales/entity_order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class,
             'sales_entity/order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class,
             'sales_entity/order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class,
             'sales/entity_order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class,
-            'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
             'sales/entity_order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
-            'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
+            'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
             'sales_entity/order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
+            'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
             'sales/entity_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class,
             'sales_entity/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class,
-            'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class,
             'sales/entity_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class,
+            'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class,
             'sales/entity_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Order::class,
             'sales_entity/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Order::class,
             'sales_entity/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/entity_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/entity_order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class,
             'sales_entity/order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class,
-            'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
             'sales/entity_order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
+            'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
             'sales_entity/order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class,
             'sales/entity_order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class,
             'sales_entity/order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class,
             'sales/entity_order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class,
-            'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
             'sales/entity_order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
+            'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
             'sales/entity_order_item' => \Mage_Sales_Model_Entity_Order_Item::class,
             'sales_entity/order_item' => \Mage_Sales_Model_Entity_Order_Item::class,
             'sales/entity_order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class,
             'sales_entity/order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class,
-            'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
             'sales/entity_order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
+            'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
             'sales_entity/order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class,
             'sales/entity_order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class,
             'sales/entity_order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class,
             'sales_entity/order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class,
-            'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
             'sales_entity/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
-            'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
+            'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
             'sales/entity_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
+            'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
             'sales/entity_order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class,
             'sales_entity/order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class,
             'sales/entity_order_shipment_comment' => \Mage_Sales_Model_Entity_Order_Shipment_Comment::class,
@@ -11981,66 +11954,66 @@
             'sales_entity/order_shipment_comment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Comment_Collection::class,
             'sales_entity/order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class,
             'sales/entity_order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class,
-            'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
             'sales/entity_order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
-            'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
+            'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
             'sales_entity/order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
-            'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
+            'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
             'sales_entity/order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
-            'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
+            'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
             'sales_entity/order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
-            'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
+            'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
             'sales_entity/order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
+            'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
             'sales_entity/quote' => \Mage_Sales_Model_Entity_Quote::class,
             'sales/entity_quote' => \Mage_Sales_Model_Entity_Quote::class,
-            'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
             'sales_entity/quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
+            'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
             'sales_entity/quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class,
             'sales/entity_quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class,
-            'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
             'sales/entity_quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
-            'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
+            'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
             'sales/entity_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
-            'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
+            'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
             'sales_entity/quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
-            'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
+            'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
             'sales/entity_quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
+            'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
             'sales_entity/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales/entity_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales_entity/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class,
             'sales/entity_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class,
-            'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
             'sales_entity/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
-            'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
             'sales/entity_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/entity_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales_entity/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales/entity_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class,
             'sales_entity/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class,
             'sales_entity/quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class,
             'sales/entity_quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class,
-            'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
             'sales_entity/quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
-            'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
+            'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
             'sales/entity_quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
-            'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
+            'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
             'sales_entity/quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
+            'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
             'sales/entity_quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class,
             'sales_entity/quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class,
             'sales/entity_quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class,
             'sales_entity/quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class,
-            'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
             'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
-            'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
+            'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
             'sales/entity_quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
-            'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
+            'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
             'sales/entity_quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
+            'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
             'sales_entity/quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class,
             'sales/entity_quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class,
-            'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
             'sales_entity/sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
-            'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class,
+            'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
             'sales_entity/setup' => \Mage_Sales_Model_Entity_Setup::class,
+            'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class,
             'sales/mysql4_abstract' => \Mage_Sales_Model_Mysql4_Abstract::class,
             'sales/mysql4_billing_agreement' => \Mage_Sales_Model_Mysql4_Billing_Agreement::class,
             'sales/mysql4_billing_agreement_collection' => \Mage_Sales_Model_Mysql4_Billing_Agreement_Collection::class,
@@ -12235,50 +12208,50 @@
             'sales/recurring_profile' => \Mage_Sales_Model_Recurring_Profile::class,
             'sales_resource/abstract' => \Mage_Sales_Model_Resource_Abstract::class,
             'sales/resource_abstract' => \Mage_Sales_Model_Resource_Abstract::class,
-            'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
             'sales_resource/billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
-            'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
+            'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
             'sales_resource/billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
+            'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
             'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
             'sales/resource_collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
             'sales_resource/helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
             'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
-            'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class,
             'sales_resource/order' => \Mage_Sales_Model_Resource_Order::class,
+            'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class,
             'sales_resource/order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class,
             'sales/resource_order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class,
-            'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
             'sales_resource/order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
+            'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
             'sales/resource_order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class,
             'sales_resource/order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class,
             'sales/resource_order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class,
             'sales_resource/order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class,
             'sales/resource_order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class,
             'sales_resource/order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class,
-            'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
             'sales/resource_order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
+            'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
             'sales_resource/order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class,
             'sales/resource_order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class,
             'sales/resource_order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class,
             'sales_resource/order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class,
-            'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
             'sales/resource_order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
-            'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
+            'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
             'sales/resource_order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
-            'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
+            'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
             'sales/resource_order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
-            'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
+            'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
             'sales_resource/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
+            'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales/resource_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class,
             'sales_resource/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class,
-            'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
             'sales/resource_order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
-            'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
+            'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
             'sales_resource/order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
+            'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
             'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
             'sales/resource_order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
-            'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
             'sales/resource_order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
+            'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
             'sales_resource/order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class,
             'sales/resource_order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class,
             'sales_resource/order_creditmemo_item_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item_Collection::class,
@@ -12287,138 +12260,138 @@
             'sales/resource_order_grid_collection' => \Mage_Sales_Model_Resource_Order_Grid_Collection::class,
             'sales/resource_order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class,
             'sales_resource/order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class,
-            'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
             'sales/resource_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
-            'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
+            'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
             'sales_resource/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
+            'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
             'sales_resource/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class,
             'sales/resource_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class,
             'sales/resource_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class,
             'sales_resource/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/resource_order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class,
             'sales_resource/order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class,
-            'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
             'sales/resource_order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
+            'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
             'sales/resource_order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class,
             'sales_resource/order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class,
-            'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
             'sales/resource_order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
-            'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
+            'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
             'sales_resource/order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
+            'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
             'sales/resource_order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class,
             'sales_resource/order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class,
-            'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
             'sales_resource/order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
+            'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
             'sales/resource_order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class,
             'sales_resource/order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class,
-            'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
             'sales_resource/order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
-            'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
+            'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
             'sales/resource_order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
+            'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
             'sales_resource/order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
             'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
-            'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
             'sales_resource/order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
-            'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
+            'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
             'sales_resource/order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
-            'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
+            'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
             'sales/resource_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
+            'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
             'sales_resource/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class,
             'sales/resource_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class,
             'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
             'sales/resource_order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
-            'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
             'sales/resource_order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
-            'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
+            'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
             'sales/resource_order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
+            'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
             'sales_resource/order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class,
             'sales/resource_order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class,
-            'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
             'sales_resource/order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
-            'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
+            'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
             'sales_resource/order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
-            'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
+            'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
             'sales_resource/order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
-            'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
+            'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
             'sales_resource/order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
+            'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
             'sales_resource/order_status' => \Mage_Sales_Model_Resource_Order_Status::class,
             'sales/resource_order_status' => \Mage_Sales_Model_Resource_Order_Status::class,
             'sales_resource/order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class,
             'sales/resource_order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class,
-            'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
             'sales_resource/order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
-            'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
+            'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
             'sales_resource/order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
-            'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
+            'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
             'sales/resource_order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
-            'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
+            'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
             'sales_resource/order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
-            'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class,
+            'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
             'sales/resource_quote' => \Mage_Sales_Model_Resource_Quote::class,
+            'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class,
             'sales_resource/quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class,
             'sales/resource_quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class,
             'sales/resource_quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class,
             'sales_resource/quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class,
             'sales/resource_quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class,
             'sales_resource/quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class,
-            'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
             'sales/resource_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
+            'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
             'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
             'sales/resource_quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
-            'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
             'sales_resource/quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
+            'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
             'sales_resource/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales/resource_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales/resource_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class,
             'sales_resource/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class,
             'sales/resource_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class,
             'sales_resource/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class,
-            'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/resource_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales/resource_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
-            'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
             'sales_resource/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
-            'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
+            'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
             'sales/resource_quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
+            'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
             'sales_resource/quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class,
             'sales/resource_quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class,
-            'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
             'sales/resource_quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
-            'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
+            'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
             'sales_resource/quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
-            'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
+            'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
             'sales_resource/quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
+            'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
             'sales_resource/quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class,
             'sales/resource_quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class,
-            'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
             'sales/resource_quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
+            'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
             'sales/resource_quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class,
             'sales_resource/quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class,
-            'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
             'sales/resource_quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
-            'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
+            'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
             'sales/resource_quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
-            'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
+            'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
             'sales_resource/quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
-            'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
+            'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
             'sales/resource_quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
-            'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
+            'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
             'sales/resource_recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
+            'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
             'sales/resource_recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class,
             'sales_resource/recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class,
-            'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class,
             'sales/resource_report' => \Mage_Sales_Model_Resource_Report::class,
+            'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class,
             'sales/resource_report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class,
             'sales_resource/report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class,
-            'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
             'sales/resource_report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
+            'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
             'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
             'sales/resource_report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
-            'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
             'sales_resource/report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
-            'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
+            'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
             'sales_resource/report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
+            'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
             'sales/resource_report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class,
             'sales_resource/report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class,
             'sales_resource/report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class,
@@ -12431,24 +12404,24 @@
             'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class,
             'sales_resource/report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class,
             'sales/resource_report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class,
-            'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
             'sales/resource_report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
-            'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
+            'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
             'sales_resource/report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
+            'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
             'sales_resource/report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class,
             'sales/resource_report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class,
             'sales_resource/report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class,
             'sales/resource_report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class,
-            'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
             'sales_resource/report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
+            'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
             'sales_resource/report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class,
             'sales/resource_report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class,
             'sales_resource/report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class,
             'sales/resource_report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class,
-            'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
             'sales/resource_sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
-            'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class,
+            'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
             'sales/resource_setup' => \Mage_Sales_Model_Resource_Setup::class,
+            'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class,
             'sales/service_order' => \Mage_Sales_Model_Service_Order::class,
             'sales/service_quote' => \Mage_Sales_Model_Service_Quote::class,
             'sales/status_list' => \Mage_Sales_Model_Status_List::class,
@@ -12458,8 +12431,8 @@
             'sendfriend/observer' => \Mage_Sendfriend_Model_Observer::class,
             'sendfriend_resource/sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class,
             'sendfriend/resource_sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class,
-            'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
             'sendfriend/resource_sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
+            'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
             'sendfriend/resource_setup' => \Mage_Sendfriend_Model_Resource_Setup::class,
             'sendfriend_resource/setup' => \Mage_Sendfriend_Model_Resource_Setup::class,
             'sendfriend/sendfriend' => \Mage_Sendfriend_Model_Sendfriend::class,
@@ -12478,8 +12451,8 @@
             'shipping/rate_result_abstract' => \Mage_Shipping_Model_Rate_Result_Abstract::class,
             'shipping/rate_result_error' => \Mage_Shipping_Model_Rate_Result_Error::class,
             'shipping/rate_result_method' => \Mage_Shipping_Model_Rate_Result_Method::class,
-            'shipping/resource_carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class,
             'shipping_resource/carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class,
+            'shipping/resource_carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class,
             'shipping/resource_carrier_tablerate_collection' => \Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection::class,
             'shipping_resource/carrier_tablerate_collection' => \Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection::class,
             'shipping/shipment_request' => \Mage_Shipping_Model_Shipment_Request::class,
@@ -12499,16 +12472,16 @@
             'sitemap/observer' => \Mage_Sitemap_Model_Observer::class,
             'sitemap_resource/catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class,
             'sitemap/resource_catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class,
-            'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
             'sitemap/resource_catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
-            'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
+            'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
             'sitemap_resource/catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
-            'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
+            'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
             'sitemap_resource/cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
+            'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
             'sitemap_resource/sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class,
             'sitemap/resource_sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class,
-            'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
             'sitemap_resource/sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
+            'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
             'sitemap/sitemap' => \Mage_Sitemap_Model_Sitemap::class,
             'tag/api' => \Mage_Tag_Model_Api::class,
             'tag/api_v2' => \Mage_Tag_Model_Api_V2::class,
@@ -12521,21 +12494,21 @@
             'tag/mysql4_tag' => \Mage_Tag_Model_Mysql4_Tag::class,
             'tag/mysql4_tag_collection' => \Mage_Tag_Model_Mysql4_Tag_Collection::class,
             'tag/mysql4_tag_relation' => \Mage_Tag_Model_Mysql4_Tag_Relation::class,
-            'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag/resource_customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag_resource/customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
-            'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
+            'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag_resource/indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
-            'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
+            'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
             'tag_resource/popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
+            'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
             'tag_resource/product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class,
             'tag/resource_product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class,
             'tag_resource/tag' => \Mage_Tag_Model_Resource_Tag::class,
             'tag/resource_tag' => \Mage_Tag_Model_Resource_Tag::class,
-            'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
             'tag_resource/tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
-            'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
+            'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
             'tag_resource/tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
+            'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
             'tag/session' => \Mage_Tag_Model_Session::class,
             'tag/tag' => \Mage_Tag_Model_Tag::class,
             'tag/tag_relation' => \Mage_Tag_Model_Tag_Relation::class,
@@ -12574,16 +12547,16 @@
             'tax/resource_calculation_rate' => \Mage_Tax_Model_Resource_Calculation_Rate::class,
             'tax/resource_calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class,
             'tax_resource/calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class,
-            'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
             'tax/resource_calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
-            'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
+            'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
             'tax/resource_calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
-            'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
+            'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
             'tax/resource_calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
-            'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
+            'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
             'tax_resource/calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
-            'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class,
+            'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
             'tax/resource_class' => \Mage_Tax_Model_Resource_Class::class,
+            'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class,
             'tax/resource_class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class,
             'tax_resource/class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class,
             'tax_resource/report_collection' => \Mage_Tax_Model_Resource_Report_Collection::class,
@@ -12594,16 +12567,16 @@
             'tax/resource_report_tax_createdat' => \Mage_Tax_Model_Resource_Report_Tax_Createdat::class,
             'tax_resource/report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class,
             'tax/resource_report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class,
-            'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
             'tax/resource_report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
-            'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
+            'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
             'tax_resource/sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
+            'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
             'tax_resource/sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class,
             'tax/resource_sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class,
-            'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class,
             'tax/resource_sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class,
-            'tax_resource/sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class,
+            'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class,
             'tax/resource_sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class,
+            'tax_resource/sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class,
             'tax/resource_setup' => \Mage_Tax_Model_Resource_Setup::class,
             'tax_resource/setup' => \Mage_Tax_Model_Resource_Setup::class,
             'tax/sales_order_tax' => \Mage_Tax_Model_Sales_Order_Tax::class,
@@ -12686,10 +12659,10 @@
             'weee/observer' => \Mage_Weee_Model_Observer::class,
             'weee/resource_attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class,
             'weee_resource/attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class,
-            'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class,
             'weee/resource_setup' => \Mage_Weee_Model_Resource_Setup::class,
-            'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class,
+            'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class,
             'weee/resource_tax' => \Mage_Weee_Model_Resource_Tax::class,
+            'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class,
             'weee/tax' => \Mage_Weee_Model_Tax::class,
             'weee/total_creditmemo_weee' => \Mage_Weee_Model_Total_Creditmemo_Weee::class,
             'weee/total_invoice_weee' => \Mage_Weee_Model_Total_Invoice_Weee::class,
@@ -12699,12 +12672,12 @@
             'widget/mysql4_widget_instance' => \Mage_Widget_Model_Mysql4_Widget_Instance::class,
             'widget/mysql4_widget_instance_collection' => \Mage_Widget_Model_Mysql4_Widget_Instance_Collection::class,
             'widget/observer' => \Mage_Widget_Model_Observer::class,
-            'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class,
             'widget/resource_widget' => \Mage_Widget_Model_Resource_Widget::class,
+            'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class,
             'widget_resource/widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class,
             'widget/resource_widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class,
-            'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
             'widget_resource/widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
+            'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
             'widget/template_filter' => \Mage_Widget_Model_Template_Filter::class,
             'widget/widget' => \Mage_Widget_Model_Widget::class,
             'widget/widget_config' => \Mage_Widget_Model_Widget_Config::class,
@@ -12721,14 +12694,14 @@
             'wishlist/mysql4_wishlist' => \Mage_Wishlist_Model_Mysql4_Wishlist::class,
             'wishlist/mysql4_wishlist_collection' => \Mage_Wishlist_Model_Mysql4_Wishlist_Collection::class,
             'wishlist/observer' => \Mage_Wishlist_Model_Observer::class,
-            'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class,
             'wishlist_resource/item' => \Mage_Wishlist_Model_Resource_Item::class,
+            'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class,
             'wishlist_resource/item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class,
             'wishlist/resource_item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class,
             'wishlist/resource_item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
             'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
-            'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
             'wishlist_resource/item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
+            'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
             'wishlist_resource/product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class,
             'wishlist/resource_product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class,
             'wishlist/resource_wishlist' => \Mage_Wishlist_Model_Resource_Wishlist::class,
@@ -12737,7 +12710,6 @@
             'wishlist/resource_wishlist_collection' => \Mage_Wishlist_Model_Resource_Wishlist_Collection::class,
             'wishlist/session' => \Mage_Wishlist_Model_Session::class,
             'wishlist/wishlist' => \Mage_Wishlist_Model_Wishlist::class,
-            'varien/autoload' => \Varien_Autoload::class,
         ])
     );
     override( \Mage_Core_Model_Factory::getSingleton(0),
@@ -12747,11 +12719,10 @@
             'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class,
             'adminnotification/mysql4_inbox_collection' => \Mage_AdminNotification_Model_Mysql4_Inbox_Collection::class,
             'adminnotification/observer' => \Mage_AdminNotification_Model_Observer::class,
-            'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
             'adminnotification/resource_inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
-            'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
+            'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
             'adminnotification/resource_inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
-            'adminnotification/survey' => \Mage_AdminNotification_Model_Survey::class,
+            'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
             'admin/acl' => \Mage_Admin_Model_Acl::class,
             'admin/acl_assert_ip' => \Mage_Admin_Model_Acl_Assert_Ip::class,
             'admin/acl_assert_time' => \Mage_Admin_Model_Acl_Assert_Time::class,
@@ -12780,38 +12751,38 @@
             'admin/redirectpolicy' => \Mage_Admin_Model_Redirectpolicy::class,
             'admin/resource_acl' => \Mage_Admin_Model_Resource_Acl::class,
             'admin_resource/acl' => \Mage_Admin_Model_Resource_Acl::class,
-            'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
             'admin/resource_acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
+            'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
             'admin/resource_acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class,
             'admin_resource/acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class,
-            'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class,
             'admin/resource_block' => \Mage_Admin_Model_Resource_Block::class,
-            'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
+            'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class,
             'admin/resource_block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
+            'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
             'admin_resource/permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class,
             'admin/resource_permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class,
-            'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class,
             'admin/resource_role' => \Mage_Admin_Model_Resource_Role::class,
+            'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class,
             'admin/resource_role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class,
             'admin_resource/role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class,
-            'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class,
             'admin_resource/roles' => \Mage_Admin_Model_Resource_Roles::class,
-            'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
+            'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class,
             'admin_resource/roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
-            'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
+            'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
             'admin/resource_roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
+            'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
             'admin/resource_rules' => \Mage_Admin_Model_Resource_Rules::class,
             'admin_resource/rules' => \Mage_Admin_Model_Resource_Rules::class,
             'admin_resource/rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
             'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
-            'admin_resource/user' => \Mage_Admin_Model_Resource_User::class,
             'admin/resource_user' => \Mage_Admin_Model_Resource_User::class,
+            'admin_resource/user' => \Mage_Admin_Model_Resource_User::class,
             'admin/resource_user_collection' => \Mage_Admin_Model_Resource_User_Collection::class,
             'admin_resource/user_collection' => \Mage_Admin_Model_Resource_User_Collection::class,
-            'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class,
             'admin_resource/variable' => \Mage_Admin_Model_Resource_Variable::class,
-            'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
+            'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class,
             'admin/resource_variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
+            'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
             'admin/role' => \Mage_Admin_Model_Role::class,
             'admin/roles' => \Mage_Admin_Model_Roles::class,
             'admin/rules' => \Mage_Admin_Model_Rules::class,
@@ -12846,6 +12817,7 @@
             'adminhtml/system_config_backend_baseurl' => \Mage_Adminhtml_Model_System_Config_Backend_Baseurl::class,
             'adminhtml/system_config_backend_cache' => \Mage_Adminhtml_Model_System_Config_Backend_Cache::class,
             'adminhtml/system_config_backend_catalog_inventory_managestock' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock::class,
+            'adminhtml/system_config_backend_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Separator::class,
             'adminhtml/system_config_backend_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Type::class,
             'adminhtml/system_config_backend_category' => \Mage_Adminhtml_Model_System_Config_Backend_Category::class,
             'adminhtml/system_config_backend_cookie' => \Mage_Adminhtml_Model_System_Config_Backend_Cookie::class,
@@ -12898,12 +12870,14 @@
             'adminhtml/system_config_source_catalog_listMode' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListMode::class,
             'adminhtml/system_config_source_catalog_listPerPage' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListPerPage::class,
             'adminhtml/system_config_source_catalog_listSort' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort::class,
+            'adminhtml/system_config_source_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Separator::class,
             'adminhtml/system_config_source_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Type::class,
             'adminhtml/system_config_source_catalog_timeFormat' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_TimeFormat::class,
             'adminhtml/system_config_source_category' => \Mage_Adminhtml_Model_System_Config_Source_Category::class,
             'adminhtml/system_config_source_checktype' => \Mage_Adminhtml_Model_System_Config_Source_Checktype::class,
             'adminhtml/system_config_source_cms_page' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Page::class,
             'adminhtml/system_config_source_cms_wysiwyg_enabled' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Wysiwyg_Enabled::class,
+            'adminhtml/system_config_source_cookie_samesite' => \Mage_Adminhtml_Model_System_Config_Source_Cookie_Samesite::class,
             'adminhtml/system_config_source_country' => \Mage_Adminhtml_Model_System_Config_Source_Country::class,
             'adminhtml/system_config_source_country_full' => \Mage_Adminhtml_Model_System_Config_Source_Country_Full::class,
             'adminhtml/system_config_source_cron_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency::class,
@@ -12930,6 +12904,7 @@
             'adminhtml/system_config_source_locale_timezone' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Timezone::class,
             'adminhtml/system_config_source_locale_weekdaycodes' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdaycodes::class,
             'adminhtml/system_config_source_locale_weekdays' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdays::class,
+            'adminhtml/system_config_source_log_level' => \Mage_Adminhtml_Model_System_Config_Source_Log_Level::class,
             'adminhtml/system_config_source_nooptreq' => \Mage_Adminhtml_Model_System_Config_Source_Nooptreq::class,
             'adminhtml/system_config_source_notification_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Notification_Frequency::class,
             'adminhtml/system_config_source_order_status' => \Mage_Adminhtml_Model_System_Config_Source_Order_Status::class,
@@ -12953,7 +12928,6 @@
             'adminhtml/system_config_source_shipping_flatrate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Flatrate::class,
             'adminhtml/system_config_source_shipping_tablerate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Tablerate::class,
             'adminhtml/system_config_source_shipping_taxclass' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Taxclass::class,
-            'adminhtml/system_config_source_startdateenddate' => \Mage_Adminhtml_Model_System_Config_Source_Startdateenddate::class,
             'adminhtml/system_config_source_storage_media_database' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Database::class,
             'adminhtml/system_config_source_storage_media_storage' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Storage::class,
             'adminhtml/system_config_source_store' => \Mage_Adminhtml_Model_System_Config_Source_Store::class,
@@ -13009,22 +12983,22 @@
             'api2_resource/acl_filter_attribute' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute::class,
             'api2/resource_acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class,
             'api2_resource/acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class,
-            'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
             'api2_resource/acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
+            'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
             'api2/resource_acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class,
             'api2_resource/acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class,
             'api2_resource/acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class,
             'api2/resource_acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class,
             'api2/resource_acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class,
             'api2_resource/acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class,
-            'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class,
             'api2/resource_setup' => \Mage_Api2_Model_Resource_Setup::class,
+            'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class,
             'api2/resource_validator' => \Mage_Api2_Model_Resource_Validator::class,
             'api2_resource/validator' => \Mage_Api2_Model_Resource_Validator::class,
             'api2/resource_validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class,
             'api2_resource/validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class,
-            'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
             'api2/resource_validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
+            'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
             'api2/response' => \Mage_Api2_Model_Response::class,
             'api2/route_abstract' => \Mage_Api2_Model_Route_Abstract::class,
             'api2/route_apiType' => \Mage_Api2_Model_Route_ApiType::class,
@@ -13056,8 +13030,8 @@
             'api/mysql4_user_collection' => \Mage_Api_Model_Mysql4_User_Collection::class,
             'api/resource_abstract' => \Mage_Api_Model_Resource_Abstract::class,
             'api_resource/abstract' => \Mage_Api_Model_Resource_Abstract::class,
-            'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class,
             'api_resource/acl' => \Mage_Api_Model_Resource_Acl::class,
+            'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class,
             'api_resource/acl_role' => \Mage_Api_Model_Resource_Acl_Role::class,
             'api/resource_acl_role' => \Mage_Api_Model_Resource_Acl_Role::class,
             'api/resource_acl_role_collection' => \Mage_Api_Model_Resource_Acl_Role_Collection::class,
@@ -13066,18 +13040,18 @@
             'api_resource/permissions_collection' => \Mage_Api_Model_Resource_Permissions_Collection::class,
             'api_resource/role' => \Mage_Api_Model_Resource_Role::class,
             'api/resource_role' => \Mage_Api_Model_Resource_Role::class,
-            'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
             'api_resource/role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
+            'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
             'api/resource_roles' => \Mage_Api_Model_Resource_Roles::class,
             'api_resource/roles' => \Mage_Api_Model_Resource_Roles::class,
-            'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
             'api_resource/roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
-            'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
+            'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
             'api_resource/roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
-            'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class,
+            'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
             'api_resource/rules' => \Mage_Api_Model_Resource_Rules::class,
-            'api/resource_rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class,
+            'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class,
             'api_resource/rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class,
+            'api/resource_rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class,
             'api/resource_user' => \Mage_Api_Model_Resource_User::class,
             'api_resource/user' => \Mage_Api_Model_Resource_User::class,
             'api/resource_user_collection' => \Mage_Api_Model_Resource_User_Collection::class,
@@ -13104,15 +13078,6 @@
             'authorizenet/directpost_request' => \Mage_Authorizenet_Model_Directpost_Request::class,
             'authorizenet/directpost_response' => \Mage_Authorizenet_Model_Directpost_Response::class,
             'authorizenet/directpost_session' => \Mage_Authorizenet_Model_Directpost_Session::class,
-            'backup/backup' => \Mage_Backup_Model_Backup::class,
-            'backup/config_backend_cron' => \Mage_Backup_Model_Config_Backend_Cron::class,
-            'backup/config_source_type' => \Mage_Backup_Model_Config_Source_Type::class,
-            'backup/db' => \Mage_Backup_Model_Db::class,
-            'backup/fs_collection' => \Mage_Backup_Model_Fs_Collection::class,
-            'backup/mysql4_db' => \Mage_Backup_Model_Mysql4_Db::class,
-            'backup/observer' => \Mage_Backup_Model_Observer::class,
-            'backup/resource_db' => \Mage_Backup_Model_Resource_Db::class,
-            'backup/resource_helper_mysql4' => \Mage_Backup_Model_Resource_Helper_Mysql4::class,
             'bundle/catalogIndex_data_bundle' => \Mage_Bundle_Model_CatalogIndex_Data_Bundle::class,
             'bundle/mysql4_bundle' => \Mage_Bundle_Model_Mysql4_Bundle::class,
             'bundle/mysql4_indexer_price' => \Mage_Bundle_Model_Mysql4_Indexer_Price::class,
@@ -13138,10 +13103,10 @@
             'bundle_resource/option' => \Mage_Bundle_Model_Resource_Option::class,
             'bundle/resource_option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class,
             'bundle_resource/option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class,
-            'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
             'bundle_resource/price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
-            'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class,
+            'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
             'bundle_resource/selection' => \Mage_Bundle_Model_Resource_Selection::class,
+            'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class,
             'bundle_resource/selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class,
             'bundle/resource_selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class,
             'bundle/sales_order_pdf_items_abstract' => \Mage_Bundle_Model_Sales_Order_Pdf_Items_Abstract::class,
@@ -13157,8 +13122,8 @@
             'captcha/config_form_frontend' => \Mage_Captcha_Model_Config_Form_Frontend::class,
             'captcha/config_mode' => \Mage_Captcha_Model_Config_Mode::class,
             'captcha/observer' => \Mage_Captcha_Model_Observer::class,
-            'captcha_resource/log' => \Mage_Captcha_Model_Resource_Log::class,
             'captcha/resource_log' => \Mage_Captcha_Model_Resource_Log::class,
+            'captcha_resource/log' => \Mage_Captcha_Model_Resource_Log::class,
             'captcha/zend' => \Mage_Captcha_Model_Zend::class,
             'catalogindex/aggregation' => \Mage_CatalogIndex_Model_Aggregation::class,
             'catalogindex/attribute' => \Mage_CatalogIndex_Model_Attribute::class,
@@ -13201,8 +13166,8 @@
             'catalogindex/resource_data_abstract' => \Mage_CatalogIndex_Model_Resource_Data_Abstract::class,
             'catalogindex_resource/data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class,
             'catalogindex/resource_data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class,
-            'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
             'catalogindex_resource/data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
+            'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
             'catalogindex_resource/indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class,
             'catalogindex/resource_indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class,
             'catalogindex/resource_indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class,
@@ -13234,20 +13199,20 @@
             'cataloginventory/mysql4_stock_item_collection' => \Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection::class,
             'cataloginventory/mysql4_stock_status' => \Mage_CatalogInventory_Model_Mysql4_Stock_Status::class,
             'cataloginventory/observer' => \Mage_CatalogInventory_Model_Observer::class,
-            'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
             'cataloginventory_resource/indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
+            'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
             'cataloginventory/resource_indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class,
             'cataloginventory_resource/indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class,
-            'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
             'cataloginventory/resource_indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
+            'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
             'cataloginventory/resource_indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class,
             'cataloginventory_resource/indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class,
             'cataloginventory_resource/stock' => \Mage_CatalogInventory_Model_Resource_Stock::class,
             'cataloginventory/resource_stock' => \Mage_CatalogInventory_Model_Resource_Stock::class,
-            'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
             'cataloginventory/resource_stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
-            'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
+            'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
             'cataloginventory/resource_stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
+            'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
             'cataloginventory/resource_stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class,
             'cataloginventory_resource/stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class,
             'cataloginventory/source_backorders' => \Mage_CatalogInventory_Model_Source_Backorders::class,
@@ -13270,8 +13235,8 @@
             'catalogrule/observer' => \Mage_CatalogRule_Model_Observer::class,
             'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
             'catalogrule/resource_rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
-            'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
             'catalogrule_resource/rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
+            'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
             'catalogrule_resource/rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class,
             'catalogrule/resource_rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class,
             'catalogrule_resource/rule_product_price_collection' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price_Collection::class,
@@ -13300,24 +13265,24 @@
             'catalogsearch/query' => \Mage_CatalogSearch_Model_Query::class,
             'catalogsearch_resource/advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class,
             'catalogsearch/resource_advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class,
-            'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
             'catalogsearch_resource/advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
+            'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
             'catalogsearch_resource/fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class,
             'catalogsearch/resource_fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class,
             'catalogsearch_resource/fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class,
             'catalogsearch/resource_fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class,
-            'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
             'catalogsearch_resource/fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
-            'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
+            'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
             'catalogsearch/resource_helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
-            'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
+            'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
             'catalogsearch_resource/indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
-            'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class,
+            'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
             'catalogsearch_resource/query' => \Mage_CatalogSearch_Model_Resource_Query::class,
-            'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
+            'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class,
             'catalogsearch_resource/query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
-            'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
+            'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
             'catalogsearch/resource_search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
+            'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
             'catalogsearch/session' => \Mage_CatalogSearch_Model_Session::class,
             'catalogsearch/system_config_backend_sitemap' => \Mage_CatalogSearch_Model_System_Config_Backend_Sitemap::class,
             'catalog/abstract' => \Mage_Catalog_Model_Abstract::class,
@@ -13460,144 +13425,144 @@
             'catalog/product_website' => \Mage_Catalog_Model_Product_Website::class,
             'catalog/resource_abstract' => \Mage_Catalog_Model_Resource_Abstract::class,
             'catalog_resource/abstract' => \Mage_Catalog_Model_Resource_Abstract::class,
-            'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
             'catalog/resource_attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
-            'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class,
+            'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
             'catalog_resource/category' => \Mage_Catalog_Model_Resource_Category::class,
+            'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class,
             'catalog_resource/category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class,
             'catalog/resource_category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class,
-            'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
             'catalog/resource_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
-            'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
+            'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
             'catalog/resource_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
+            'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
             'catalog_resource/category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class,
             'catalog/resource_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class,
             'catalog_resource/category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class,
             'catalog/resource_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class,
             'catalog/resource_category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class,
             'catalog_resource/category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class,
-            'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
             'catalog_resource/category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
-            'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
+            'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
             'catalog/resource_category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
+            'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
             'catalog_resource/category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class,
             'catalog/resource_category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class,
             'catalog/resource_category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class,
             'catalog_resource/category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class,
-            'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
             'catalog_resource/collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
+            'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
             'catalog_resource/config' => \Mage_Catalog_Model_Resource_Config::class,
             'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class,
-            'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
             'catalog/resource_eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
+            'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
             'catalog_resource/eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class,
             'catalog/resource_eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class,
             'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
             'catalog_resource/eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
-            'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
             'catalog/resource_eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
-            'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
+            'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
             'catalog_resource/eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
+            'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
             'catalog_resource/eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
-            'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
+            'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
             'catalog_resource/eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
+            'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
             'catalog/resource_eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class,
             'catalog_resource/eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class,
             'catalog/resource_eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class,
             'catalog_resource/eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class,
             'catalog/resource_eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class,
             'catalog_resource/eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class,
-            'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
             'catalog/resource_eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
+            'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
             'catalog/resource_eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
             'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
             'catalog/resource_eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class,
             'catalog_resource/eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class,
-            'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
             'catalog_resource/eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
-            'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
+            'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
             'catalog_resource/eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
+            'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
             'catalog_resource/eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class,
             'catalog/resource_eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class,
-            'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
             'catalog_resource/eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
+            'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
             'catalog/resource_eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
             'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
-            'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
             'catalog/resource_eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
-            'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
+            'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
             'catalog/resource_eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
-            'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
+            'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
             'catalog_resource/eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
+            'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
             'catalog/resource_eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class,
             'catalog/resource_eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
+            'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
             'catalog/resource_eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class,
             'catalog/resource_eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class,
             'catalog/resource_eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class,
-            'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
             'catalog_resource/eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
-            'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
+            'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
             'catalog_resource/eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
-            'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
+            'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
             'catalog_resource/eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
+            'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
             'catalog/resource_eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class,
             'catalog/resource_eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class,
             'catalog/resource_eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class,
-            'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
             'catalog/resource_eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
-            'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
+            'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
             'catalog_resource/eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
+            'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
             'catalog_resource/eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class,
             'catalog/resource_eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class,
-            'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
             'catalog/resource_eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
-            'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
+            'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
             'catalog/resource_eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
+            'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
             'catalog/resource_eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class,
             'catalog_resource/eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class,
-            'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
             'catalog/resource_eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
+            'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
             'catalog_resource/eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class,
             'catalog/resource_eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class,
             'catalog_resource/eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class,
             'catalog/resource_eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class,
-            'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
             'catalog/resource_eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
-            'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
+            'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
             'catalog_resource/eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
-            'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
+            'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
             'catalog/resource_eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
+            'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
             'catalog/resource_eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
             'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
-            'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
             'catalog/resource_eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
+            'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
             'catalog/resource_eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class,
             'catalog_resource/eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class,
-            'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
             'catalog_resource/eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
-            'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
+            'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
             'catalog/resource_eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
-            'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
             'catalog/resource_eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
+            'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
             'catalog_resource/eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
+            'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
             'catalog/resource_eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class,
             'catalog_resource/eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class,
             'catalog/resource_eav_mysql4_sendfriend' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend::class,
@@ -13606,16 +13571,16 @@
             'catalog/resource_eav_mysql4_sendfriend_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection::class,
             'catalog_resource/eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class,
             'catalog/resource_eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class,
-            'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
             'catalog/resource_eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
-            'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
+            'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
             'catalog/resource_helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
+            'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
             'catalog_resource/layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class,
             'catalog/resource_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class,
             'catalog/resource_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class,
             'catalog_resource/layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class,
-            'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
             'catalog/resource_layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
+            'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
             'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class,
             'catalog_resource/product' => \Mage_Catalog_Model_Resource_Product::class,
             'catalog/resource_product_action' => \Mage_Catalog_Model_Resource_Product_Action::class,
@@ -13626,42 +13591,42 @@
             'catalog_resource/product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class,
             'catalog/resource_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class,
             'catalog_resource/product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class,
-            'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
             'catalog/resource_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
-            'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
+            'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
             'catalog_resource/product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
+            'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
             'catalog/resource_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class,
-            'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
             'catalog_resource/product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
-            'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
+            'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
             'catalog/resource_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
-            'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
+            'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
             'catalog_resource/product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
-            'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
+            'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
+            'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
             'catalog_resource/product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class,
             'catalog/resource_product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class,
-            'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
             'catalog/resource_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
+            'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
             'catalog/resource_product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class,
             'catalog_resource/product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class,
-            'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
             'catalog/resource_product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
+            'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
             'catalog/resource_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class,
             'catalog_resource/product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class,
-            'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
             'catalog_resource/product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
-            'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
+            'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
             'catalog/resource_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
+            'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
             'catalog/resource_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class,
             'catalog_resource/product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class,
-            'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
             'catalog_resource/product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
+            'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
             'catalog_resource/product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
             'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
-            'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
             'catalog_resource/product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
+            'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
             'catalog/resource_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class,
             'catalog_resource/product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class,
             'catalog_resource/product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class,
@@ -13672,12 +13637,12 @@
             'catalog_resource/product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class,
             'catalog/resource_product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
             'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
-            'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
             'catalog_resource/product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
-            'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
+            'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
             'catalog/resource_product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
-            'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
+            'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
             'catalog_resource/product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
+            'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
             'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
             'catalog_resource/product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
             'catalog_resource/product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class,
@@ -13686,14 +13651,14 @@
             'catalog/resource_product_status' => \Mage_Catalog_Model_Resource_Product_Status::class,
             'catalog_resource/product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class,
             'catalog/resource_product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class,
-            'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
             'catalog/resource_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
-            'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
             'catalog_resource/product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
             'catalog_resource/product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class,
             'catalog/resource_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class,
-            'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
             'catalog_resource/product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
+            'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
             'catalog/resource_setup' => \Mage_Catalog_Model_Resource_Setup::class,
             'catalog_resource/setup' => \Mage_Catalog_Model_Resource_Setup::class,
             'catalog_resource/url' => \Mage_Catalog_Model_Resource_Url::class,
@@ -13739,12 +13704,12 @@
             'checkout/observer' => \Mage_Checkout_Model_Observer::class,
             'checkout_resource/agreement' => \Mage_Checkout_Model_Resource_Agreement::class,
             'checkout/resource_agreement' => \Mage_Checkout_Model_Resource_Agreement::class,
-            'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
             'checkout/resource_agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
-            'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class,
+            'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
             'checkout_resource/cart' => \Mage_Checkout_Model_Resource_Cart::class,
-            'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class,
+            'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class,
             'checkout/resource_setup' => \Mage_Checkout_Model_Resource_Setup::class,
+            'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class,
             'checkout/session' => \Mage_Checkout_Model_Session::class,
             'checkout/type_abstract' => \Mage_Checkout_Model_Type_Abstract::class,
             'checkout/type_multishipping' => \Mage_Checkout_Model_Type_Multishipping::class,
@@ -13759,25 +13724,25 @@
             'cms/mysql4_page_service' => \Mage_Cms_Model_Mysql4_Page_Service::class,
             'cms/observer' => \Mage_Cms_Model_Observer::class,
             'cms/page' => \Mage_Cms_Model_Page::class,
-            'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class,
             'cms/resource_block' => \Mage_Cms_Model_Resource_Block::class,
+            'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class,
             'cms_resource/block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class,
             'cms/resource_block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class,
             'cms/resource_page' => \Mage_Cms_Model_Resource_Page::class,
             'cms_resource/page' => \Mage_Cms_Model_Resource_Page::class,
-            'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
             'cms_resource/page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
-            'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
+            'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
             'cms/resource_page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
+            'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
             'cms/template_filter' => \Mage_Cms_Model_Template_Filter::class,
             'cms/wysiwyg_config' => \Mage_Cms_Model_Wysiwyg_Config::class,
             'cms/wysiwyg_images_storage' => \Mage_Cms_Model_Wysiwyg_Images_Storage::class,
             'cms/wysiwyg_images_storage_collection' => \Mage_Cms_Model_Wysiwyg_Images_Storage_Collection::class,
             'configurableswatches/observer' => \Mage_ConfigurableSwatches_Model_Observer::class,
-            'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
             'configurableswatches_resource/catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
-            'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
+            'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
             'configurableswatches_resource/catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
+            'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
             'configurableswatches_resource/catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
             'configurableswatches/resource_catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
             'configurableswatches/system_config_source_catalog_product_configattribute' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute::class,
@@ -13884,152 +13849,152 @@
             'core/mysql4_website_collection' => \Mage_Core_Model_Mysql4_Website_Collection::class,
             'core/observer' => \Mage_Core_Model_Observer::class,
             'core/resource' => \Mage_Core_Model_Resource::class,
+            'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
             'core_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
             'core/resource_abstract' => \Mage_Core_Model_Resource_Abstract::class,
-            'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
+            'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
             'core/resource_cache' => \Mage_Core_Model_Resource_Cache::class,
             'core_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
-            'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
             'core_resource/config' => \Mage_Core_Model_Resource_Config::class,
             'payment_resource/config' => \Mage_Core_Model_Resource_Config::class,
             'core/resource_config' => \Mage_Core_Model_Resource_Config::class,
-            'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
             'core/resource_config_data' => \Mage_Core_Model_Resource_Config_Data::class,
+            'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
             'payment_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
-            'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'core_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
-            'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
-            'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
+            'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'payment_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
-            'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
+            'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
+            'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
             'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
             'core/resource_db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
-            'core/resource_design' => \Mage_Core_Model_Resource_Design::class,
+            'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
             'core_resource/design' => \Mage_Core_Model_Resource_Design::class,
+            'core/resource_design' => \Mage_Core_Model_Resource_Design::class,
             'payment_resource/design' => \Mage_Core_Model_Resource_Design::class,
-            'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
-            'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
             'payment_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
-            'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
+            'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
+            'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
             'payment_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
             'core/resource_design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
+            'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
             'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
             'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
             'core/resource_email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
-            'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
-            'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
             'payment_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
-            'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
+            'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
+            'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
             'core/resource_email_template' => \Mage_Core_Model_Resource_Email_Template::class,
             'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
-            'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
+            'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
             'core/resource_email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
+            'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
             'core_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
-            'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
-            'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
             'core_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
-            'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
-            'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
+            'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
             'core_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
             'payment_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
             'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
-            'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
+            'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
             'payment_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
             'core/resource_file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
-            'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
+            'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
             'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
             'core/resource_file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
-            'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
-            'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
             'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
+            'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
             'core/resource_file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
             'payment_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
-            'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class,
             'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
+            'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class,
             'payment_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
-            'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
             'core_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
-            'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
+            'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
             'core/resource_helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
+            'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
             'core_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
             'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
             'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
             'core/resource_iterator' => \Mage_Core_Model_Resource_Iterator::class,
-            'core/resource_language' => \Mage_Core_Model_Resource_Language::class,
-            'core_resource/language' => \Mage_Core_Model_Resource_Language::class,
             'payment_resource/language' => \Mage_Core_Model_Resource_Language::class,
+            'core_resource/language' => \Mage_Core_Model_Resource_Language::class,
+            'core/resource_language' => \Mage_Core_Model_Resource_Language::class,
             'payment_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
-            'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
             'core/resource_language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
-            'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
+            'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
             'core_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
             'core/resource_layout' => \Mage_Core_Model_Resource_Layout::class,
+            'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
             'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
-            'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class,
             'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
+            'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class,
             'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
-            'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'payment_resource/session' => \Mage_Core_Model_Resource_Session::class,
+            'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
             'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class,
             'payment_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
-            'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core/resource_setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
+            'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'payment_resource/store' => \Mage_Core_Model_Resource_Store::class,
             'core_resource/store' => \Mage_Core_Model_Resource_Store::class,
             'core/resource_store' => \Mage_Core_Model_Resource_Store::class,
-            'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
             'core/resource_store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
+            'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
             'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
-            'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'core/resource_store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'payment_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
-            'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
-            'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
+            'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'payment_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
-            'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
+            'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
+            'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
             'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class,
+            'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
             'core_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
             'core_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
-            'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
             'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class,
-            'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
-            'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
+            'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
             'payment_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
-            'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
+            'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
             'core/resource_type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
             'payment_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'core/resource_type_db' => \Mage_Core_Model_Resource_Type_Db::class,
-            'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'core_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
             'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
             'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
-            'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
-            'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
             'payment_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
             'payment_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
-            'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
             'core_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
-            'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
-            'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
+            'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
             'payment_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
+            'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
+            'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
             'core_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'core_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
-            'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
             'core/resource_variable' => \Mage_Core_Model_Resource_Variable::class,
+            'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
             'core/resource_variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
-            'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
             'core_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
+            'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
+            'core/resource_website' => \Mage_Core_Model_Resource_Website::class,
             'core_resource/website' => \Mage_Core_Model_Resource_Website::class,
             'payment_resource/website' => \Mage_Core_Model_Resource_Website::class,
-            'core/resource_website' => \Mage_Core_Model_Resource_Website::class,
-            'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core/resource_website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
+            'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core/session' => \Mage_Core_Model_Session::class,
             'core/session_abstract' => \Mage_Core_Model_Session_Abstract::class,
@@ -14059,10 +14024,10 @@
             'cron/mysql4_schedule' => \Mage_Cron_Model_Mysql4_Schedule::class,
             'cron/mysql4_schedule_collection' => \Mage_Cron_Model_Mysql4_Schedule_Collection::class,
             'cron/observer' => \Mage_Cron_Model_Observer::class,
-            'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class,
             'cron/resource_schedule' => \Mage_Cron_Model_Resource_Schedule::class,
-            'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
+            'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class,
             'cron/resource_schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
+            'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
             'cron/schedule' => \Mage_Cron_Model_Schedule::class,
             'currencysymbol/observer' => \Mage_CurrencySymbol_Model_Observer::class,
             'currencysymbol/system_currencysymbol' => \Mage_CurrencySymbol_Model_System_Currencysymbol::class,
@@ -14137,16 +14102,16 @@
             'customer_resource/address' => \Mage_Customer_Model_Resource_Address::class,
             'customer/resource_address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class,
             'customer_resource/address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class,
-            'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
             'customer_resource/address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
-            'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
+            'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
             'customer/resource_address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
-            'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
+            'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
             'customer/resource_address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
-            'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
+            'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
             'customer_resource/address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
-            'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
+            'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
             'customer_resource/address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
+            'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
             'customer/resource_attribute' => \Mage_Customer_Model_Resource_Attribute::class,
             'customer_resource/attribute' => \Mage_Customer_Model_Resource_Attribute::class,
             'customer_resource/attribute_collection' => \Mage_Customer_Model_Resource_Attribute_Collection::class,
@@ -14155,22 +14120,22 @@
             'customer_resource/customer' => \Mage_Customer_Model_Resource_Customer::class,
             'customer_resource/customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class,
             'customer/resource_customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class,
-            'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
             'customer/resource_flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
-            'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
+            'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
             'customer/resource_flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
-            'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
+            'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
             'customer/resource_form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
-            'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
+            'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
             'customer/resource_form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
+            'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
             'customer/resource_group' => \Mage_Customer_Model_Resource_Group::class,
             'customer_resource/group' => \Mage_Customer_Model_Resource_Group::class,
             'customer_resource/group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class,
             'customer/resource_group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class,
-            'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class,
             'customer_resource/setup' => \Mage_Customer_Model_Resource_Setup::class,
-            'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
+            'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class,
             'customer_resource/wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
+            'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
             'customer/session' => \Mage_Customer_Model_Session::class,
             'dataflow/batch' => \Mage_Dataflow_Model_Batch::class,
             'dataflow/batch_abstract' => \Mage_Dataflow_Model_Batch_Abstract::class,
@@ -14222,10 +14187,10 @@
             'dataflow/mysql4_session' => \Mage_Dataflow_Model_Mysql4_Session::class,
             'dataflow/profile' => \Mage_Dataflow_Model_Profile::class,
             'dataflow/profile_history' => \Mage_Dataflow_Model_Profile_History::class,
-            'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class,
             'dataflow/resource_batch' => \Mage_Dataflow_Model_Resource_Batch::class,
-            'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
+            'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class,
             'dataflow/resource_batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
+            'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
             'dataflow/resource_batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class,
             'dataflow_resource/batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class,
             'dataflow_resource/batch_export' => \Mage_Dataflow_Model_Resource_Batch_Export::class,
@@ -14236,12 +14201,12 @@
             'dataflow/resource_import' => \Mage_Dataflow_Model_Resource_Import::class,
             'dataflow_resource/import_collection' => \Mage_Dataflow_Model_Resource_Import_Collection::class,
             'dataflow/resource_import_collection' => \Mage_Dataflow_Model_Resource_Import_Collection::class,
-            'dataflow_resource/profile' => \Mage_Dataflow_Model_Resource_Profile::class,
             'dataflow/resource_profile' => \Mage_Dataflow_Model_Resource_Profile::class,
+            'dataflow_resource/profile' => \Mage_Dataflow_Model_Resource_Profile::class,
             'dataflow/resource_profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class,
             'dataflow_resource/profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class,
-            'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
             'dataflow_resource/profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
+            'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
             'dataflow_resource/profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class,
             'dataflow/resource_profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class,
             'dataflow_resource/session' => \Mage_Dataflow_Model_Resource_Session::class,
@@ -14275,8 +14240,8 @@
             'directory/resource_country' => \Mage_Directory_Model_Resource_Country::class,
             'directory_resource/country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class,
             'directory/resource_country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class,
-            'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
             'directory/resource_country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
+            'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
             'directory_resource/country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class,
             'directory/resource_country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class,
             'directory_resource/currency' => \Mage_Directory_Model_Resource_Currency::class,
@@ -14307,8 +14272,8 @@
             'downloadable/observer' => \Mage_Downloadable_Model_Observer::class,
             'downloadable/product_price' => \Mage_Downloadable_Model_Product_Price::class,
             'downloadable/product_type' => \Mage_Downloadable_Model_Product_Type::class,
-            'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
             'downloadable_resource/indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
+            'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
             'downloadable/resource_link' => \Mage_Downloadable_Model_Resource_Link::class,
             'downloadable_resource/link' => \Mage_Downloadable_Model_Resource_Link::class,
             'downloadable/resource_link_collection' => \Mage_Downloadable_Model_Resource_Link_Collection::class,
@@ -14317,12 +14282,12 @@
             'downloadable_resource/link_purchased' => \Mage_Downloadable_Model_Resource_Link_Purchased::class,
             'downloadable/resource_link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class,
             'downloadable_resource/link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class,
-            'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
             'downloadable/resource_link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
+            'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
             'downloadable/resource_link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
             'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
-            'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class,
             'downloadable/resource_sample' => \Mage_Downloadable_Model_Resource_Sample::class,
+            'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class,
             'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
             'downloadable/resource_sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
             'downloadable/sales_order_pdf_items_abstract' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Abstract::class,
@@ -14410,46 +14375,46 @@
             'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class,
             'eav_resource/attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class,
             'eav/resource_attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class,
-            'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class,
             'eav_resource/config' => \Mage_Eav_Model_Resource_Config::class,
+            'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class,
             'eav/resource_entity_attribute' => \Mage_Eav_Model_Resource_Entity_Attribute::class,
             'eav_resource/entity_attribute' => \Mage_Eav_Model_Resource_Entity_Attribute::class,
             'eav_resource/entity_attribute_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Collection::class,
             'eav/resource_entity_attribute_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Collection::class,
             'eav_resource/entity_attribute_group' => \Mage_Eav_Model_Resource_Entity_Attribute_Group::class,
             'eav/resource_entity_attribute_group' => \Mage_Eav_Model_Resource_Entity_Attribute_Group::class,
-            'eav/resource_entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class,
             'eav_resource/entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class,
+            'eav/resource_entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class,
             'eav/resource_entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
             'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
-            'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
-            'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
+            'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
-            'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
+            'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
+            'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
             'eav_resource/entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class,
             'eav/resource_entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class,
             'eav_resource/entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class,
             'eav/resource_entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class,
-            'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
             'eav_resource/entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
+            'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
             'eav/resource_form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class,
             'eav_resource/form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class,
-            'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
             'eav/resource_form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
+            'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
             'eav/resource_form_element' => \Mage_Eav_Model_Resource_Form_Element::class,
             'eav_resource/form_element' => \Mage_Eav_Model_Resource_Form_Element::class,
-            'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
             'eav_resource/form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
-            'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
+            'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
             'eav/resource_form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
+            'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
             'eav_resource/form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
             'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
             'eav/resource_form_type' => \Mage_Eav_Model_Resource_Form_Type::class,
             'eav_resource/form_type' => \Mage_Eav_Model_Resource_Form_Type::class,
-            'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class,
             'eav_resource/form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class,
+            'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class,
             'eav_resource/helper_mysql4' => \Mage_Eav_Model_Resource_Helper_Mysql4::class,
             'eav/resource_helper_mysql4' => \Mage_Eav_Model_Resource_Helper_Mysql4::class,
             'giftmessage/api' => \Mage_GiftMessage_Model_Api::class,
@@ -14461,12 +14426,12 @@
             'giftmessage/mysql4_message_collection' => \Mage_GiftMessage_Model_Mysql4_Message_Collection::class,
             'giftmessage/mysql4_setup' => \Mage_GiftMessage_Model_Mysql4_Setup::class,
             'giftmessage/observer' => \Mage_GiftMessage_Model_Observer::class,
-            'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class,
             'giftmessage/resource_message' => \Mage_GiftMessage_Model_Resource_Message::class,
-            'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
+            'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class,
             'giftmessage_resource/message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
-            'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
+            'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
             'giftmessage_resource/setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
+            'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
             'googleanalytics/observer' => \Mage_GoogleAnalytics_Model_Observer::class,
             'googleanalytics/system_config_source_type' => \Mage_GoogleAnalytics_Model_System_Config_Source_Type::class,
             'googlecheckout/payment' => \Mage_GoogleCheckout_Model_Payment::class,
@@ -14502,8 +14467,8 @@
             'importexport/product_attribute_backend_urlkey' => \Mage_ImportExport_Model_Product_Attribute_Backend_Urlkey::class,
             'importexport_resource/helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class,
             'importexport/resource_helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class,
-            'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
             'importexport_resource/import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
+            'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
             'importexport_resource/setup' => \Mage_ImportExport_Model_Resource_Setup::class,
             'importexport/resource_setup' => \Mage_ImportExport_Model_Resource_Setup::class,
             'importexport/source_export_entity' => \Mage_ImportExport_Model_Source_Export_Entity::class,
@@ -14525,16 +14490,16 @@
             'index/process' => \Mage_Index_Model_Process::class,
             'index_resource/abstract' => \Mage_Index_Model_Resource_Abstract::class,
             'index/resource_abstract' => \Mage_Index_Model_Resource_Abstract::class,
-            'index/resource_event' => \Mage_Index_Model_Resource_Event::class,
             'index_resource/event' => \Mage_Index_Model_Resource_Event::class,
+            'index/resource_event' => \Mage_Index_Model_Resource_Event::class,
             'index/resource_event_collection' => \Mage_Index_Model_Resource_Event_Collection::class,
             'index_resource/event_collection' => \Mage_Index_Model_Resource_Event_Collection::class,
             'index/resource_helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class,
             'index_resource/helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class,
-            'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
             'index/resource_lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
-            'index_resource/process' => \Mage_Index_Model_Resource_Process::class,
+            'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
             'index/resource_process' => \Mage_Index_Model_Resource_Process::class,
+            'index_resource/process' => \Mage_Index_Model_Resource_Process::class,
             'index/resource_process_collection' => \Mage_Index_Model_Resource_Process_Collection::class,
             'index_resource/process_collection' => \Mage_Index_Model_Resource_Process_Collection::class,
             'index/resource_setup' => \Mage_Index_Model_Resource_Setup::class,
@@ -14567,22 +14532,22 @@
             'log/mysql4_visitor_online_collection' => \Mage_Log_Model_Mysql4_Visitor_Online_Collection::class,
             'log_resource/aggregation' => \Mage_Log_Model_Resource_Aggregation::class,
             'log/resource_aggregation' => \Mage_Log_Model_Resource_Aggregation::class,
-            'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class,
             'log/resource_customer' => \Mage_Log_Model_Resource_Customer::class,
+            'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class,
             'log/resource_log' => \Mage_Log_Model_Resource_Log::class,
             'log_resource/log' => \Mage_Log_Model_Resource_Log::class,
             'log_resource/visitor' => \Mage_Log_Model_Resource_Visitor::class,
             'log/resource_visitor' => \Mage_Log_Model_Resource_Visitor::class,
             'log_resource/visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class,
             'log/resource_visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class,
-            'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
             'log_resource/visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
-            'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
+            'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
             'log_resource/visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
+            'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
             'log/visitor' => \Mage_Log_Model_Visitor::class,
             'log/visitor_online' => \Mage_Log_Model_Visitor_Online::class,
-            'media_resource/image' => \Mage_Media_Model_File_Image::class,
             'media/file_image' => \Mage_Media_Model_File_Image::class,
+            'media_resource/image' => \Mage_Media_Model_File_Image::class,
             'media/image' => \Mage_Media_Model_Image::class,
             'newsletter/message' => \Mage_Newsletter_Model_Message::class,
             'newsletter/mysql4_problem' => \Mage_Newsletter_Model_Mysql4_Problem::class,
@@ -14600,14 +14565,14 @@
             'newsletter_resource/problem' => \Mage_Newsletter_Model_Resource_Problem::class,
             'newsletter/resource_problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class,
             'newsletter_resource/problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class,
-            'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class,
             'newsletter/resource_queue' => \Mage_Newsletter_Model_Resource_Queue::class,
-            'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
+            'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class,
             'newsletter/resource_queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
-            'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
+            'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
             'newsletter/resource_subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
-            'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
+            'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
             'newsletter/resource_subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
+            'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
             'newsletter_resource/template' => \Mage_Newsletter_Model_Resource_Template::class,
             'newsletter/resource_template' => \Mage_Newsletter_Model_Resource_Template::class,
             'newsletter_resource/template_collection' => \Mage_Newsletter_Model_Resource_Template_Collection::class,
@@ -14620,20 +14585,20 @@
             'oauth/consumer_validator_keyLength' => \Mage_Oauth_Model_Consumer_Validator_KeyLength::class,
             'oauth/nonce' => \Mage_Oauth_Model_Nonce::class,
             'oauth/observer' => \Mage_Oauth_Model_Observer::class,
-            'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
             'oauth/resource_consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
+            'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
             'oauth/resource_consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class,
             'oauth_resource/consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class,
             'oauth_resource/nonce' => \Mage_Oauth_Model_Resource_Nonce::class,
             'oauth/resource_nonce' => \Mage_Oauth_Model_Resource_Nonce::class,
             'oauth_resource/nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class,
             'oauth/resource_nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class,
-            'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class,
             'oauth/resource_setup' => \Mage_Oauth_Model_Resource_Setup::class,
-            'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class,
+            'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class,
             'oauth_resource/token' => \Mage_Oauth_Model_Resource_Token::class,
-            'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
+            'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class,
             'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
+            'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
             'oauth/server' => \Mage_Oauth_Model_Server::class,
             'oauth/token' => \Mage_Oauth_Model_Token::class,
             'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class,
@@ -14650,8 +14615,8 @@
             'paygate/authorizenet_source_paymentAction' => \Mage_Paygate_Model_Authorizenet_Source_PaymentAction::class,
             'paygate/mysql4_authorizenet_debug' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug::class,
             'paygate/mysql4_authorizenet_debug_collection' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection::class,
-            'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
             'paygate/resource_authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
+            'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
             'paygate_resource/authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class,
             'paygate/resource_authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class,
             'payment/billing_agreementAbstract' => \Mage_Payment_Model_Billing_AgreementAbstract::class,
@@ -14714,12 +14679,12 @@
             'paypal/resource_cert' => \Mage_Paypal_Model_Resource_Cert::class,
             'paypal_resource/payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class,
             'paypal/resource_payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class,
-            'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
             'paypal/resource_payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
+            'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
             'paypal/resource_report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class,
             'paypal_resource/report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class,
-            'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
             'paypal/resource_report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
+            'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
             'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
             'paypal/resource_report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
             'paypal/resource_setup' => \Mage_Paypal_Model_Resource_Setup::class,
@@ -14744,8 +14709,8 @@
             'persistent/observer' => \Mage_Persistent_Model_Observer::class,
             'persistent/observer_session' => \Mage_Persistent_Model_Observer_Session::class,
             'persistent/persistent_config' => \Mage_Persistent_Model_Persistent_Config::class,
-            'persistent/resource_session' => \Mage_Persistent_Model_Resource_Session::class,
             'persistent_resource/session' => \Mage_Persistent_Model_Resource_Session::class,
+            'persistent/resource_session' => \Mage_Persistent_Model_Resource_Session::class,
             'persistent/session' => \Mage_Persistent_Model_Session::class,
             'poll/mysql4_poll' => \Mage_Poll_Model_Mysql4_Poll::class,
             'poll/mysql4_poll_answer' => \Mage_Poll_Model_Mysql4_Poll_Answer::class,
@@ -14755,16 +14720,16 @@
             'poll/poll' => \Mage_Poll_Model_Poll::class,
             'poll/poll_answer' => \Mage_Poll_Model_Poll_Answer::class,
             'poll/poll_vote' => \Mage_Poll_Model_Poll_Vote::class,
-            'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class,
             'poll_resource/poll' => \Mage_Poll_Model_Resource_Poll::class,
+            'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class,
             'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
             'poll/resource_poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
-            'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
             'poll_resource/poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
-            'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
+            'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
             'poll_resource/poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
-            'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
+            'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
             'poll/resource_poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
+            'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
             'productalert/email' => \Mage_ProductAlert_Model_Email::class,
             'productalert/mysql4_price' => \Mage_ProductAlert_Model_Mysql4_Price::class,
             'productalert/mysql4_price_collection' => \Mage_ProductAlert_Model_Mysql4_Price_Collection::class,
@@ -14774,20 +14739,20 @@
             'productalert/mysql4_stock_customer_collection' => \Mage_ProductAlert_Model_Mysql4_Stock_Customer_Collection::class,
             'productalert/observer' => \Mage_ProductAlert_Model_Observer::class,
             'productalert/price' => \Mage_ProductAlert_Model_Price::class,
-            'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
             'productalert_resource/abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
-            'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class,
+            'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
             'productalert_resource/price' => \Mage_ProductAlert_Model_Resource_Price::class,
-            'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
+            'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class,
             'productalert/resource_price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
-            'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
+            'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
             'productalert/resource_price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
+            'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
             'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
             'productalert/resource_stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
-            'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
             'productalert/resource_stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
-            'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
+            'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
             'productalert/resource_stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
+            'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
             'productalert/stock' => \Mage_ProductAlert_Model_Stock::class,
             'rating/mysql4_rating' => \Mage_Rating_Model_Mysql4_Rating::class,
             'rating/mysql4_rating_collection' => \Mage_Rating_Model_Mysql4_Rating_Collection::class,
@@ -14801,20 +14766,20 @@
             'rating/rating_entity' => \Mage_Rating_Model_Rating_Entity::class,
             'rating/rating_option' => \Mage_Rating_Model_Rating_Option::class,
             'rating/rating_option_vote' => \Mage_Rating_Model_Rating_Option_Vote::class,
-            'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class,
             'rating/resource_rating' => \Mage_Rating_Model_Resource_Rating::class,
+            'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class,
             'rating_resource/rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class,
             'rating/resource_rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class,
             'rating/resource_rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class,
             'rating_resource/rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class,
-            'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
             'rating/resource_rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
-            'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
+            'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
             'rating_resource/rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
+            'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
             'rating_resource/rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class,
             'rating/resource_rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class,
-            'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
             'rating/resource_rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
+            'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
             'reports/config' => \Mage_Reports_Model_Config::class,
             'reports/event' => \Mage_Reports_Model_Event::class,
             'reports/event_observer' => \Mage_Reports_Model_Event_Observer::class,
@@ -14860,6 +14825,7 @@
             'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class,
             'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class,
             'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class,
+            'reports/observer' => \Mage_Reports_Model_Observer::class,
             'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class,
             'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class,
             'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class,
@@ -14868,88 +14834,88 @@
             'reports_resource/accounts_collection' => \Mage_Reports_Model_Resource_Accounts_Collection::class,
             'reports/resource_coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class,
             'reports_resource/coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class,
-            'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
             'reports/resource_customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
-            'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
+            'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
             'reports/resource_customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
-            'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
+            'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
             'reports_resource/customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
-            'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
+            'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
             'reports/resource_entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
+            'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
             'reports_resource/event' => \Mage_Reports_Model_Resource_Event::class,
             'reports/resource_event' => \Mage_Reports_Model_Resource_Event::class,
             'reports_resource/event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
             'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
             'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
             'reports/resource_event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
-            'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
             'reports/resource_event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
-            'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
+            'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
             'reports_resource/helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
-            'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
+            'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
             'reports/resource_invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
-            'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
+            'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
             'reports_resource/order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
-            'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
+            'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
             'reports_resource/product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
+            'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
             'reports/resource_product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class,
             'reports_resource/product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class,
             'reports_resource/product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class,
             'reports/resource_product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class,
-            'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
             'reports/resource_product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
+            'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
             'reports_resource/product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class,
             'reports/resource_product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class,
-            'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
             'reports_resource/product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
-            'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
+            'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
             'reports/resource_product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
-            'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
+            'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
             'reports_resource/product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
-            'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
+            'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
             'reports/resource_product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
+            'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
             'reports_resource/product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class,
             'reports/resource_product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class,
-            'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
             'reports_resource/product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
-            'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
+            'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
             'reports_resource/product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
-            'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
+            'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
             'reports/resource_quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
-            'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class,
+            'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
             'reports_resource/refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class,
+            'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class,
             'reports/resource_report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class,
             'reports_resource/report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class,
             'reports/resource_report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class,
             'reports_resource/report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class,
-            'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
             'reports_resource/report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
+            'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
             'reports/resource_report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class,
             'reports_resource/report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class,
-            'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
             'reports/resource_report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
+            'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
             'reports_resource/review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
             'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
-            'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
             'reports_resource/review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
+            'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
             'reports_resource/review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class,
             'reports/resource_review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class,
             'reports_resource/shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class,
             'reports/resource_shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class,
-            'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
             'reports_resource/shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
+            'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
             'reports_resource/tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class,
             'reports/resource_tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class,
-            'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
             'reports/resource_tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
-            'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
+            'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
             'reports/resource_tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
-            'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
+            'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
             'reports/resource_tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
+            'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
             'reports_resource/wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class,
             'reports/resource_wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class,
-            'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
             'reports_resource/wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
+            'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
             'reports/session' => \Mage_Reports_Model_Session::class,
             'reports/test' => \Mage_Reports_Model_Test::class,
             'reports/totals' => \Mage_Reports_Model_Totals::class,
@@ -14966,14 +14932,14 @@
             'review/resource_review_collection' => \Mage_Review_Model_Resource_Review_Collection::class,
             'review_resource/review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class,
             'review/resource_review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class,
-            'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class,
             'review_resource/review_status' => \Mage_Review_Model_Resource_Review_Status::class,
-            'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
+            'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class,
             'review_resource/review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
+            'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
             'review/resource_review_summary' => \Mage_Review_Model_Resource_Review_Summary::class,
             'review_resource/review_summary' => \Mage_Review_Model_Resource_Review_Summary::class,
-            'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
             'review/resource_review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
+            'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
             'review/review' => \Mage_Review_Model_Review::class,
             'review/review_status' => \Mage_Review_Model_Review_Status::class,
             'review/review_summary' => \Mage_Review_Model_Review_Summary::class,
@@ -14996,14 +14962,14 @@
             'rule/mysql4_rule_collection' => \Mage_Rule_Model_Mysql4_Rule_Collection::class,
             'rule/renderer_actions' => \Mage_Rule_Model_Renderer_Actions::class,
             'rule/renderer_conditions' => \Mage_Rule_Model_Renderer_Conditions::class,
-            'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class,
             'rule/resource_abstract' => \Mage_Rule_Model_Resource_Abstract::class,
-            'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class,
+            'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class,
             'rule/resource_rule' => \Mage_Rule_Model_Resource_Rule::class,
-            'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
+            'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class,
             'rule_resource/rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
-            'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
+            'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
             'rule_resource/rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
+            'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
             'rule/resource_rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class,
             'rule_resource/rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class,
             'rule/rule' => \Mage_Rule_Model_Rule::class,
@@ -15032,24 +14998,24 @@
             'salesrule/resource_coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class,
             'salesrule/resource_coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class,
             'salesrule_resource/coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class,
-            'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
             'salesrule_resource/report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
-            'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
+            'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
             'salesrule_resource/report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
+            'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
             'salesrule_resource/report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class,
             'salesrule/resource_report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class,
             'salesrule_resource/report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class,
             'salesrule/resource_report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class,
             'salesrule_resource/report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class,
             'salesrule/resource_report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class,
-            'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class,
             'salesrule_resource/rule' => \Mage_SalesRule_Model_Resource_Rule::class,
-            'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
+            'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class,
             'salesrule_resource/rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
-            'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
+            'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
             'salesrule_resource/rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
-            'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
+            'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
             'salesrule/resource_rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
+            'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
             'salesrule_resource/rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class,
             'salesrule/resource_rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class,
             'salesrule_resource/rule_product_collection' => \Mage_SalesRule_Model_Resource_Rule_Product_Collection::class,
@@ -15094,14 +15060,14 @@
             'sales/email_template' => \Mage_Sales_Model_Email_Template::class,
             'sales/entity_order' => \Mage_Sales_Model_Entity_Order::class,
             'sales_entity/order' => \Mage_Sales_Model_Entity_Order::class,
-            'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
             'sales_entity/order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
-            'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
+            'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
             'sales/entity_order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
-            'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
+            'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
             'sales_entity/order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
-            'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
+            'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
             'sales_entity/order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
+            'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
             'sales/entity_order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class,
             'sales_entity/order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class,
             'sales/entity_order_attribute_backend_shipping' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Shipping::class,
@@ -15110,22 +15076,22 @@
             'sales/entity_order_collection' => \Mage_Sales_Model_Entity_Order_Collection::class,
             'sales_entity/order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class,
             'sales/entity_order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class,
-            'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales_entity/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
-            'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
+            'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales/entity_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
-            'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
+            'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
             'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
+            'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
             'sales/entity_order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class,
             'sales_entity/order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class,
             'sales/entity_order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class,
             'sales_entity/order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class,
             'sales_entity/order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class,
             'sales/entity_order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class,
-            'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
             'sales/entity_order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
-            'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
+            'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
             'sales_entity/order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
+            'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
             'sales/entity_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class,
             'sales_entity/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class,
             'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class,
@@ -15136,28 +15102,28 @@
             'sales/entity_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/entity_order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class,
             'sales_entity/order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class,
-            'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
             'sales/entity_order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
+            'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
             'sales_entity/order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class,
             'sales/entity_order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class,
             'sales_entity/order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class,
             'sales/entity_order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class,
-            'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
             'sales/entity_order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
+            'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
             'sales/entity_order_item' => \Mage_Sales_Model_Entity_Order_Item::class,
             'sales_entity/order_item' => \Mage_Sales_Model_Entity_Order_Item::class,
             'sales/entity_order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class,
             'sales_entity/order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class,
-            'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
             'sales/entity_order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
+            'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
             'sales_entity/order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class,
             'sales/entity_order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class,
             'sales_entity/order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class,
             'sales/entity_order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class,
-            'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
             'sales_entity/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
-            'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
+            'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
             'sales/entity_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
+            'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
             'sales/entity_order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class,
             'sales_entity/order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class,
             'sales/entity_order_shipment_comment' => \Mage_Sales_Model_Entity_Order_Shipment_Comment::class,
@@ -15166,66 +15132,66 @@
             'sales_entity/order_shipment_comment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Comment_Collection::class,
             'sales/entity_order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class,
             'sales_entity/order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class,
-            'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
             'sales/entity_order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
-            'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
+            'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
             'sales_entity/order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
-            'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
+            'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
             'sales_entity/order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
-            'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
+            'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
             'sales_entity/order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
-            'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
+            'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
             'sales_entity/order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
+            'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
             'sales_entity/quote' => \Mage_Sales_Model_Entity_Quote::class,
             'sales/entity_quote' => \Mage_Sales_Model_Entity_Quote::class,
-            'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
             'sales_entity/quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
+            'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
             'sales_entity/quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class,
             'sales/entity_quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class,
-            'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
             'sales/entity_quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
-            'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
+            'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
             'sales/entity_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
-            'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
+            'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
             'sales_entity/quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
-            'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
+            'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
             'sales/entity_quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
+            'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
             'sales_entity/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales/entity_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales_entity/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class,
             'sales/entity_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class,
-            'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
             'sales_entity/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
-            'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
             'sales/entity_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/entity_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales_entity/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales/entity_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class,
             'sales_entity/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class,
             'sales/entity_quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class,
             'sales_entity/quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class,
-            'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
             'sales_entity/quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
-            'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
+            'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
             'sales/entity_quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
-            'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
+            'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
             'sales_entity/quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
+            'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
             'sales/entity_quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class,
             'sales_entity/quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class,
             'sales/entity_quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class,
             'sales_entity/quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class,
-            'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
             'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
-            'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
+            'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
             'sales/entity_quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
-            'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
+            'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
             'sales/entity_quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
+            'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
             'sales_entity/quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class,
             'sales/entity_quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class,
-            'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
             'sales_entity/sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
-            'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class,
+            'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
             'sales_entity/setup' => \Mage_Sales_Model_Entity_Setup::class,
+            'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class,
             'sales/mysql4_abstract' => \Mage_Sales_Model_Mysql4_Abstract::class,
             'sales/mysql4_billing_agreement' => \Mage_Sales_Model_Mysql4_Billing_Agreement::class,
             'sales/mysql4_billing_agreement_collection' => \Mage_Sales_Model_Mysql4_Billing_Agreement_Collection::class,
@@ -15420,48 +15386,48 @@
             'sales/recurring_profile' => \Mage_Sales_Model_Recurring_Profile::class,
             'sales_resource/abstract' => \Mage_Sales_Model_Resource_Abstract::class,
             'sales/resource_abstract' => \Mage_Sales_Model_Resource_Abstract::class,
-            'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
             'sales_resource/billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
-            'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
+            'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
             'sales_resource/billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
-            'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
+            'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
             'sales/resource_collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
-            'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
+            'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
             'sales_resource/helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
-            'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class,
+            'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
             'sales_resource/order' => \Mage_Sales_Model_Resource_Order::class,
+            'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class,
             'sales_resource/order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class,
             'sales/resource_order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class,
-            'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
             'sales_resource/order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
+            'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
             'sales/resource_order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class,
             'sales_resource/order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class,
             'sales/resource_order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class,
             'sales_resource/order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class,
             'sales/resource_order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class,
             'sales_resource/order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class,
-            'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
             'sales/resource_order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
+            'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
             'sales_resource/order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class,
             'sales/resource_order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class,
             'sales/resource_order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class,
             'sales_resource/order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class,
-            'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
             'sales/resource_order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
+            'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
             'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
             'sales/resource_order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
             'sales/resource_order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
             'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
-            'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales_resource/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
+            'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales/resource_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class,
             'sales_resource/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class,
-            'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
             'sales/resource_order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
-            'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
+            'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
             'sales_resource/order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
-            'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
+            'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
             'sales/resource_order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
+            'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
             'sales/resource_order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
             'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
             'sales_resource/order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class,
@@ -15472,84 +15438,84 @@
             'sales/resource_order_grid_collection' => \Mage_Sales_Model_Resource_Order_Grid_Collection::class,
             'sales/resource_order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class,
             'sales_resource/order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class,
-            'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
             'sales/resource_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
-            'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
+            'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
             'sales_resource/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
+            'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
             'sales_resource/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class,
             'sales/resource_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class,
             'sales/resource_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class,
             'sales_resource/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/resource_order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class,
             'sales_resource/order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class,
-            'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
             'sales/resource_order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
+            'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
             'sales/resource_order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class,
             'sales_resource/order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class,
-            'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
             'sales/resource_order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
-            'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
+            'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
             'sales_resource/order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
+            'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
             'sales/resource_order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class,
             'sales_resource/order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class,
-            'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
             'sales_resource/order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
+            'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
             'sales/resource_order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class,
             'sales_resource/order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class,
-            'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
             'sales_resource/order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
+            'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
             'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
             'sales/resource_order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
-            'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
             'sales_resource/order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
-            'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
+            'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
             'sales_resource/order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
-            'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
+            'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
             'sales_resource/order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
-            'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
+            'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
             'sales/resource_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
+            'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
             'sales_resource/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class,
             'sales/resource_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class,
-            'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
             'sales/resource_order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
+            'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
             'sales/resource_order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
             'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
-            'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
             'sales/resource_order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
+            'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
             'sales_resource/order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class,
             'sales/resource_order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class,
-            'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
             'sales_resource/order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
-            'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
+            'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
             'sales_resource/order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
-            'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
+            'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
             'sales_resource/order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
+            'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
             'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
             'sales_resource/order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
             'sales_resource/order_status' => \Mage_Sales_Model_Resource_Order_Status::class,
             'sales/resource_order_status' => \Mage_Sales_Model_Resource_Order_Status::class,
             'sales_resource/order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class,
             'sales/resource_order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class,
-            'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
             'sales_resource/order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
-            'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
+            'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
             'sales_resource/order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
-            'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
+            'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
             'sales/resource_order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
-            'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
+            'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
             'sales_resource/order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
-            'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class,
+            'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
             'sales/resource_quote' => \Mage_Sales_Model_Resource_Quote::class,
+            'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class,
             'sales_resource/quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class,
             'sales/resource_quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class,
             'sales/resource_quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class,
             'sales_resource/quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class,
             'sales/resource_quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class,
             'sales_resource/quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class,
-            'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
             'sales/resource_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
-            'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
+            'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
             'sales/resource_quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
+            'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
             'sales_resource/quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
             'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
             'sales_resource/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class,
@@ -15558,82 +15524,82 @@
             'sales_resource/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class,
             'sales/resource_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class,
             'sales_resource/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class,
-            'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/resource_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
-            'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
+            'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/resource_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
+            'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales_resource/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
             'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
-            'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
             'sales/resource_quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
+            'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
             'sales_resource/quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class,
             'sales/resource_quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class,
-            'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
             'sales/resource_quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
-            'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
+            'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
             'sales_resource/quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
-            'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
+            'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
             'sales_resource/quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
+            'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
             'sales_resource/quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class,
             'sales/resource_quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class,
-            'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
             'sales/resource_quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
+            'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
             'sales/resource_quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class,
             'sales_resource/quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class,
-            'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
             'sales/resource_quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
-            'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
+            'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
             'sales/resource_quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
-            'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
+            'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
             'sales_resource/quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
-            'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
+            'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
             'sales/resource_quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
-            'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
+            'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
             'sales/resource_recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
+            'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
             'sales/resource_recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class,
             'sales_resource/recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class,
-            'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class,
             'sales/resource_report' => \Mage_Sales_Model_Resource_Report::class,
+            'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class,
             'sales/resource_report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class,
             'sales_resource/report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class,
-            'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
             'sales/resource_report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
-            'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
+            'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
             'sales/resource_report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
+            'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
             'sales_resource/report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
             'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
-            'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
             'sales_resource/report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
+            'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
             'sales/resource_report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class,
             'sales_resource/report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class,
             'sales_resource/report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class,
             'sales/resource_report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class,
             'sales/resource_report_order' => \Mage_Sales_Model_Resource_Report_Order::class,
             'sales_resource/report_order' => \Mage_Sales_Model_Resource_Report_Order::class,
-            'sales/resource_report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class,
             'sales_resource/report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class,
-            'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class,
+            'sales/resource_report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class,
             'sales/resource_report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class,
+            'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class,
             'sales_resource/report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class,
             'sales/resource_report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class,
-            'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
             'sales/resource_report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
-            'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
+            'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
             'sales_resource/report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
+            'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
             'sales_resource/report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class,
             'sales/resource_report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class,
             'sales_resource/report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class,
             'sales/resource_report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class,
-            'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
             'sales_resource/report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
+            'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
             'sales_resource/report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class,
             'sales/resource_report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class,
             'sales_resource/report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class,
             'sales/resource_report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class,
-            'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
             'sales/resource_sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
-            'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class,
+            'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
             'sales/resource_setup' => \Mage_Sales_Model_Resource_Setup::class,
+            'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class,
             'sales/service_order' => \Mage_Sales_Model_Service_Order::class,
             'sales/service_quote' => \Mage_Sales_Model_Service_Quote::class,
             'sales/status_list' => \Mage_Sales_Model_Status_List::class,
@@ -15643,8 +15609,8 @@
             'sendfriend/observer' => \Mage_Sendfriend_Model_Observer::class,
             'sendfriend_resource/sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class,
             'sendfriend/resource_sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class,
-            'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
             'sendfriend/resource_sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
+            'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
             'sendfriend/resource_setup' => \Mage_Sendfriend_Model_Resource_Setup::class,
             'sendfriend_resource/setup' => \Mage_Sendfriend_Model_Resource_Setup::class,
             'sendfriend/sendfriend' => \Mage_Sendfriend_Model_Sendfriend::class,
@@ -15684,16 +15650,16 @@
             'sitemap/observer' => \Mage_Sitemap_Model_Observer::class,
             'sitemap_resource/catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class,
             'sitemap/resource_catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class,
-            'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
             'sitemap/resource_catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
+            'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
             'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
             'sitemap_resource/catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
             'sitemap_resource/cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
             'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
             'sitemap_resource/sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class,
             'sitemap/resource_sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class,
-            'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
             'sitemap_resource/sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
+            'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
             'sitemap/sitemap' => \Mage_Sitemap_Model_Sitemap::class,
             'tag/api' => \Mage_Tag_Model_Api::class,
             'tag/api_v2' => \Mage_Tag_Model_Api_V2::class,
@@ -15706,21 +15672,21 @@
             'tag/mysql4_tag' => \Mage_Tag_Model_Mysql4_Tag::class,
             'tag/mysql4_tag_collection' => \Mage_Tag_Model_Mysql4_Tag_Collection::class,
             'tag/mysql4_tag_relation' => \Mage_Tag_Model_Mysql4_Tag_Relation::class,
-            'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag/resource_customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag_resource/customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
-            'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
+            'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag_resource/indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
-            'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
+            'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
             'tag_resource/popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
+            'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
             'tag_resource/product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class,
             'tag/resource_product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class,
             'tag_resource/tag' => \Mage_Tag_Model_Resource_Tag::class,
             'tag/resource_tag' => \Mage_Tag_Model_Resource_Tag::class,
-            'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
             'tag_resource/tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
-            'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
+            'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
             'tag_resource/tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
+            'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
             'tag/session' => \Mage_Tag_Model_Session::class,
             'tag/tag' => \Mage_Tag_Model_Tag::class,
             'tag/tag_relation' => \Mage_Tag_Model_Tag_Relation::class,
@@ -15759,16 +15725,16 @@
             'tax/resource_calculation_rate' => \Mage_Tax_Model_Resource_Calculation_Rate::class,
             'tax/resource_calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class,
             'tax_resource/calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class,
-            'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
             'tax/resource_calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
-            'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
+            'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
             'tax/resource_calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
-            'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
+            'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
             'tax/resource_calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
-            'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
+            'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
             'tax_resource/calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
-            'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class,
+            'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
             'tax/resource_class' => \Mage_Tax_Model_Resource_Class::class,
+            'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class,
             'tax/resource_class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class,
             'tax_resource/class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class,
             'tax_resource/report_collection' => \Mage_Tax_Model_Resource_Report_Collection::class,
@@ -15779,10 +15745,10 @@
             'tax/resource_report_tax_createdat' => \Mage_Tax_Model_Resource_Report_Tax_Createdat::class,
             'tax_resource/report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class,
             'tax/resource_report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class,
-            'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
             'tax/resource_report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
-            'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
+            'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
             'tax_resource/sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
+            'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
             'tax_resource/sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class,
             'tax/resource_sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class,
             'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class,
@@ -15871,8 +15837,8 @@
             'weee/observer' => \Mage_Weee_Model_Observer::class,
             'weee/resource_attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class,
             'weee_resource/attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class,
-            'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class,
             'weee/resource_setup' => \Mage_Weee_Model_Resource_Setup::class,
+            'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class,
             'weee/resource_tax' => \Mage_Weee_Model_Resource_Tax::class,
             'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class,
             'weee/tax' => \Mage_Weee_Model_Tax::class,
@@ -15884,12 +15850,12 @@
             'widget/mysql4_widget_instance' => \Mage_Widget_Model_Mysql4_Widget_Instance::class,
             'widget/mysql4_widget_instance_collection' => \Mage_Widget_Model_Mysql4_Widget_Instance_Collection::class,
             'widget/observer' => \Mage_Widget_Model_Observer::class,
-            'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class,
             'widget/resource_widget' => \Mage_Widget_Model_Resource_Widget::class,
+            'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class,
             'widget_resource/widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class,
             'widget/resource_widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class,
-            'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
             'widget_resource/widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
+            'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
             'widget/template_filter' => \Mage_Widget_Model_Template_Filter::class,
             'widget/widget' => \Mage_Widget_Model_Widget::class,
             'widget/widget_config' => \Mage_Widget_Model_Widget_Config::class,
@@ -15906,14 +15872,14 @@
             'wishlist/mysql4_wishlist' => \Mage_Wishlist_Model_Mysql4_Wishlist::class,
             'wishlist/mysql4_wishlist_collection' => \Mage_Wishlist_Model_Mysql4_Wishlist_Collection::class,
             'wishlist/observer' => \Mage_Wishlist_Model_Observer::class,
-            'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class,
             'wishlist_resource/item' => \Mage_Wishlist_Model_Resource_Item::class,
+            'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class,
             'wishlist_resource/item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class,
             'wishlist/resource_item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class,
-            'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
             'wishlist/resource_item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
-            'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
+            'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
             'wishlist_resource/item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
+            'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
             'wishlist_resource/product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class,
             'wishlist/resource_product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class,
             'wishlist/resource_wishlist' => \Mage_Wishlist_Model_Resource_Wishlist::class,
@@ -15922,7 +15888,6 @@
             'wishlist/resource_wishlist_collection' => \Mage_Wishlist_Model_Resource_Wishlist_Collection::class,
             'wishlist/session' => \Mage_Wishlist_Model_Session::class,
             'wishlist/wishlist' => \Mage_Wishlist_Model_Wishlist::class,
-            'varien/autoload' => \Varien_Autoload::class,
         ])
     );
     override( \Mage_Customer_AccountController::_getModel(0),
@@ -15932,11 +15897,10 @@
             'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class,
             'adminnotification/mysql4_inbox_collection' => \Mage_AdminNotification_Model_Mysql4_Inbox_Collection::class,
             'adminnotification/observer' => \Mage_AdminNotification_Model_Observer::class,
-            'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
             'adminnotification/resource_inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
-            'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
+            'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
             'adminnotification/resource_inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
-            'adminnotification/survey' => \Mage_AdminNotification_Model_Survey::class,
+            'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
             'admin/acl' => \Mage_Admin_Model_Acl::class,
             'admin/acl_assert_ip' => \Mage_Admin_Model_Acl_Assert_Ip::class,
             'admin/acl_assert_time' => \Mage_Admin_Model_Acl_Assert_Time::class,
@@ -15965,38 +15929,38 @@
             'admin/redirectpolicy' => \Mage_Admin_Model_Redirectpolicy::class,
             'admin/resource_acl' => \Mage_Admin_Model_Resource_Acl::class,
             'admin_resource/acl' => \Mage_Admin_Model_Resource_Acl::class,
-            'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
             'admin/resource_acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
+            'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
             'admin/resource_acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class,
             'admin_resource/acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class,
-            'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class,
             'admin/resource_block' => \Mage_Admin_Model_Resource_Block::class,
-            'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
+            'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class,
             'admin/resource_block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
+            'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
             'admin_resource/permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class,
             'admin/resource_permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class,
             'admin/resource_role' => \Mage_Admin_Model_Resource_Role::class,
             'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class,
             'admin/resource_role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class,
             'admin_resource/role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class,
-            'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class,
             'admin_resource/roles' => \Mage_Admin_Model_Resource_Roles::class,
-            'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
+            'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class,
             'admin_resource/roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
-            'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
+            'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
             'admin/resource_roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
+            'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
             'admin/resource_rules' => \Mage_Admin_Model_Resource_Rules::class,
             'admin_resource/rules' => \Mage_Admin_Model_Resource_Rules::class,
-            'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
             'admin_resource/rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
+            'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
             'admin_resource/user' => \Mage_Admin_Model_Resource_User::class,
             'admin/resource_user' => \Mage_Admin_Model_Resource_User::class,
             'admin/resource_user_collection' => \Mage_Admin_Model_Resource_User_Collection::class,
             'admin_resource/user_collection' => \Mage_Admin_Model_Resource_User_Collection::class,
-            'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class,
             'admin_resource/variable' => \Mage_Admin_Model_Resource_Variable::class,
-            'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
+            'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class,
             'admin/resource_variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
+            'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
             'admin/role' => \Mage_Admin_Model_Role::class,
             'admin/roles' => \Mage_Admin_Model_Roles::class,
             'admin/rules' => \Mage_Admin_Model_Rules::class,
@@ -16031,6 +15995,7 @@
             'adminhtml/system_config_backend_baseurl' => \Mage_Adminhtml_Model_System_Config_Backend_Baseurl::class,
             'adminhtml/system_config_backend_cache' => \Mage_Adminhtml_Model_System_Config_Backend_Cache::class,
             'adminhtml/system_config_backend_catalog_inventory_managestock' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock::class,
+            'adminhtml/system_config_backend_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Separator::class,
             'adminhtml/system_config_backend_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Type::class,
             'adminhtml/system_config_backend_category' => \Mage_Adminhtml_Model_System_Config_Backend_Category::class,
             'adminhtml/system_config_backend_cookie' => \Mage_Adminhtml_Model_System_Config_Backend_Cookie::class,
@@ -16083,12 +16048,14 @@
             'adminhtml/system_config_source_catalog_listMode' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListMode::class,
             'adminhtml/system_config_source_catalog_listPerPage' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListPerPage::class,
             'adminhtml/system_config_source_catalog_listSort' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort::class,
+            'adminhtml/system_config_source_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Separator::class,
             'adminhtml/system_config_source_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Type::class,
             'adminhtml/system_config_source_catalog_timeFormat' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_TimeFormat::class,
             'adminhtml/system_config_source_category' => \Mage_Adminhtml_Model_System_Config_Source_Category::class,
             'adminhtml/system_config_source_checktype' => \Mage_Adminhtml_Model_System_Config_Source_Checktype::class,
             'adminhtml/system_config_source_cms_page' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Page::class,
             'adminhtml/system_config_source_cms_wysiwyg_enabled' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Wysiwyg_Enabled::class,
+            'adminhtml/system_config_source_cookie_samesite' => \Mage_Adminhtml_Model_System_Config_Source_Cookie_Samesite::class,
             'adminhtml/system_config_source_country' => \Mage_Adminhtml_Model_System_Config_Source_Country::class,
             'adminhtml/system_config_source_country_full' => \Mage_Adminhtml_Model_System_Config_Source_Country_Full::class,
             'adminhtml/system_config_source_cron_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency::class,
@@ -16115,6 +16082,7 @@
             'adminhtml/system_config_source_locale_timezone' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Timezone::class,
             'adminhtml/system_config_source_locale_weekdaycodes' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdaycodes::class,
             'adminhtml/system_config_source_locale_weekdays' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdays::class,
+            'adminhtml/system_config_source_log_level' => \Mage_Adminhtml_Model_System_Config_Source_Log_Level::class,
             'adminhtml/system_config_source_nooptreq' => \Mage_Adminhtml_Model_System_Config_Source_Nooptreq::class,
             'adminhtml/system_config_source_notification_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Notification_Frequency::class,
             'adminhtml/system_config_source_order_status' => \Mage_Adminhtml_Model_System_Config_Source_Order_Status::class,
@@ -16138,7 +16106,6 @@
             'adminhtml/system_config_source_shipping_flatrate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Flatrate::class,
             'adminhtml/system_config_source_shipping_tablerate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Tablerate::class,
             'adminhtml/system_config_source_shipping_taxclass' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Taxclass::class,
-            'adminhtml/system_config_source_startdateenddate' => \Mage_Adminhtml_Model_System_Config_Source_Startdateenddate::class,
             'adminhtml/system_config_source_storage_media_database' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Database::class,
             'adminhtml/system_config_source_storage_media_storage' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Storage::class,
             'adminhtml/system_config_source_store' => \Mage_Adminhtml_Model_System_Config_Source_Store::class,
@@ -16194,22 +16161,22 @@
             'api2_resource/acl_filter_attribute' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute::class,
             'api2/resource_acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class,
             'api2_resource/acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class,
-            'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
             'api2_resource/acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
+            'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
             'api2/resource_acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class,
             'api2_resource/acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class,
             'api2_resource/acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class,
             'api2/resource_acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class,
             'api2/resource_acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class,
             'api2_resource/acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class,
-            'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class,
             'api2/resource_setup' => \Mage_Api2_Model_Resource_Setup::class,
+            'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class,
             'api2/resource_validator' => \Mage_Api2_Model_Resource_Validator::class,
             'api2_resource/validator' => \Mage_Api2_Model_Resource_Validator::class,
             'api2/resource_validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class,
             'api2_resource/validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class,
-            'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
             'api2/resource_validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
+            'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
             'api2/response' => \Mage_Api2_Model_Response::class,
             'api2/route_abstract' => \Mage_Api2_Model_Route_Abstract::class,
             'api2/route_apiType' => \Mage_Api2_Model_Route_ApiType::class,
@@ -16241,8 +16208,8 @@
             'api/mysql4_user_collection' => \Mage_Api_Model_Mysql4_User_Collection::class,
             'api/resource_abstract' => \Mage_Api_Model_Resource_Abstract::class,
             'api_resource/abstract' => \Mage_Api_Model_Resource_Abstract::class,
-            'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class,
             'api_resource/acl' => \Mage_Api_Model_Resource_Acl::class,
+            'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class,
             'api_resource/acl_role' => \Mage_Api_Model_Resource_Acl_Role::class,
             'api/resource_acl_role' => \Mage_Api_Model_Resource_Acl_Role::class,
             'api/resource_acl_role_collection' => \Mage_Api_Model_Resource_Acl_Role_Collection::class,
@@ -16251,14 +16218,14 @@
             'api_resource/permissions_collection' => \Mage_Api_Model_Resource_Permissions_Collection::class,
             'api_resource/role' => \Mage_Api_Model_Resource_Role::class,
             'api/resource_role' => \Mage_Api_Model_Resource_Role::class,
-            'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
             'api_resource/role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
+            'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
             'api/resource_roles' => \Mage_Api_Model_Resource_Roles::class,
             'api_resource/roles' => \Mage_Api_Model_Resource_Roles::class,
-            'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
             'api_resource/roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
-            'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
+            'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
             'api_resource/roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
+            'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
             'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class,
             'api_resource/rules' => \Mage_Api_Model_Resource_Rules::class,
             'api_resource/rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class,
@@ -16289,15 +16256,6 @@
             'authorizenet/directpost_request' => \Mage_Authorizenet_Model_Directpost_Request::class,
             'authorizenet/directpost_response' => \Mage_Authorizenet_Model_Directpost_Response::class,
             'authorizenet/directpost_session' => \Mage_Authorizenet_Model_Directpost_Session::class,
-            'backup/backup' => \Mage_Backup_Model_Backup::class,
-            'backup/config_backend_cron' => \Mage_Backup_Model_Config_Backend_Cron::class,
-            'backup/config_source_type' => \Mage_Backup_Model_Config_Source_Type::class,
-            'backup/db' => \Mage_Backup_Model_Db::class,
-            'backup/fs_collection' => \Mage_Backup_Model_Fs_Collection::class,
-            'backup/mysql4_db' => \Mage_Backup_Model_Mysql4_Db::class,
-            'backup/observer' => \Mage_Backup_Model_Observer::class,
-            'backup/resource_db' => \Mage_Backup_Model_Resource_Db::class,
-            'backup/resource_helper_mysql4' => \Mage_Backup_Model_Resource_Helper_Mysql4::class,
             'bundle/catalogIndex_data_bundle' => \Mage_Bundle_Model_CatalogIndex_Data_Bundle::class,
             'bundle/mysql4_bundle' => \Mage_Bundle_Model_Mysql4_Bundle::class,
             'bundle/mysql4_indexer_price' => \Mage_Bundle_Model_Mysql4_Indexer_Price::class,
@@ -16317,16 +16275,16 @@
             'bundle/resource_bundle' => \Mage_Bundle_Model_Resource_Bundle::class,
             'bundle/resource_indexer_price' => \Mage_Bundle_Model_Resource_Indexer_Price::class,
             'bundle_resource/indexer_price' => \Mage_Bundle_Model_Resource_Indexer_Price::class,
-            'bundle/resource_indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class,
             'bundle_resource/indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class,
+            'bundle/resource_indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class,
             'bundle/resource_option' => \Mage_Bundle_Model_Resource_Option::class,
             'bundle_resource/option' => \Mage_Bundle_Model_Resource_Option::class,
             'bundle/resource_option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class,
             'bundle_resource/option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class,
             'bundle_resource/price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
             'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
-            'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class,
             'bundle_resource/selection' => \Mage_Bundle_Model_Resource_Selection::class,
+            'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class,
             'bundle_resource/selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class,
             'bundle/resource_selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class,
             'bundle/sales_order_pdf_items_abstract' => \Mage_Bundle_Model_Sales_Order_Pdf_Items_Abstract::class,
@@ -16386,14 +16344,14 @@
             'catalogindex/resource_data_abstract' => \Mage_CatalogIndex_Model_Resource_Data_Abstract::class,
             'catalogindex_resource/data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class,
             'catalogindex/resource_data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class,
-            'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
             'catalogindex_resource/data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
+            'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
             'catalogindex_resource/indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class,
             'catalogindex/resource_indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class,
             'catalogindex/resource_indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class,
             'catalogindex_resource/indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class,
-            'catalogindex_resource/indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class,
             'catalogindex/resource_indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class,
+            'catalogindex_resource/indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class,
             'catalogindex_resource/indexer_minimalprice' => \Mage_CatalogIndex_Model_Resource_Indexer_Minimalprice::class,
             'catalogindex/resource_indexer_minimalprice' => \Mage_CatalogIndex_Model_Resource_Indexer_Minimalprice::class,
             'catalogindex/resource_indexer_price' => \Mage_CatalogIndex_Model_Resource_Indexer_Price::class,
@@ -16419,20 +16377,20 @@
             'cataloginventory/mysql4_stock_item_collection' => \Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection::class,
             'cataloginventory/mysql4_stock_status' => \Mage_CatalogInventory_Model_Mysql4_Stock_Status::class,
             'cataloginventory/observer' => \Mage_CatalogInventory_Model_Observer::class,
-            'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
             'cataloginventory_resource/indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
+            'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
             'cataloginventory/resource_indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class,
             'cataloginventory_resource/indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class,
-            'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
             'cataloginventory/resource_indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
+            'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
             'cataloginventory/resource_indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class,
             'cataloginventory_resource/indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class,
             'cataloginventory_resource/stock' => \Mage_CatalogInventory_Model_Resource_Stock::class,
             'cataloginventory/resource_stock' => \Mage_CatalogInventory_Model_Resource_Stock::class,
             'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
             'cataloginventory/resource_stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
-            'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
             'cataloginventory/resource_stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
+            'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
             'cataloginventory/resource_stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class,
             'cataloginventory_resource/stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class,
             'cataloginventory/source_backorders' => \Mage_CatalogInventory_Model_Source_Backorders::class,
@@ -16453,10 +16411,10 @@
             'catalogrule/mysql4_rule_product_price' => \Mage_CatalogRule_Model_Mysql4_Rule_Product_Price::class,
             'catalogrule/mysql4_rule_product_price_collection' => \Mage_CatalogRule_Model_Mysql4_Rule_Product_Price_Collection::class,
             'catalogrule/observer' => \Mage_CatalogRule_Model_Observer::class,
-            'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
             'catalogrule/resource_rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
-            'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
+            'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
             'catalogrule_resource/rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
+            'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
             'catalogrule_resource/rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class,
             'catalogrule/resource_rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class,
             'catalogrule_resource/rule_product_price_collection' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price_Collection::class,
@@ -16485,24 +16443,24 @@
             'catalogsearch/query' => \Mage_CatalogSearch_Model_Query::class,
             'catalogsearch_resource/advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class,
             'catalogsearch/resource_advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class,
-            'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
             'catalogsearch_resource/advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
+            'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
             'catalogsearch_resource/fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class,
             'catalogsearch/resource_fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class,
             'catalogsearch_resource/fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class,
             'catalogsearch/resource_fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class,
             'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
             'catalogsearch_resource/fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
-            'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
             'catalogsearch/resource_helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
-            'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
+            'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
             'catalogsearch_resource/indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
+            'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
             'catalogsearch_resource/query' => \Mage_CatalogSearch_Model_Resource_Query::class,
             'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class,
-            'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
             'catalogsearch_resource/query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
-            'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
+            'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
             'catalogsearch/resource_search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
+            'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
             'catalogsearch/session' => \Mage_CatalogSearch_Model_Session::class,
             'catalogsearch/system_config_backend_sitemap' => \Mage_CatalogSearch_Model_System_Config_Backend_Sitemap::class,
             'catalog/abstract' => \Mage_Catalog_Model_Abstract::class,
@@ -16645,144 +16603,144 @@
             'catalog/product_website' => \Mage_Catalog_Model_Product_Website::class,
             'catalog/resource_abstract' => \Mage_Catalog_Model_Resource_Abstract::class,
             'catalog_resource/abstract' => \Mage_Catalog_Model_Resource_Abstract::class,
-            'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
             'catalog/resource_attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
-            'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class,
+            'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
             'catalog_resource/category' => \Mage_Catalog_Model_Resource_Category::class,
+            'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class,
             'catalog_resource/category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class,
             'catalog/resource_category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class,
-            'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
             'catalog/resource_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
-            'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
+            'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
             'catalog/resource_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
+            'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
             'catalog_resource/category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class,
             'catalog/resource_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class,
             'catalog_resource/category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class,
             'catalog/resource_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class,
             'catalog/resource_category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class,
             'catalog_resource/category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class,
-            'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
             'catalog_resource/category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
-            'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
+            'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
             'catalog/resource_category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
+            'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
             'catalog_resource/category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class,
             'catalog/resource_category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class,
             'catalog/resource_category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class,
             'catalog_resource/category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class,
-            'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
             'catalog_resource/collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
-            'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class,
+            'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
             'catalog_resource/config' => \Mage_Catalog_Model_Resource_Config::class,
-            'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
+            'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class,
             'catalog/resource_eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
+            'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
             'catalog_resource/eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class,
             'catalog/resource_eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class,
-            'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
             'catalog_resource/eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
-            'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
+            'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
             'catalog/resource_eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
-            'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
+            'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
             'catalog_resource/eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
+            'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
             'catalog_resource/eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
-            'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
+            'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
             'catalog_resource/eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
+            'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
             'catalog/resource_eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class,
             'catalog_resource/eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class,
             'catalog/resource_eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class,
             'catalog_resource/eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class,
             'catalog/resource_eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class,
             'catalog_resource/eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class,
-            'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
             'catalog/resource_eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
-            'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
+            'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
             'catalog/resource_eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
+            'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
             'catalog/resource_eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class,
             'catalog_resource/eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class,
-            'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
             'catalog_resource/eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
+            'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
             'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
             'catalog_resource/eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
             'catalog_resource/eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class,
             'catalog/resource_eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class,
-            'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
             'catalog_resource/eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
-            'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
+            'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
             'catalog/resource_eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
-            'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
+            'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
             'catalog/resource_eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
-            'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
+            'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
             'catalog/resource_eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
+            'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
             'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
             'catalog_resource/eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
-            'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
             'catalog/resource_eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
+            'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class,
             'catalog/resource_eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
+            'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
             'catalog/resource_eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class,
             'catalog/resource_eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class,
             'catalog/resource_eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class,
-            'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
             'catalog_resource/eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
-            'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
+            'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
             'catalog_resource/eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
-            'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
+            'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
             'catalog_resource/eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
+            'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
             'catalog/resource_eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class,
             'catalog/resource_eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class,
             'catalog/resource_eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class,
-            'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
             'catalog/resource_eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
-            'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
+            'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
             'catalog_resource/eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
+            'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
             'catalog_resource/eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class,
             'catalog/resource_eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class,
             'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
             'catalog/resource_eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
-            'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
             'catalog/resource_eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
+            'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
             'catalog/resource_eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class,
             'catalog_resource/eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class,
-            'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
             'catalog/resource_eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
+            'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
             'catalog_resource/eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class,
             'catalog/resource_eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class,
             'catalog_resource/eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class,
             'catalog/resource_eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
             'catalog/resource_eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
-            'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
             'catalog_resource/eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
-            'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
+            'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
             'catalog/resource_eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
-            'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
+            'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
             'catalog/resource_eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
-            'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
+            'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
             'catalog/resource_eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
+            'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
             'catalog/resource_eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class,
             'catalog_resource/eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class,
-            'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
             'catalog_resource/eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
-            'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
+            'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
             'catalog/resource_eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
-            'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
             'catalog/resource_eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
+            'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
             'catalog_resource/eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
+            'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
             'catalog/resource_eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class,
             'catalog_resource/eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class,
             'catalog/resource_eav_mysql4_sendfriend' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend::class,
@@ -16791,98 +16749,98 @@
             'catalog/resource_eav_mysql4_sendfriend_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection::class,
             'catalog_resource/eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class,
             'catalog/resource_eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class,
-            'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
             'catalog/resource_eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
+            'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
             'catalog/resource_helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
             'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
             'catalog_resource/layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class,
             'catalog/resource_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class,
             'catalog/resource_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class,
             'catalog_resource/layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class,
-            'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
             'catalog/resource_layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
-            'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class,
+            'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
             'catalog_resource/product' => \Mage_Catalog_Model_Resource_Product::class,
+            'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class,
             'catalog/resource_product_action' => \Mage_Catalog_Model_Resource_Product_Action::class,
             'catalog_resource/product_action' => \Mage_Catalog_Model_Resource_Product_Action::class,
-            'catalog_resource/product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class,
             'catalog/resource_product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class,
+            'catalog_resource/product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class,
             'catalog/resource_product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class,
             'catalog_resource/product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class,
             'catalog/resource_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class,
             'catalog_resource/product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class,
-            'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
             'catalog/resource_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
+            'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
             'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
             'catalog_resource/product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
             'catalog/resource_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class,
-            'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
             'catalog_resource/product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
+            'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
             'catalog/resource_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
             'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
-            'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
-            'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
+            'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
+            'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
             'catalog_resource/product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class,
             'catalog/resource_product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class,
-            'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
             'catalog/resource_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
+            'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
             'catalog/resource_product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class,
             'catalog_resource/product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class,
-            'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
             'catalog/resource_product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
+            'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
             'catalog/resource_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class,
             'catalog_resource/product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class,
-            'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
             'catalog_resource/product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
-            'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
+            'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
             'catalog/resource_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
+            'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
             'catalog/resource_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class,
             'catalog_resource/product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class,
-            'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
             'catalog_resource/product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
-            'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
+            'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
             'catalog_resource/product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
-            'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
+            'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
             'catalog_resource/product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
+            'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
             'catalog/resource_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class,
             'catalog_resource/product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class,
             'catalog_resource/product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class,
             'catalog/resource_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class,
-            'catalog/resource_product_link' => \Mage_Catalog_Model_Resource_Product_Link::class,
             'catalog_resource/product_link' => \Mage_Catalog_Model_Resource_Product_Link::class,
+            'catalog/resource_product_link' => \Mage_Catalog_Model_Resource_Product_Link::class,
             'catalog/resource_product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class,
             'catalog_resource/product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class,
-            'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
             'catalog/resource_product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
-            'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
+            'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
             'catalog_resource/product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
-            'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
+            'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
             'catalog/resource_product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
-            'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
+            'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
             'catalog_resource/product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
-            'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
+            'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
             'catalog_resource/product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
+            'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
             'catalog_resource/product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class,
             'catalog/resource_product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class,
             'catalog_resource/product_status' => \Mage_Catalog_Model_Resource_Product_Status::class,
             'catalog/resource_product_status' => \Mage_Catalog_Model_Resource_Product_Status::class,
             'catalog_resource/product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class,
             'catalog/resource_product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class,
-            'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
             'catalog/resource_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
-            'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
             'catalog_resource/product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
             'catalog_resource/product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class,
             'catalog/resource_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class,
-            'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
             'catalog_resource/product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
+            'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
             'catalog/resource_setup' => \Mage_Catalog_Model_Resource_Setup::class,
             'catalog_resource/setup' => \Mage_Catalog_Model_Resource_Setup::class,
-            'catalog/resource_url' => \Mage_Catalog_Model_Resource_Url::class,
             'catalog_resource/url' => \Mage_Catalog_Model_Resource_Url::class,
+            'catalog/resource_url' => \Mage_Catalog_Model_Resource_Url::class,
             'catalog/session' => \Mage_Catalog_Model_Session::class,
             'catalog/system_config_backend_catalog_category_flat' => \Mage_Catalog_Model_System_Config_Backend_Catalog_Category_Flat::class,
             'catalog/system_config_backend_catalog_product_flat' => \Mage_Catalog_Model_System_Config_Backend_Catalog_Product_Flat::class,
@@ -16924,12 +16882,12 @@
             'checkout/observer' => \Mage_Checkout_Model_Observer::class,
             'checkout_resource/agreement' => \Mage_Checkout_Model_Resource_Agreement::class,
             'checkout/resource_agreement' => \Mage_Checkout_Model_Resource_Agreement::class,
-            'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
             'checkout/resource_agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
-            'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class,
+            'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
             'checkout_resource/cart' => \Mage_Checkout_Model_Resource_Cart::class,
-            'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class,
+            'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class,
             'checkout/resource_setup' => \Mage_Checkout_Model_Resource_Setup::class,
+            'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class,
             'checkout/session' => \Mage_Checkout_Model_Session::class,
             'checkout/type_abstract' => \Mage_Checkout_Model_Type_Abstract::class,
             'checkout/type_multishipping' => \Mage_Checkout_Model_Type_Multishipping::class,
@@ -16944,25 +16902,25 @@
             'cms/mysql4_page_service' => \Mage_Cms_Model_Mysql4_Page_Service::class,
             'cms/observer' => \Mage_Cms_Model_Observer::class,
             'cms/page' => \Mage_Cms_Model_Page::class,
-            'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class,
             'cms/resource_block' => \Mage_Cms_Model_Resource_Block::class,
+            'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class,
             'cms_resource/block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class,
             'cms/resource_block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class,
             'cms/resource_page' => \Mage_Cms_Model_Resource_Page::class,
             'cms_resource/page' => \Mage_Cms_Model_Resource_Page::class,
             'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
             'cms_resource/page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
-            'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
             'cms/resource_page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
+            'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
             'cms/template_filter' => \Mage_Cms_Model_Template_Filter::class,
             'cms/wysiwyg_config' => \Mage_Cms_Model_Wysiwyg_Config::class,
             'cms/wysiwyg_images_storage' => \Mage_Cms_Model_Wysiwyg_Images_Storage::class,
             'cms/wysiwyg_images_storage_collection' => \Mage_Cms_Model_Wysiwyg_Images_Storage_Collection::class,
             'configurableswatches/observer' => \Mage_ConfigurableSwatches_Model_Observer::class,
-            'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
             'configurableswatches_resource/catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
-            'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
+            'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
             'configurableswatches_resource/catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
+            'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
             'configurableswatches_resource/catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
             'configurableswatches/resource_catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
             'configurableswatches/system_config_source_catalog_product_configattribute' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute::class,
@@ -17069,152 +17027,152 @@
             'core/mysql4_website_collection' => \Mage_Core_Model_Mysql4_Website_Collection::class,
             'core/observer' => \Mage_Core_Model_Observer::class,
             'core/resource' => \Mage_Core_Model_Resource::class,
+            'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
             'core_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
             'core/resource_abstract' => \Mage_Core_Model_Resource_Abstract::class,
-            'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
+            'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
             'core/resource_cache' => \Mage_Core_Model_Resource_Cache::class,
             'core_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
-            'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
+            'core/resource_config' => \Mage_Core_Model_Resource_Config::class,
             'core_resource/config' => \Mage_Core_Model_Resource_Config::class,
             'payment_resource/config' => \Mage_Core_Model_Resource_Config::class,
-            'core/resource_config' => \Mage_Core_Model_Resource_Config::class,
-            'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
             'core/resource_config_data' => \Mage_Core_Model_Resource_Config_Data::class,
+            'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
             'payment_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
-            'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'core_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
+            'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
-            'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
-            'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
             'payment_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
+            'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
+            'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
             'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
-            'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
             'core/resource_db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
-            'core/resource_design' => \Mage_Core_Model_Resource_Design::class,
+            'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
             'core_resource/design' => \Mage_Core_Model_Resource_Design::class,
+            'core/resource_design' => \Mage_Core_Model_Resource_Design::class,
             'payment_resource/design' => \Mage_Core_Model_Resource_Design::class,
             'payment_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
-            'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
             'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
-            'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
+            'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
             'payment_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
             'core/resource_design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
-            'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
-            'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
+            'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
             'core/resource_email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
-            'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
-            'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
+            'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
+            'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
             'payment_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
-            'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
+            'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
+            'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
             'core/resource_email_template' => \Mage_Core_Model_Resource_Email_Template::class,
+            'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
             'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
-            'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
             'core/resource_email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
+            'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
             'core_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
             'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
             'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
             'core_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
-            'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
-            'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
             'core_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
             'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
-            'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
             'payment_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
+            'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
+            'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
             'payment_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
             'core/resource_file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
-            'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
-            'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
             'core/resource_file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
+            'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
             'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
-            'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
-            'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
             'core/resource_file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
-            'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
+            'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
+            'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
             'payment_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
+            'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
             'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class,
             'payment_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
-            'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
             'core_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
-            'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
+            'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
             'core/resource_helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
+            'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
             'core_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
-            'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
-            'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
             'core/resource_iterator' => \Mage_Core_Model_Resource_Iterator::class,
+            'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
+            'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
             'payment_resource/language' => \Mage_Core_Model_Resource_Language::class,
-            'core/resource_language' => \Mage_Core_Model_Resource_Language::class,
             'core_resource/language' => \Mage_Core_Model_Resource_Language::class,
+            'core/resource_language' => \Mage_Core_Model_Resource_Language::class,
             'payment_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
-            'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
             'core/resource_language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
-            'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
+            'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
             'core_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
             'core/resource_layout' => \Mage_Core_Model_Resource_Layout::class,
-            'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
+            'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
             'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class,
             'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
+            'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
+            'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
             'payment_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
-            'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
             'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
             'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class,
             'payment_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
-            'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core/resource_setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
-            'payment_resource/store' => \Mage_Core_Model_Resource_Store::class,
-            'core_resource/store' => \Mage_Core_Model_Resource_Store::class,
+            'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core/resource_store' => \Mage_Core_Model_Resource_Store::class,
-            'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
+            'core_resource/store' => \Mage_Core_Model_Resource_Store::class,
+            'payment_resource/store' => \Mage_Core_Model_Resource_Store::class,
             'core/resource_store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
             'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
-            'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
+            'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
             'core/resource_store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'payment_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
-            'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
-            'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
+            'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'payment_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
-            'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
-            'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class,
+            'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
+            'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
             'core_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
-            'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class,
+            'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class,
+            'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
             'core_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
+            'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class,
             'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
-            'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
-            'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
             'payment_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
-            'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
+            'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
             'core/resource_type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
             'payment_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
-            'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'core/resource_type_db' => \Mage_Core_Model_Resource_Type_Db::class,
+            'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
-            'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
-            'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
             'core_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
-            'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
-            'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
+            'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
             'payment_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
             'payment_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
-            'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
             'core_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
+            'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
             'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
             'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
             'payment_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
-            'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
-            'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'core_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
+            'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
+            'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'core_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
-            'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
             'core/resource_variable' => \Mage_Core_Model_Resource_Variable::class,
+            'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
             'core/resource_variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
-            'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
             'core_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
-            'core_resource/website' => \Mage_Core_Model_Resource_Website::class,
+            'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
             'payment_resource/website' => \Mage_Core_Model_Resource_Website::class,
+            'core_resource/website' => \Mage_Core_Model_Resource_Website::class,
             'core/resource_website' => \Mage_Core_Model_Resource_Website::class,
-            'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core/resource_website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
+            'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core/session' => \Mage_Core_Model_Session::class,
             'core/session_abstract' => \Mage_Core_Model_Session_Abstract::class,
@@ -17244,10 +17202,10 @@
             'cron/mysql4_schedule' => \Mage_Cron_Model_Mysql4_Schedule::class,
             'cron/mysql4_schedule_collection' => \Mage_Cron_Model_Mysql4_Schedule_Collection::class,
             'cron/observer' => \Mage_Cron_Model_Observer::class,
-            'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class,
             'cron/resource_schedule' => \Mage_Cron_Model_Resource_Schedule::class,
-            'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
+            'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class,
             'cron/resource_schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
+            'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
             'cron/schedule' => \Mage_Cron_Model_Schedule::class,
             'currencysymbol/observer' => \Mage_CurrencySymbol_Model_Observer::class,
             'currencysymbol/system_currencysymbol' => \Mage_CurrencySymbol_Model_System_Currencysymbol::class,
@@ -17324,14 +17282,14 @@
             'customer_resource/address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class,
             'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
             'customer_resource/address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
-            'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
             'customer/resource_address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
-            'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
+            'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
             'customer/resource_address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
-            'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
+            'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
             'customer_resource/address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
-            'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
+            'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
             'customer_resource/address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
+            'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
             'customer/resource_attribute' => \Mage_Customer_Model_Resource_Attribute::class,
             'customer_resource/attribute' => \Mage_Customer_Model_Resource_Attribute::class,
             'customer_resource/attribute_collection' => \Mage_Customer_Model_Resource_Attribute_Collection::class,
@@ -17340,20 +17298,20 @@
             'customer_resource/customer' => \Mage_Customer_Model_Resource_Customer::class,
             'customer_resource/customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class,
             'customer/resource_customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class,
-            'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
             'customer/resource_flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
-            'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
+            'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
             'customer/resource_flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
-            'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
+            'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
             'customer/resource_form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
+            'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
             'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
             'customer/resource_form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
             'customer/resource_group' => \Mage_Customer_Model_Resource_Group::class,
             'customer_resource/group' => \Mage_Customer_Model_Resource_Group::class,
             'customer_resource/group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class,
             'customer/resource_group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class,
-            'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class,
             'customer_resource/setup' => \Mage_Customer_Model_Resource_Setup::class,
+            'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class,
             'customer_resource/wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
             'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
             'customer/session' => \Mage_Customer_Model_Session::class,
@@ -17407,10 +17365,10 @@
             'dataflow/mysql4_session' => \Mage_Dataflow_Model_Mysql4_Session::class,
             'dataflow/profile' => \Mage_Dataflow_Model_Profile::class,
             'dataflow/profile_history' => \Mage_Dataflow_Model_Profile_History::class,
-            'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class,
             'dataflow/resource_batch' => \Mage_Dataflow_Model_Resource_Batch::class,
-            'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
+            'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class,
             'dataflow/resource_batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
+            'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
             'dataflow/resource_batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class,
             'dataflow_resource/batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class,
             'dataflow_resource/batch_export' => \Mage_Dataflow_Model_Resource_Batch_Export::class,
@@ -17425,12 +17383,12 @@
             'dataflow/resource_profile' => \Mage_Dataflow_Model_Resource_Profile::class,
             'dataflow/resource_profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class,
             'dataflow_resource/profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class,
-            'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
             'dataflow_resource/profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
+            'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
             'dataflow_resource/profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class,
             'dataflow/resource_profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class,
-            'dataflow/resource_session' => \Mage_Dataflow_Model_Resource_Session::class,
             'dataflow_resource/session' => \Mage_Dataflow_Model_Resource_Session::class,
+            'dataflow/resource_session' => \Mage_Dataflow_Model_Resource_Session::class,
             'dataflow/session' => \Mage_Dataflow_Model_Session::class,
             'dataflow/session_adapter_http' => \Mage_Dataflow_Model_Session_Adapter_Http::class,
             'dataflow/session_parser_csv' => \Mage_Dataflow_Model_Session_Parser_Csv::class,
@@ -17460,18 +17418,18 @@
             'directory/resource_country' => \Mage_Directory_Model_Resource_Country::class,
             'directory_resource/country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class,
             'directory/resource_country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class,
-            'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
             'directory/resource_country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
+            'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
             'directory_resource/country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class,
             'directory/resource_country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class,
             'directory_resource/currency' => \Mage_Directory_Model_Resource_Currency::class,
             'directory/resource_currency' => \Mage_Directory_Model_Resource_Currency::class,
-            'directory/resource_currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class,
             'directory_resource/currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class,
+            'directory/resource_currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class,
             'directory/resource_region' => \Mage_Directory_Model_Resource_Region::class,
             'directory_resource/region' => \Mage_Directory_Model_Resource_Region::class,
-            'directory/resource_region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class,
             'directory_resource/region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class,
+            'directory/resource_region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class,
             'downloadable/catalogIndex_data_downloadable' => \Mage_Downloadable_Model_CatalogIndex_Data_Downloadable::class,
             'downloadable/link' => \Mage_Downloadable_Model_Link::class,
             'downloadable/link_api' => \Mage_Downloadable_Model_Link_Api::class,
@@ -17492,8 +17450,8 @@
             'downloadable/observer' => \Mage_Downloadable_Model_Observer::class,
             'downloadable/product_price' => \Mage_Downloadable_Model_Product_Price::class,
             'downloadable/product_type' => \Mage_Downloadable_Model_Product_Type::class,
-            'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
             'downloadable_resource/indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
+            'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
             'downloadable/resource_link' => \Mage_Downloadable_Model_Resource_Link::class,
             'downloadable_resource/link' => \Mage_Downloadable_Model_Resource_Link::class,
             'downloadable/resource_link_collection' => \Mage_Downloadable_Model_Resource_Link_Collection::class,
@@ -17502,14 +17460,14 @@
             'downloadable_resource/link_purchased' => \Mage_Downloadable_Model_Resource_Link_Purchased::class,
             'downloadable/resource_link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class,
             'downloadable_resource/link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class,
-            'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
             'downloadable/resource_link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
-            'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
+            'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
             'downloadable/resource_link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
-            'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class,
+            'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
             'downloadable/resource_sample' => \Mage_Downloadable_Model_Resource_Sample::class,
-            'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
+            'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class,
             'downloadable/resource_sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
+            'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
             'downloadable/sales_order_pdf_items_abstract' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Abstract::class,
             'downloadable/sales_order_pdf_items_creditmemo' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Creditmemo::class,
             'downloadable/sales_order_pdf_items_invoice' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Invoice::class,
@@ -17591,8 +17549,8 @@
             'eav/mysql4_form_fieldset_collection' => \Mage_Eav_Model_Mysql4_Form_Fieldset_Collection::class,
             'eav/mysql4_form_type' => \Mage_Eav_Model_Mysql4_Form_Type::class,
             'eav/mysql4_form_type_collection' => \Mage_Eav_Model_Mysql4_Form_Type_Collection::class,
-            'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class,
             'eav_resource/attribute' => \Mage_Eav_Model_Resource_Attribute::class,
+            'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class,
             'eav_resource/attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class,
             'eav/resource_attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class,
             'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class,
@@ -17609,28 +17567,28 @@
             'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
             'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
-            'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
-            'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
+            'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
+            'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
             'eav_resource/entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class,
             'eav/resource_entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class,
             'eav_resource/entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class,
             'eav/resource_entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class,
-            'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
             'eav_resource/entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
+            'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
             'eav/resource_form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class,
             'eav_resource/form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class,
-            'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
             'eav/resource_form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
+            'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
             'eav/resource_form_element' => \Mage_Eav_Model_Resource_Form_Element::class,
             'eav_resource/form_element' => \Mage_Eav_Model_Resource_Form_Element::class,
-            'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
             'eav_resource/form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
-            'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
+            'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
             'eav/resource_form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
-            'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
+            'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
             'eav_resource/form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
+            'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
             'eav/resource_form_type' => \Mage_Eav_Model_Resource_Form_Type::class,
             'eav_resource/form_type' => \Mage_Eav_Model_Resource_Form_Type::class,
             'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class,
@@ -17646,12 +17604,12 @@
             'giftmessage/mysql4_message_collection' => \Mage_GiftMessage_Model_Mysql4_Message_Collection::class,
             'giftmessage/mysql4_setup' => \Mage_GiftMessage_Model_Mysql4_Setup::class,
             'giftmessage/observer' => \Mage_GiftMessage_Model_Observer::class,
-            'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class,
             'giftmessage/resource_message' => \Mage_GiftMessage_Model_Resource_Message::class,
-            'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
+            'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class,
             'giftmessage_resource/message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
-            'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
+            'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
             'giftmessage_resource/setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
+            'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
             'googleanalytics/observer' => \Mage_GoogleAnalytics_Model_Observer::class,
             'googleanalytics/system_config_source_type' => \Mage_GoogleAnalytics_Model_System_Config_Source_Type::class,
             'googlecheckout/payment' => \Mage_GoogleCheckout_Model_Payment::class,
@@ -17687,8 +17645,8 @@
             'importexport/product_attribute_backend_urlkey' => \Mage_ImportExport_Model_Product_Attribute_Backend_Urlkey::class,
             'importexport_resource/helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class,
             'importexport/resource_helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class,
-            'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
             'importexport_resource/import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
+            'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
             'importexport_resource/setup' => \Mage_ImportExport_Model_Resource_Setup::class,
             'importexport/resource_setup' => \Mage_ImportExport_Model_Resource_Setup::class,
             'importexport/source_export_entity' => \Mage_ImportExport_Model_Source_Export_Entity::class,
@@ -17710,16 +17668,16 @@
             'index/process' => \Mage_Index_Model_Process::class,
             'index_resource/abstract' => \Mage_Index_Model_Resource_Abstract::class,
             'index/resource_abstract' => \Mage_Index_Model_Resource_Abstract::class,
-            'index/resource_event' => \Mage_Index_Model_Resource_Event::class,
             'index_resource/event' => \Mage_Index_Model_Resource_Event::class,
+            'index/resource_event' => \Mage_Index_Model_Resource_Event::class,
             'index/resource_event_collection' => \Mage_Index_Model_Resource_Event_Collection::class,
             'index_resource/event_collection' => \Mage_Index_Model_Resource_Event_Collection::class,
             'index/resource_helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class,
             'index_resource/helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class,
-            'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
             'index/resource_lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
-            'index_resource/process' => \Mage_Index_Model_Resource_Process::class,
+            'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
             'index/resource_process' => \Mage_Index_Model_Resource_Process::class,
+            'index_resource/process' => \Mage_Index_Model_Resource_Process::class,
             'index/resource_process_collection' => \Mage_Index_Model_Resource_Process_Collection::class,
             'index_resource/process_collection' => \Mage_Index_Model_Resource_Process_Collection::class,
             'index/resource_setup' => \Mage_Index_Model_Resource_Setup::class,
@@ -17752,22 +17710,22 @@
             'log/mysql4_visitor_online_collection' => \Mage_Log_Model_Mysql4_Visitor_Online_Collection::class,
             'log_resource/aggregation' => \Mage_Log_Model_Resource_Aggregation::class,
             'log/resource_aggregation' => \Mage_Log_Model_Resource_Aggregation::class,
-            'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class,
             'log/resource_customer' => \Mage_Log_Model_Resource_Customer::class,
+            'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class,
             'log/resource_log' => \Mage_Log_Model_Resource_Log::class,
             'log_resource/log' => \Mage_Log_Model_Resource_Log::class,
             'log_resource/visitor' => \Mage_Log_Model_Resource_Visitor::class,
             'log/resource_visitor' => \Mage_Log_Model_Resource_Visitor::class,
             'log_resource/visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class,
             'log/resource_visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class,
-            'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
             'log_resource/visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
-            'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
+            'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
             'log_resource/visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
+            'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
             'log/visitor' => \Mage_Log_Model_Visitor::class,
             'log/visitor_online' => \Mage_Log_Model_Visitor_Online::class,
-            'media_resource/image' => \Mage_Media_Model_File_Image::class,
             'media/file_image' => \Mage_Media_Model_File_Image::class,
+            'media_resource/image' => \Mage_Media_Model_File_Image::class,
             'media/image' => \Mage_Media_Model_Image::class,
             'newsletter/message' => \Mage_Newsletter_Model_Message::class,
             'newsletter/mysql4_problem' => \Mage_Newsletter_Model_Mysql4_Problem::class,
@@ -17785,14 +17743,14 @@
             'newsletter_resource/problem' => \Mage_Newsletter_Model_Resource_Problem::class,
             'newsletter/resource_problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class,
             'newsletter_resource/problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class,
-            'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class,
             'newsletter/resource_queue' => \Mage_Newsletter_Model_Resource_Queue::class,
-            'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
+            'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class,
             'newsletter/resource_queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
-            'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
+            'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
             'newsletter/resource_subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
-            'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
+            'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
             'newsletter/resource_subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
+            'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
             'newsletter_resource/template' => \Mage_Newsletter_Model_Resource_Template::class,
             'newsletter/resource_template' => \Mage_Newsletter_Model_Resource_Template::class,
             'newsletter_resource/template_collection' => \Mage_Newsletter_Model_Resource_Template_Collection::class,
@@ -17805,20 +17763,20 @@
             'oauth/consumer_validator_keyLength' => \Mage_Oauth_Model_Consumer_Validator_KeyLength::class,
             'oauth/nonce' => \Mage_Oauth_Model_Nonce::class,
             'oauth/observer' => \Mage_Oauth_Model_Observer::class,
-            'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
             'oauth/resource_consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
+            'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
             'oauth/resource_consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class,
             'oauth_resource/consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class,
             'oauth_resource/nonce' => \Mage_Oauth_Model_Resource_Nonce::class,
             'oauth/resource_nonce' => \Mage_Oauth_Model_Resource_Nonce::class,
             'oauth_resource/nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class,
             'oauth/resource_nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class,
-            'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class,
             'oauth/resource_setup' => \Mage_Oauth_Model_Resource_Setup::class,
+            'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class,
             'oauth_resource/token' => \Mage_Oauth_Model_Resource_Token::class,
             'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class,
-            'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
             'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
+            'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
             'oauth/server' => \Mage_Oauth_Model_Server::class,
             'oauth/token' => \Mage_Oauth_Model_Token::class,
             'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class,
@@ -17835,8 +17793,8 @@
             'paygate/authorizenet_source_paymentAction' => \Mage_Paygate_Model_Authorizenet_Source_PaymentAction::class,
             'paygate/mysql4_authorizenet_debug' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug::class,
             'paygate/mysql4_authorizenet_debug_collection' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection::class,
-            'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
             'paygate/resource_authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
+            'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
             'paygate_resource/authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class,
             'paygate/resource_authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class,
             'payment/billing_agreementAbstract' => \Mage_Payment_Model_Billing_AgreementAbstract::class,
@@ -17899,14 +17857,14 @@
             'paypal/resource_cert' => \Mage_Paypal_Model_Resource_Cert::class,
             'paypal_resource/payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class,
             'paypal/resource_payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class,
-            'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
             'paypal/resource_payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
+            'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
             'paypal/resource_report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class,
             'paypal_resource/report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class,
-            'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
             'paypal/resource_report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
-            'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
+            'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
             'paypal/resource_report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
+            'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
             'paypal/resource_setup' => \Mage_Paypal_Model_Resource_Setup::class,
             'paypal_resource/setup' => \Mage_Paypal_Model_Resource_Setup::class,
             'paypal/session' => \Mage_Paypal_Model_Session::class,
@@ -17940,16 +17898,16 @@
             'poll/poll' => \Mage_Poll_Model_Poll::class,
             'poll/poll_answer' => \Mage_Poll_Model_Poll_Answer::class,
             'poll/poll_vote' => \Mage_Poll_Model_Poll_Vote::class,
-            'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class,
             'poll_resource/poll' => \Mage_Poll_Model_Resource_Poll::class,
-            'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
+            'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class,
             'poll/resource_poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
-            'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
+            'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
             'poll_resource/poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
-            'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
+            'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
             'poll_resource/poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
-            'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
+            'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
             'poll/resource_poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
+            'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
             'productalert/email' => \Mage_ProductAlert_Model_Email::class,
             'productalert/mysql4_price' => \Mage_ProductAlert_Model_Mysql4_Price::class,
             'productalert/mysql4_price_collection' => \Mage_ProductAlert_Model_Mysql4_Price_Collection::class,
@@ -17959,20 +17917,20 @@
             'productalert/mysql4_stock_customer_collection' => \Mage_ProductAlert_Model_Mysql4_Stock_Customer_Collection::class,
             'productalert/observer' => \Mage_ProductAlert_Model_Observer::class,
             'productalert/price' => \Mage_ProductAlert_Model_Price::class,
-            'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
             'productalert_resource/abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
-            'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class,
+            'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
             'productalert_resource/price' => \Mage_ProductAlert_Model_Resource_Price::class,
-            'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
+            'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class,
             'productalert/resource_price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
-            'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
+            'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
             'productalert/resource_price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
-            'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
+            'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
             'productalert/resource_stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
-            'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
+            'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
             'productalert/resource_stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
-            'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
+            'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
             'productalert/resource_stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
+            'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
             'productalert/stock' => \Mage_ProductAlert_Model_Stock::class,
             'rating/mysql4_rating' => \Mage_Rating_Model_Mysql4_Rating::class,
             'rating/mysql4_rating_collection' => \Mage_Rating_Model_Mysql4_Rating_Collection::class,
@@ -17986,20 +17944,20 @@
             'rating/rating_entity' => \Mage_Rating_Model_Rating_Entity::class,
             'rating/rating_option' => \Mage_Rating_Model_Rating_Option::class,
             'rating/rating_option_vote' => \Mage_Rating_Model_Rating_Option_Vote::class,
-            'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class,
             'rating/resource_rating' => \Mage_Rating_Model_Resource_Rating::class,
+            'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class,
             'rating_resource/rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class,
             'rating/resource_rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class,
             'rating/resource_rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class,
             'rating_resource/rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class,
-            'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
             'rating/resource_rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
-            'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
+            'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
             'rating_resource/rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
+            'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
             'rating_resource/rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class,
             'rating/resource_rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class,
-            'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
             'rating/resource_rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
+            'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
             'reports/config' => \Mage_Reports_Model_Config::class,
             'reports/event' => \Mage_Reports_Model_Event::class,
             'reports/event_observer' => \Mage_Reports_Model_Event_Observer::class,
@@ -18045,6 +18003,7 @@
             'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class,
             'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class,
             'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class,
+            'reports/observer' => \Mage_Reports_Model_Observer::class,
             'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class,
             'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class,
             'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class,
@@ -18053,52 +18012,52 @@
             'reports_resource/accounts_collection' => \Mage_Reports_Model_Resource_Accounts_Collection::class,
             'reports/resource_coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class,
             'reports_resource/coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class,
-            'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
             'reports/resource_customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
-            'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
+            'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
             'reports/resource_customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
-            'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
+            'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
             'reports_resource/customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
-            'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
+            'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
             'reports/resource_entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
+            'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
             'reports_resource/event' => \Mage_Reports_Model_Resource_Event::class,
             'reports/resource_event' => \Mage_Reports_Model_Resource_Event::class,
-            'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
             'reports_resource/event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
-            'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
+            'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
             'reports/resource_event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
-            'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
+            'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
             'reports/resource_event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
-            'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
+            'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
             'reports_resource/helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
-            'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
+            'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
             'reports/resource_invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
-            'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
+            'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
             'reports_resource/order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
-            'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
+            'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
             'reports_resource/product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
+            'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
             'reports/resource_product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class,
             'reports_resource/product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class,
             'reports_resource/product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class,
             'reports/resource_product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class,
-            'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
             'reports/resource_product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
+            'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
             'reports_resource/product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class,
             'reports/resource_product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class,
-            'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
             'reports_resource/product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
+            'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
             'reports/resource_product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
             'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
             'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
             'reports_resource/product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
-            'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
             'reports/resource_product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
+            'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
             'reports_resource/product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class,
             'reports/resource_product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class,
-            'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
             'reports_resource/product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
-            'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
+            'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
             'reports_resource/product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
+            'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
             'reports/resource_quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
             'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
             'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class,
@@ -18107,34 +18066,34 @@
             'reports_resource/report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class,
             'reports/resource_report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class,
             'reports_resource/report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class,
-            'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
             'reports_resource/report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
+            'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
             'reports/resource_report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class,
             'reports_resource/report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class,
-            'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
             'reports/resource_report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
-            'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
+            'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
             'reports_resource/review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
-            'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
+            'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
             'reports_resource/review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
+            'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
             'reports_resource/review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class,
             'reports/resource_review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class,
             'reports_resource/shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class,
             'reports/resource_shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class,
-            'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
             'reports_resource/shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
+            'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
             'reports_resource/tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class,
             'reports/resource_tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class,
             'reports/resource_tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
             'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
             'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
             'reports/resource_tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
-            'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
             'reports/resource_tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
+            'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
             'reports_resource/wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class,
             'reports/resource_wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class,
-            'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
             'reports_resource/wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
+            'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
             'reports/session' => \Mage_Reports_Model_Session::class,
             'reports/test' => \Mage_Reports_Model_Test::class,
             'reports/totals' => \Mage_Reports_Model_Totals::class,
@@ -18153,12 +18112,12 @@
             'review/resource_review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class,
             'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class,
             'review_resource/review_status' => \Mage_Review_Model_Resource_Review_Status::class,
-            'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
             'review_resource/review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
+            'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
             'review/resource_review_summary' => \Mage_Review_Model_Resource_Review_Summary::class,
             'review_resource/review_summary' => \Mage_Review_Model_Resource_Review_Summary::class,
-            'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
             'review/resource_review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
+            'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
             'review/review' => \Mage_Review_Model_Review::class,
             'review/review_status' => \Mage_Review_Model_Review_Status::class,
             'review/review_summary' => \Mage_Review_Model_Review_Summary::class,
@@ -18181,12 +18140,12 @@
             'rule/mysql4_rule_collection' => \Mage_Rule_Model_Mysql4_Rule_Collection::class,
             'rule/renderer_actions' => \Mage_Rule_Model_Renderer_Actions::class,
             'rule/renderer_conditions' => \Mage_Rule_Model_Renderer_Conditions::class,
-            'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class,
             'rule/resource_abstract' => \Mage_Rule_Model_Resource_Abstract::class,
-            'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class,
+            'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class,
             'rule/resource_rule' => \Mage_Rule_Model_Resource_Rule::class,
-            'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
+            'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class,
             'rule_resource/rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
+            'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
             'rule_resource/rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
             'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
             'rule/resource_rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class,
@@ -18213,28 +18172,28 @@
             'salesrule/quote_nominal_discount' => \Mage_SalesRule_Model_Quote_Nominal_Discount::class,
             'salesrule_resource/coupon' => \Mage_SalesRule_Model_Resource_Coupon::class,
             'salesrule/resource_coupon' => \Mage_SalesRule_Model_Resource_Coupon::class,
-            'salesrule_resource/coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class,
             'salesrule/resource_coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class,
+            'salesrule_resource/coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class,
             'salesrule/resource_coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class,
             'salesrule_resource/coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class,
-            'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
             'salesrule_resource/report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
-            'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
+            'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
             'salesrule_resource/report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
+            'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
             'salesrule_resource/report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class,
             'salesrule/resource_report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class,
             'salesrule_resource/report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class,
             'salesrule/resource_report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class,
             'salesrule_resource/report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class,
             'salesrule/resource_report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class,
-            'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class,
             'salesrule_resource/rule' => \Mage_SalesRule_Model_Resource_Rule::class,
-            'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
+            'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class,
             'salesrule_resource/rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
-            'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
+            'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
             'salesrule_resource/rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
-            'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
+            'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
             'salesrule/resource_rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
+            'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
             'salesrule_resource/rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class,
             'salesrule/resource_rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class,
             'salesrule/resource_rule_product_collection' => \Mage_SalesRule_Model_Resource_Rule_Product_Collection::class,
@@ -18279,14 +18238,14 @@
             'sales/email_template' => \Mage_Sales_Model_Email_Template::class,
             'sales/entity_order' => \Mage_Sales_Model_Entity_Order::class,
             'sales_entity/order' => \Mage_Sales_Model_Entity_Order::class,
-            'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
             'sales_entity/order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
-            'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
+            'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
             'sales/entity_order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
-            'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
+            'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
             'sales_entity/order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
-            'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
+            'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
             'sales_entity/order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
+            'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
             'sales_entity/order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class,
             'sales/entity_order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class,
             'sales/entity_order_attribute_backend_shipping' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Shipping::class,
@@ -18295,54 +18254,54 @@
             'sales/entity_order_collection' => \Mage_Sales_Model_Entity_Order_Collection::class,
             'sales_entity/order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class,
             'sales/entity_order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class,
-            'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales_entity/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
-            'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
+            'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales/entity_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
-            'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
+            'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
             'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
+            'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
             'sales/entity_order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class,
             'sales_entity/order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class,
             'sales/entity_order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class,
             'sales_entity/order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class,
             'sales_entity/order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class,
             'sales/entity_order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class,
-            'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
             'sales/entity_order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
-            'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
+            'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
             'sales_entity/order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
+            'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
             'sales/entity_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class,
             'sales_entity/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class,
-            'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class,
             'sales/entity_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class,
+            'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class,
             'sales/entity_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Order::class,
             'sales_entity/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Order::class,
             'sales_entity/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/entity_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/entity_order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class,
             'sales_entity/order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class,
-            'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
             'sales/entity_order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
+            'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
             'sales_entity/order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class,
             'sales/entity_order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class,
             'sales_entity/order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class,
             'sales/entity_order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class,
-            'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
             'sales/entity_order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
+            'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
             'sales/entity_order_item' => \Mage_Sales_Model_Entity_Order_Item::class,
             'sales_entity/order_item' => \Mage_Sales_Model_Entity_Order_Item::class,
             'sales/entity_order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class,
             'sales_entity/order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class,
-            'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
             'sales/entity_order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
+            'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
             'sales_entity/order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class,
             'sales/entity_order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class,
             'sales/entity_order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class,
             'sales_entity/order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class,
-            'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
             'sales_entity/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
-            'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
+            'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
             'sales/entity_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
+            'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
             'sales/entity_order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class,
             'sales_entity/order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class,
             'sales/entity_order_shipment_comment' => \Mage_Sales_Model_Entity_Order_Shipment_Comment::class,
@@ -18351,66 +18310,66 @@
             'sales_entity/order_shipment_comment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Comment_Collection::class,
             'sales_entity/order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class,
             'sales/entity_order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class,
-            'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
             'sales/entity_order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
-            'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
+            'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
             'sales_entity/order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
-            'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
+            'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
             'sales_entity/order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
-            'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
+            'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
             'sales_entity/order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
-            'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
+            'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
             'sales_entity/order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
+            'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
             'sales_entity/quote' => \Mage_Sales_Model_Entity_Quote::class,
             'sales/entity_quote' => \Mage_Sales_Model_Entity_Quote::class,
-            'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
             'sales_entity/quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
+            'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
             'sales_entity/quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class,
             'sales/entity_quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class,
-            'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
             'sales/entity_quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
-            'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
+            'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
             'sales/entity_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
-            'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
+            'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
             'sales_entity/quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
-            'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
+            'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
             'sales/entity_quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
+            'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
             'sales_entity/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales/entity_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales_entity/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class,
             'sales/entity_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class,
-            'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
             'sales_entity/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
-            'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
             'sales/entity_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/entity_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales_entity/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales/entity_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class,
             'sales_entity/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class,
             'sales_entity/quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class,
             'sales/entity_quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class,
-            'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
             'sales_entity/quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
-            'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
+            'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
             'sales/entity_quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
-            'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
+            'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
             'sales_entity/quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
+            'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
             'sales/entity_quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class,
             'sales_entity/quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class,
             'sales/entity_quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class,
             'sales_entity/quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class,
-            'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
             'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
-            'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
+            'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
             'sales/entity_quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
-            'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
+            'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
             'sales/entity_quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
+            'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
             'sales_entity/quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class,
             'sales/entity_quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class,
-            'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
             'sales_entity/sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
-            'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class,
+            'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
             'sales_entity/setup' => \Mage_Sales_Model_Entity_Setup::class,
+            'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class,
             'sales/mysql4_abstract' => \Mage_Sales_Model_Mysql4_Abstract::class,
             'sales/mysql4_billing_agreement' => \Mage_Sales_Model_Mysql4_Billing_Agreement::class,
             'sales/mysql4_billing_agreement_collection' => \Mage_Sales_Model_Mysql4_Billing_Agreement_Collection::class,
@@ -18605,50 +18564,50 @@
             'sales/recurring_profile' => \Mage_Sales_Model_Recurring_Profile::class,
             'sales_resource/abstract' => \Mage_Sales_Model_Resource_Abstract::class,
             'sales/resource_abstract' => \Mage_Sales_Model_Resource_Abstract::class,
-            'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
             'sales_resource/billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
-            'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
+            'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
             'sales_resource/billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
+            'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
             'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
             'sales/resource_collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
             'sales_resource/helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
             'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
-            'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class,
             'sales_resource/order' => \Mage_Sales_Model_Resource_Order::class,
+            'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class,
             'sales_resource/order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class,
             'sales/resource_order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class,
-            'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
             'sales_resource/order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
+            'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
             'sales/resource_order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class,
             'sales_resource/order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class,
             'sales/resource_order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class,
             'sales_resource/order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class,
             'sales/resource_order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class,
             'sales_resource/order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class,
-            'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
             'sales/resource_order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
+            'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
             'sales_resource/order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class,
             'sales/resource_order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class,
             'sales/resource_order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class,
             'sales_resource/order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class,
-            'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
             'sales/resource_order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
-            'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
+            'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
             'sales/resource_order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
-            'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
+            'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
             'sales/resource_order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
-            'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
+            'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
             'sales_resource/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
+            'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales/resource_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class,
             'sales_resource/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class,
-            'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
             'sales/resource_order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
-            'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
+            'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
             'sales_resource/order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
+            'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
             'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
             'sales/resource_order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
-            'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
             'sales/resource_order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
+            'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
             'sales_resource/order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class,
             'sales/resource_order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class,
             'sales_resource/order_creditmemo_item_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item_Collection::class,
@@ -18657,138 +18616,138 @@
             'sales/resource_order_grid_collection' => \Mage_Sales_Model_Resource_Order_Grid_Collection::class,
             'sales/resource_order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class,
             'sales_resource/order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class,
-            'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
             'sales/resource_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
-            'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
+            'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
             'sales_resource/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
+            'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
             'sales_resource/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class,
             'sales/resource_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class,
             'sales/resource_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class,
             'sales_resource/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/resource_order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class,
             'sales_resource/order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class,
-            'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
             'sales/resource_order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
+            'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
             'sales/resource_order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class,
             'sales_resource/order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class,
-            'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
             'sales/resource_order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
-            'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
+            'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
             'sales_resource/order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
+            'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
             'sales/resource_order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class,
             'sales_resource/order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class,
-            'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
             'sales_resource/order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
+            'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
             'sales/resource_order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class,
             'sales_resource/order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class,
-            'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
             'sales_resource/order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
-            'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
+            'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
             'sales/resource_order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
+            'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
             'sales_resource/order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
             'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
-            'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
             'sales_resource/order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
-            'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
+            'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
             'sales_resource/order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
-            'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
+            'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
             'sales/resource_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
+            'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
             'sales_resource/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class,
             'sales/resource_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class,
             'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
             'sales/resource_order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
-            'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
             'sales/resource_order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
-            'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
+            'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
             'sales/resource_order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
+            'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
             'sales_resource/order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class,
             'sales/resource_order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class,
-            'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
             'sales_resource/order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
-            'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
+            'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
             'sales_resource/order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
-            'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
+            'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
             'sales_resource/order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
-            'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
+            'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
             'sales_resource/order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
+            'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
             'sales_resource/order_status' => \Mage_Sales_Model_Resource_Order_Status::class,
             'sales/resource_order_status' => \Mage_Sales_Model_Resource_Order_Status::class,
             'sales_resource/order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class,
             'sales/resource_order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class,
-            'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
             'sales_resource/order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
-            'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
+            'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
             'sales_resource/order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
-            'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
+            'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
             'sales/resource_order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
-            'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
+            'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
             'sales_resource/order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
-            'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class,
+            'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
             'sales/resource_quote' => \Mage_Sales_Model_Resource_Quote::class,
+            'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class,
             'sales_resource/quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class,
             'sales/resource_quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class,
             'sales/resource_quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class,
             'sales_resource/quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class,
             'sales/resource_quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class,
             'sales_resource/quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class,
-            'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
             'sales/resource_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
+            'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
             'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
             'sales/resource_quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
-            'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
             'sales_resource/quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
+            'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
             'sales_resource/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales/resource_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales/resource_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class,
             'sales_resource/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class,
             'sales/resource_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class,
             'sales_resource/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class,
-            'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/resource_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales/resource_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
-            'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
             'sales_resource/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
-            'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
+            'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
             'sales/resource_quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
+            'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
             'sales_resource/quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class,
             'sales/resource_quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class,
-            'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
             'sales/resource_quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
-            'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
+            'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
             'sales_resource/quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
-            'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
+            'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
             'sales_resource/quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
+            'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
             'sales_resource/quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class,
             'sales/resource_quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class,
-            'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
             'sales/resource_quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
+            'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
             'sales/resource_quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class,
             'sales_resource/quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class,
-            'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
             'sales/resource_quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
-            'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
+            'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
             'sales/resource_quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
-            'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
+            'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
             'sales_resource/quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
-            'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
+            'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
             'sales/resource_quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
-            'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
+            'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
             'sales/resource_recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
+            'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
             'sales/resource_recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class,
             'sales_resource/recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class,
-            'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class,
             'sales/resource_report' => \Mage_Sales_Model_Resource_Report::class,
+            'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class,
             'sales/resource_report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class,
             'sales_resource/report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class,
-            'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
             'sales/resource_report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
+            'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
             'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
             'sales/resource_report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
-            'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
             'sales_resource/report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
-            'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
+            'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
             'sales_resource/report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
+            'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
             'sales/resource_report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class,
             'sales_resource/report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class,
             'sales_resource/report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class,
@@ -18801,24 +18760,24 @@
             'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class,
             'sales_resource/report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class,
             'sales/resource_report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class,
-            'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
             'sales/resource_report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
-            'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
+            'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
             'sales_resource/report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
+            'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
             'sales_resource/report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class,
             'sales/resource_report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class,
             'sales_resource/report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class,
             'sales/resource_report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class,
-            'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
             'sales_resource/report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
+            'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
             'sales_resource/report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class,
             'sales/resource_report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class,
             'sales_resource/report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class,
             'sales/resource_report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class,
-            'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
             'sales/resource_sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
-            'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class,
+            'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
             'sales/resource_setup' => \Mage_Sales_Model_Resource_Setup::class,
+            'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class,
             'sales/service_order' => \Mage_Sales_Model_Service_Order::class,
             'sales/service_quote' => \Mage_Sales_Model_Service_Quote::class,
             'sales/status_list' => \Mage_Sales_Model_Status_List::class,
@@ -18828,8 +18787,8 @@
             'sendfriend/observer' => \Mage_Sendfriend_Model_Observer::class,
             'sendfriend_resource/sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class,
             'sendfriend/resource_sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class,
-            'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
             'sendfriend/resource_sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
+            'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
             'sendfriend/resource_setup' => \Mage_Sendfriend_Model_Resource_Setup::class,
             'sendfriend_resource/setup' => \Mage_Sendfriend_Model_Resource_Setup::class,
             'sendfriend/sendfriend' => \Mage_Sendfriend_Model_Sendfriend::class,
@@ -18848,8 +18807,8 @@
             'shipping/rate_result_abstract' => \Mage_Shipping_Model_Rate_Result_Abstract::class,
             'shipping/rate_result_error' => \Mage_Shipping_Model_Rate_Result_Error::class,
             'shipping/rate_result_method' => \Mage_Shipping_Model_Rate_Result_Method::class,
-            'shipping/resource_carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class,
             'shipping_resource/carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class,
+            'shipping/resource_carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class,
             'shipping/resource_carrier_tablerate_collection' => \Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection::class,
             'shipping_resource/carrier_tablerate_collection' => \Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection::class,
             'shipping/shipment_request' => \Mage_Shipping_Model_Shipment_Request::class,
@@ -18869,16 +18828,16 @@
             'sitemap/observer' => \Mage_Sitemap_Model_Observer::class,
             'sitemap_resource/catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class,
             'sitemap/resource_catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class,
-            'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
             'sitemap/resource_catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
-            'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
+            'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
             'sitemap_resource/catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
-            'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
+            'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
             'sitemap_resource/cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
+            'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
             'sitemap_resource/sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class,
             'sitemap/resource_sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class,
-            'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
             'sitemap_resource/sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
+            'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
             'sitemap/sitemap' => \Mage_Sitemap_Model_Sitemap::class,
             'tag/api' => \Mage_Tag_Model_Api::class,
             'tag/api_v2' => \Mage_Tag_Model_Api_V2::class,
@@ -18891,21 +18850,21 @@
             'tag/mysql4_tag' => \Mage_Tag_Model_Mysql4_Tag::class,
             'tag/mysql4_tag_collection' => \Mage_Tag_Model_Mysql4_Tag_Collection::class,
             'tag/mysql4_tag_relation' => \Mage_Tag_Model_Mysql4_Tag_Relation::class,
-            'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag/resource_customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag_resource/customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
-            'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
+            'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag_resource/indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
-            'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
+            'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
             'tag_resource/popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
+            'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
             'tag_resource/product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class,
             'tag/resource_product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class,
             'tag_resource/tag' => \Mage_Tag_Model_Resource_Tag::class,
             'tag/resource_tag' => \Mage_Tag_Model_Resource_Tag::class,
-            'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
             'tag_resource/tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
-            'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
+            'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
             'tag_resource/tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
+            'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
             'tag/session' => \Mage_Tag_Model_Session::class,
             'tag/tag' => \Mage_Tag_Model_Tag::class,
             'tag/tag_relation' => \Mage_Tag_Model_Tag_Relation::class,
@@ -18944,16 +18903,16 @@
             'tax/resource_calculation_rate' => \Mage_Tax_Model_Resource_Calculation_Rate::class,
             'tax/resource_calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class,
             'tax_resource/calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class,
-            'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
             'tax/resource_calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
-            'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
+            'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
             'tax/resource_calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
-            'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
+            'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
             'tax/resource_calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
-            'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
+            'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
             'tax_resource/calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
-            'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class,
+            'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
             'tax/resource_class' => \Mage_Tax_Model_Resource_Class::class,
+            'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class,
             'tax/resource_class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class,
             'tax_resource/class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class,
             'tax_resource/report_collection' => \Mage_Tax_Model_Resource_Report_Collection::class,
@@ -18964,16 +18923,16 @@
             'tax/resource_report_tax_createdat' => \Mage_Tax_Model_Resource_Report_Tax_Createdat::class,
             'tax_resource/report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class,
             'tax/resource_report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class,
-            'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
             'tax/resource_report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
-            'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
+            'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
             'tax_resource/sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
+            'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
             'tax_resource/sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class,
             'tax/resource_sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class,
-            'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class,
             'tax/resource_sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class,
-            'tax_resource/sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class,
+            'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class,
             'tax/resource_sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class,
+            'tax_resource/sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class,
             'tax/resource_setup' => \Mage_Tax_Model_Resource_Setup::class,
             'tax_resource/setup' => \Mage_Tax_Model_Resource_Setup::class,
             'tax/sales_order_tax' => \Mage_Tax_Model_Sales_Order_Tax::class,
@@ -19056,10 +19015,10 @@
             'weee/observer' => \Mage_Weee_Model_Observer::class,
             'weee/resource_attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class,
             'weee_resource/attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class,
-            'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class,
             'weee/resource_setup' => \Mage_Weee_Model_Resource_Setup::class,
-            'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class,
+            'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class,
             'weee/resource_tax' => \Mage_Weee_Model_Resource_Tax::class,
+            'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class,
             'weee/tax' => \Mage_Weee_Model_Tax::class,
             'weee/total_creditmemo_weee' => \Mage_Weee_Model_Total_Creditmemo_Weee::class,
             'weee/total_invoice_weee' => \Mage_Weee_Model_Total_Invoice_Weee::class,
@@ -19069,12 +19028,12 @@
             'widget/mysql4_widget_instance' => \Mage_Widget_Model_Mysql4_Widget_Instance::class,
             'widget/mysql4_widget_instance_collection' => \Mage_Widget_Model_Mysql4_Widget_Instance_Collection::class,
             'widget/observer' => \Mage_Widget_Model_Observer::class,
-            'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class,
             'widget/resource_widget' => \Mage_Widget_Model_Resource_Widget::class,
+            'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class,
             'widget_resource/widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class,
             'widget/resource_widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class,
-            'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
             'widget_resource/widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
+            'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
             'widget/template_filter' => \Mage_Widget_Model_Template_Filter::class,
             'widget/widget' => \Mage_Widget_Model_Widget::class,
             'widget/widget_config' => \Mage_Widget_Model_Widget_Config::class,
@@ -19091,14 +19050,14 @@
             'wishlist/mysql4_wishlist' => \Mage_Wishlist_Model_Mysql4_Wishlist::class,
             'wishlist/mysql4_wishlist_collection' => \Mage_Wishlist_Model_Mysql4_Wishlist_Collection::class,
             'wishlist/observer' => \Mage_Wishlist_Model_Observer::class,
-            'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class,
             'wishlist_resource/item' => \Mage_Wishlist_Model_Resource_Item::class,
+            'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class,
             'wishlist_resource/item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class,
             'wishlist/resource_item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class,
             'wishlist/resource_item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
             'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
-            'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
             'wishlist_resource/item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
+            'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
             'wishlist_resource/product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class,
             'wishlist/resource_product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class,
             'wishlist/resource_wishlist' => \Mage_Wishlist_Model_Resource_Wishlist::class,
@@ -19107,7 +19066,6 @@
             'wishlist/resource_wishlist_collection' => \Mage_Wishlist_Model_Resource_Wishlist_Collection::class,
             'wishlist/session' => \Mage_Wishlist_Model_Session::class,
             'wishlist/wishlist' => \Mage_Wishlist_Model_Wishlist::class,
-            'varien/autoload' => \Varien_Autoload::class,
         ])
     );
     override( \Mage_SalesRule_Model_Validator::_getSingleton(0),
@@ -19117,11 +19075,10 @@
             'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class,
             'adminnotification/mysql4_inbox_collection' => \Mage_AdminNotification_Model_Mysql4_Inbox_Collection::class,
             'adminnotification/observer' => \Mage_AdminNotification_Model_Observer::class,
-            'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
             'adminnotification/resource_inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
-            'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
+            'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
             'adminnotification/resource_inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
-            'adminnotification/survey' => \Mage_AdminNotification_Model_Survey::class,
+            'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
             'admin/acl' => \Mage_Admin_Model_Acl::class,
             'admin/acl_assert_ip' => \Mage_Admin_Model_Acl_Assert_Ip::class,
             'admin/acl_assert_time' => \Mage_Admin_Model_Acl_Assert_Time::class,
@@ -19150,38 +19107,38 @@
             'admin/redirectpolicy' => \Mage_Admin_Model_Redirectpolicy::class,
             'admin/resource_acl' => \Mage_Admin_Model_Resource_Acl::class,
             'admin_resource/acl' => \Mage_Admin_Model_Resource_Acl::class,
-            'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
             'admin/resource_acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
+            'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
             'admin/resource_acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class,
             'admin_resource/acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class,
-            'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class,
             'admin/resource_block' => \Mage_Admin_Model_Resource_Block::class,
-            'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
+            'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class,
             'admin/resource_block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
+            'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
             'admin_resource/permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class,
             'admin/resource_permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class,
-            'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class,
             'admin/resource_role' => \Mage_Admin_Model_Resource_Role::class,
+            'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class,
             'admin/resource_role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class,
             'admin_resource/role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class,
-            'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class,
             'admin_resource/roles' => \Mage_Admin_Model_Resource_Roles::class,
-            'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
+            'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class,
             'admin_resource/roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
-            'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
+            'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
             'admin/resource_roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
+            'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
             'admin/resource_rules' => \Mage_Admin_Model_Resource_Rules::class,
             'admin_resource/rules' => \Mage_Admin_Model_Resource_Rules::class,
             'admin_resource/rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
             'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
-            'admin_resource/user' => \Mage_Admin_Model_Resource_User::class,
             'admin/resource_user' => \Mage_Admin_Model_Resource_User::class,
+            'admin_resource/user' => \Mage_Admin_Model_Resource_User::class,
             'admin/resource_user_collection' => \Mage_Admin_Model_Resource_User_Collection::class,
             'admin_resource/user_collection' => \Mage_Admin_Model_Resource_User_Collection::class,
-            'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class,
             'admin_resource/variable' => \Mage_Admin_Model_Resource_Variable::class,
-            'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
+            'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class,
             'admin/resource_variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
+            'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
             'admin/role' => \Mage_Admin_Model_Role::class,
             'admin/roles' => \Mage_Admin_Model_Roles::class,
             'admin/rules' => \Mage_Admin_Model_Rules::class,
@@ -19216,6 +19173,7 @@
             'adminhtml/system_config_backend_baseurl' => \Mage_Adminhtml_Model_System_Config_Backend_Baseurl::class,
             'adminhtml/system_config_backend_cache' => \Mage_Adminhtml_Model_System_Config_Backend_Cache::class,
             'adminhtml/system_config_backend_catalog_inventory_managestock' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock::class,
+            'adminhtml/system_config_backend_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Separator::class,
             'adminhtml/system_config_backend_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Type::class,
             'adminhtml/system_config_backend_category' => \Mage_Adminhtml_Model_System_Config_Backend_Category::class,
             'adminhtml/system_config_backend_cookie' => \Mage_Adminhtml_Model_System_Config_Backend_Cookie::class,
@@ -19268,12 +19226,14 @@
             'adminhtml/system_config_source_catalog_listMode' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListMode::class,
             'adminhtml/system_config_source_catalog_listPerPage' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListPerPage::class,
             'adminhtml/system_config_source_catalog_listSort' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort::class,
+            'adminhtml/system_config_source_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Separator::class,
             'adminhtml/system_config_source_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Type::class,
             'adminhtml/system_config_source_catalog_timeFormat' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_TimeFormat::class,
             'adminhtml/system_config_source_category' => \Mage_Adminhtml_Model_System_Config_Source_Category::class,
             'adminhtml/system_config_source_checktype' => \Mage_Adminhtml_Model_System_Config_Source_Checktype::class,
             'adminhtml/system_config_source_cms_page' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Page::class,
             'adminhtml/system_config_source_cms_wysiwyg_enabled' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Wysiwyg_Enabled::class,
+            'adminhtml/system_config_source_cookie_samesite' => \Mage_Adminhtml_Model_System_Config_Source_Cookie_Samesite::class,
             'adminhtml/system_config_source_country' => \Mage_Adminhtml_Model_System_Config_Source_Country::class,
             'adminhtml/system_config_source_country_full' => \Mage_Adminhtml_Model_System_Config_Source_Country_Full::class,
             'adminhtml/system_config_source_cron_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency::class,
@@ -19300,6 +19260,7 @@
             'adminhtml/system_config_source_locale_timezone' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Timezone::class,
             'adminhtml/system_config_source_locale_weekdaycodes' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdaycodes::class,
             'adminhtml/system_config_source_locale_weekdays' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdays::class,
+            'adminhtml/system_config_source_log_level' => \Mage_Adminhtml_Model_System_Config_Source_Log_Level::class,
             'adminhtml/system_config_source_nooptreq' => \Mage_Adminhtml_Model_System_Config_Source_Nooptreq::class,
             'adminhtml/system_config_source_notification_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Notification_Frequency::class,
             'adminhtml/system_config_source_order_status' => \Mage_Adminhtml_Model_System_Config_Source_Order_Status::class,
@@ -19323,7 +19284,6 @@
             'adminhtml/system_config_source_shipping_flatrate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Flatrate::class,
             'adminhtml/system_config_source_shipping_tablerate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Tablerate::class,
             'adminhtml/system_config_source_shipping_taxclass' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Taxclass::class,
-            'adminhtml/system_config_source_startdateenddate' => \Mage_Adminhtml_Model_System_Config_Source_Startdateenddate::class,
             'adminhtml/system_config_source_storage_media_database' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Database::class,
             'adminhtml/system_config_source_storage_media_storage' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Storage::class,
             'adminhtml/system_config_source_store' => \Mage_Adminhtml_Model_System_Config_Source_Store::class,
@@ -19379,22 +19339,22 @@
             'api2_resource/acl_filter_attribute' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute::class,
             'api2/resource_acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class,
             'api2_resource/acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class,
-            'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
             'api2_resource/acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
+            'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
             'api2/resource_acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class,
             'api2_resource/acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class,
             'api2_resource/acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class,
             'api2/resource_acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class,
             'api2/resource_acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class,
             'api2_resource/acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class,
-            'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class,
             'api2/resource_setup' => \Mage_Api2_Model_Resource_Setup::class,
+            'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class,
             'api2/resource_validator' => \Mage_Api2_Model_Resource_Validator::class,
             'api2_resource/validator' => \Mage_Api2_Model_Resource_Validator::class,
             'api2/resource_validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class,
             'api2_resource/validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class,
-            'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
             'api2/resource_validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
+            'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
             'api2/response' => \Mage_Api2_Model_Response::class,
             'api2/route_abstract' => \Mage_Api2_Model_Route_Abstract::class,
             'api2/route_apiType' => \Mage_Api2_Model_Route_ApiType::class,
@@ -19426,8 +19386,8 @@
             'api/mysql4_user_collection' => \Mage_Api_Model_Mysql4_User_Collection::class,
             'api/resource_abstract' => \Mage_Api_Model_Resource_Abstract::class,
             'api_resource/abstract' => \Mage_Api_Model_Resource_Abstract::class,
-            'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class,
             'api_resource/acl' => \Mage_Api_Model_Resource_Acl::class,
+            'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class,
             'api_resource/acl_role' => \Mage_Api_Model_Resource_Acl_Role::class,
             'api/resource_acl_role' => \Mage_Api_Model_Resource_Acl_Role::class,
             'api/resource_acl_role_collection' => \Mage_Api_Model_Resource_Acl_Role_Collection::class,
@@ -19436,18 +19396,18 @@
             'api_resource/permissions_collection' => \Mage_Api_Model_Resource_Permissions_Collection::class,
             'api_resource/role' => \Mage_Api_Model_Resource_Role::class,
             'api/resource_role' => \Mage_Api_Model_Resource_Role::class,
-            'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
             'api_resource/role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
+            'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
             'api/resource_roles' => \Mage_Api_Model_Resource_Roles::class,
             'api_resource/roles' => \Mage_Api_Model_Resource_Roles::class,
-            'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
             'api_resource/roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
-            'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
+            'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
             'api_resource/roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
-            'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class,
+            'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
             'api_resource/rules' => \Mage_Api_Model_Resource_Rules::class,
-            'api/resource_rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class,
+            'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class,
             'api_resource/rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class,
+            'api/resource_rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class,
             'api/resource_user' => \Mage_Api_Model_Resource_User::class,
             'api_resource/user' => \Mage_Api_Model_Resource_User::class,
             'api/resource_user_collection' => \Mage_Api_Model_Resource_User_Collection::class,
@@ -19474,15 +19434,6 @@
             'authorizenet/directpost_request' => \Mage_Authorizenet_Model_Directpost_Request::class,
             'authorizenet/directpost_response' => \Mage_Authorizenet_Model_Directpost_Response::class,
             'authorizenet/directpost_session' => \Mage_Authorizenet_Model_Directpost_Session::class,
-            'backup/backup' => \Mage_Backup_Model_Backup::class,
-            'backup/config_backend_cron' => \Mage_Backup_Model_Config_Backend_Cron::class,
-            'backup/config_source_type' => \Mage_Backup_Model_Config_Source_Type::class,
-            'backup/db' => \Mage_Backup_Model_Db::class,
-            'backup/fs_collection' => \Mage_Backup_Model_Fs_Collection::class,
-            'backup/mysql4_db' => \Mage_Backup_Model_Mysql4_Db::class,
-            'backup/observer' => \Mage_Backup_Model_Observer::class,
-            'backup/resource_db' => \Mage_Backup_Model_Resource_Db::class,
-            'backup/resource_helper_mysql4' => \Mage_Backup_Model_Resource_Helper_Mysql4::class,
             'bundle/catalogIndex_data_bundle' => \Mage_Bundle_Model_CatalogIndex_Data_Bundle::class,
             'bundle/mysql4_bundle' => \Mage_Bundle_Model_Mysql4_Bundle::class,
             'bundle/mysql4_indexer_price' => \Mage_Bundle_Model_Mysql4_Indexer_Price::class,
@@ -19508,10 +19459,10 @@
             'bundle_resource/option' => \Mage_Bundle_Model_Resource_Option::class,
             'bundle/resource_option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class,
             'bundle_resource/option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class,
-            'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
             'bundle_resource/price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
-            'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class,
+            'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
             'bundle_resource/selection' => \Mage_Bundle_Model_Resource_Selection::class,
+            'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class,
             'bundle_resource/selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class,
             'bundle/resource_selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class,
             'bundle/sales_order_pdf_items_abstract' => \Mage_Bundle_Model_Sales_Order_Pdf_Items_Abstract::class,
@@ -19527,8 +19478,8 @@
             'captcha/config_form_frontend' => \Mage_Captcha_Model_Config_Form_Frontend::class,
             'captcha/config_mode' => \Mage_Captcha_Model_Config_Mode::class,
             'captcha/observer' => \Mage_Captcha_Model_Observer::class,
-            'captcha_resource/log' => \Mage_Captcha_Model_Resource_Log::class,
             'captcha/resource_log' => \Mage_Captcha_Model_Resource_Log::class,
+            'captcha_resource/log' => \Mage_Captcha_Model_Resource_Log::class,
             'captcha/zend' => \Mage_Captcha_Model_Zend::class,
             'catalogindex/aggregation' => \Mage_CatalogIndex_Model_Aggregation::class,
             'catalogindex/attribute' => \Mage_CatalogIndex_Model_Attribute::class,
@@ -19571,8 +19522,8 @@
             'catalogindex/resource_data_abstract' => \Mage_CatalogIndex_Model_Resource_Data_Abstract::class,
             'catalogindex_resource/data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class,
             'catalogindex/resource_data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class,
-            'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
             'catalogindex_resource/data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
+            'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
             'catalogindex_resource/indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class,
             'catalogindex/resource_indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class,
             'catalogindex/resource_indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class,
@@ -19604,20 +19555,20 @@
             'cataloginventory/mysql4_stock_item_collection' => \Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection::class,
             'cataloginventory/mysql4_stock_status' => \Mage_CatalogInventory_Model_Mysql4_Stock_Status::class,
             'cataloginventory/observer' => \Mage_CatalogInventory_Model_Observer::class,
-            'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
             'cataloginventory_resource/indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
+            'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
             'cataloginventory/resource_indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class,
             'cataloginventory_resource/indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class,
-            'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
             'cataloginventory/resource_indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
+            'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
             'cataloginventory/resource_indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class,
             'cataloginventory_resource/indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class,
             'cataloginventory_resource/stock' => \Mage_CatalogInventory_Model_Resource_Stock::class,
             'cataloginventory/resource_stock' => \Mage_CatalogInventory_Model_Resource_Stock::class,
-            'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
             'cataloginventory/resource_stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
-            'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
+            'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
             'cataloginventory/resource_stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
+            'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
             'cataloginventory/resource_stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class,
             'cataloginventory_resource/stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class,
             'cataloginventory/source_backorders' => \Mage_CatalogInventory_Model_Source_Backorders::class,
@@ -19640,8 +19591,8 @@
             'catalogrule/observer' => \Mage_CatalogRule_Model_Observer::class,
             'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
             'catalogrule/resource_rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
-            'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
             'catalogrule_resource/rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
+            'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
             'catalogrule_resource/rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class,
             'catalogrule/resource_rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class,
             'catalogrule_resource/rule_product_price_collection' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price_Collection::class,
@@ -19670,24 +19621,24 @@
             'catalogsearch/query' => \Mage_CatalogSearch_Model_Query::class,
             'catalogsearch_resource/advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class,
             'catalogsearch/resource_advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class,
-            'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
             'catalogsearch_resource/advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
+            'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
             'catalogsearch_resource/fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class,
             'catalogsearch/resource_fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class,
             'catalogsearch_resource/fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class,
             'catalogsearch/resource_fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class,
-            'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
             'catalogsearch_resource/fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
-            'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
+            'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
             'catalogsearch/resource_helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
-            'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
+            'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
             'catalogsearch_resource/indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
-            'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class,
+            'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
             'catalogsearch_resource/query' => \Mage_CatalogSearch_Model_Resource_Query::class,
-            'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
+            'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class,
             'catalogsearch_resource/query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
-            'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
+            'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
             'catalogsearch/resource_search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
+            'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
             'catalogsearch/session' => \Mage_CatalogSearch_Model_Session::class,
             'catalogsearch/system_config_backend_sitemap' => \Mage_CatalogSearch_Model_System_Config_Backend_Sitemap::class,
             'catalog/abstract' => \Mage_Catalog_Model_Abstract::class,
@@ -19830,144 +19781,144 @@
             'catalog/product_website' => \Mage_Catalog_Model_Product_Website::class,
             'catalog/resource_abstract' => \Mage_Catalog_Model_Resource_Abstract::class,
             'catalog_resource/abstract' => \Mage_Catalog_Model_Resource_Abstract::class,
-            'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
             'catalog/resource_attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
-            'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class,
+            'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
             'catalog_resource/category' => \Mage_Catalog_Model_Resource_Category::class,
+            'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class,
             'catalog_resource/category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class,
             'catalog/resource_category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class,
-            'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
             'catalog/resource_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
-            'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
+            'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
             'catalog/resource_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
+            'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
             'catalog_resource/category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class,
             'catalog/resource_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class,
             'catalog_resource/category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class,
             'catalog/resource_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class,
             'catalog/resource_category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class,
             'catalog_resource/category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class,
-            'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
             'catalog_resource/category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
-            'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
+            'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
             'catalog/resource_category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
+            'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
             'catalog_resource/category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class,
             'catalog/resource_category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class,
             'catalog/resource_category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class,
             'catalog_resource/category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class,
-            'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
             'catalog_resource/collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
+            'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
             'catalog_resource/config' => \Mage_Catalog_Model_Resource_Config::class,
             'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class,
-            'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
             'catalog/resource_eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
+            'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
             'catalog_resource/eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class,
             'catalog/resource_eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class,
             'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
             'catalog_resource/eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
-            'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
             'catalog/resource_eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
-            'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
+            'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
             'catalog_resource/eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
+            'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
             'catalog_resource/eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
-            'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
+            'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
             'catalog_resource/eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
+            'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
             'catalog/resource_eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class,
             'catalog_resource/eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class,
             'catalog/resource_eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class,
             'catalog_resource/eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class,
             'catalog/resource_eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class,
             'catalog_resource/eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class,
-            'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
             'catalog/resource_eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
+            'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
             'catalog/resource_eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
             'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
             'catalog/resource_eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class,
             'catalog_resource/eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class,
-            'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
             'catalog_resource/eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
-            'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
+            'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
             'catalog_resource/eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
+            'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
             'catalog_resource/eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class,
             'catalog/resource_eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class,
-            'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
             'catalog_resource/eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
+            'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
             'catalog/resource_eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
             'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
-            'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
             'catalog/resource_eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
-            'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
+            'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
             'catalog/resource_eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
-            'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
+            'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
             'catalog_resource/eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
+            'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
             'catalog/resource_eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class,
             'catalog/resource_eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
+            'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
             'catalog/resource_eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class,
             'catalog/resource_eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class,
             'catalog/resource_eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class,
-            'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
             'catalog_resource/eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
-            'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
+            'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
             'catalog_resource/eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
-            'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
+            'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
             'catalog_resource/eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
+            'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
             'catalog/resource_eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class,
             'catalog/resource_eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class,
             'catalog/resource_eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class,
-            'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
             'catalog/resource_eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
-            'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
+            'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
             'catalog_resource/eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
+            'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
             'catalog_resource/eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class,
             'catalog/resource_eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class,
-            'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
             'catalog/resource_eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
-            'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
+            'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
             'catalog/resource_eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
+            'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
             'catalog/resource_eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class,
             'catalog_resource/eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class,
-            'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
             'catalog/resource_eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
+            'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
             'catalog_resource/eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class,
             'catalog/resource_eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class,
             'catalog_resource/eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class,
             'catalog/resource_eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class,
-            'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
             'catalog/resource_eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
-            'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
+            'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
             'catalog_resource/eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
-            'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
+            'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
             'catalog/resource_eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
+            'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
             'catalog/resource_eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
             'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
-            'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
             'catalog/resource_eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
+            'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
             'catalog/resource_eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class,
             'catalog_resource/eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class,
-            'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
             'catalog_resource/eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
-            'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
+            'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
             'catalog/resource_eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
-            'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
             'catalog/resource_eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
+            'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
             'catalog_resource/eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
+            'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
             'catalog/resource_eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class,
             'catalog_resource/eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class,
             'catalog/resource_eav_mysql4_sendfriend' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend::class,
@@ -19976,16 +19927,16 @@
             'catalog/resource_eav_mysql4_sendfriend_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection::class,
             'catalog_resource/eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class,
             'catalog/resource_eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class,
-            'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
             'catalog/resource_eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
-            'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
+            'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
             'catalog/resource_helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
+            'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
             'catalog_resource/layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class,
             'catalog/resource_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class,
             'catalog/resource_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class,
             'catalog_resource/layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class,
-            'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
             'catalog/resource_layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
+            'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
             'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class,
             'catalog_resource/product' => \Mage_Catalog_Model_Resource_Product::class,
             'catalog/resource_product_action' => \Mage_Catalog_Model_Resource_Product_Action::class,
@@ -19996,42 +19947,42 @@
             'catalog_resource/product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class,
             'catalog/resource_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class,
             'catalog_resource/product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class,
-            'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
             'catalog/resource_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
-            'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
+            'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
             'catalog_resource/product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
+            'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
             'catalog/resource_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class,
-            'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
             'catalog_resource/product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
-            'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
+            'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
             'catalog/resource_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
-            'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
+            'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
             'catalog_resource/product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
-            'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
+            'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
+            'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
             'catalog_resource/product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class,
             'catalog/resource_product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class,
-            'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
             'catalog/resource_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
+            'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
             'catalog/resource_product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class,
             'catalog_resource/product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class,
-            'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
             'catalog/resource_product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
+            'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
             'catalog/resource_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class,
             'catalog_resource/product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class,
-            'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
             'catalog_resource/product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
-            'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
+            'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
             'catalog/resource_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
+            'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
             'catalog/resource_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class,
             'catalog_resource/product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class,
-            'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
             'catalog_resource/product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
+            'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
             'catalog_resource/product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
             'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
-            'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
             'catalog_resource/product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
+            'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
             'catalog/resource_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class,
             'catalog_resource/product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class,
             'catalog_resource/product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class,
@@ -20042,12 +19993,12 @@
             'catalog_resource/product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class,
             'catalog/resource_product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
             'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
-            'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
             'catalog_resource/product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
-            'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
+            'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
             'catalog/resource_product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
-            'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
+            'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
             'catalog_resource/product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
+            'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
             'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
             'catalog_resource/product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
             'catalog_resource/product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class,
@@ -20056,14 +20007,14 @@
             'catalog/resource_product_status' => \Mage_Catalog_Model_Resource_Product_Status::class,
             'catalog_resource/product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class,
             'catalog/resource_product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class,
-            'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
             'catalog/resource_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
-            'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
             'catalog_resource/product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
             'catalog_resource/product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class,
             'catalog/resource_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class,
-            'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
             'catalog_resource/product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
+            'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
             'catalog/resource_setup' => \Mage_Catalog_Model_Resource_Setup::class,
             'catalog_resource/setup' => \Mage_Catalog_Model_Resource_Setup::class,
             'catalog_resource/url' => \Mage_Catalog_Model_Resource_Url::class,
@@ -20109,12 +20060,12 @@
             'checkout/observer' => \Mage_Checkout_Model_Observer::class,
             'checkout_resource/agreement' => \Mage_Checkout_Model_Resource_Agreement::class,
             'checkout/resource_agreement' => \Mage_Checkout_Model_Resource_Agreement::class,
-            'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
             'checkout/resource_agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
-            'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class,
+            'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
             'checkout_resource/cart' => \Mage_Checkout_Model_Resource_Cart::class,
-            'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class,
+            'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class,
             'checkout/resource_setup' => \Mage_Checkout_Model_Resource_Setup::class,
+            'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class,
             'checkout/session' => \Mage_Checkout_Model_Session::class,
             'checkout/type_abstract' => \Mage_Checkout_Model_Type_Abstract::class,
             'checkout/type_multishipping' => \Mage_Checkout_Model_Type_Multishipping::class,
@@ -20129,25 +20080,25 @@
             'cms/mysql4_page_service' => \Mage_Cms_Model_Mysql4_Page_Service::class,
             'cms/observer' => \Mage_Cms_Model_Observer::class,
             'cms/page' => \Mage_Cms_Model_Page::class,
-            'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class,
             'cms/resource_block' => \Mage_Cms_Model_Resource_Block::class,
+            'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class,
             'cms_resource/block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class,
             'cms/resource_block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class,
             'cms/resource_page' => \Mage_Cms_Model_Resource_Page::class,
             'cms_resource/page' => \Mage_Cms_Model_Resource_Page::class,
-            'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
             'cms_resource/page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
-            'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
+            'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
             'cms/resource_page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
+            'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
             'cms/template_filter' => \Mage_Cms_Model_Template_Filter::class,
             'cms/wysiwyg_config' => \Mage_Cms_Model_Wysiwyg_Config::class,
             'cms/wysiwyg_images_storage' => \Mage_Cms_Model_Wysiwyg_Images_Storage::class,
             'cms/wysiwyg_images_storage_collection' => \Mage_Cms_Model_Wysiwyg_Images_Storage_Collection::class,
             'configurableswatches/observer' => \Mage_ConfigurableSwatches_Model_Observer::class,
-            'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
             'configurableswatches_resource/catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
-            'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
+            'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
             'configurableswatches_resource/catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
+            'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
             'configurableswatches_resource/catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
             'configurableswatches/resource_catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
             'configurableswatches/system_config_source_catalog_product_configattribute' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute::class,
@@ -20254,152 +20205,152 @@
             'core/mysql4_website_collection' => \Mage_Core_Model_Mysql4_Website_Collection::class,
             'core/observer' => \Mage_Core_Model_Observer::class,
             'core/resource' => \Mage_Core_Model_Resource::class,
+            'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
             'core_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
             'core/resource_abstract' => \Mage_Core_Model_Resource_Abstract::class,
-            'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
+            'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
             'core/resource_cache' => \Mage_Core_Model_Resource_Cache::class,
             'core_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
-            'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
-            'core_resource/config' => \Mage_Core_Model_Resource_Config::class,
             'payment_resource/config' => \Mage_Core_Model_Resource_Config::class,
             'core/resource_config' => \Mage_Core_Model_Resource_Config::class,
-            'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
+            'core_resource/config' => \Mage_Core_Model_Resource_Config::class,
             'core/resource_config_data' => \Mage_Core_Model_Resource_Config_Data::class,
+            'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
             'payment_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
-            'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'core_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
-            'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
-            'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
+            'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'payment_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
-            'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
+            'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
+            'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
             'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
             'core/resource_db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
-            'core/resource_design' => \Mage_Core_Model_Resource_Design::class,
+            'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
             'core_resource/design' => \Mage_Core_Model_Resource_Design::class,
+            'core/resource_design' => \Mage_Core_Model_Resource_Design::class,
             'payment_resource/design' => \Mage_Core_Model_Resource_Design::class,
-            'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
             'payment_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
+            'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
             'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
-            'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
             'payment_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
             'core/resource_design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
+            'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
             'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
             'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
             'core/resource_email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
-            'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
-            'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
             'payment_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
-            'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
+            'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
+            'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
             'core/resource_email_template' => \Mage_Core_Model_Resource_Email_Template::class,
             'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
-            'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
+            'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
             'core/resource_email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
+            'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
             'core_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
-            'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
-            'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
             'core_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
-            'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
-            'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
+            'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
             'core_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
             'payment_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
             'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
-            'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
+            'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
             'payment_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
             'core/resource_file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
-            'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
+            'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
             'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
             'core/resource_file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
-            'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
             'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
-            'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
             'core/resource_file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
-            'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class,
-            'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
+            'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
             'payment_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
+            'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
+            'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class,
             'payment_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
-            'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
             'core_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
-            'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
+            'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
             'core/resource_helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
+            'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
             'core_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
             'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
             'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
             'core/resource_iterator' => \Mage_Core_Model_Resource_Iterator::class,
-            'core_resource/language' => \Mage_Core_Model_Resource_Language::class,
             'payment_resource/language' => \Mage_Core_Model_Resource_Language::class,
+            'core_resource/language' => \Mage_Core_Model_Resource_Language::class,
             'core/resource_language' => \Mage_Core_Model_Resource_Language::class,
             'payment_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
-            'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
             'core/resource_language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
-            'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
+            'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
             'core_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
             'core/resource_layout' => \Mage_Core_Model_Resource_Layout::class,
+            'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
             'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
-            'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class,
             'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
+            'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class,
             'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
-            'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'payment_resource/session' => \Mage_Core_Model_Resource_Session::class,
+            'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
             'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class,
             'payment_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
-            'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core/resource_setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
+            'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'payment_resource/store' => \Mage_Core_Model_Resource_Store::class,
             'core_resource/store' => \Mage_Core_Model_Resource_Store::class,
             'core/resource_store' => \Mage_Core_Model_Resource_Store::class,
-            'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
             'core/resource_store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
+            'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
             'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
-            'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'core/resource_store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'payment_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
-            'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
-            'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
+            'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'payment_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
+            'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
+            'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
             'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
-            'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class,
             'core_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
-            'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
-            'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class,
+            'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class,
             'core_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
-            'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
-            'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
+            'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class,
+            'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
             'payment_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
-            'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
+            'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
             'core/resource_type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
             'payment_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'core/resource_type_db' => \Mage_Core_Model_Resource_Type_Db::class,
-            'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'core_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
             'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
             'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
-            'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
-            'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
             'payment_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
             'payment_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
-            'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
             'core_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
-            'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
-            'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
+            'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
             'payment_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
+            'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
+            'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
             'core_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'core_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
-            'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
             'core/resource_variable' => \Mage_Core_Model_Resource_Variable::class,
+            'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
             'core/resource_variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
-            'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
             'core_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
+            'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
+            'core/resource_website' => \Mage_Core_Model_Resource_Website::class,
             'core_resource/website' => \Mage_Core_Model_Resource_Website::class,
             'payment_resource/website' => \Mage_Core_Model_Resource_Website::class,
-            'core/resource_website' => \Mage_Core_Model_Resource_Website::class,
-            'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core/resource_website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
+            'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core/session' => \Mage_Core_Model_Session::class,
             'core/session_abstract' => \Mage_Core_Model_Session_Abstract::class,
@@ -20429,10 +20380,10 @@
             'cron/mysql4_schedule' => \Mage_Cron_Model_Mysql4_Schedule::class,
             'cron/mysql4_schedule_collection' => \Mage_Cron_Model_Mysql4_Schedule_Collection::class,
             'cron/observer' => \Mage_Cron_Model_Observer::class,
-            'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class,
             'cron/resource_schedule' => \Mage_Cron_Model_Resource_Schedule::class,
-            'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
+            'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class,
             'cron/resource_schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
+            'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
             'cron/schedule' => \Mage_Cron_Model_Schedule::class,
             'currencysymbol/observer' => \Mage_CurrencySymbol_Model_Observer::class,
             'currencysymbol/system_currencysymbol' => \Mage_CurrencySymbol_Model_System_Currencysymbol::class,
@@ -20507,16 +20458,16 @@
             'customer_resource/address' => \Mage_Customer_Model_Resource_Address::class,
             'customer/resource_address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class,
             'customer_resource/address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class,
-            'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
             'customer_resource/address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
-            'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
+            'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
             'customer/resource_address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
-            'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
+            'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
             'customer/resource_address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
-            'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
+            'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
             'customer_resource/address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
-            'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
+            'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
             'customer_resource/address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
+            'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
             'customer/resource_attribute' => \Mage_Customer_Model_Resource_Attribute::class,
             'customer_resource/attribute' => \Mage_Customer_Model_Resource_Attribute::class,
             'customer_resource/attribute_collection' => \Mage_Customer_Model_Resource_Attribute_Collection::class,
@@ -20525,22 +20476,22 @@
             'customer_resource/customer' => \Mage_Customer_Model_Resource_Customer::class,
             'customer_resource/customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class,
             'customer/resource_customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class,
-            'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
             'customer/resource_flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
-            'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
+            'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
             'customer/resource_flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
-            'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
+            'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
             'customer/resource_form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
-            'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
+            'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
             'customer/resource_form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
+            'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
             'customer/resource_group' => \Mage_Customer_Model_Resource_Group::class,
             'customer_resource/group' => \Mage_Customer_Model_Resource_Group::class,
             'customer_resource/group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class,
             'customer/resource_group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class,
-            'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class,
             'customer_resource/setup' => \Mage_Customer_Model_Resource_Setup::class,
-            'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
+            'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class,
             'customer_resource/wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
+            'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
             'customer/session' => \Mage_Customer_Model_Session::class,
             'dataflow/batch' => \Mage_Dataflow_Model_Batch::class,
             'dataflow/batch_abstract' => \Mage_Dataflow_Model_Batch_Abstract::class,
@@ -20592,10 +20543,10 @@
             'dataflow/mysql4_session' => \Mage_Dataflow_Model_Mysql4_Session::class,
             'dataflow/profile' => \Mage_Dataflow_Model_Profile::class,
             'dataflow/profile_history' => \Mage_Dataflow_Model_Profile_History::class,
-            'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class,
             'dataflow/resource_batch' => \Mage_Dataflow_Model_Resource_Batch::class,
-            'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
+            'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class,
             'dataflow/resource_batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
+            'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
             'dataflow/resource_batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class,
             'dataflow_resource/batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class,
             'dataflow_resource/batch_export' => \Mage_Dataflow_Model_Resource_Batch_Export::class,
@@ -20606,12 +20557,12 @@
             'dataflow/resource_import' => \Mage_Dataflow_Model_Resource_Import::class,
             'dataflow_resource/import_collection' => \Mage_Dataflow_Model_Resource_Import_Collection::class,
             'dataflow/resource_import_collection' => \Mage_Dataflow_Model_Resource_Import_Collection::class,
-            'dataflow_resource/profile' => \Mage_Dataflow_Model_Resource_Profile::class,
             'dataflow/resource_profile' => \Mage_Dataflow_Model_Resource_Profile::class,
+            'dataflow_resource/profile' => \Mage_Dataflow_Model_Resource_Profile::class,
             'dataflow/resource_profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class,
             'dataflow_resource/profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class,
-            'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
             'dataflow_resource/profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
+            'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
             'dataflow_resource/profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class,
             'dataflow/resource_profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class,
             'dataflow_resource/session' => \Mage_Dataflow_Model_Resource_Session::class,
@@ -20645,8 +20596,8 @@
             'directory/resource_country' => \Mage_Directory_Model_Resource_Country::class,
             'directory_resource/country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class,
             'directory/resource_country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class,
-            'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
             'directory/resource_country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
+            'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
             'directory_resource/country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class,
             'directory/resource_country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class,
             'directory_resource/currency' => \Mage_Directory_Model_Resource_Currency::class,
@@ -20677,8 +20628,8 @@
             'downloadable/observer' => \Mage_Downloadable_Model_Observer::class,
             'downloadable/product_price' => \Mage_Downloadable_Model_Product_Price::class,
             'downloadable/product_type' => \Mage_Downloadable_Model_Product_Type::class,
-            'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
             'downloadable_resource/indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
+            'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
             'downloadable/resource_link' => \Mage_Downloadable_Model_Resource_Link::class,
             'downloadable_resource/link' => \Mage_Downloadable_Model_Resource_Link::class,
             'downloadable/resource_link_collection' => \Mage_Downloadable_Model_Resource_Link_Collection::class,
@@ -20687,12 +20638,12 @@
             'downloadable_resource/link_purchased' => \Mage_Downloadable_Model_Resource_Link_Purchased::class,
             'downloadable/resource_link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class,
             'downloadable_resource/link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class,
-            'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
             'downloadable/resource_link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
+            'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
             'downloadable/resource_link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
             'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
-            'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class,
             'downloadable/resource_sample' => \Mage_Downloadable_Model_Resource_Sample::class,
+            'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class,
             'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
             'downloadable/resource_sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
             'downloadable/sales_order_pdf_items_abstract' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Abstract::class,
@@ -20780,46 +20731,46 @@
             'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class,
             'eav_resource/attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class,
             'eav/resource_attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class,
-            'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class,
             'eav_resource/config' => \Mage_Eav_Model_Resource_Config::class,
+            'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class,
             'eav/resource_entity_attribute' => \Mage_Eav_Model_Resource_Entity_Attribute::class,
             'eav_resource/entity_attribute' => \Mage_Eav_Model_Resource_Entity_Attribute::class,
             'eav_resource/entity_attribute_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Collection::class,
             'eav/resource_entity_attribute_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Collection::class,
             'eav_resource/entity_attribute_group' => \Mage_Eav_Model_Resource_Entity_Attribute_Group::class,
             'eav/resource_entity_attribute_group' => \Mage_Eav_Model_Resource_Entity_Attribute_Group::class,
-            'eav/resource_entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class,
             'eav_resource/entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class,
+            'eav/resource_entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class,
             'eav/resource_entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
             'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
-            'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
-            'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
+            'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
-            'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
+            'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
+            'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
             'eav_resource/entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class,
             'eav/resource_entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class,
             'eav_resource/entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class,
             'eav/resource_entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class,
-            'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
             'eav_resource/entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
+            'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
             'eav/resource_form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class,
             'eav_resource/form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class,
-            'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
             'eav/resource_form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
+            'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
             'eav/resource_form_element' => \Mage_Eav_Model_Resource_Form_Element::class,
             'eav_resource/form_element' => \Mage_Eav_Model_Resource_Form_Element::class,
-            'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
             'eav_resource/form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
-            'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
+            'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
             'eav/resource_form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
+            'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
             'eav_resource/form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
             'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
             'eav/resource_form_type' => \Mage_Eav_Model_Resource_Form_Type::class,
             'eav_resource/form_type' => \Mage_Eav_Model_Resource_Form_Type::class,
-            'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class,
             'eav_resource/form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class,
+            'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class,
             'eav_resource/helper_mysql4' => \Mage_Eav_Model_Resource_Helper_Mysql4::class,
             'eav/resource_helper_mysql4' => \Mage_Eav_Model_Resource_Helper_Mysql4::class,
             'giftmessage/api' => \Mage_GiftMessage_Model_Api::class,
@@ -20831,12 +20782,12 @@
             'giftmessage/mysql4_message_collection' => \Mage_GiftMessage_Model_Mysql4_Message_Collection::class,
             'giftmessage/mysql4_setup' => \Mage_GiftMessage_Model_Mysql4_Setup::class,
             'giftmessage/observer' => \Mage_GiftMessage_Model_Observer::class,
-            'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class,
             'giftmessage/resource_message' => \Mage_GiftMessage_Model_Resource_Message::class,
-            'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
+            'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class,
             'giftmessage_resource/message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
-            'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
+            'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
             'giftmessage_resource/setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
+            'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
             'googleanalytics/observer' => \Mage_GoogleAnalytics_Model_Observer::class,
             'googleanalytics/system_config_source_type' => \Mage_GoogleAnalytics_Model_System_Config_Source_Type::class,
             'googlecheckout/payment' => \Mage_GoogleCheckout_Model_Payment::class,
@@ -20872,8 +20823,8 @@
             'importexport/product_attribute_backend_urlkey' => \Mage_ImportExport_Model_Product_Attribute_Backend_Urlkey::class,
             'importexport_resource/helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class,
             'importexport/resource_helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class,
-            'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
             'importexport_resource/import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
+            'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
             'importexport_resource/setup' => \Mage_ImportExport_Model_Resource_Setup::class,
             'importexport/resource_setup' => \Mage_ImportExport_Model_Resource_Setup::class,
             'importexport/source_export_entity' => \Mage_ImportExport_Model_Source_Export_Entity::class,
@@ -20895,16 +20846,16 @@
             'index/process' => \Mage_Index_Model_Process::class,
             'index_resource/abstract' => \Mage_Index_Model_Resource_Abstract::class,
             'index/resource_abstract' => \Mage_Index_Model_Resource_Abstract::class,
-            'index/resource_event' => \Mage_Index_Model_Resource_Event::class,
             'index_resource/event' => \Mage_Index_Model_Resource_Event::class,
+            'index/resource_event' => \Mage_Index_Model_Resource_Event::class,
             'index/resource_event_collection' => \Mage_Index_Model_Resource_Event_Collection::class,
             'index_resource/event_collection' => \Mage_Index_Model_Resource_Event_Collection::class,
             'index/resource_helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class,
             'index_resource/helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class,
-            'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
             'index/resource_lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
-            'index_resource/process' => \Mage_Index_Model_Resource_Process::class,
+            'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
             'index/resource_process' => \Mage_Index_Model_Resource_Process::class,
+            'index_resource/process' => \Mage_Index_Model_Resource_Process::class,
             'index/resource_process_collection' => \Mage_Index_Model_Resource_Process_Collection::class,
             'index_resource/process_collection' => \Mage_Index_Model_Resource_Process_Collection::class,
             'index/resource_setup' => \Mage_Index_Model_Resource_Setup::class,
@@ -20937,22 +20888,22 @@
             'log/mysql4_visitor_online_collection' => \Mage_Log_Model_Mysql4_Visitor_Online_Collection::class,
             'log_resource/aggregation' => \Mage_Log_Model_Resource_Aggregation::class,
             'log/resource_aggregation' => \Mage_Log_Model_Resource_Aggregation::class,
-            'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class,
             'log/resource_customer' => \Mage_Log_Model_Resource_Customer::class,
+            'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class,
             'log/resource_log' => \Mage_Log_Model_Resource_Log::class,
             'log_resource/log' => \Mage_Log_Model_Resource_Log::class,
             'log_resource/visitor' => \Mage_Log_Model_Resource_Visitor::class,
             'log/resource_visitor' => \Mage_Log_Model_Resource_Visitor::class,
             'log_resource/visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class,
             'log/resource_visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class,
-            'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
             'log_resource/visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
-            'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
+            'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
             'log_resource/visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
+            'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
             'log/visitor' => \Mage_Log_Model_Visitor::class,
             'log/visitor_online' => \Mage_Log_Model_Visitor_Online::class,
-            'media_resource/image' => \Mage_Media_Model_File_Image::class,
             'media/file_image' => \Mage_Media_Model_File_Image::class,
+            'media_resource/image' => \Mage_Media_Model_File_Image::class,
             'media/image' => \Mage_Media_Model_Image::class,
             'newsletter/message' => \Mage_Newsletter_Model_Message::class,
             'newsletter/mysql4_problem' => \Mage_Newsletter_Model_Mysql4_Problem::class,
@@ -20970,14 +20921,14 @@
             'newsletter_resource/problem' => \Mage_Newsletter_Model_Resource_Problem::class,
             'newsletter/resource_problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class,
             'newsletter_resource/problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class,
-            'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class,
             'newsletter/resource_queue' => \Mage_Newsletter_Model_Resource_Queue::class,
-            'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
+            'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class,
             'newsletter/resource_queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
-            'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
+            'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
             'newsletter/resource_subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
-            'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
+            'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
             'newsletter/resource_subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
+            'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
             'newsletter_resource/template' => \Mage_Newsletter_Model_Resource_Template::class,
             'newsletter/resource_template' => \Mage_Newsletter_Model_Resource_Template::class,
             'newsletter_resource/template_collection' => \Mage_Newsletter_Model_Resource_Template_Collection::class,
@@ -20990,20 +20941,20 @@
             'oauth/consumer_validator_keyLength' => \Mage_Oauth_Model_Consumer_Validator_KeyLength::class,
             'oauth/nonce' => \Mage_Oauth_Model_Nonce::class,
             'oauth/observer' => \Mage_Oauth_Model_Observer::class,
-            'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
             'oauth/resource_consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
+            'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
             'oauth/resource_consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class,
             'oauth_resource/consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class,
             'oauth_resource/nonce' => \Mage_Oauth_Model_Resource_Nonce::class,
             'oauth/resource_nonce' => \Mage_Oauth_Model_Resource_Nonce::class,
             'oauth_resource/nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class,
             'oauth/resource_nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class,
-            'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class,
             'oauth/resource_setup' => \Mage_Oauth_Model_Resource_Setup::class,
-            'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class,
+            'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class,
             'oauth_resource/token' => \Mage_Oauth_Model_Resource_Token::class,
-            'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
+            'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class,
             'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
+            'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
             'oauth/server' => \Mage_Oauth_Model_Server::class,
             'oauth/token' => \Mage_Oauth_Model_Token::class,
             'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class,
@@ -21020,8 +20971,8 @@
             'paygate/authorizenet_source_paymentAction' => \Mage_Paygate_Model_Authorizenet_Source_PaymentAction::class,
             'paygate/mysql4_authorizenet_debug' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug::class,
             'paygate/mysql4_authorizenet_debug_collection' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection::class,
-            'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
             'paygate/resource_authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
+            'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
             'paygate_resource/authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class,
             'paygate/resource_authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class,
             'payment/billing_agreementAbstract' => \Mage_Payment_Model_Billing_AgreementAbstract::class,
@@ -21084,12 +21035,12 @@
             'paypal/resource_cert' => \Mage_Paypal_Model_Resource_Cert::class,
             'paypal_resource/payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class,
             'paypal/resource_payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class,
-            'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
             'paypal/resource_payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
+            'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
             'paypal/resource_report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class,
             'paypal_resource/report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class,
-            'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
             'paypal/resource_report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
+            'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
             'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
             'paypal/resource_report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
             'paypal/resource_setup' => \Mage_Paypal_Model_Resource_Setup::class,
@@ -21114,8 +21065,8 @@
             'persistent/observer' => \Mage_Persistent_Model_Observer::class,
             'persistent/observer_session' => \Mage_Persistent_Model_Observer_Session::class,
             'persistent/persistent_config' => \Mage_Persistent_Model_Persistent_Config::class,
-            'persistent/resource_session' => \Mage_Persistent_Model_Resource_Session::class,
             'persistent_resource/session' => \Mage_Persistent_Model_Resource_Session::class,
+            'persistent/resource_session' => \Mage_Persistent_Model_Resource_Session::class,
             'persistent/session' => \Mage_Persistent_Model_Session::class,
             'poll/mysql4_poll' => \Mage_Poll_Model_Mysql4_Poll::class,
             'poll/mysql4_poll_answer' => \Mage_Poll_Model_Mysql4_Poll_Answer::class,
@@ -21125,16 +21076,16 @@
             'poll/poll' => \Mage_Poll_Model_Poll::class,
             'poll/poll_answer' => \Mage_Poll_Model_Poll_Answer::class,
             'poll/poll_vote' => \Mage_Poll_Model_Poll_Vote::class,
-            'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class,
             'poll_resource/poll' => \Mage_Poll_Model_Resource_Poll::class,
+            'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class,
             'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
             'poll/resource_poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
-            'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
             'poll_resource/poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
-            'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
+            'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
             'poll_resource/poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
-            'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
+            'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
             'poll/resource_poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
+            'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
             'productalert/email' => \Mage_ProductAlert_Model_Email::class,
             'productalert/mysql4_price' => \Mage_ProductAlert_Model_Mysql4_Price::class,
             'productalert/mysql4_price_collection' => \Mage_ProductAlert_Model_Mysql4_Price_Collection::class,
@@ -21144,20 +21095,20 @@
             'productalert/mysql4_stock_customer_collection' => \Mage_ProductAlert_Model_Mysql4_Stock_Customer_Collection::class,
             'productalert/observer' => \Mage_ProductAlert_Model_Observer::class,
             'productalert/price' => \Mage_ProductAlert_Model_Price::class,
-            'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
             'productalert_resource/abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
-            'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class,
+            'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
             'productalert_resource/price' => \Mage_ProductAlert_Model_Resource_Price::class,
-            'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
+            'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class,
             'productalert/resource_price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
-            'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
+            'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
             'productalert/resource_price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
+            'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
             'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
             'productalert/resource_stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
-            'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
             'productalert/resource_stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
-            'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
+            'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
             'productalert/resource_stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
+            'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
             'productalert/stock' => \Mage_ProductAlert_Model_Stock::class,
             'rating/mysql4_rating' => \Mage_Rating_Model_Mysql4_Rating::class,
             'rating/mysql4_rating_collection' => \Mage_Rating_Model_Mysql4_Rating_Collection::class,
@@ -21171,20 +21122,20 @@
             'rating/rating_entity' => \Mage_Rating_Model_Rating_Entity::class,
             'rating/rating_option' => \Mage_Rating_Model_Rating_Option::class,
             'rating/rating_option_vote' => \Mage_Rating_Model_Rating_Option_Vote::class,
-            'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class,
             'rating/resource_rating' => \Mage_Rating_Model_Resource_Rating::class,
+            'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class,
             'rating_resource/rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class,
             'rating/resource_rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class,
             'rating/resource_rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class,
             'rating_resource/rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class,
-            'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
             'rating/resource_rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
-            'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
+            'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
             'rating_resource/rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
+            'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
             'rating_resource/rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class,
             'rating/resource_rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class,
-            'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
             'rating/resource_rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
+            'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
             'reports/config' => \Mage_Reports_Model_Config::class,
             'reports/event' => \Mage_Reports_Model_Event::class,
             'reports/event_observer' => \Mage_Reports_Model_Event_Observer::class,
@@ -21230,6 +21181,7 @@
             'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class,
             'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class,
             'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class,
+            'reports/observer' => \Mage_Reports_Model_Observer::class,
             'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class,
             'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class,
             'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class,
@@ -21238,88 +21190,88 @@
             'reports_resource/accounts_collection' => \Mage_Reports_Model_Resource_Accounts_Collection::class,
             'reports/resource_coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class,
             'reports_resource/coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class,
-            'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
             'reports/resource_customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
-            'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
+            'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
             'reports/resource_customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
-            'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
+            'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
             'reports_resource/customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
-            'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
+            'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
             'reports/resource_entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
+            'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
             'reports_resource/event' => \Mage_Reports_Model_Resource_Event::class,
             'reports/resource_event' => \Mage_Reports_Model_Resource_Event::class,
             'reports_resource/event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
             'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
             'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
             'reports/resource_event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
-            'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
             'reports/resource_event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
-            'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
+            'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
             'reports_resource/helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
-            'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
+            'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
             'reports/resource_invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
-            'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
+            'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
             'reports_resource/order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
-            'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
+            'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
             'reports_resource/product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
+            'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
             'reports/resource_product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class,
             'reports_resource/product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class,
             'reports_resource/product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class,
             'reports/resource_product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class,
-            'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
             'reports/resource_product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
+            'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
             'reports_resource/product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class,
             'reports/resource_product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class,
-            'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
             'reports_resource/product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
-            'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
+            'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
             'reports/resource_product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
-            'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
+            'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
             'reports_resource/product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
-            'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
+            'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
             'reports/resource_product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
+            'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
             'reports_resource/product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class,
             'reports/resource_product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class,
-            'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
             'reports_resource/product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
-            'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
+            'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
             'reports_resource/product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
-            'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
+            'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
             'reports/resource_quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
-            'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class,
+            'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
             'reports_resource/refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class,
+            'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class,
             'reports/resource_report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class,
             'reports_resource/report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class,
             'reports/resource_report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class,
             'reports_resource/report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class,
-            'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
             'reports_resource/report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
+            'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
             'reports/resource_report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class,
             'reports_resource/report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class,
-            'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
             'reports/resource_report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
+            'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
             'reports_resource/review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
             'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
-            'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
             'reports_resource/review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
+            'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
             'reports_resource/review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class,
             'reports/resource_review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class,
             'reports_resource/shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class,
             'reports/resource_shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class,
-            'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
             'reports_resource/shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
+            'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
             'reports_resource/tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class,
             'reports/resource_tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class,
-            'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
             'reports/resource_tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
-            'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
+            'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
             'reports/resource_tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
-            'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
+            'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
             'reports/resource_tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
+            'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
             'reports_resource/wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class,
             'reports/resource_wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class,
-            'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
             'reports_resource/wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
+            'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
             'reports/session' => \Mage_Reports_Model_Session::class,
             'reports/test' => \Mage_Reports_Model_Test::class,
             'reports/totals' => \Mage_Reports_Model_Totals::class,
@@ -21336,14 +21288,14 @@
             'review/resource_review_collection' => \Mage_Review_Model_Resource_Review_Collection::class,
             'review_resource/review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class,
             'review/resource_review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class,
-            'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class,
             'review_resource/review_status' => \Mage_Review_Model_Resource_Review_Status::class,
-            'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
+            'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class,
             'review_resource/review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
+            'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
             'review/resource_review_summary' => \Mage_Review_Model_Resource_Review_Summary::class,
             'review_resource/review_summary' => \Mage_Review_Model_Resource_Review_Summary::class,
-            'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
             'review/resource_review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
+            'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
             'review/review' => \Mage_Review_Model_Review::class,
             'review/review_status' => \Mage_Review_Model_Review_Status::class,
             'review/review_summary' => \Mage_Review_Model_Review_Summary::class,
@@ -21366,14 +21318,14 @@
             'rule/mysql4_rule_collection' => \Mage_Rule_Model_Mysql4_Rule_Collection::class,
             'rule/renderer_actions' => \Mage_Rule_Model_Renderer_Actions::class,
             'rule/renderer_conditions' => \Mage_Rule_Model_Renderer_Conditions::class,
-            'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class,
             'rule/resource_abstract' => \Mage_Rule_Model_Resource_Abstract::class,
-            'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class,
+            'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class,
             'rule/resource_rule' => \Mage_Rule_Model_Resource_Rule::class,
-            'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
+            'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class,
             'rule_resource/rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
-            'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
+            'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
             'rule_resource/rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
+            'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
             'rule/resource_rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class,
             'rule_resource/rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class,
             'rule/rule' => \Mage_Rule_Model_Rule::class,
@@ -21402,24 +21354,24 @@
             'salesrule/resource_coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class,
             'salesrule/resource_coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class,
             'salesrule_resource/coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class,
-            'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
             'salesrule_resource/report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
-            'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
+            'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
             'salesrule_resource/report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
+            'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
             'salesrule_resource/report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class,
             'salesrule/resource_report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class,
             'salesrule_resource/report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class,
             'salesrule/resource_report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class,
             'salesrule_resource/report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class,
             'salesrule/resource_report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class,
-            'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class,
             'salesrule_resource/rule' => \Mage_SalesRule_Model_Resource_Rule::class,
-            'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
+            'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class,
             'salesrule_resource/rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
-            'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
+            'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
             'salesrule_resource/rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
-            'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
+            'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
             'salesrule/resource_rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
+            'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
             'salesrule_resource/rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class,
             'salesrule/resource_rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class,
             'salesrule_resource/rule_product_collection' => \Mage_SalesRule_Model_Resource_Rule_Product_Collection::class,
@@ -21464,14 +21416,14 @@
             'sales/email_template' => \Mage_Sales_Model_Email_Template::class,
             'sales/entity_order' => \Mage_Sales_Model_Entity_Order::class,
             'sales_entity/order' => \Mage_Sales_Model_Entity_Order::class,
-            'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
             'sales_entity/order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
-            'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
+            'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
             'sales/entity_order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
-            'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
+            'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
             'sales_entity/order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
-            'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
+            'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
             'sales_entity/order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
+            'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
             'sales/entity_order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class,
             'sales_entity/order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class,
             'sales/entity_order_attribute_backend_shipping' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Shipping::class,
@@ -21480,22 +21432,22 @@
             'sales/entity_order_collection' => \Mage_Sales_Model_Entity_Order_Collection::class,
             'sales_entity/order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class,
             'sales/entity_order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class,
-            'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales_entity/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
-            'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
+            'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales/entity_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
-            'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
+            'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
             'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
+            'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
             'sales/entity_order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class,
             'sales_entity/order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class,
             'sales/entity_order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class,
             'sales_entity/order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class,
             'sales_entity/order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class,
             'sales/entity_order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class,
-            'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
             'sales/entity_order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
-            'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
+            'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
             'sales_entity/order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
+            'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
             'sales/entity_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class,
             'sales_entity/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class,
             'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class,
@@ -21506,28 +21458,28 @@
             'sales/entity_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/entity_order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class,
             'sales_entity/order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class,
-            'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
             'sales/entity_order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
+            'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
             'sales_entity/order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class,
             'sales/entity_order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class,
             'sales_entity/order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class,
             'sales/entity_order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class,
-            'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
             'sales/entity_order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
+            'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
             'sales/entity_order_item' => \Mage_Sales_Model_Entity_Order_Item::class,
             'sales_entity/order_item' => \Mage_Sales_Model_Entity_Order_Item::class,
             'sales/entity_order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class,
             'sales_entity/order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class,
-            'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
             'sales/entity_order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
+            'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
             'sales_entity/order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class,
             'sales/entity_order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class,
             'sales_entity/order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class,
             'sales/entity_order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class,
-            'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
             'sales_entity/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
-            'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
+            'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
             'sales/entity_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
+            'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
             'sales/entity_order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class,
             'sales_entity/order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class,
             'sales/entity_order_shipment_comment' => \Mage_Sales_Model_Entity_Order_Shipment_Comment::class,
@@ -21536,66 +21488,66 @@
             'sales_entity/order_shipment_comment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Comment_Collection::class,
             'sales/entity_order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class,
             'sales_entity/order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class,
-            'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
             'sales/entity_order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
-            'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
+            'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
             'sales_entity/order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
-            'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
+            'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
             'sales_entity/order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
-            'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
+            'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
             'sales_entity/order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
-            'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
+            'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
             'sales_entity/order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
+            'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
             'sales_entity/quote' => \Mage_Sales_Model_Entity_Quote::class,
             'sales/entity_quote' => \Mage_Sales_Model_Entity_Quote::class,
-            'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
             'sales_entity/quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
+            'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
             'sales_entity/quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class,
             'sales/entity_quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class,
-            'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
             'sales/entity_quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
-            'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
+            'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
             'sales/entity_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
-            'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
+            'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
             'sales_entity/quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
-            'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
+            'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
             'sales/entity_quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
+            'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
             'sales_entity/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales/entity_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales_entity/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class,
             'sales/entity_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class,
-            'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
             'sales_entity/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
-            'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
             'sales/entity_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/entity_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales_entity/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales/entity_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class,
             'sales_entity/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class,
             'sales/entity_quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class,
             'sales_entity/quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class,
-            'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
             'sales_entity/quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
-            'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
+            'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
             'sales/entity_quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
-            'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
+            'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
             'sales_entity/quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
+            'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
             'sales/entity_quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class,
             'sales_entity/quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class,
             'sales/entity_quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class,
             'sales_entity/quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class,
-            'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
             'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
-            'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
+            'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
             'sales/entity_quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
-            'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
+            'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
             'sales/entity_quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
+            'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
             'sales_entity/quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class,
             'sales/entity_quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class,
-            'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
             'sales_entity/sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
-            'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class,
+            'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
             'sales_entity/setup' => \Mage_Sales_Model_Entity_Setup::class,
+            'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class,
             'sales/mysql4_abstract' => \Mage_Sales_Model_Mysql4_Abstract::class,
             'sales/mysql4_billing_agreement' => \Mage_Sales_Model_Mysql4_Billing_Agreement::class,
             'sales/mysql4_billing_agreement_collection' => \Mage_Sales_Model_Mysql4_Billing_Agreement_Collection::class,
@@ -21790,48 +21742,48 @@
             'sales/recurring_profile' => \Mage_Sales_Model_Recurring_Profile::class,
             'sales_resource/abstract' => \Mage_Sales_Model_Resource_Abstract::class,
             'sales/resource_abstract' => \Mage_Sales_Model_Resource_Abstract::class,
-            'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
             'sales_resource/billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
-            'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
+            'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
             'sales_resource/billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
-            'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
+            'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
             'sales/resource_collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
-            'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
+            'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
             'sales_resource/helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
-            'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class,
+            'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
             'sales_resource/order' => \Mage_Sales_Model_Resource_Order::class,
+            'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class,
             'sales_resource/order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class,
             'sales/resource_order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class,
-            'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
             'sales_resource/order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
+            'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
             'sales/resource_order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class,
             'sales_resource/order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class,
             'sales/resource_order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class,
             'sales_resource/order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class,
             'sales/resource_order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class,
             'sales_resource/order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class,
-            'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
             'sales/resource_order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
+            'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
             'sales_resource/order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class,
             'sales/resource_order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class,
             'sales/resource_order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class,
             'sales_resource/order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class,
-            'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
             'sales/resource_order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
+            'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
             'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
             'sales/resource_order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
             'sales/resource_order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
             'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
-            'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales_resource/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
+            'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales/resource_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class,
             'sales_resource/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class,
-            'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
             'sales/resource_order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
-            'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
+            'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
             'sales_resource/order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
-            'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
+            'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
             'sales/resource_order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
+            'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
             'sales/resource_order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
             'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
             'sales_resource/order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class,
@@ -21842,84 +21794,84 @@
             'sales/resource_order_grid_collection' => \Mage_Sales_Model_Resource_Order_Grid_Collection::class,
             'sales/resource_order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class,
             'sales_resource/order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class,
-            'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
             'sales/resource_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
-            'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
+            'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
             'sales_resource/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
+            'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
             'sales_resource/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class,
             'sales/resource_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class,
             'sales/resource_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class,
             'sales_resource/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/resource_order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class,
             'sales_resource/order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class,
-            'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
             'sales/resource_order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
+            'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
             'sales/resource_order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class,
             'sales_resource/order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class,
-            'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
             'sales/resource_order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
-            'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
+            'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
             'sales_resource/order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
+            'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
             'sales/resource_order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class,
             'sales_resource/order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class,
-            'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
             'sales_resource/order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
+            'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
             'sales/resource_order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class,
             'sales_resource/order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class,
-            'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
             'sales_resource/order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
+            'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
             'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
             'sales/resource_order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
-            'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
             'sales_resource/order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
-            'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
+            'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
             'sales_resource/order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
-            'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
+            'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
             'sales_resource/order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
-            'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
+            'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
             'sales/resource_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
+            'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
             'sales_resource/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class,
             'sales/resource_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class,
-            'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
             'sales/resource_order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
+            'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
             'sales/resource_order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
             'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
-            'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
             'sales/resource_order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
+            'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
             'sales_resource/order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class,
             'sales/resource_order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class,
-            'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
             'sales_resource/order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
-            'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
+            'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
             'sales_resource/order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
-            'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
+            'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
             'sales_resource/order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
+            'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
             'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
             'sales_resource/order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
             'sales_resource/order_status' => \Mage_Sales_Model_Resource_Order_Status::class,
             'sales/resource_order_status' => \Mage_Sales_Model_Resource_Order_Status::class,
             'sales_resource/order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class,
             'sales/resource_order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class,
-            'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
             'sales_resource/order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
-            'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
+            'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
             'sales_resource/order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
-            'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
+            'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
             'sales/resource_order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
-            'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
+            'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
             'sales_resource/order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
-            'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class,
+            'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
             'sales/resource_quote' => \Mage_Sales_Model_Resource_Quote::class,
+            'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class,
             'sales_resource/quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class,
             'sales/resource_quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class,
             'sales/resource_quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class,
             'sales_resource/quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class,
             'sales/resource_quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class,
             'sales_resource/quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class,
-            'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
             'sales/resource_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
-            'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
+            'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
             'sales/resource_quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
+            'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
             'sales_resource/quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
             'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
             'sales_resource/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class,
@@ -21928,82 +21880,82 @@
             'sales_resource/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class,
             'sales/resource_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class,
             'sales_resource/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class,
-            'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/resource_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
-            'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
+            'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/resource_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
+            'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales_resource/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
             'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
-            'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
             'sales/resource_quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
+            'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
             'sales_resource/quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class,
             'sales/resource_quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class,
-            'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
             'sales/resource_quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
-            'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
+            'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
             'sales_resource/quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
-            'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
+            'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
             'sales_resource/quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
+            'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
             'sales_resource/quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class,
             'sales/resource_quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class,
-            'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
             'sales/resource_quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
+            'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
             'sales/resource_quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class,
             'sales_resource/quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class,
-            'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
             'sales/resource_quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
-            'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
+            'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
             'sales/resource_quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
-            'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
+            'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
             'sales_resource/quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
-            'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
+            'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
             'sales/resource_quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
-            'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
+            'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
             'sales/resource_recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
+            'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
             'sales/resource_recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class,
             'sales_resource/recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class,
-            'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class,
             'sales/resource_report' => \Mage_Sales_Model_Resource_Report::class,
+            'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class,
             'sales/resource_report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class,
             'sales_resource/report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class,
-            'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
             'sales/resource_report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
-            'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
+            'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
             'sales/resource_report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
+            'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
             'sales_resource/report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
             'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
-            'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
             'sales_resource/report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
+            'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
             'sales/resource_report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class,
             'sales_resource/report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class,
             'sales_resource/report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class,
             'sales/resource_report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class,
             'sales/resource_report_order' => \Mage_Sales_Model_Resource_Report_Order::class,
             'sales_resource/report_order' => \Mage_Sales_Model_Resource_Report_Order::class,
-            'sales/resource_report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class,
             'sales_resource/report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class,
-            'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class,
+            'sales/resource_report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class,
             'sales/resource_report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class,
+            'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class,
             'sales_resource/report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class,
             'sales/resource_report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class,
-            'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
             'sales/resource_report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
-            'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
+            'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
             'sales_resource/report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
+            'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
             'sales_resource/report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class,
             'sales/resource_report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class,
             'sales_resource/report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class,
             'sales/resource_report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class,
-            'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
             'sales_resource/report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
+            'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
             'sales_resource/report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class,
             'sales/resource_report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class,
             'sales_resource/report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class,
             'sales/resource_report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class,
-            'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
             'sales/resource_sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
-            'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class,
+            'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
             'sales/resource_setup' => \Mage_Sales_Model_Resource_Setup::class,
+            'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class,
             'sales/service_order' => \Mage_Sales_Model_Service_Order::class,
             'sales/service_quote' => \Mage_Sales_Model_Service_Quote::class,
             'sales/status_list' => \Mage_Sales_Model_Status_List::class,
@@ -22013,8 +21965,8 @@
             'sendfriend/observer' => \Mage_Sendfriend_Model_Observer::class,
             'sendfriend_resource/sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class,
             'sendfriend/resource_sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class,
-            'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
             'sendfriend/resource_sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
+            'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
             'sendfriend/resource_setup' => \Mage_Sendfriend_Model_Resource_Setup::class,
             'sendfriend_resource/setup' => \Mage_Sendfriend_Model_Resource_Setup::class,
             'sendfriend/sendfriend' => \Mage_Sendfriend_Model_Sendfriend::class,
@@ -22054,16 +22006,16 @@
             'sitemap/observer' => \Mage_Sitemap_Model_Observer::class,
             'sitemap_resource/catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class,
             'sitemap/resource_catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class,
-            'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
             'sitemap/resource_catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
+            'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
             'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
             'sitemap_resource/catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
             'sitemap_resource/cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
             'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
             'sitemap_resource/sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class,
             'sitemap/resource_sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class,
-            'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
             'sitemap_resource/sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
+            'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
             'sitemap/sitemap' => \Mage_Sitemap_Model_Sitemap::class,
             'tag/api' => \Mage_Tag_Model_Api::class,
             'tag/api_v2' => \Mage_Tag_Model_Api_V2::class,
@@ -22076,21 +22028,21 @@
             'tag/mysql4_tag' => \Mage_Tag_Model_Mysql4_Tag::class,
             'tag/mysql4_tag_collection' => \Mage_Tag_Model_Mysql4_Tag_Collection::class,
             'tag/mysql4_tag_relation' => \Mage_Tag_Model_Mysql4_Tag_Relation::class,
-            'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag/resource_customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag_resource/customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
-            'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
+            'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag_resource/indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
-            'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
+            'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
             'tag_resource/popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
+            'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
             'tag_resource/product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class,
             'tag/resource_product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class,
             'tag_resource/tag' => \Mage_Tag_Model_Resource_Tag::class,
             'tag/resource_tag' => \Mage_Tag_Model_Resource_Tag::class,
-            'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
             'tag_resource/tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
-            'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
+            'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
             'tag_resource/tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
+            'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
             'tag/session' => \Mage_Tag_Model_Session::class,
             'tag/tag' => \Mage_Tag_Model_Tag::class,
             'tag/tag_relation' => \Mage_Tag_Model_Tag_Relation::class,
@@ -22129,16 +22081,16 @@
             'tax/resource_calculation_rate' => \Mage_Tax_Model_Resource_Calculation_Rate::class,
             'tax/resource_calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class,
             'tax_resource/calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class,
-            'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
             'tax/resource_calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
-            'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
+            'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
             'tax/resource_calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
-            'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
+            'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
             'tax/resource_calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
-            'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
+            'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
             'tax_resource/calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
-            'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class,
+            'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
             'tax/resource_class' => \Mage_Tax_Model_Resource_Class::class,
+            'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class,
             'tax/resource_class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class,
             'tax_resource/class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class,
             'tax_resource/report_collection' => \Mage_Tax_Model_Resource_Report_Collection::class,
@@ -22149,10 +22101,10 @@
             'tax/resource_report_tax_createdat' => \Mage_Tax_Model_Resource_Report_Tax_Createdat::class,
             'tax_resource/report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class,
             'tax/resource_report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class,
-            'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
             'tax/resource_report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
-            'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
+            'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
             'tax_resource/sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
+            'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
             'tax_resource/sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class,
             'tax/resource_sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class,
             'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class,
@@ -22241,8 +22193,8 @@
             'weee/observer' => \Mage_Weee_Model_Observer::class,
             'weee/resource_attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class,
             'weee_resource/attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class,
-            'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class,
             'weee/resource_setup' => \Mage_Weee_Model_Resource_Setup::class,
+            'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class,
             'weee/resource_tax' => \Mage_Weee_Model_Resource_Tax::class,
             'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class,
             'weee/tax' => \Mage_Weee_Model_Tax::class,
@@ -22254,12 +22206,12 @@
             'widget/mysql4_widget_instance' => \Mage_Widget_Model_Mysql4_Widget_Instance::class,
             'widget/mysql4_widget_instance_collection' => \Mage_Widget_Model_Mysql4_Widget_Instance_Collection::class,
             'widget/observer' => \Mage_Widget_Model_Observer::class,
-            'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class,
             'widget/resource_widget' => \Mage_Widget_Model_Resource_Widget::class,
+            'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class,
             'widget_resource/widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class,
             'widget/resource_widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class,
-            'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
             'widget_resource/widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
+            'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
             'widget/template_filter' => \Mage_Widget_Model_Template_Filter::class,
             'widget/widget' => \Mage_Widget_Model_Widget::class,
             'widget/widget_config' => \Mage_Widget_Model_Widget_Config::class,
@@ -22276,14 +22228,14 @@
             'wishlist/mysql4_wishlist' => \Mage_Wishlist_Model_Mysql4_Wishlist::class,
             'wishlist/mysql4_wishlist_collection' => \Mage_Wishlist_Model_Mysql4_Wishlist_Collection::class,
             'wishlist/observer' => \Mage_Wishlist_Model_Observer::class,
-            'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class,
             'wishlist_resource/item' => \Mage_Wishlist_Model_Resource_Item::class,
+            'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class,
             'wishlist_resource/item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class,
             'wishlist/resource_item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class,
-            'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
             'wishlist/resource_item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
-            'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
+            'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
             'wishlist_resource/item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
+            'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
             'wishlist_resource/product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class,
             'wishlist/resource_product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class,
             'wishlist/resource_wishlist' => \Mage_Wishlist_Model_Resource_Wishlist::class,
@@ -22292,7 +22244,6 @@
             'wishlist/resource_wishlist_collection' => \Mage_Wishlist_Model_Resource_Wishlist_Collection::class,
             'wishlist/session' => \Mage_Wishlist_Model_Session::class,
             'wishlist/wishlist' => \Mage_Wishlist_Model_Wishlist::class,
-            'varien/autoload' => \Varien_Autoload::class,
         ])
     );
     override( \Mage_Shipping_Model_Carrier_Tablerate::_getModel(0),
@@ -22302,11 +22253,10 @@
             'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class,
             'adminnotification/mysql4_inbox_collection' => \Mage_AdminNotification_Model_Mysql4_Inbox_Collection::class,
             'adminnotification/observer' => \Mage_AdminNotification_Model_Observer::class,
-            'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
             'adminnotification/resource_inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
-            'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
+            'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
             'adminnotification/resource_inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
-            'adminnotification/survey' => \Mage_AdminNotification_Model_Survey::class,
+            'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
             'admin/acl' => \Mage_Admin_Model_Acl::class,
             'admin/acl_assert_ip' => \Mage_Admin_Model_Acl_Assert_Ip::class,
             'admin/acl_assert_time' => \Mage_Admin_Model_Acl_Assert_Time::class,
@@ -22335,38 +22285,38 @@
             'admin/redirectpolicy' => \Mage_Admin_Model_Redirectpolicy::class,
             'admin/resource_acl' => \Mage_Admin_Model_Resource_Acl::class,
             'admin_resource/acl' => \Mage_Admin_Model_Resource_Acl::class,
-            'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
             'admin/resource_acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
+            'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
             'admin/resource_acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class,
             'admin_resource/acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class,
-            'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class,
             'admin/resource_block' => \Mage_Admin_Model_Resource_Block::class,
-            'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
+            'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class,
             'admin/resource_block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
+            'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
             'admin_resource/permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class,
             'admin/resource_permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class,
             'admin/resource_role' => \Mage_Admin_Model_Resource_Role::class,
             'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class,
             'admin/resource_role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class,
             'admin_resource/role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class,
-            'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class,
             'admin_resource/roles' => \Mage_Admin_Model_Resource_Roles::class,
-            'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
+            'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class,
             'admin_resource/roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
-            'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
+            'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
             'admin/resource_roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
+            'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
             'admin/resource_rules' => \Mage_Admin_Model_Resource_Rules::class,
             'admin_resource/rules' => \Mage_Admin_Model_Resource_Rules::class,
-            'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
             'admin_resource/rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
+            'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
             'admin_resource/user' => \Mage_Admin_Model_Resource_User::class,
             'admin/resource_user' => \Mage_Admin_Model_Resource_User::class,
             'admin/resource_user_collection' => \Mage_Admin_Model_Resource_User_Collection::class,
             'admin_resource/user_collection' => \Mage_Admin_Model_Resource_User_Collection::class,
-            'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class,
             'admin_resource/variable' => \Mage_Admin_Model_Resource_Variable::class,
-            'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
+            'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class,
             'admin/resource_variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
+            'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
             'admin/role' => \Mage_Admin_Model_Role::class,
             'admin/roles' => \Mage_Admin_Model_Roles::class,
             'admin/rules' => \Mage_Admin_Model_Rules::class,
@@ -22401,6 +22351,7 @@
             'adminhtml/system_config_backend_baseurl' => \Mage_Adminhtml_Model_System_Config_Backend_Baseurl::class,
             'adminhtml/system_config_backend_cache' => \Mage_Adminhtml_Model_System_Config_Backend_Cache::class,
             'adminhtml/system_config_backend_catalog_inventory_managestock' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock::class,
+            'adminhtml/system_config_backend_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Separator::class,
             'adminhtml/system_config_backend_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Type::class,
             'adminhtml/system_config_backend_category' => \Mage_Adminhtml_Model_System_Config_Backend_Category::class,
             'adminhtml/system_config_backend_cookie' => \Mage_Adminhtml_Model_System_Config_Backend_Cookie::class,
@@ -22453,12 +22404,14 @@
             'adminhtml/system_config_source_catalog_listMode' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListMode::class,
             'adminhtml/system_config_source_catalog_listPerPage' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListPerPage::class,
             'adminhtml/system_config_source_catalog_listSort' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort::class,
+            'adminhtml/system_config_source_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Separator::class,
             'adminhtml/system_config_source_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Type::class,
             'adminhtml/system_config_source_catalog_timeFormat' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_TimeFormat::class,
             'adminhtml/system_config_source_category' => \Mage_Adminhtml_Model_System_Config_Source_Category::class,
             'adminhtml/system_config_source_checktype' => \Mage_Adminhtml_Model_System_Config_Source_Checktype::class,
             'adminhtml/system_config_source_cms_page' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Page::class,
             'adminhtml/system_config_source_cms_wysiwyg_enabled' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Wysiwyg_Enabled::class,
+            'adminhtml/system_config_source_cookie_samesite' => \Mage_Adminhtml_Model_System_Config_Source_Cookie_Samesite::class,
             'adminhtml/system_config_source_country' => \Mage_Adminhtml_Model_System_Config_Source_Country::class,
             'adminhtml/system_config_source_country_full' => \Mage_Adminhtml_Model_System_Config_Source_Country_Full::class,
             'adminhtml/system_config_source_cron_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency::class,
@@ -22485,6 +22438,7 @@
             'adminhtml/system_config_source_locale_timezone' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Timezone::class,
             'adminhtml/system_config_source_locale_weekdaycodes' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdaycodes::class,
             'adminhtml/system_config_source_locale_weekdays' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdays::class,
+            'adminhtml/system_config_source_log_level' => \Mage_Adminhtml_Model_System_Config_Source_Log_Level::class,
             'adminhtml/system_config_source_nooptreq' => \Mage_Adminhtml_Model_System_Config_Source_Nooptreq::class,
             'adminhtml/system_config_source_notification_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Notification_Frequency::class,
             'adminhtml/system_config_source_order_status' => \Mage_Adminhtml_Model_System_Config_Source_Order_Status::class,
@@ -22508,7 +22462,6 @@
             'adminhtml/system_config_source_shipping_flatrate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Flatrate::class,
             'adminhtml/system_config_source_shipping_tablerate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Tablerate::class,
             'adminhtml/system_config_source_shipping_taxclass' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Taxclass::class,
-            'adminhtml/system_config_source_startdateenddate' => \Mage_Adminhtml_Model_System_Config_Source_Startdateenddate::class,
             'adminhtml/system_config_source_storage_media_database' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Database::class,
             'adminhtml/system_config_source_storage_media_storage' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Storage::class,
             'adminhtml/system_config_source_store' => \Mage_Adminhtml_Model_System_Config_Source_Store::class,
@@ -22564,22 +22517,22 @@
             'api2_resource/acl_filter_attribute' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute::class,
             'api2/resource_acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class,
             'api2_resource/acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class,
-            'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
             'api2_resource/acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
+            'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
             'api2/resource_acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class,
             'api2_resource/acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class,
             'api2_resource/acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class,
             'api2/resource_acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class,
             'api2/resource_acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class,
             'api2_resource/acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class,
-            'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class,
             'api2/resource_setup' => \Mage_Api2_Model_Resource_Setup::class,
+            'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class,
             'api2/resource_validator' => \Mage_Api2_Model_Resource_Validator::class,
             'api2_resource/validator' => \Mage_Api2_Model_Resource_Validator::class,
             'api2/resource_validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class,
             'api2_resource/validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class,
-            'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
             'api2/resource_validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
+            'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
             'api2/response' => \Mage_Api2_Model_Response::class,
             'api2/route_abstract' => \Mage_Api2_Model_Route_Abstract::class,
             'api2/route_apiType' => \Mage_Api2_Model_Route_ApiType::class,
@@ -22611,8 +22564,8 @@
             'api/mysql4_user_collection' => \Mage_Api_Model_Mysql4_User_Collection::class,
             'api/resource_abstract' => \Mage_Api_Model_Resource_Abstract::class,
             'api_resource/abstract' => \Mage_Api_Model_Resource_Abstract::class,
-            'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class,
             'api_resource/acl' => \Mage_Api_Model_Resource_Acl::class,
+            'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class,
             'api_resource/acl_role' => \Mage_Api_Model_Resource_Acl_Role::class,
             'api/resource_acl_role' => \Mage_Api_Model_Resource_Acl_Role::class,
             'api/resource_acl_role_collection' => \Mage_Api_Model_Resource_Acl_Role_Collection::class,
@@ -22621,14 +22574,14 @@
             'api_resource/permissions_collection' => \Mage_Api_Model_Resource_Permissions_Collection::class,
             'api_resource/role' => \Mage_Api_Model_Resource_Role::class,
             'api/resource_role' => \Mage_Api_Model_Resource_Role::class,
-            'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
             'api_resource/role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
+            'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
             'api/resource_roles' => \Mage_Api_Model_Resource_Roles::class,
             'api_resource/roles' => \Mage_Api_Model_Resource_Roles::class,
-            'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
             'api_resource/roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
-            'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
+            'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
             'api_resource/roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
+            'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
             'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class,
             'api_resource/rules' => \Mage_Api_Model_Resource_Rules::class,
             'api_resource/rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class,
@@ -22659,15 +22612,6 @@
             'authorizenet/directpost_request' => \Mage_Authorizenet_Model_Directpost_Request::class,
             'authorizenet/directpost_response' => \Mage_Authorizenet_Model_Directpost_Response::class,
             'authorizenet/directpost_session' => \Mage_Authorizenet_Model_Directpost_Session::class,
-            'backup/backup' => \Mage_Backup_Model_Backup::class,
-            'backup/config_backend_cron' => \Mage_Backup_Model_Config_Backend_Cron::class,
-            'backup/config_source_type' => \Mage_Backup_Model_Config_Source_Type::class,
-            'backup/db' => \Mage_Backup_Model_Db::class,
-            'backup/fs_collection' => \Mage_Backup_Model_Fs_Collection::class,
-            'backup/mysql4_db' => \Mage_Backup_Model_Mysql4_Db::class,
-            'backup/observer' => \Mage_Backup_Model_Observer::class,
-            'backup/resource_db' => \Mage_Backup_Model_Resource_Db::class,
-            'backup/resource_helper_mysql4' => \Mage_Backup_Model_Resource_Helper_Mysql4::class,
             'bundle/catalogIndex_data_bundle' => \Mage_Bundle_Model_CatalogIndex_Data_Bundle::class,
             'bundle/mysql4_bundle' => \Mage_Bundle_Model_Mysql4_Bundle::class,
             'bundle/mysql4_indexer_price' => \Mage_Bundle_Model_Mysql4_Indexer_Price::class,
@@ -22687,16 +22631,16 @@
             'bundle/resource_bundle' => \Mage_Bundle_Model_Resource_Bundle::class,
             'bundle/resource_indexer_price' => \Mage_Bundle_Model_Resource_Indexer_Price::class,
             'bundle_resource/indexer_price' => \Mage_Bundle_Model_Resource_Indexer_Price::class,
-            'bundle/resource_indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class,
             'bundle_resource/indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class,
+            'bundle/resource_indexer_stock' => \Mage_Bundle_Model_Resource_Indexer_Stock::class,
             'bundle/resource_option' => \Mage_Bundle_Model_Resource_Option::class,
             'bundle_resource/option' => \Mage_Bundle_Model_Resource_Option::class,
             'bundle/resource_option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class,
             'bundle_resource/option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class,
             'bundle_resource/price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
             'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
-            'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class,
             'bundle_resource/selection' => \Mage_Bundle_Model_Resource_Selection::class,
+            'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class,
             'bundle_resource/selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class,
             'bundle/resource_selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class,
             'bundle/sales_order_pdf_items_abstract' => \Mage_Bundle_Model_Sales_Order_Pdf_Items_Abstract::class,
@@ -22756,14 +22700,14 @@
             'catalogindex/resource_data_abstract' => \Mage_CatalogIndex_Model_Resource_Data_Abstract::class,
             'catalogindex_resource/data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class,
             'catalogindex/resource_data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class,
-            'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
             'catalogindex_resource/data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
+            'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
             'catalogindex_resource/indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class,
             'catalogindex/resource_indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class,
             'catalogindex/resource_indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class,
             'catalogindex_resource/indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class,
-            'catalogindex_resource/indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class,
             'catalogindex/resource_indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class,
+            'catalogindex_resource/indexer_eav' => \Mage_CatalogIndex_Model_Resource_Indexer_Eav::class,
             'catalogindex_resource/indexer_minimalprice' => \Mage_CatalogIndex_Model_Resource_Indexer_Minimalprice::class,
             'catalogindex/resource_indexer_minimalprice' => \Mage_CatalogIndex_Model_Resource_Indexer_Minimalprice::class,
             'catalogindex/resource_indexer_price' => \Mage_CatalogIndex_Model_Resource_Indexer_Price::class,
@@ -22789,20 +22733,20 @@
             'cataloginventory/mysql4_stock_item_collection' => \Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection::class,
             'cataloginventory/mysql4_stock_status' => \Mage_CatalogInventory_Model_Mysql4_Stock_Status::class,
             'cataloginventory/observer' => \Mage_CatalogInventory_Model_Observer::class,
-            'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
             'cataloginventory_resource/indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
+            'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
             'cataloginventory/resource_indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class,
             'cataloginventory_resource/indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class,
-            'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
             'cataloginventory/resource_indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
+            'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
             'cataloginventory/resource_indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class,
             'cataloginventory_resource/indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class,
             'cataloginventory_resource/stock' => \Mage_CatalogInventory_Model_Resource_Stock::class,
             'cataloginventory/resource_stock' => \Mage_CatalogInventory_Model_Resource_Stock::class,
             'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
             'cataloginventory/resource_stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
-            'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
             'cataloginventory/resource_stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
+            'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
             'cataloginventory/resource_stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class,
             'cataloginventory_resource/stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class,
             'cataloginventory/source_backorders' => \Mage_CatalogInventory_Model_Source_Backorders::class,
@@ -22823,10 +22767,10 @@
             'catalogrule/mysql4_rule_product_price' => \Mage_CatalogRule_Model_Mysql4_Rule_Product_Price::class,
             'catalogrule/mysql4_rule_product_price_collection' => \Mage_CatalogRule_Model_Mysql4_Rule_Product_Price_Collection::class,
             'catalogrule/observer' => \Mage_CatalogRule_Model_Observer::class,
-            'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
             'catalogrule/resource_rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
-            'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
+            'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
             'catalogrule_resource/rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
+            'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
             'catalogrule_resource/rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class,
             'catalogrule/resource_rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class,
             'catalogrule_resource/rule_product_price_collection' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price_Collection::class,
@@ -22855,24 +22799,24 @@
             'catalogsearch/query' => \Mage_CatalogSearch_Model_Query::class,
             'catalogsearch_resource/advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class,
             'catalogsearch/resource_advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class,
-            'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
             'catalogsearch_resource/advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
+            'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
             'catalogsearch_resource/fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class,
             'catalogsearch/resource_fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class,
             'catalogsearch_resource/fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class,
             'catalogsearch/resource_fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class,
             'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
             'catalogsearch_resource/fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
-            'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
             'catalogsearch/resource_helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
-            'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
+            'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
             'catalogsearch_resource/indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
+            'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
             'catalogsearch_resource/query' => \Mage_CatalogSearch_Model_Resource_Query::class,
             'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class,
-            'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
             'catalogsearch_resource/query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
-            'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
+            'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
             'catalogsearch/resource_search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
+            'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
             'catalogsearch/session' => \Mage_CatalogSearch_Model_Session::class,
             'catalogsearch/system_config_backend_sitemap' => \Mage_CatalogSearch_Model_System_Config_Backend_Sitemap::class,
             'catalog/abstract' => \Mage_Catalog_Model_Abstract::class,
@@ -23015,144 +22959,144 @@
             'catalog/product_website' => \Mage_Catalog_Model_Product_Website::class,
             'catalog/resource_abstract' => \Mage_Catalog_Model_Resource_Abstract::class,
             'catalog_resource/abstract' => \Mage_Catalog_Model_Resource_Abstract::class,
-            'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
             'catalog/resource_attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
-            'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class,
+            'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
             'catalog_resource/category' => \Mage_Catalog_Model_Resource_Category::class,
+            'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class,
             'catalog_resource/category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class,
             'catalog/resource_category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class,
-            'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
             'catalog/resource_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
-            'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
+            'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
             'catalog/resource_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
+            'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
             'catalog_resource/category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class,
             'catalog/resource_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class,
             'catalog_resource/category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class,
             'catalog/resource_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class,
             'catalog/resource_category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class,
             'catalog_resource/category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class,
-            'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
             'catalog_resource/category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
-            'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
+            'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
             'catalog/resource_category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
+            'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
             'catalog_resource/category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class,
             'catalog/resource_category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class,
             'catalog/resource_category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class,
             'catalog_resource/category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class,
-            'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
             'catalog_resource/collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
-            'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class,
+            'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
             'catalog_resource/config' => \Mage_Catalog_Model_Resource_Config::class,
-            'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
+            'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class,
             'catalog/resource_eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
+            'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
             'catalog_resource/eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class,
             'catalog/resource_eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class,
-            'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
             'catalog_resource/eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
-            'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
+            'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
             'catalog/resource_eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
-            'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
+            'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
             'catalog_resource/eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
+            'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
             'catalog_resource/eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
-            'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
+            'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
             'catalog_resource/eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
+            'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
             'catalog/resource_eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class,
             'catalog_resource/eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class,
             'catalog/resource_eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class,
             'catalog_resource/eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class,
             'catalog/resource_eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class,
             'catalog_resource/eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class,
-            'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
             'catalog/resource_eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
-            'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
+            'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
             'catalog/resource_eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
+            'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
             'catalog/resource_eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class,
             'catalog_resource/eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class,
-            'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
             'catalog_resource/eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
+            'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
             'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
             'catalog_resource/eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
             'catalog_resource/eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class,
             'catalog/resource_eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class,
-            'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
             'catalog_resource/eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
-            'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
+            'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
             'catalog/resource_eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
-            'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
+            'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
             'catalog/resource_eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
-            'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
+            'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
             'catalog/resource_eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
+            'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
             'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
             'catalog_resource/eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
-            'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
             'catalog/resource_eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
+            'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class,
             'catalog/resource_eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
+            'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
             'catalog/resource_eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class,
             'catalog/resource_eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class,
             'catalog/resource_eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class,
-            'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
             'catalog_resource/eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
-            'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
+            'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
             'catalog_resource/eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
-            'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
+            'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
             'catalog_resource/eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
+            'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
             'catalog/resource_eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class,
             'catalog/resource_eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class,
             'catalog/resource_eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class,
-            'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
             'catalog/resource_eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
-            'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
+            'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
             'catalog_resource/eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
+            'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
             'catalog_resource/eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class,
             'catalog/resource_eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class,
             'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
             'catalog/resource_eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
-            'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
             'catalog/resource_eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
+            'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
             'catalog/resource_eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class,
             'catalog_resource/eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class,
-            'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
             'catalog/resource_eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
+            'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
             'catalog_resource/eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class,
             'catalog/resource_eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class,
             'catalog_resource/eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class,
             'catalog/resource_eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
             'catalog/resource_eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
-            'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
             'catalog_resource/eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
-            'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
+            'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
             'catalog/resource_eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
-            'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
+            'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
             'catalog/resource_eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
-            'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
+            'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
             'catalog/resource_eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
+            'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
             'catalog/resource_eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class,
             'catalog_resource/eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class,
-            'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
             'catalog_resource/eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
-            'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
+            'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
             'catalog/resource_eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
-            'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
             'catalog/resource_eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
+            'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
             'catalog_resource/eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
+            'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
             'catalog/resource_eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class,
             'catalog_resource/eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class,
             'catalog/resource_eav_mysql4_sendfriend' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend::class,
@@ -23161,98 +23105,98 @@
             'catalog/resource_eav_mysql4_sendfriend_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection::class,
             'catalog_resource/eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class,
             'catalog/resource_eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class,
-            'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
             'catalog/resource_eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
+            'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
             'catalog/resource_helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
             'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
             'catalog_resource/layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class,
             'catalog/resource_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class,
             'catalog/resource_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class,
             'catalog_resource/layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class,
-            'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
             'catalog/resource_layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
-            'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class,
+            'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
             'catalog_resource/product' => \Mage_Catalog_Model_Resource_Product::class,
+            'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class,
             'catalog/resource_product_action' => \Mage_Catalog_Model_Resource_Product_Action::class,
             'catalog_resource/product_action' => \Mage_Catalog_Model_Resource_Product_Action::class,
-            'catalog_resource/product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class,
             'catalog/resource_product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class,
+            'catalog_resource/product_attribute_backend_groupprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice::class,
             'catalog/resource_product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class,
             'catalog_resource/product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class,
             'catalog/resource_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class,
             'catalog_resource/product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class,
-            'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
             'catalog/resource_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
+            'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
             'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
             'catalog_resource/product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
             'catalog/resource_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class,
-            'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
             'catalog_resource/product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
+            'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
             'catalog/resource_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
             'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
-            'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
-            'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
+            'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
+            'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
             'catalog_resource/product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class,
             'catalog/resource_product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class,
-            'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
             'catalog/resource_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
+            'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
             'catalog/resource_product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class,
             'catalog_resource/product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class,
-            'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
             'catalog/resource_product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
+            'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
             'catalog/resource_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class,
             'catalog_resource/product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class,
-            'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
             'catalog_resource/product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
-            'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
+            'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
             'catalog/resource_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
+            'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
             'catalog/resource_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class,
             'catalog_resource/product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class,
-            'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
             'catalog_resource/product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
-            'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
+            'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
             'catalog_resource/product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
-            'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
+            'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
             'catalog_resource/product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
+            'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
             'catalog/resource_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class,
             'catalog_resource/product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class,
             'catalog_resource/product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class,
             'catalog/resource_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class,
-            'catalog/resource_product_link' => \Mage_Catalog_Model_Resource_Product_Link::class,
             'catalog_resource/product_link' => \Mage_Catalog_Model_Resource_Product_Link::class,
+            'catalog/resource_product_link' => \Mage_Catalog_Model_Resource_Product_Link::class,
             'catalog/resource_product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class,
             'catalog_resource/product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class,
-            'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
             'catalog/resource_product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
-            'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
+            'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
             'catalog_resource/product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
-            'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
+            'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
             'catalog/resource_product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
-            'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
+            'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
             'catalog_resource/product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
-            'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
+            'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
             'catalog_resource/product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
+            'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
             'catalog_resource/product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class,
             'catalog/resource_product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class,
             'catalog_resource/product_status' => \Mage_Catalog_Model_Resource_Product_Status::class,
             'catalog/resource_product_status' => \Mage_Catalog_Model_Resource_Product_Status::class,
             'catalog_resource/product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class,
             'catalog/resource_product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class,
-            'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
             'catalog/resource_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
-            'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
             'catalog_resource/product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
             'catalog_resource/product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class,
             'catalog/resource_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class,
-            'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
             'catalog_resource/product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
+            'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
             'catalog/resource_setup' => \Mage_Catalog_Model_Resource_Setup::class,
             'catalog_resource/setup' => \Mage_Catalog_Model_Resource_Setup::class,
-            'catalog/resource_url' => \Mage_Catalog_Model_Resource_Url::class,
             'catalog_resource/url' => \Mage_Catalog_Model_Resource_Url::class,
+            'catalog/resource_url' => \Mage_Catalog_Model_Resource_Url::class,
             'catalog/session' => \Mage_Catalog_Model_Session::class,
             'catalog/system_config_backend_catalog_category_flat' => \Mage_Catalog_Model_System_Config_Backend_Catalog_Category_Flat::class,
             'catalog/system_config_backend_catalog_product_flat' => \Mage_Catalog_Model_System_Config_Backend_Catalog_Product_Flat::class,
@@ -23294,12 +23238,12 @@
             'checkout/observer' => \Mage_Checkout_Model_Observer::class,
             'checkout_resource/agreement' => \Mage_Checkout_Model_Resource_Agreement::class,
             'checkout/resource_agreement' => \Mage_Checkout_Model_Resource_Agreement::class,
-            'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
             'checkout/resource_agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
-            'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class,
+            'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
             'checkout_resource/cart' => \Mage_Checkout_Model_Resource_Cart::class,
-            'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class,
+            'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class,
             'checkout/resource_setup' => \Mage_Checkout_Model_Resource_Setup::class,
+            'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class,
             'checkout/session' => \Mage_Checkout_Model_Session::class,
             'checkout/type_abstract' => \Mage_Checkout_Model_Type_Abstract::class,
             'checkout/type_multishipping' => \Mage_Checkout_Model_Type_Multishipping::class,
@@ -23314,25 +23258,25 @@
             'cms/mysql4_page_service' => \Mage_Cms_Model_Mysql4_Page_Service::class,
             'cms/observer' => \Mage_Cms_Model_Observer::class,
             'cms/page' => \Mage_Cms_Model_Page::class,
-            'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class,
             'cms/resource_block' => \Mage_Cms_Model_Resource_Block::class,
+            'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class,
             'cms_resource/block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class,
             'cms/resource_block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class,
             'cms/resource_page' => \Mage_Cms_Model_Resource_Page::class,
             'cms_resource/page' => \Mage_Cms_Model_Resource_Page::class,
             'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
             'cms_resource/page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
-            'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
             'cms/resource_page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
+            'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
             'cms/template_filter' => \Mage_Cms_Model_Template_Filter::class,
             'cms/wysiwyg_config' => \Mage_Cms_Model_Wysiwyg_Config::class,
             'cms/wysiwyg_images_storage' => \Mage_Cms_Model_Wysiwyg_Images_Storage::class,
             'cms/wysiwyg_images_storage_collection' => \Mage_Cms_Model_Wysiwyg_Images_Storage_Collection::class,
             'configurableswatches/observer' => \Mage_ConfigurableSwatches_Model_Observer::class,
-            'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
             'configurableswatches_resource/catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
-            'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
+            'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
             'configurableswatches_resource/catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
+            'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
             'configurableswatches_resource/catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
             'configurableswatches/resource_catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
             'configurableswatches/system_config_source_catalog_product_configattribute' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute::class,
@@ -23439,152 +23383,152 @@
             'core/mysql4_website_collection' => \Mage_Core_Model_Mysql4_Website_Collection::class,
             'core/observer' => \Mage_Core_Model_Observer::class,
             'core/resource' => \Mage_Core_Model_Resource::class,
+            'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
             'core_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
             'core/resource_abstract' => \Mage_Core_Model_Resource_Abstract::class,
-            'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
+            'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
             'core/resource_cache' => \Mage_Core_Model_Resource_Cache::class,
             'core_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
-            'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
             'core_resource/config' => \Mage_Core_Model_Resource_Config::class,
             'payment_resource/config' => \Mage_Core_Model_Resource_Config::class,
             'core/resource_config' => \Mage_Core_Model_Resource_Config::class,
-            'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
             'core/resource_config_data' => \Mage_Core_Model_Resource_Config_Data::class,
+            'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
             'payment_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
-            'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'core_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
+            'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
-            'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
-            'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
             'payment_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
+            'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
+            'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
             'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
-            'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
             'core/resource_db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
-            'core/resource_design' => \Mage_Core_Model_Resource_Design::class,
+            'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
             'core_resource/design' => \Mage_Core_Model_Resource_Design::class,
+            'core/resource_design' => \Mage_Core_Model_Resource_Design::class,
             'payment_resource/design' => \Mage_Core_Model_Resource_Design::class,
-            'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
-            'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
             'payment_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
-            'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
+            'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
+            'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
             'payment_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
             'core/resource_design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
-            'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
-            'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
+            'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
             'core/resource_email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
-            'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
-            'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
+            'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
+            'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
             'payment_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
-            'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
+            'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
+            'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
             'core/resource_email_template' => \Mage_Core_Model_Resource_Email_Template::class,
+            'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
             'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
-            'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
             'core/resource_email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
+            'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
             'core_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
             'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
             'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
             'core_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
-            'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
-            'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
             'core_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
             'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
-            'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
             'payment_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
+            'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
+            'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
             'payment_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
             'core/resource_file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
-            'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
-            'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
             'core/resource_file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
+            'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
             'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
-            'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
             'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
+            'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
             'core/resource_file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
             'payment_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
-            'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class,
             'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
+            'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class,
             'payment_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
-            'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
             'core_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
-            'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
+            'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
             'core/resource_helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
+            'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
             'core_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
-            'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
-            'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
             'core/resource_iterator' => \Mage_Core_Model_Resource_Iterator::class,
-            'core/resource_language' => \Mage_Core_Model_Resource_Language::class,
-            'core_resource/language' => \Mage_Core_Model_Resource_Language::class,
+            'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
+            'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
             'payment_resource/language' => \Mage_Core_Model_Resource_Language::class,
+            'core_resource/language' => \Mage_Core_Model_Resource_Language::class,
+            'core/resource_language' => \Mage_Core_Model_Resource_Language::class,
             'payment_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
-            'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
             'core/resource_language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
-            'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
+            'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
             'core_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
             'core/resource_layout' => \Mage_Core_Model_Resource_Layout::class,
-            'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
+            'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
             'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class,
             'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
+            'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
+            'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
             'payment_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
-            'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
             'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
             'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class,
             'payment_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
-            'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core/resource_setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
-            'payment_resource/store' => \Mage_Core_Model_Resource_Store::class,
-            'core_resource/store' => \Mage_Core_Model_Resource_Store::class,
+            'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core/resource_store' => \Mage_Core_Model_Resource_Store::class,
-            'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
+            'core_resource/store' => \Mage_Core_Model_Resource_Store::class,
+            'payment_resource/store' => \Mage_Core_Model_Resource_Store::class,
             'core/resource_store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
             'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
-            'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
+            'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
             'core/resource_store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'payment_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
-            'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
-            'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
+            'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'payment_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
-            'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
+            'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
+            'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
             'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class,
+            'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
             'core_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
             'core_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
-            'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
             'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class,
-            'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
-            'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
+            'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
             'payment_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
-            'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
+            'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
             'core/resource_type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
             'payment_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
-            'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'core/resource_type_db' => \Mage_Core_Model_Resource_Type_Db::class,
+            'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
-            'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
-            'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
             'core_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
-            'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
-            'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
+            'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
             'payment_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
             'payment_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
-            'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
             'core_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
+            'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
             'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
             'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
             'payment_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
-            'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
-            'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'core_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
+            'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
+            'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'core_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
-            'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
             'core/resource_variable' => \Mage_Core_Model_Resource_Variable::class,
+            'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
             'core/resource_variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
-            'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
             'core_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
-            'core_resource/website' => \Mage_Core_Model_Resource_Website::class,
+            'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
             'payment_resource/website' => \Mage_Core_Model_Resource_Website::class,
+            'core_resource/website' => \Mage_Core_Model_Resource_Website::class,
             'core/resource_website' => \Mage_Core_Model_Resource_Website::class,
-            'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core/resource_website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
+            'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core/session' => \Mage_Core_Model_Session::class,
             'core/session_abstract' => \Mage_Core_Model_Session_Abstract::class,
@@ -23614,10 +23558,10 @@
             'cron/mysql4_schedule' => \Mage_Cron_Model_Mysql4_Schedule::class,
             'cron/mysql4_schedule_collection' => \Mage_Cron_Model_Mysql4_Schedule_Collection::class,
             'cron/observer' => \Mage_Cron_Model_Observer::class,
-            'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class,
             'cron/resource_schedule' => \Mage_Cron_Model_Resource_Schedule::class,
-            'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
+            'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class,
             'cron/resource_schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
+            'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
             'cron/schedule' => \Mage_Cron_Model_Schedule::class,
             'currencysymbol/observer' => \Mage_CurrencySymbol_Model_Observer::class,
             'currencysymbol/system_currencysymbol' => \Mage_CurrencySymbol_Model_System_Currencysymbol::class,
@@ -23694,14 +23638,14 @@
             'customer_resource/address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class,
             'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
             'customer_resource/address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
-            'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
             'customer/resource_address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
-            'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
+            'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
             'customer/resource_address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
-            'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
+            'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
             'customer_resource/address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
-            'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
+            'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
             'customer_resource/address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
+            'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
             'customer/resource_attribute' => \Mage_Customer_Model_Resource_Attribute::class,
             'customer_resource/attribute' => \Mage_Customer_Model_Resource_Attribute::class,
             'customer_resource/attribute_collection' => \Mage_Customer_Model_Resource_Attribute_Collection::class,
@@ -23710,20 +23654,20 @@
             'customer_resource/customer' => \Mage_Customer_Model_Resource_Customer::class,
             'customer_resource/customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class,
             'customer/resource_customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class,
-            'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
             'customer/resource_flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
-            'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
+            'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
             'customer/resource_flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
-            'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
+            'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
             'customer/resource_form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
+            'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
             'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
             'customer/resource_form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
             'customer/resource_group' => \Mage_Customer_Model_Resource_Group::class,
             'customer_resource/group' => \Mage_Customer_Model_Resource_Group::class,
             'customer_resource/group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class,
             'customer/resource_group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class,
-            'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class,
             'customer_resource/setup' => \Mage_Customer_Model_Resource_Setup::class,
+            'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class,
             'customer_resource/wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
             'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
             'customer/session' => \Mage_Customer_Model_Session::class,
@@ -23777,10 +23721,10 @@
             'dataflow/mysql4_session' => \Mage_Dataflow_Model_Mysql4_Session::class,
             'dataflow/profile' => \Mage_Dataflow_Model_Profile::class,
             'dataflow/profile_history' => \Mage_Dataflow_Model_Profile_History::class,
-            'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class,
             'dataflow/resource_batch' => \Mage_Dataflow_Model_Resource_Batch::class,
-            'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
+            'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class,
             'dataflow/resource_batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
+            'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
             'dataflow/resource_batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class,
             'dataflow_resource/batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class,
             'dataflow_resource/batch_export' => \Mage_Dataflow_Model_Resource_Batch_Export::class,
@@ -23795,12 +23739,12 @@
             'dataflow/resource_profile' => \Mage_Dataflow_Model_Resource_Profile::class,
             'dataflow/resource_profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class,
             'dataflow_resource/profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class,
-            'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
             'dataflow_resource/profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
+            'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
             'dataflow_resource/profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class,
             'dataflow/resource_profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class,
-            'dataflow/resource_session' => \Mage_Dataflow_Model_Resource_Session::class,
             'dataflow_resource/session' => \Mage_Dataflow_Model_Resource_Session::class,
+            'dataflow/resource_session' => \Mage_Dataflow_Model_Resource_Session::class,
             'dataflow/session' => \Mage_Dataflow_Model_Session::class,
             'dataflow/session_adapter_http' => \Mage_Dataflow_Model_Session_Adapter_Http::class,
             'dataflow/session_parser_csv' => \Mage_Dataflow_Model_Session_Parser_Csv::class,
@@ -23830,18 +23774,18 @@
             'directory/resource_country' => \Mage_Directory_Model_Resource_Country::class,
             'directory_resource/country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class,
             'directory/resource_country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class,
-            'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
             'directory/resource_country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
+            'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
             'directory_resource/country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class,
             'directory/resource_country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class,
             'directory_resource/currency' => \Mage_Directory_Model_Resource_Currency::class,
             'directory/resource_currency' => \Mage_Directory_Model_Resource_Currency::class,
-            'directory/resource_currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class,
             'directory_resource/currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class,
+            'directory/resource_currency_collection' => \Mage_Directory_Model_Resource_Currency_Collection::class,
             'directory/resource_region' => \Mage_Directory_Model_Resource_Region::class,
             'directory_resource/region' => \Mage_Directory_Model_Resource_Region::class,
-            'directory/resource_region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class,
             'directory_resource/region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class,
+            'directory/resource_region_collection' => \Mage_Directory_Model_Resource_Region_Collection::class,
             'downloadable/catalogIndex_data_downloadable' => \Mage_Downloadable_Model_CatalogIndex_Data_Downloadable::class,
             'downloadable/link' => \Mage_Downloadable_Model_Link::class,
             'downloadable/link_api' => \Mage_Downloadable_Model_Link_Api::class,
@@ -23862,8 +23806,8 @@
             'downloadable/observer' => \Mage_Downloadable_Model_Observer::class,
             'downloadable/product_price' => \Mage_Downloadable_Model_Product_Price::class,
             'downloadable/product_type' => \Mage_Downloadable_Model_Product_Type::class,
-            'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
             'downloadable_resource/indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
+            'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
             'downloadable/resource_link' => \Mage_Downloadable_Model_Resource_Link::class,
             'downloadable_resource/link' => \Mage_Downloadable_Model_Resource_Link::class,
             'downloadable/resource_link_collection' => \Mage_Downloadable_Model_Resource_Link_Collection::class,
@@ -23872,14 +23816,14 @@
             'downloadable_resource/link_purchased' => \Mage_Downloadable_Model_Resource_Link_Purchased::class,
             'downloadable/resource_link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class,
             'downloadable_resource/link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class,
-            'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
             'downloadable/resource_link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
-            'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
+            'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
             'downloadable/resource_link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
-            'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class,
+            'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
             'downloadable/resource_sample' => \Mage_Downloadable_Model_Resource_Sample::class,
-            'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
+            'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class,
             'downloadable/resource_sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
+            'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
             'downloadable/sales_order_pdf_items_abstract' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Abstract::class,
             'downloadable/sales_order_pdf_items_creditmemo' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Creditmemo::class,
             'downloadable/sales_order_pdf_items_invoice' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Invoice::class,
@@ -23961,8 +23905,8 @@
             'eav/mysql4_form_fieldset_collection' => \Mage_Eav_Model_Mysql4_Form_Fieldset_Collection::class,
             'eav/mysql4_form_type' => \Mage_Eav_Model_Mysql4_Form_Type::class,
             'eav/mysql4_form_type_collection' => \Mage_Eav_Model_Mysql4_Form_Type_Collection::class,
-            'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class,
             'eav_resource/attribute' => \Mage_Eav_Model_Resource_Attribute::class,
+            'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class,
             'eav_resource/attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class,
             'eav/resource_attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class,
             'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class,
@@ -23979,28 +23923,28 @@
             'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
             'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
-            'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
-            'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
+            'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
+            'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
             'eav_resource/entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class,
             'eav/resource_entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class,
             'eav_resource/entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class,
             'eav/resource_entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class,
-            'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
             'eav_resource/entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
+            'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
             'eav/resource_form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class,
             'eav_resource/form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class,
-            'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
             'eav/resource_form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
+            'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
             'eav/resource_form_element' => \Mage_Eav_Model_Resource_Form_Element::class,
             'eav_resource/form_element' => \Mage_Eav_Model_Resource_Form_Element::class,
-            'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
             'eav_resource/form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
-            'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
+            'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
             'eav/resource_form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
-            'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
+            'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
             'eav_resource/form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
+            'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
             'eav/resource_form_type' => \Mage_Eav_Model_Resource_Form_Type::class,
             'eav_resource/form_type' => \Mage_Eav_Model_Resource_Form_Type::class,
             'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class,
@@ -24016,12 +23960,12 @@
             'giftmessage/mysql4_message_collection' => \Mage_GiftMessage_Model_Mysql4_Message_Collection::class,
             'giftmessage/mysql4_setup' => \Mage_GiftMessage_Model_Mysql4_Setup::class,
             'giftmessage/observer' => \Mage_GiftMessage_Model_Observer::class,
-            'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class,
             'giftmessage/resource_message' => \Mage_GiftMessage_Model_Resource_Message::class,
-            'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
+            'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class,
             'giftmessage_resource/message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
-            'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
+            'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
             'giftmessage_resource/setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
+            'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
             'googleanalytics/observer' => \Mage_GoogleAnalytics_Model_Observer::class,
             'googleanalytics/system_config_source_type' => \Mage_GoogleAnalytics_Model_System_Config_Source_Type::class,
             'googlecheckout/payment' => \Mage_GoogleCheckout_Model_Payment::class,
@@ -24057,8 +24001,8 @@
             'importexport/product_attribute_backend_urlkey' => \Mage_ImportExport_Model_Product_Attribute_Backend_Urlkey::class,
             'importexport_resource/helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class,
             'importexport/resource_helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class,
-            'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
             'importexport_resource/import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
+            'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
             'importexport_resource/setup' => \Mage_ImportExport_Model_Resource_Setup::class,
             'importexport/resource_setup' => \Mage_ImportExport_Model_Resource_Setup::class,
             'importexport/source_export_entity' => \Mage_ImportExport_Model_Source_Export_Entity::class,
@@ -24080,16 +24024,16 @@
             'index/process' => \Mage_Index_Model_Process::class,
             'index_resource/abstract' => \Mage_Index_Model_Resource_Abstract::class,
             'index/resource_abstract' => \Mage_Index_Model_Resource_Abstract::class,
-            'index/resource_event' => \Mage_Index_Model_Resource_Event::class,
             'index_resource/event' => \Mage_Index_Model_Resource_Event::class,
+            'index/resource_event' => \Mage_Index_Model_Resource_Event::class,
             'index/resource_event_collection' => \Mage_Index_Model_Resource_Event_Collection::class,
             'index_resource/event_collection' => \Mage_Index_Model_Resource_Event_Collection::class,
             'index/resource_helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class,
             'index_resource/helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class,
-            'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
             'index/resource_lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
-            'index_resource/process' => \Mage_Index_Model_Resource_Process::class,
+            'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
             'index/resource_process' => \Mage_Index_Model_Resource_Process::class,
+            'index_resource/process' => \Mage_Index_Model_Resource_Process::class,
             'index/resource_process_collection' => \Mage_Index_Model_Resource_Process_Collection::class,
             'index_resource/process_collection' => \Mage_Index_Model_Resource_Process_Collection::class,
             'index/resource_setup' => \Mage_Index_Model_Resource_Setup::class,
@@ -24122,22 +24066,22 @@
             'log/mysql4_visitor_online_collection' => \Mage_Log_Model_Mysql4_Visitor_Online_Collection::class,
             'log_resource/aggregation' => \Mage_Log_Model_Resource_Aggregation::class,
             'log/resource_aggregation' => \Mage_Log_Model_Resource_Aggregation::class,
-            'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class,
             'log/resource_customer' => \Mage_Log_Model_Resource_Customer::class,
+            'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class,
             'log/resource_log' => \Mage_Log_Model_Resource_Log::class,
             'log_resource/log' => \Mage_Log_Model_Resource_Log::class,
             'log_resource/visitor' => \Mage_Log_Model_Resource_Visitor::class,
             'log/resource_visitor' => \Mage_Log_Model_Resource_Visitor::class,
             'log_resource/visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class,
             'log/resource_visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class,
-            'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
             'log_resource/visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
-            'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
+            'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
             'log_resource/visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
+            'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
             'log/visitor' => \Mage_Log_Model_Visitor::class,
             'log/visitor_online' => \Mage_Log_Model_Visitor_Online::class,
-            'media_resource/image' => \Mage_Media_Model_File_Image::class,
             'media/file_image' => \Mage_Media_Model_File_Image::class,
+            'media_resource/image' => \Mage_Media_Model_File_Image::class,
             'media/image' => \Mage_Media_Model_Image::class,
             'newsletter/message' => \Mage_Newsletter_Model_Message::class,
             'newsletter/mysql4_problem' => \Mage_Newsletter_Model_Mysql4_Problem::class,
@@ -24155,14 +24099,14 @@
             'newsletter_resource/problem' => \Mage_Newsletter_Model_Resource_Problem::class,
             'newsletter/resource_problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class,
             'newsletter_resource/problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class,
-            'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class,
             'newsletter/resource_queue' => \Mage_Newsletter_Model_Resource_Queue::class,
-            'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
+            'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class,
             'newsletter/resource_queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
-            'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
+            'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
             'newsletter/resource_subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
-            'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
+            'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
             'newsletter/resource_subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
+            'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
             'newsletter_resource/template' => \Mage_Newsletter_Model_Resource_Template::class,
             'newsletter/resource_template' => \Mage_Newsletter_Model_Resource_Template::class,
             'newsletter_resource/template_collection' => \Mage_Newsletter_Model_Resource_Template_Collection::class,
@@ -24175,20 +24119,20 @@
             'oauth/consumer_validator_keyLength' => \Mage_Oauth_Model_Consumer_Validator_KeyLength::class,
             'oauth/nonce' => \Mage_Oauth_Model_Nonce::class,
             'oauth/observer' => \Mage_Oauth_Model_Observer::class,
-            'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
             'oauth/resource_consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
+            'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
             'oauth/resource_consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class,
             'oauth_resource/consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class,
             'oauth_resource/nonce' => \Mage_Oauth_Model_Resource_Nonce::class,
             'oauth/resource_nonce' => \Mage_Oauth_Model_Resource_Nonce::class,
             'oauth_resource/nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class,
             'oauth/resource_nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class,
-            'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class,
             'oauth/resource_setup' => \Mage_Oauth_Model_Resource_Setup::class,
+            'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class,
             'oauth_resource/token' => \Mage_Oauth_Model_Resource_Token::class,
             'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class,
-            'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
             'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
+            'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
             'oauth/server' => \Mage_Oauth_Model_Server::class,
             'oauth/token' => \Mage_Oauth_Model_Token::class,
             'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class,
@@ -24205,8 +24149,8 @@
             'paygate/authorizenet_source_paymentAction' => \Mage_Paygate_Model_Authorizenet_Source_PaymentAction::class,
             'paygate/mysql4_authorizenet_debug' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug::class,
             'paygate/mysql4_authorizenet_debug_collection' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection::class,
-            'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
             'paygate/resource_authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
+            'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
             'paygate_resource/authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class,
             'paygate/resource_authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class,
             'payment/billing_agreementAbstract' => \Mage_Payment_Model_Billing_AgreementAbstract::class,
@@ -24269,14 +24213,14 @@
             'paypal/resource_cert' => \Mage_Paypal_Model_Resource_Cert::class,
             'paypal_resource/payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class,
             'paypal/resource_payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class,
-            'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
             'paypal/resource_payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
+            'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
             'paypal/resource_report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class,
             'paypal_resource/report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class,
-            'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
             'paypal/resource_report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
-            'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
+            'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
             'paypal/resource_report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
+            'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
             'paypal/resource_setup' => \Mage_Paypal_Model_Resource_Setup::class,
             'paypal_resource/setup' => \Mage_Paypal_Model_Resource_Setup::class,
             'paypal/session' => \Mage_Paypal_Model_Session::class,
@@ -24310,16 +24254,16 @@
             'poll/poll' => \Mage_Poll_Model_Poll::class,
             'poll/poll_answer' => \Mage_Poll_Model_Poll_Answer::class,
             'poll/poll_vote' => \Mage_Poll_Model_Poll_Vote::class,
-            'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class,
             'poll_resource/poll' => \Mage_Poll_Model_Resource_Poll::class,
-            'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
+            'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class,
             'poll/resource_poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
-            'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
+            'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
             'poll_resource/poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
-            'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
+            'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
             'poll_resource/poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
-            'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
+            'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
             'poll/resource_poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
+            'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
             'productalert/email' => \Mage_ProductAlert_Model_Email::class,
             'productalert/mysql4_price' => \Mage_ProductAlert_Model_Mysql4_Price::class,
             'productalert/mysql4_price_collection' => \Mage_ProductAlert_Model_Mysql4_Price_Collection::class,
@@ -24329,20 +24273,20 @@
             'productalert/mysql4_stock_customer_collection' => \Mage_ProductAlert_Model_Mysql4_Stock_Customer_Collection::class,
             'productalert/observer' => \Mage_ProductAlert_Model_Observer::class,
             'productalert/price' => \Mage_ProductAlert_Model_Price::class,
-            'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
             'productalert_resource/abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
-            'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class,
+            'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
             'productalert_resource/price' => \Mage_ProductAlert_Model_Resource_Price::class,
-            'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
+            'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class,
             'productalert/resource_price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
-            'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
+            'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
             'productalert/resource_price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
-            'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
+            'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
             'productalert/resource_stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
-            'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
+            'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
             'productalert/resource_stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
-            'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
+            'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
             'productalert/resource_stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
+            'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
             'productalert/stock' => \Mage_ProductAlert_Model_Stock::class,
             'rating/mysql4_rating' => \Mage_Rating_Model_Mysql4_Rating::class,
             'rating/mysql4_rating_collection' => \Mage_Rating_Model_Mysql4_Rating_Collection::class,
@@ -24356,20 +24300,20 @@
             'rating/rating_entity' => \Mage_Rating_Model_Rating_Entity::class,
             'rating/rating_option' => \Mage_Rating_Model_Rating_Option::class,
             'rating/rating_option_vote' => \Mage_Rating_Model_Rating_Option_Vote::class,
-            'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class,
             'rating/resource_rating' => \Mage_Rating_Model_Resource_Rating::class,
+            'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class,
             'rating_resource/rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class,
             'rating/resource_rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class,
             'rating/resource_rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class,
             'rating_resource/rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class,
-            'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
             'rating/resource_rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
-            'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
+            'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
             'rating_resource/rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
+            'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
             'rating_resource/rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class,
             'rating/resource_rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class,
-            'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
             'rating/resource_rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
+            'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
             'reports/config' => \Mage_Reports_Model_Config::class,
             'reports/event' => \Mage_Reports_Model_Event::class,
             'reports/event_observer' => \Mage_Reports_Model_Event_Observer::class,
@@ -24415,6 +24359,7 @@
             'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class,
             'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class,
             'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class,
+            'reports/observer' => \Mage_Reports_Model_Observer::class,
             'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class,
             'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class,
             'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class,
@@ -24423,52 +24368,52 @@
             'reports_resource/accounts_collection' => \Mage_Reports_Model_Resource_Accounts_Collection::class,
             'reports/resource_coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class,
             'reports_resource/coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class,
-            'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
             'reports/resource_customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
-            'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
+            'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
             'reports/resource_customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
-            'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
+            'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
             'reports_resource/customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
-            'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
+            'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
             'reports/resource_entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
+            'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
             'reports_resource/event' => \Mage_Reports_Model_Resource_Event::class,
             'reports/resource_event' => \Mage_Reports_Model_Resource_Event::class,
-            'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
             'reports_resource/event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
-            'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
+            'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
             'reports/resource_event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
-            'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
+            'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
             'reports/resource_event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
-            'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
+            'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
             'reports_resource/helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
-            'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
+            'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
             'reports/resource_invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
-            'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
+            'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
             'reports_resource/order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
-            'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
+            'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
             'reports_resource/product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
+            'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
             'reports/resource_product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class,
             'reports_resource/product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class,
             'reports_resource/product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class,
             'reports/resource_product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class,
-            'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
             'reports/resource_product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
+            'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
             'reports_resource/product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class,
             'reports/resource_product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class,
-            'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
             'reports_resource/product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
+            'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
             'reports/resource_product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
             'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
             'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
             'reports_resource/product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
-            'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
             'reports/resource_product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
+            'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
             'reports_resource/product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class,
             'reports/resource_product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class,
-            'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
             'reports_resource/product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
-            'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
+            'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
             'reports_resource/product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
+            'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
             'reports/resource_quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
             'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
             'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class,
@@ -24477,34 +24422,34 @@
             'reports_resource/report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class,
             'reports/resource_report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class,
             'reports_resource/report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class,
-            'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
             'reports_resource/report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
+            'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
             'reports/resource_report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class,
             'reports_resource/report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class,
-            'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
             'reports/resource_report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
-            'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
+            'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
             'reports_resource/review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
-            'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
+            'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
             'reports_resource/review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
+            'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
             'reports_resource/review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class,
             'reports/resource_review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class,
             'reports_resource/shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class,
             'reports/resource_shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class,
-            'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
             'reports_resource/shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
+            'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
             'reports_resource/tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class,
             'reports/resource_tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class,
             'reports/resource_tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
             'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
             'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
             'reports/resource_tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
-            'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
             'reports/resource_tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
+            'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
             'reports_resource/wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class,
             'reports/resource_wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class,
-            'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
             'reports_resource/wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
+            'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
             'reports/session' => \Mage_Reports_Model_Session::class,
             'reports/test' => \Mage_Reports_Model_Test::class,
             'reports/totals' => \Mage_Reports_Model_Totals::class,
@@ -24523,12 +24468,12 @@
             'review/resource_review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class,
             'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class,
             'review_resource/review_status' => \Mage_Review_Model_Resource_Review_Status::class,
-            'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
             'review_resource/review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
+            'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
             'review/resource_review_summary' => \Mage_Review_Model_Resource_Review_Summary::class,
             'review_resource/review_summary' => \Mage_Review_Model_Resource_Review_Summary::class,
-            'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
             'review/resource_review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
+            'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
             'review/review' => \Mage_Review_Model_Review::class,
             'review/review_status' => \Mage_Review_Model_Review_Status::class,
             'review/review_summary' => \Mage_Review_Model_Review_Summary::class,
@@ -24551,12 +24496,12 @@
             'rule/mysql4_rule_collection' => \Mage_Rule_Model_Mysql4_Rule_Collection::class,
             'rule/renderer_actions' => \Mage_Rule_Model_Renderer_Actions::class,
             'rule/renderer_conditions' => \Mage_Rule_Model_Renderer_Conditions::class,
-            'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class,
             'rule/resource_abstract' => \Mage_Rule_Model_Resource_Abstract::class,
-            'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class,
+            'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class,
             'rule/resource_rule' => \Mage_Rule_Model_Resource_Rule::class,
-            'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
+            'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class,
             'rule_resource/rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
+            'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
             'rule_resource/rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
             'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
             'rule/resource_rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class,
@@ -24583,28 +24528,28 @@
             'salesrule/quote_nominal_discount' => \Mage_SalesRule_Model_Quote_Nominal_Discount::class,
             'salesrule_resource/coupon' => \Mage_SalesRule_Model_Resource_Coupon::class,
             'salesrule/resource_coupon' => \Mage_SalesRule_Model_Resource_Coupon::class,
-            'salesrule_resource/coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class,
             'salesrule/resource_coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class,
+            'salesrule_resource/coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class,
             'salesrule/resource_coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class,
             'salesrule_resource/coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class,
-            'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
             'salesrule_resource/report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
-            'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
+            'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
             'salesrule_resource/report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
+            'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
             'salesrule_resource/report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class,
             'salesrule/resource_report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class,
             'salesrule_resource/report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class,
             'salesrule/resource_report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class,
             'salesrule_resource/report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class,
             'salesrule/resource_report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class,
-            'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class,
             'salesrule_resource/rule' => \Mage_SalesRule_Model_Resource_Rule::class,
-            'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
+            'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class,
             'salesrule_resource/rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
-            'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
+            'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
             'salesrule_resource/rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
-            'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
+            'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
             'salesrule/resource_rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
+            'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
             'salesrule_resource/rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class,
             'salesrule/resource_rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class,
             'salesrule/resource_rule_product_collection' => \Mage_SalesRule_Model_Resource_Rule_Product_Collection::class,
@@ -24649,14 +24594,14 @@
             'sales/email_template' => \Mage_Sales_Model_Email_Template::class,
             'sales/entity_order' => \Mage_Sales_Model_Entity_Order::class,
             'sales_entity/order' => \Mage_Sales_Model_Entity_Order::class,
-            'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
             'sales_entity/order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
-            'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
+            'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
             'sales/entity_order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
-            'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
+            'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
             'sales_entity/order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
-            'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
+            'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
             'sales_entity/order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
+            'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
             'sales_entity/order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class,
             'sales/entity_order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class,
             'sales/entity_order_attribute_backend_shipping' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Shipping::class,
@@ -24665,54 +24610,54 @@
             'sales/entity_order_collection' => \Mage_Sales_Model_Entity_Order_Collection::class,
             'sales_entity/order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class,
             'sales/entity_order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class,
-            'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales_entity/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
-            'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
+            'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales/entity_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
-            'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
+            'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
             'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
+            'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
             'sales/entity_order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class,
             'sales_entity/order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class,
             'sales/entity_order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class,
             'sales_entity/order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class,
             'sales_entity/order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class,
             'sales/entity_order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class,
-            'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
             'sales/entity_order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
-            'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
+            'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
             'sales_entity/order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
+            'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
             'sales/entity_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class,
             'sales_entity/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class,
-            'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class,
             'sales/entity_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class,
+            'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class,
             'sales/entity_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Order::class,
             'sales_entity/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Order::class,
             'sales_entity/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/entity_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/entity_order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class,
             'sales_entity/order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class,
-            'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
             'sales/entity_order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
+            'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
             'sales_entity/order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class,
             'sales/entity_order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class,
             'sales_entity/order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class,
             'sales/entity_order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class,
-            'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
             'sales/entity_order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
+            'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
             'sales/entity_order_item' => \Mage_Sales_Model_Entity_Order_Item::class,
             'sales_entity/order_item' => \Mage_Sales_Model_Entity_Order_Item::class,
             'sales/entity_order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class,
             'sales_entity/order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class,
-            'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
             'sales/entity_order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
+            'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
             'sales_entity/order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class,
             'sales/entity_order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class,
             'sales/entity_order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class,
             'sales_entity/order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class,
-            'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
             'sales_entity/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
-            'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
+            'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
             'sales/entity_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
+            'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
             'sales/entity_order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class,
             'sales_entity/order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class,
             'sales/entity_order_shipment_comment' => \Mage_Sales_Model_Entity_Order_Shipment_Comment::class,
@@ -24721,66 +24666,66 @@
             'sales_entity/order_shipment_comment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Comment_Collection::class,
             'sales_entity/order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class,
             'sales/entity_order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class,
-            'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
             'sales/entity_order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
-            'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
+            'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
             'sales_entity/order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
-            'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
+            'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
             'sales_entity/order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
-            'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
+            'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
             'sales_entity/order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
-            'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
+            'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
             'sales_entity/order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
+            'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
             'sales_entity/quote' => \Mage_Sales_Model_Entity_Quote::class,
             'sales/entity_quote' => \Mage_Sales_Model_Entity_Quote::class,
-            'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
             'sales_entity/quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
+            'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
             'sales_entity/quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class,
             'sales/entity_quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class,
-            'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
             'sales/entity_quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
-            'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
+            'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
             'sales/entity_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
-            'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
+            'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
             'sales_entity/quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
-            'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
+            'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
             'sales/entity_quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
+            'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
             'sales_entity/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales/entity_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales_entity/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class,
             'sales/entity_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class,
-            'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
             'sales_entity/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
-            'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
             'sales/entity_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/entity_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales_entity/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales/entity_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class,
             'sales_entity/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class,
             'sales_entity/quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class,
             'sales/entity_quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class,
-            'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
             'sales_entity/quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
-            'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
+            'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
             'sales/entity_quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
-            'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
+            'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
             'sales_entity/quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
+            'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
             'sales/entity_quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class,
             'sales_entity/quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class,
             'sales/entity_quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class,
             'sales_entity/quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class,
-            'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
             'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
-            'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
+            'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
             'sales/entity_quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
-            'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
+            'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
             'sales/entity_quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
+            'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
             'sales_entity/quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class,
             'sales/entity_quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class,
-            'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
             'sales_entity/sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
-            'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class,
+            'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
             'sales_entity/setup' => \Mage_Sales_Model_Entity_Setup::class,
+            'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class,
             'sales/mysql4_abstract' => \Mage_Sales_Model_Mysql4_Abstract::class,
             'sales/mysql4_billing_agreement' => \Mage_Sales_Model_Mysql4_Billing_Agreement::class,
             'sales/mysql4_billing_agreement_collection' => \Mage_Sales_Model_Mysql4_Billing_Agreement_Collection::class,
@@ -24975,50 +24920,50 @@
             'sales/recurring_profile' => \Mage_Sales_Model_Recurring_Profile::class,
             'sales_resource/abstract' => \Mage_Sales_Model_Resource_Abstract::class,
             'sales/resource_abstract' => \Mage_Sales_Model_Resource_Abstract::class,
-            'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
             'sales_resource/billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
-            'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
+            'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
             'sales_resource/billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
+            'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
             'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
             'sales/resource_collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
             'sales_resource/helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
             'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
-            'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class,
             'sales_resource/order' => \Mage_Sales_Model_Resource_Order::class,
+            'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class,
             'sales_resource/order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class,
             'sales/resource_order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class,
-            'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
             'sales_resource/order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
+            'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
             'sales/resource_order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class,
             'sales_resource/order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class,
             'sales/resource_order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class,
             'sales_resource/order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class,
             'sales/resource_order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class,
             'sales_resource/order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class,
-            'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
             'sales/resource_order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
+            'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
             'sales_resource/order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class,
             'sales/resource_order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class,
             'sales/resource_order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class,
             'sales_resource/order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class,
-            'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
             'sales/resource_order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
-            'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
+            'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
             'sales/resource_order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
-            'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
+            'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
             'sales/resource_order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
-            'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
+            'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
             'sales_resource/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
+            'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales/resource_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class,
             'sales_resource/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class,
-            'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
             'sales/resource_order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
-            'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
+            'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
             'sales_resource/order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
+            'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
             'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
             'sales/resource_order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
-            'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
             'sales/resource_order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
+            'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
             'sales_resource/order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class,
             'sales/resource_order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class,
             'sales_resource/order_creditmemo_item_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item_Collection::class,
@@ -25027,138 +24972,138 @@
             'sales/resource_order_grid_collection' => \Mage_Sales_Model_Resource_Order_Grid_Collection::class,
             'sales/resource_order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class,
             'sales_resource/order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class,
-            'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
             'sales/resource_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
-            'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
+            'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
             'sales_resource/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
+            'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
             'sales_resource/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class,
             'sales/resource_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class,
             'sales/resource_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class,
             'sales_resource/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/resource_order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class,
             'sales_resource/order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class,
-            'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
             'sales/resource_order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
+            'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
             'sales/resource_order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class,
             'sales_resource/order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class,
-            'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
             'sales/resource_order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
-            'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
+            'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
             'sales_resource/order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
+            'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
             'sales/resource_order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class,
             'sales_resource/order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class,
-            'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
             'sales_resource/order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
+            'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
             'sales/resource_order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class,
             'sales_resource/order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class,
-            'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
             'sales_resource/order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
-            'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
+            'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
             'sales/resource_order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
+            'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
             'sales_resource/order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
             'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
-            'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
             'sales_resource/order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
-            'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
+            'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
             'sales_resource/order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
-            'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
+            'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
             'sales/resource_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
+            'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
             'sales_resource/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class,
             'sales/resource_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class,
             'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
             'sales/resource_order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
-            'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
             'sales/resource_order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
-            'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
+            'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
             'sales/resource_order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
+            'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
             'sales_resource/order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class,
             'sales/resource_order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class,
-            'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
             'sales_resource/order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
-            'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
+            'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
             'sales_resource/order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
-            'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
+            'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
             'sales_resource/order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
-            'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
+            'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
             'sales_resource/order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
+            'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
             'sales_resource/order_status' => \Mage_Sales_Model_Resource_Order_Status::class,
             'sales/resource_order_status' => \Mage_Sales_Model_Resource_Order_Status::class,
             'sales_resource/order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class,
             'sales/resource_order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class,
-            'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
             'sales_resource/order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
-            'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
+            'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
             'sales_resource/order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
-            'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
+            'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
             'sales/resource_order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
-            'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
+            'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
             'sales_resource/order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
-            'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class,
+            'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
             'sales/resource_quote' => \Mage_Sales_Model_Resource_Quote::class,
+            'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class,
             'sales_resource/quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class,
             'sales/resource_quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class,
             'sales/resource_quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class,
             'sales_resource/quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class,
             'sales/resource_quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class,
             'sales_resource/quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class,
-            'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
             'sales/resource_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
+            'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
             'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
             'sales/resource_quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
-            'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
             'sales_resource/quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
+            'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
             'sales_resource/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales/resource_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales/resource_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class,
             'sales_resource/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class,
             'sales/resource_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class,
             'sales_resource/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class,
-            'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/resource_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales/resource_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
-            'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
             'sales_resource/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
-            'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
+            'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
             'sales/resource_quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
+            'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
             'sales_resource/quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class,
             'sales/resource_quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class,
-            'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
             'sales/resource_quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
-            'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
+            'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
             'sales_resource/quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
-            'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
+            'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
             'sales_resource/quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
+            'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
             'sales_resource/quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class,
             'sales/resource_quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class,
-            'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
             'sales/resource_quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
+            'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
             'sales/resource_quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class,
             'sales_resource/quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class,
-            'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
             'sales/resource_quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
-            'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
+            'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
             'sales/resource_quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
-            'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
+            'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
             'sales_resource/quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
-            'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
+            'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
             'sales/resource_quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
-            'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
+            'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
             'sales/resource_recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
+            'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
             'sales/resource_recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class,
             'sales_resource/recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class,
-            'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class,
             'sales/resource_report' => \Mage_Sales_Model_Resource_Report::class,
+            'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class,
             'sales/resource_report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class,
             'sales_resource/report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class,
-            'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
             'sales/resource_report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
+            'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
             'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
             'sales/resource_report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
-            'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
             'sales_resource/report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
-            'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
+            'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
             'sales_resource/report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
+            'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
             'sales/resource_report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class,
             'sales_resource/report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class,
             'sales_resource/report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class,
@@ -25171,24 +25116,24 @@
             'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class,
             'sales_resource/report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class,
             'sales/resource_report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class,
-            'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
             'sales/resource_report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
-            'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
+            'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
             'sales_resource/report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
+            'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
             'sales_resource/report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class,
             'sales/resource_report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class,
             'sales_resource/report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class,
             'sales/resource_report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class,
-            'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
             'sales_resource/report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
+            'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
             'sales_resource/report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class,
             'sales/resource_report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class,
             'sales_resource/report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class,
             'sales/resource_report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class,
-            'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
             'sales/resource_sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
-            'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class,
+            'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
             'sales/resource_setup' => \Mage_Sales_Model_Resource_Setup::class,
+            'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class,
             'sales/service_order' => \Mage_Sales_Model_Service_Order::class,
             'sales/service_quote' => \Mage_Sales_Model_Service_Quote::class,
             'sales/status_list' => \Mage_Sales_Model_Status_List::class,
@@ -25198,8 +25143,8 @@
             'sendfriend/observer' => \Mage_Sendfriend_Model_Observer::class,
             'sendfriend_resource/sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class,
             'sendfriend/resource_sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class,
-            'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
             'sendfriend/resource_sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
+            'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
             'sendfriend/resource_setup' => \Mage_Sendfriend_Model_Resource_Setup::class,
             'sendfriend_resource/setup' => \Mage_Sendfriend_Model_Resource_Setup::class,
             'sendfriend/sendfriend' => \Mage_Sendfriend_Model_Sendfriend::class,
@@ -25218,8 +25163,8 @@
             'shipping/rate_result_abstract' => \Mage_Shipping_Model_Rate_Result_Abstract::class,
             'shipping/rate_result_error' => \Mage_Shipping_Model_Rate_Result_Error::class,
             'shipping/rate_result_method' => \Mage_Shipping_Model_Rate_Result_Method::class,
-            'shipping/resource_carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class,
             'shipping_resource/carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class,
+            'shipping/resource_carrier_tablerate' => \Mage_Shipping_Model_Resource_Carrier_Tablerate::class,
             'shipping/resource_carrier_tablerate_collection' => \Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection::class,
             'shipping_resource/carrier_tablerate_collection' => \Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection::class,
             'shipping/shipment_request' => \Mage_Shipping_Model_Shipment_Request::class,
@@ -25239,16 +25184,16 @@
             'sitemap/observer' => \Mage_Sitemap_Model_Observer::class,
             'sitemap_resource/catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class,
             'sitemap/resource_catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class,
-            'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
             'sitemap/resource_catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
-            'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
+            'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
             'sitemap_resource/catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
-            'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
+            'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
             'sitemap_resource/cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
+            'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
             'sitemap_resource/sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class,
             'sitemap/resource_sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class,
-            'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
             'sitemap_resource/sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
+            'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
             'sitemap/sitemap' => \Mage_Sitemap_Model_Sitemap::class,
             'tag/api' => \Mage_Tag_Model_Api::class,
             'tag/api_v2' => \Mage_Tag_Model_Api_V2::class,
@@ -25261,21 +25206,21 @@
             'tag/mysql4_tag' => \Mage_Tag_Model_Mysql4_Tag::class,
             'tag/mysql4_tag_collection' => \Mage_Tag_Model_Mysql4_Tag_Collection::class,
             'tag/mysql4_tag_relation' => \Mage_Tag_Model_Mysql4_Tag_Relation::class,
-            'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag/resource_customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag_resource/customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
-            'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
+            'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag_resource/indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
-            'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
+            'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
             'tag_resource/popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
+            'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
             'tag_resource/product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class,
             'tag/resource_product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class,
             'tag_resource/tag' => \Mage_Tag_Model_Resource_Tag::class,
             'tag/resource_tag' => \Mage_Tag_Model_Resource_Tag::class,
-            'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
             'tag_resource/tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
-            'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
+            'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
             'tag_resource/tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
+            'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
             'tag/session' => \Mage_Tag_Model_Session::class,
             'tag/tag' => \Mage_Tag_Model_Tag::class,
             'tag/tag_relation' => \Mage_Tag_Model_Tag_Relation::class,
@@ -25314,16 +25259,16 @@
             'tax/resource_calculation_rate' => \Mage_Tax_Model_Resource_Calculation_Rate::class,
             'tax/resource_calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class,
             'tax_resource/calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class,
-            'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
             'tax/resource_calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
-            'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
+            'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
             'tax/resource_calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
-            'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
+            'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
             'tax/resource_calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
-            'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
+            'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
             'tax_resource/calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
-            'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class,
+            'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
             'tax/resource_class' => \Mage_Tax_Model_Resource_Class::class,
+            'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class,
             'tax/resource_class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class,
             'tax_resource/class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class,
             'tax_resource/report_collection' => \Mage_Tax_Model_Resource_Report_Collection::class,
@@ -25334,16 +25279,16 @@
             'tax/resource_report_tax_createdat' => \Mage_Tax_Model_Resource_Report_Tax_Createdat::class,
             'tax_resource/report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class,
             'tax/resource_report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class,
-            'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
             'tax/resource_report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
-            'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
+            'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
             'tax_resource/sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
+            'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
             'tax_resource/sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class,
             'tax/resource_sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class,
-            'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class,
             'tax/resource_sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class,
-            'tax_resource/sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class,
+            'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class,
             'tax/resource_sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class,
+            'tax_resource/sales_order_tax_item_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection::class,
             'tax/resource_setup' => \Mage_Tax_Model_Resource_Setup::class,
             'tax_resource/setup' => \Mage_Tax_Model_Resource_Setup::class,
             'tax/sales_order_tax' => \Mage_Tax_Model_Sales_Order_Tax::class,
@@ -25426,10 +25371,10 @@
             'weee/observer' => \Mage_Weee_Model_Observer::class,
             'weee/resource_attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class,
             'weee_resource/attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class,
-            'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class,
             'weee/resource_setup' => \Mage_Weee_Model_Resource_Setup::class,
-            'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class,
+            'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class,
             'weee/resource_tax' => \Mage_Weee_Model_Resource_Tax::class,
+            'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class,
             'weee/tax' => \Mage_Weee_Model_Tax::class,
             'weee/total_creditmemo_weee' => \Mage_Weee_Model_Total_Creditmemo_Weee::class,
             'weee/total_invoice_weee' => \Mage_Weee_Model_Total_Invoice_Weee::class,
@@ -25439,12 +25384,12 @@
             'widget/mysql4_widget_instance' => \Mage_Widget_Model_Mysql4_Widget_Instance::class,
             'widget/mysql4_widget_instance_collection' => \Mage_Widget_Model_Mysql4_Widget_Instance_Collection::class,
             'widget/observer' => \Mage_Widget_Model_Observer::class,
-            'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class,
             'widget/resource_widget' => \Mage_Widget_Model_Resource_Widget::class,
+            'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class,
             'widget_resource/widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class,
             'widget/resource_widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class,
-            'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
             'widget_resource/widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
+            'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
             'widget/template_filter' => \Mage_Widget_Model_Template_Filter::class,
             'widget/widget' => \Mage_Widget_Model_Widget::class,
             'widget/widget_config' => \Mage_Widget_Model_Widget_Config::class,
@@ -25461,14 +25406,14 @@
             'wishlist/mysql4_wishlist' => \Mage_Wishlist_Model_Mysql4_Wishlist::class,
             'wishlist/mysql4_wishlist_collection' => \Mage_Wishlist_Model_Mysql4_Wishlist_Collection::class,
             'wishlist/observer' => \Mage_Wishlist_Model_Observer::class,
-            'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class,
             'wishlist_resource/item' => \Mage_Wishlist_Model_Resource_Item::class,
+            'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class,
             'wishlist_resource/item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class,
             'wishlist/resource_item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class,
             'wishlist/resource_item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
             'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
-            'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
             'wishlist_resource/item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
+            'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
             'wishlist_resource/product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class,
             'wishlist/resource_product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class,
             'wishlist/resource_wishlist' => \Mage_Wishlist_Model_Resource_Wishlist::class,
@@ -25477,7 +25422,6 @@
             'wishlist/resource_wishlist_collection' => \Mage_Wishlist_Model_Resource_Wishlist_Collection::class,
             'wishlist/session' => \Mage_Wishlist_Model_Session::class,
             'wishlist/wishlist' => \Mage_Wishlist_Model_Wishlist::class,
-            'varien/autoload' => \Varien_Autoload::class,
         ])
     );
     override( \Mage_Wishlist_Helper_Data::_getSingletonModel(0),
@@ -25487,11 +25431,10 @@
             'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class,
             'adminnotification/mysql4_inbox_collection' => \Mage_AdminNotification_Model_Mysql4_Inbox_Collection::class,
             'adminnotification/observer' => \Mage_AdminNotification_Model_Observer::class,
-            'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
             'adminnotification/resource_inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
-            'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
+            'adminnotification_resource/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
             'adminnotification/resource_inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
-            'adminnotification/survey' => \Mage_AdminNotification_Model_Survey::class,
+            'adminnotification_resource/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
             'admin/acl' => \Mage_Admin_Model_Acl::class,
             'admin/acl_assert_ip' => \Mage_Admin_Model_Acl_Assert_Ip::class,
             'admin/acl_assert_time' => \Mage_Admin_Model_Acl_Assert_Time::class,
@@ -25520,38 +25463,38 @@
             'admin/redirectpolicy' => \Mage_Admin_Model_Redirectpolicy::class,
             'admin/resource_acl' => \Mage_Admin_Model_Resource_Acl::class,
             'admin_resource/acl' => \Mage_Admin_Model_Resource_Acl::class,
-            'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
             'admin/resource_acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
+            'admin_resource/acl_role' => \Mage_Admin_Model_Resource_Acl_Role::class,
             'admin/resource_acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class,
             'admin_resource/acl_role_collection' => \Mage_Admin_Model_Resource_Acl_Role_Collection::class,
-            'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class,
             'admin/resource_block' => \Mage_Admin_Model_Resource_Block::class,
-            'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
+            'admin_resource/block' => \Mage_Admin_Model_Resource_Block::class,
             'admin/resource_block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
+            'admin_resource/block_collection' => \Mage_Admin_Model_Resource_Block_Collection::class,
             'admin_resource/permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class,
             'admin/resource_permissions_collection' => \Mage_Admin_Model_Resource_Permissions_Collection::class,
-            'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class,
             'admin/resource_role' => \Mage_Admin_Model_Resource_Role::class,
+            'admin_resource/role' => \Mage_Admin_Model_Resource_Role::class,
             'admin/resource_role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class,
             'admin_resource/role_collection' => \Mage_Admin_Model_Resource_Role_Collection::class,
-            'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class,
             'admin_resource/roles' => \Mage_Admin_Model_Resource_Roles::class,
-            'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
+            'admin/resource_roles' => \Mage_Admin_Model_Resource_Roles::class,
             'admin_resource/roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
-            'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
+            'admin/resource_roles_collection' => \Mage_Admin_Model_Resource_Roles_Collection::class,
             'admin/resource_roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
+            'admin_resource/roles_user_collection' => \Mage_Admin_Model_Resource_Roles_User_Collection::class,
             'admin/resource_rules' => \Mage_Admin_Model_Resource_Rules::class,
             'admin_resource/rules' => \Mage_Admin_Model_Resource_Rules::class,
             'admin_resource/rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
             'admin/resource_rules_collection' => \Mage_Admin_Model_Resource_Rules_Collection::class,
-            'admin_resource/user' => \Mage_Admin_Model_Resource_User::class,
             'admin/resource_user' => \Mage_Admin_Model_Resource_User::class,
+            'admin_resource/user' => \Mage_Admin_Model_Resource_User::class,
             'admin/resource_user_collection' => \Mage_Admin_Model_Resource_User_Collection::class,
             'admin_resource/user_collection' => \Mage_Admin_Model_Resource_User_Collection::class,
-            'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class,
             'admin_resource/variable' => \Mage_Admin_Model_Resource_Variable::class,
-            'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
+            'admin/resource_variable' => \Mage_Admin_Model_Resource_Variable::class,
             'admin/resource_variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
+            'admin_resource/variable_collection' => \Mage_Admin_Model_Resource_Variable_Collection::class,
             'admin/role' => \Mage_Admin_Model_Role::class,
             'admin/roles' => \Mage_Admin_Model_Roles::class,
             'admin/rules' => \Mage_Admin_Model_Rules::class,
@@ -25586,6 +25529,7 @@
             'adminhtml/system_config_backend_baseurl' => \Mage_Adminhtml_Model_System_Config_Backend_Baseurl::class,
             'adminhtml/system_config_backend_cache' => \Mage_Adminhtml_Model_System_Config_Backend_Cache::class,
             'adminhtml/system_config_backend_catalog_inventory_managestock' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock::class,
+            'adminhtml/system_config_backend_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Separator::class,
             'adminhtml/system_config_backend_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Type::class,
             'adminhtml/system_config_backend_category' => \Mage_Adminhtml_Model_System_Config_Backend_Category::class,
             'adminhtml/system_config_backend_cookie' => \Mage_Adminhtml_Model_System_Config_Backend_Cookie::class,
@@ -25638,12 +25582,14 @@
             'adminhtml/system_config_source_catalog_listMode' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListMode::class,
             'adminhtml/system_config_source_catalog_listPerPage' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListPerPage::class,
             'adminhtml/system_config_source_catalog_listSort' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort::class,
+            'adminhtml/system_config_source_catalog_search_separator' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Separator::class,
             'adminhtml/system_config_source_catalog_search_type' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Type::class,
             'adminhtml/system_config_source_catalog_timeFormat' => \Mage_Adminhtml_Model_System_Config_Source_Catalog_TimeFormat::class,
             'adminhtml/system_config_source_category' => \Mage_Adminhtml_Model_System_Config_Source_Category::class,
             'adminhtml/system_config_source_checktype' => \Mage_Adminhtml_Model_System_Config_Source_Checktype::class,
             'adminhtml/system_config_source_cms_page' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Page::class,
             'adminhtml/system_config_source_cms_wysiwyg_enabled' => \Mage_Adminhtml_Model_System_Config_Source_Cms_Wysiwyg_Enabled::class,
+            'adminhtml/system_config_source_cookie_samesite' => \Mage_Adminhtml_Model_System_Config_Source_Cookie_Samesite::class,
             'adminhtml/system_config_source_country' => \Mage_Adminhtml_Model_System_Config_Source_Country::class,
             'adminhtml/system_config_source_country_full' => \Mage_Adminhtml_Model_System_Config_Source_Country_Full::class,
             'adminhtml/system_config_source_cron_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Cron_Frequency::class,
@@ -25670,6 +25616,7 @@
             'adminhtml/system_config_source_locale_timezone' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Timezone::class,
             'adminhtml/system_config_source_locale_weekdaycodes' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdaycodes::class,
             'adminhtml/system_config_source_locale_weekdays' => \Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdays::class,
+            'adminhtml/system_config_source_log_level' => \Mage_Adminhtml_Model_System_Config_Source_Log_Level::class,
             'adminhtml/system_config_source_nooptreq' => \Mage_Adminhtml_Model_System_Config_Source_Nooptreq::class,
             'adminhtml/system_config_source_notification_frequency' => \Mage_Adminhtml_Model_System_Config_Source_Notification_Frequency::class,
             'adminhtml/system_config_source_order_status' => \Mage_Adminhtml_Model_System_Config_Source_Order_Status::class,
@@ -25693,7 +25640,6 @@
             'adminhtml/system_config_source_shipping_flatrate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Flatrate::class,
             'adminhtml/system_config_source_shipping_tablerate' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Tablerate::class,
             'adminhtml/system_config_source_shipping_taxclass' => \Mage_Adminhtml_Model_System_Config_Source_Shipping_Taxclass::class,
-            'adminhtml/system_config_source_startdateenddate' => \Mage_Adminhtml_Model_System_Config_Source_Startdateenddate::class,
             'adminhtml/system_config_source_storage_media_database' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Database::class,
             'adminhtml/system_config_source_storage_media_storage' => \Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Storage::class,
             'adminhtml/system_config_source_store' => \Mage_Adminhtml_Model_System_Config_Source_Store::class,
@@ -25749,22 +25695,22 @@
             'api2_resource/acl_filter_attribute' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute::class,
             'api2/resource_acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class,
             'api2_resource/acl_filter_attribute_collection' => \Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection::class,
-            'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
             'api2_resource/acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
+            'api2/resource_acl_global_role' => \Mage_Api2_Model_Resource_Acl_Global_Role::class,
             'api2/resource_acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class,
             'api2_resource/acl_global_role_collection' => \Mage_Api2_Model_Resource_Acl_Global_Role_Collection::class,
             'api2_resource/acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class,
             'api2/resource_acl_global_rule' => \Mage_Api2_Model_Resource_Acl_Global_Rule::class,
             'api2/resource_acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class,
             'api2_resource/acl_global_rule_collection' => \Mage_Api2_Model_Resource_Acl_Global_Rule_Collection::class,
-            'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class,
             'api2/resource_setup' => \Mage_Api2_Model_Resource_Setup::class,
+            'api2_resource/setup' => \Mage_Api2_Model_Resource_Setup::class,
             'api2/resource_validator' => \Mage_Api2_Model_Resource_Validator::class,
             'api2_resource/validator' => \Mage_Api2_Model_Resource_Validator::class,
             'api2/resource_validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class,
             'api2_resource/validator_eav' => \Mage_Api2_Model_Resource_Validator_Eav::class,
-            'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
             'api2/resource_validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
+            'api2_resource/validator_fields' => \Mage_Api2_Model_Resource_Validator_Fields::class,
             'api2/response' => \Mage_Api2_Model_Response::class,
             'api2/route_abstract' => \Mage_Api2_Model_Route_Abstract::class,
             'api2/route_apiType' => \Mage_Api2_Model_Route_ApiType::class,
@@ -25796,8 +25742,8 @@
             'api/mysql4_user_collection' => \Mage_Api_Model_Mysql4_User_Collection::class,
             'api/resource_abstract' => \Mage_Api_Model_Resource_Abstract::class,
             'api_resource/abstract' => \Mage_Api_Model_Resource_Abstract::class,
-            'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class,
             'api_resource/acl' => \Mage_Api_Model_Resource_Acl::class,
+            'api/resource_acl' => \Mage_Api_Model_Resource_Acl::class,
             'api_resource/acl_role' => \Mage_Api_Model_Resource_Acl_Role::class,
             'api/resource_acl_role' => \Mage_Api_Model_Resource_Acl_Role::class,
             'api/resource_acl_role_collection' => \Mage_Api_Model_Resource_Acl_Role_Collection::class,
@@ -25806,18 +25752,18 @@
             'api_resource/permissions_collection' => \Mage_Api_Model_Resource_Permissions_Collection::class,
             'api_resource/role' => \Mage_Api_Model_Resource_Role::class,
             'api/resource_role' => \Mage_Api_Model_Resource_Role::class,
-            'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
             'api_resource/role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
+            'api/resource_role_collection' => \Mage_Api_Model_Resource_Role_Collection::class,
             'api/resource_roles' => \Mage_Api_Model_Resource_Roles::class,
             'api_resource/roles' => \Mage_Api_Model_Resource_Roles::class,
-            'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
             'api_resource/roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
-            'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
+            'api/resource_roles_collection' => \Mage_Api_Model_Resource_Roles_Collection::class,
             'api_resource/roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
-            'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class,
+            'api/resource_roles_user_collection' => \Mage_Api_Model_Resource_Roles_User_Collection::class,
             'api_resource/rules' => \Mage_Api_Model_Resource_Rules::class,
-            'api/resource_rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class,
+            'api/resource_rules' => \Mage_Api_Model_Resource_Rules::class,
             'api_resource/rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class,
+            'api/resource_rules_collection' => \Mage_Api_Model_Resource_Rules_Collection::class,
             'api/resource_user' => \Mage_Api_Model_Resource_User::class,
             'api_resource/user' => \Mage_Api_Model_Resource_User::class,
             'api/resource_user_collection' => \Mage_Api_Model_Resource_User_Collection::class,
@@ -25844,15 +25790,6 @@
             'authorizenet/directpost_request' => \Mage_Authorizenet_Model_Directpost_Request::class,
             'authorizenet/directpost_response' => \Mage_Authorizenet_Model_Directpost_Response::class,
             'authorizenet/directpost_session' => \Mage_Authorizenet_Model_Directpost_Session::class,
-            'backup/backup' => \Mage_Backup_Model_Backup::class,
-            'backup/config_backend_cron' => \Mage_Backup_Model_Config_Backend_Cron::class,
-            'backup/config_source_type' => \Mage_Backup_Model_Config_Source_Type::class,
-            'backup/db' => \Mage_Backup_Model_Db::class,
-            'backup/fs_collection' => \Mage_Backup_Model_Fs_Collection::class,
-            'backup/mysql4_db' => \Mage_Backup_Model_Mysql4_Db::class,
-            'backup/observer' => \Mage_Backup_Model_Observer::class,
-            'backup/resource_db' => \Mage_Backup_Model_Resource_Db::class,
-            'backup/resource_helper_mysql4' => \Mage_Backup_Model_Resource_Helper_Mysql4::class,
             'bundle/catalogIndex_data_bundle' => \Mage_Bundle_Model_CatalogIndex_Data_Bundle::class,
             'bundle/mysql4_bundle' => \Mage_Bundle_Model_Mysql4_Bundle::class,
             'bundle/mysql4_indexer_price' => \Mage_Bundle_Model_Mysql4_Indexer_Price::class,
@@ -25878,10 +25815,10 @@
             'bundle_resource/option' => \Mage_Bundle_Model_Resource_Option::class,
             'bundle/resource_option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class,
             'bundle_resource/option_collection' => \Mage_Bundle_Model_Resource_Option_Collection::class,
-            'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
             'bundle_resource/price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
-            'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class,
+            'bundle/resource_price_index' => \Mage_Bundle_Model_Resource_Price_Index::class,
             'bundle_resource/selection' => \Mage_Bundle_Model_Resource_Selection::class,
+            'bundle/resource_selection' => \Mage_Bundle_Model_Resource_Selection::class,
             'bundle_resource/selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class,
             'bundle/resource_selection_collection' => \Mage_Bundle_Model_Resource_Selection_Collection::class,
             'bundle/sales_order_pdf_items_abstract' => \Mage_Bundle_Model_Sales_Order_Pdf_Items_Abstract::class,
@@ -25897,8 +25834,8 @@
             'captcha/config_form_frontend' => \Mage_Captcha_Model_Config_Form_Frontend::class,
             'captcha/config_mode' => \Mage_Captcha_Model_Config_Mode::class,
             'captcha/observer' => \Mage_Captcha_Model_Observer::class,
-            'captcha_resource/log' => \Mage_Captcha_Model_Resource_Log::class,
             'captcha/resource_log' => \Mage_Captcha_Model_Resource_Log::class,
+            'captcha_resource/log' => \Mage_Captcha_Model_Resource_Log::class,
             'captcha/zend' => \Mage_Captcha_Model_Zend::class,
             'catalogindex/aggregation' => \Mage_CatalogIndex_Model_Aggregation::class,
             'catalogindex/attribute' => \Mage_CatalogIndex_Model_Attribute::class,
@@ -25941,8 +25878,8 @@
             'catalogindex/resource_data_abstract' => \Mage_CatalogIndex_Model_Resource_Data_Abstract::class,
             'catalogindex_resource/data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class,
             'catalogindex/resource_data_configurable' => \Mage_CatalogIndex_Model_Resource_Data_Configurable::class,
-            'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
             'catalogindex_resource/data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
+            'catalogindex/resource_data_grouped' => \Mage_CatalogIndex_Model_Resource_Data_Grouped::class,
             'catalogindex_resource/indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class,
             'catalogindex/resource_indexer' => \Mage_CatalogIndex_Model_Resource_Indexer::class,
             'catalogindex/resource_indexer_abstract' => \Mage_CatalogIndex_Model_Resource_Indexer_Abstract::class,
@@ -25974,20 +25911,20 @@
             'cataloginventory/mysql4_stock_item_collection' => \Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection::class,
             'cataloginventory/mysql4_stock_status' => \Mage_CatalogInventory_Model_Mysql4_Stock_Status::class,
             'cataloginventory/observer' => \Mage_CatalogInventory_Model_Observer::class,
-            'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
             'cataloginventory_resource/indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
+            'cataloginventory/resource_indexer_stock' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock::class,
             'cataloginventory/resource_indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class,
             'cataloginventory_resource/indexer_stock_configurable' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Configurable::class,
-            'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
             'cataloginventory/resource_indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
+            'cataloginventory_resource/indexer_stock_default' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default::class,
             'cataloginventory/resource_indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class,
             'cataloginventory_resource/indexer_stock_grouped' => \Mage_CatalogInventory_Model_Resource_Indexer_Stock_Grouped::class,
             'cataloginventory_resource/stock' => \Mage_CatalogInventory_Model_Resource_Stock::class,
             'cataloginventory/resource_stock' => \Mage_CatalogInventory_Model_Resource_Stock::class,
-            'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
             'cataloginventory/resource_stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
-            'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
+            'cataloginventory_resource/stock_item' => \Mage_CatalogInventory_Model_Resource_Stock_Item::class,
             'cataloginventory/resource_stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
+            'cataloginventory_resource/stock_item_collection' => \Mage_CatalogInventory_Model_Resource_Stock_Item_Collection::class,
             'cataloginventory/resource_stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class,
             'cataloginventory_resource/stock_status' => \Mage_CatalogInventory_Model_Resource_Stock_Status::class,
             'cataloginventory/source_backorders' => \Mage_CatalogInventory_Model_Source_Backorders::class,
@@ -26010,8 +25947,8 @@
             'catalogrule/observer' => \Mage_CatalogRule_Model_Observer::class,
             'catalogrule_resource/rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
             'catalogrule/resource_rule' => \Mage_CatalogRule_Model_Resource_Rule::class,
-            'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
             'catalogrule_resource/rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
+            'catalogrule/resource_rule_collection' => \Mage_CatalogRule_Model_Resource_Rule_Collection::class,
             'catalogrule_resource/rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class,
             'catalogrule/resource_rule_product_price' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price::class,
             'catalogrule_resource/rule_product_price_collection' => \Mage_CatalogRule_Model_Resource_Rule_Product_Price_Collection::class,
@@ -26040,24 +25977,24 @@
             'catalogsearch/query' => \Mage_CatalogSearch_Model_Query::class,
             'catalogsearch_resource/advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class,
             'catalogsearch/resource_advanced' => \Mage_CatalogSearch_Model_Resource_Advanced::class,
-            'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
             'catalogsearch_resource/advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
+            'catalogsearch/resource_advanced_collection' => \Mage_CatalogSearch_Model_Resource_Advanced_Collection::class,
             'catalogsearch_resource/fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class,
             'catalogsearch/resource_fulltext' => \Mage_CatalogSearch_Model_Resource_Fulltext::class,
             'catalogsearch_resource/fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class,
             'catalogsearch/resource_fulltext_collection' => \Mage_CatalogSearch_Model_Resource_Fulltext_Collection::class,
-            'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
             'catalogsearch_resource/fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
-            'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
+            'catalogsearch/resource_fulltext_engine' => \Mage_CatalogSearch_Model_Resource_Fulltext_Engine::class,
             'catalogsearch/resource_helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
-            'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
+            'catalogsearch_resource/helper_mysql4' => \Mage_CatalogSearch_Model_Resource_Helper_Mysql4::class,
             'catalogsearch_resource/indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
-            'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class,
+            'catalogsearch/resource_indexer_fulltext' => \Mage_CatalogSearch_Model_Resource_Indexer_Fulltext::class,
             'catalogsearch_resource/query' => \Mage_CatalogSearch_Model_Resource_Query::class,
-            'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
+            'catalogsearch/resource_query' => \Mage_CatalogSearch_Model_Resource_Query::class,
             'catalogsearch_resource/query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
-            'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
+            'catalogsearch/resource_query_collection' => \Mage_CatalogSearch_Model_Resource_Query_Collection::class,
             'catalogsearch/resource_search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
+            'catalogsearch_resource/search_collection' => \Mage_CatalogSearch_Model_Resource_Search_Collection::class,
             'catalogsearch/session' => \Mage_CatalogSearch_Model_Session::class,
             'catalogsearch/system_config_backend_sitemap' => \Mage_CatalogSearch_Model_System_Config_Backend_Sitemap::class,
             'catalog/abstract' => \Mage_Catalog_Model_Abstract::class,
@@ -26200,144 +26137,144 @@
             'catalog/product_website' => \Mage_Catalog_Model_Product_Website::class,
             'catalog/resource_abstract' => \Mage_Catalog_Model_Resource_Abstract::class,
             'catalog_resource/abstract' => \Mage_Catalog_Model_Resource_Abstract::class,
-            'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
             'catalog/resource_attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
-            'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class,
+            'catalog_resource/attribute' => \Mage_Catalog_Model_Resource_Attribute::class,
             'catalog_resource/category' => \Mage_Catalog_Model_Resource_Category::class,
+            'catalog/resource_category' => \Mage_Catalog_Model_Resource_Category::class,
             'catalog_resource/category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class,
             'catalog/resource_category_attribute_collection' => \Mage_Catalog_Model_Resource_Category_Attribute_Collection::class,
-            'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
             'catalog/resource_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
-            'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
+            'catalog_resource/category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Category_Attribute_Frontend_Image::class,
             'catalog/resource_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
+            'catalog_resource/category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout::class,
             'catalog_resource/category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class,
             'catalog/resource_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode::class,
             'catalog_resource/category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class,
             'catalog/resource_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Category_Attribute_Source_Page::class,
             'catalog/resource_category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class,
             'catalog_resource/category_collection' => \Mage_Catalog_Model_Resource_Category_Collection::class,
-            'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
             'catalog_resource/category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
-            'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
+            'catalog/resource_category_flat' => \Mage_Catalog_Model_Resource_Category_Flat::class,
             'catalog/resource_category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
+            'catalog_resource/category_flat_collection' => \Mage_Catalog_Model_Resource_Category_Flat_Collection::class,
             'catalog_resource/category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class,
             'catalog/resource_category_indexer_product' => \Mage_Catalog_Model_Resource_Category_Indexer_Product::class,
             'catalog/resource_category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class,
             'catalog_resource/category_tree' => \Mage_Catalog_Model_Resource_Category_Tree::class,
-            'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
             'catalog_resource/collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
+            'catalog/resource_collection_abstract' => \Mage_Catalog_Model_Resource_Collection_Abstract::class,
             'catalog_resource/config' => \Mage_Catalog_Model_Resource_Config::class,
             'catalog/resource_config' => \Mage_Catalog_Model_Resource_Config::class,
-            'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
             'catalog/resource_eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
+            'catalog_resource/eav_attribute' => \Mage_Catalog_Model_Resource_Eav_Attribute::class,
             'catalog_resource/eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class,
             'catalog/resource_eav_mysql4_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Abstract::class,
             'catalog/resource_eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
             'catalog_resource/eav_mysql4_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute::class,
-            'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
             'catalog/resource_eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
-            'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
+            'catalog_resource/eav_mysql4_category' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category::class,
             'catalog_resource/eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
+            'catalog/resource_eav_mysql4_category_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Collection::class,
             'catalog_resource/eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
-            'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
+            'catalog/resource_eav_mysql4_category_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Frontend_Image::class,
             'catalog_resource/eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
+            'catalog/resource_eav_mysql4_category_attribute_source_layout' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout::class,
             'catalog/resource_eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class,
             'catalog_resource/eav_mysql4_category_attribute_source_mode' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode::class,
             'catalog/resource_eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class,
             'catalog_resource/eav_mysql4_category_attribute_source_page' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page::class,
             'catalog/resource_eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class,
             'catalog_resource/eav_mysql4_category_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection::class,
-            'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
             'catalog/resource_eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
+            'catalog_resource/eav_mysql4_category_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat::class,
             'catalog/resource_eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
             'catalog_resource/eav_mysql4_category_flat_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Flat_Collection::class,
             'catalog/resource_eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class,
             'catalog_resource/eav_mysql4_category_indexer_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product::class,
-            'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
             'catalog_resource/eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
-            'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
+            'catalog/resource_eav_mysql4_category_tree' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Tree::class,
             'catalog_resource/eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
+            'catalog/resource_eav_mysql4_collection_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Collection_Abstract::class,
             'catalog_resource/eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class,
             'catalog/resource_eav_mysql4_config' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Config::class,
-            'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
             'catalog_resource/eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
+            'catalog/resource_eav_mysql4_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute::class,
             'catalog/resource_eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
             'catalog_resource/eav_mysql4_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Decimal::class,
-            'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
             'catalog/resource_eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
-            'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
+            'catalog_resource/eav_mysql4_layer_filter_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price::class,
             'catalog/resource_eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
-            'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
+            'catalog_resource/eav_mysql4_product' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product::class,
             'catalog_resource/eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
+            'catalog/resource_eav_mysql4_product_action' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Action::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
-            'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
+            'catalog/resource_eav_mysql4_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Tierprice::class,
             'catalog/resource_eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/eav_mysql4_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class,
             'catalog/resource_eav_mysql4_product_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
             'catalog_resource/eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
+            'catalog/resource_eav_mysql4_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Image::class,
             'catalog/resource_eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/eav_mysql4_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Frontend_Tierprice::class,
             'catalog/resource_eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection::class,
             'catalog_resource/eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class,
             'catalog/resource_eav_mysql4_product_compare_item' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item::class,
-            'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
             'catalog_resource/eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
-            'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
+            'catalog/resource_eav_mysql4_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection::class,
             'catalog_resource/eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
-            'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
+            'catalog/resource_eav_mysql4_product_flat' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat::class,
             'catalog_resource/eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
+            'catalog/resource_eav_mysql4_product_flat_indexer' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Flat_Indexer::class,
             'catalog/resource_eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class,
             'catalog/resource_eav_mysql4_product_indexer_eav' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav::class,
             'catalog/resource_eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class,
             'catalog_resource/eav_mysql4_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Abstract::class,
-            'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
             'catalog/resource_eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
-            'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
+            'catalog_resource/eav_mysql4_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Decimal::class,
             'catalog_resource/eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
+            'catalog/resource_eav_mysql4_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Eav_Source::class,
             'catalog_resource/eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class,
             'catalog/resource_eav_mysql4_product_indexer_price' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price::class,
-            'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
             'catalog/resource_eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
-            'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
+            'catalog_resource/eav_mysql4_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable::class,
             'catalog/resource_eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
+            'catalog_resource/eav_mysql4_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Default::class,
             'catalog/resource_eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class,
             'catalog_resource/eav_mysql4_product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Grouped::class,
-            'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
             'catalog/resource_eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
+            'catalog_resource/eav_mysql4_product_link' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link::class,
             'catalog_resource/eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class,
             'catalog/resource_eav_mysql4_product_link_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection::class,
             'catalog_resource/eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class,
             'catalog/resource_eav_mysql4_product_link_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection::class,
-            'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
             'catalog/resource_eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
-            'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
+            'catalog_resource/eav_mysql4_product_option' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option::class,
             'catalog_resource/eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
-            'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
+            'catalog/resource_eav_mysql4_product_option_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Collection::class,
             'catalog/resource_eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
+            'catalog_resource/eav_mysql4_product_option_value' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value::class,
             'catalog/resource_eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
             'catalog_resource/eav_mysql4_product_option_value_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection::class,
-            'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
             'catalog/resource_eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
+            'catalog_resource/eav_mysql4_product_relation' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Relation::class,
             'catalog/resource_eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class,
             'catalog_resource/eav_mysql4_product_status' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Status::class,
-            'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
             'catalog_resource/eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
-            'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
+            'catalog/resource_eav_mysql4_product_type_configurable' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable::class,
             'catalog/resource_eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
-            'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog_resource/eav_mysql4_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::class,
             'catalog/resource_eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
-            'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
+            'catalog_resource/eav_mysql4_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute_Collection::class,
             'catalog_resource/eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
+            'catalog/resource_eav_mysql4_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Product_Collection::class,
             'catalog/resource_eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class,
             'catalog_resource/eav_mysql4_product_website' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Website::class,
             'catalog/resource_eav_mysql4_sendfriend' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend::class,
@@ -26346,16 +26283,16 @@
             'catalog/resource_eav_mysql4_sendfriend_collection' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection::class,
             'catalog_resource/eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class,
             'catalog/resource_eav_mysql4_setup' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Setup::class,
-            'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
             'catalog/resource_eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
-            'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
+            'catalog_resource/eav_mysql4_url' => \Mage_Catalog_Model_Resource_Eav_Mysql4_Url::class,
             'catalog/resource_helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
+            'catalog_resource/helper_mysql4' => \Mage_Catalog_Model_Resource_Helper_Mysql4::class,
             'catalog_resource/layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class,
             'catalog/resource_layer_filter_attribute' => \Mage_Catalog_Model_Resource_Layer_Filter_Attribute::class,
             'catalog/resource_layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class,
             'catalog_resource/layer_filter_decimal' => \Mage_Catalog_Model_Resource_Layer_Filter_Decimal::class,
-            'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
             'catalog/resource_layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
+            'catalog_resource/layer_filter_price' => \Mage_Catalog_Model_Resource_Layer_Filter_Price::class,
             'catalog/resource_product' => \Mage_Catalog_Model_Resource_Product::class,
             'catalog_resource/product' => \Mage_Catalog_Model_Resource_Product::class,
             'catalog/resource_product_action' => \Mage_Catalog_Model_Resource_Product_Action::class,
@@ -26366,42 +26303,42 @@
             'catalog_resource/product_attribute_backend_groupprice_abstract' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract::class,
             'catalog/resource_product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class,
             'catalog_resource/product_attribute_backend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image::class,
-            'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
             'catalog/resource_product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
-            'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
+            'catalog_resource/product_attribute_backend_media' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media::class,
             'catalog_resource/product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
+            'catalog/resource_product_attribute_backend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice::class,
             'catalog/resource_product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class,
             'catalog_resource/product_attribute_backend_urlkey' => \Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey::class,
-            'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
             'catalog_resource/product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
-            'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
+            'catalog/resource_product_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Attribute_Collection::class,
             'catalog/resource_product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
-            'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
+            'catalog_resource/product_attribute_frontend_image' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Image::class,
             'catalog_resource/product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
-            'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
+            'catalog/resource_product_attribute_frontend_tierprice' => \Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice::class,
             'catalog_resource/product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
+            'catalog/resource_product_collection' => \Mage_Catalog_Model_Resource_Product_Collection::class,
             'catalog_resource/product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class,
             'catalog/resource_product_compare_item' => \Mage_Catalog_Model_Resource_Product_Compare_Item::class,
-            'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
             'catalog/resource_product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
+            'catalog_resource/product_compare_item_collection' => \Mage_Catalog_Model_Resource_Product_Compare_Item_Collection::class,
             'catalog/resource_product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class,
             'catalog_resource/product_flat' => \Mage_Catalog_Model_Resource_Product_Flat::class,
-            'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
             'catalog/resource_product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
+            'catalog_resource/product_flat_indexer' => \Mage_Catalog_Model_Resource_Product_Flat_Indexer::class,
             'catalog/resource_product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class,
             'catalog_resource/product_indexer_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Abstract::class,
-            'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
             'catalog_resource/product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
-            'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
+            'catalog/resource_product_indexer_eav' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav::class,
             'catalog/resource_product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
+            'catalog_resource/product_indexer_eav_abstract' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract::class,
             'catalog/resource_product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class,
             'catalog_resource/product_indexer_eav_decimal' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal::class,
-            'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
             'catalog_resource/product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
+            'catalog/resource_product_indexer_eav_source' => \Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source::class,
             'catalog_resource/product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
             'catalog/resource_product_indexer_price' => \Mage_Catalog_Model_Resource_Product_Indexer_Price::class,
-            'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
             'catalog_resource/product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
+            'catalog/resource_product_indexer_price_configurable' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Configurable::class,
             'catalog/resource_product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class,
             'catalog_resource/product_indexer_price_default' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Default::class,
             'catalog_resource/product_indexer_price_grouped' => \Mage_Catalog_Model_Resource_Product_Indexer_Price_Grouped::class,
@@ -26412,12 +26349,12 @@
             'catalog_resource/product_link_collection' => \Mage_Catalog_Model_Resource_Product_Link_Collection::class,
             'catalog/resource_product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
             'catalog_resource/product_link_product_collection' => \Mage_Catalog_Model_Resource_Product_Link_Product_Collection::class,
-            'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
             'catalog_resource/product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
-            'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
+            'catalog/resource_product_option' => \Mage_Catalog_Model_Resource_Product_Option::class,
             'catalog/resource_product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
-            'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
+            'catalog_resource/product_option_collection' => \Mage_Catalog_Model_Resource_Product_Option_Collection::class,
             'catalog_resource/product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
+            'catalog/resource_product_option_value' => \Mage_Catalog_Model_Resource_Product_Option_Value::class,
             'catalog/resource_product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
             'catalog_resource/product_option_value_collection' => \Mage_Catalog_Model_Resource_Product_Option_Value_Collection::class,
             'catalog_resource/product_relation' => \Mage_Catalog_Model_Resource_Product_Relation::class,
@@ -26426,14 +26363,14 @@
             'catalog/resource_product_status' => \Mage_Catalog_Model_Resource_Product_Status::class,
             'catalog_resource/product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class,
             'catalog/resource_product_type_configurable' => \Mage_Catalog_Model_Resource_Product_Type_Configurable::class,
-            'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
             'catalog/resource_product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
-            'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog_resource/product_type_configurable_attribute' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute::class,
             'catalog_resource/product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
+            'catalog/resource_product_type_configurable_attribute_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection::class,
             'catalog_resource/product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class,
             'catalog/resource_product_type_configurable_product_collection' => \Mage_Catalog_Model_Resource_Product_Type_Configurable_Product_Collection::class,
-            'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
             'catalog_resource/product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
+            'catalog/resource_product_website' => \Mage_Catalog_Model_Resource_Product_Website::class,
             'catalog/resource_setup' => \Mage_Catalog_Model_Resource_Setup::class,
             'catalog_resource/setup' => \Mage_Catalog_Model_Resource_Setup::class,
             'catalog_resource/url' => \Mage_Catalog_Model_Resource_Url::class,
@@ -26479,12 +26416,12 @@
             'checkout/observer' => \Mage_Checkout_Model_Observer::class,
             'checkout_resource/agreement' => \Mage_Checkout_Model_Resource_Agreement::class,
             'checkout/resource_agreement' => \Mage_Checkout_Model_Resource_Agreement::class,
-            'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
             'checkout/resource_agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
-            'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class,
+            'checkout_resource/agreement_collection' => \Mage_Checkout_Model_Resource_Agreement_Collection::class,
             'checkout_resource/cart' => \Mage_Checkout_Model_Resource_Cart::class,
-            'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class,
+            'checkout/resource_cart' => \Mage_Checkout_Model_Resource_Cart::class,
             'checkout/resource_setup' => \Mage_Checkout_Model_Resource_Setup::class,
+            'checkout_resource/setup' => \Mage_Checkout_Model_Resource_Setup::class,
             'checkout/session' => \Mage_Checkout_Model_Session::class,
             'checkout/type_abstract' => \Mage_Checkout_Model_Type_Abstract::class,
             'checkout/type_multishipping' => \Mage_Checkout_Model_Type_Multishipping::class,
@@ -26499,25 +26436,25 @@
             'cms/mysql4_page_service' => \Mage_Cms_Model_Mysql4_Page_Service::class,
             'cms/observer' => \Mage_Cms_Model_Observer::class,
             'cms/page' => \Mage_Cms_Model_Page::class,
-            'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class,
             'cms/resource_block' => \Mage_Cms_Model_Resource_Block::class,
+            'cms_resource/block' => \Mage_Cms_Model_Resource_Block::class,
             'cms_resource/block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class,
             'cms/resource_block_collection' => \Mage_Cms_Model_Resource_Block_Collection::class,
             'cms/resource_page' => \Mage_Cms_Model_Resource_Page::class,
             'cms_resource/page' => \Mage_Cms_Model_Resource_Page::class,
-            'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
             'cms_resource/page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
-            'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
+            'cms/resource_page_collection' => \Mage_Cms_Model_Resource_Page_Collection::class,
             'cms/resource_page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
+            'cms_resource/page_service' => \Mage_Cms_Model_Resource_Page_Service::class,
             'cms/template_filter' => \Mage_Cms_Model_Template_Filter::class,
             'cms/wysiwyg_config' => \Mage_Cms_Model_Wysiwyg_Config::class,
             'cms/wysiwyg_images_storage' => \Mage_Cms_Model_Wysiwyg_Images_Storage::class,
             'cms/wysiwyg_images_storage_collection' => \Mage_Cms_Model_Wysiwyg_Images_Storage_Collection::class,
             'configurableswatches/observer' => \Mage_ConfigurableSwatches_Model_Observer::class,
-            'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
             'configurableswatches_resource/catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
-            'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
+            'configurableswatches/resource_catalog_product_attribute_super_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_Collection::class,
             'configurableswatches_resource/catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
+            'configurableswatches/resource_catalog_product_type_configurable' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable::class,
             'configurableswatches_resource/catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
             'configurableswatches/resource_catalog_product_type_configurable_product_collection' => \Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable_Product_Collection::class,
             'configurableswatches/system_config_source_catalog_product_configattribute' => \Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute::class,
@@ -26624,152 +26561,152 @@
             'core/mysql4_website_collection' => \Mage_Core_Model_Mysql4_Website_Collection::class,
             'core/observer' => \Mage_Core_Model_Observer::class,
             'core/resource' => \Mage_Core_Model_Resource::class,
+            'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
             'core_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
             'core/resource_abstract' => \Mage_Core_Model_Resource_Abstract::class,
-            'payment_resource/abstract' => \Mage_Core_Model_Resource_Abstract::class,
+            'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
             'core/resource_cache' => \Mage_Core_Model_Resource_Cache::class,
             'core_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
-            'payment_resource/cache' => \Mage_Core_Model_Resource_Cache::class,
+            'core/resource_config' => \Mage_Core_Model_Resource_Config::class,
             'core_resource/config' => \Mage_Core_Model_Resource_Config::class,
             'payment_resource/config' => \Mage_Core_Model_Resource_Config::class,
-            'core/resource_config' => \Mage_Core_Model_Resource_Config::class,
-            'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
             'core/resource_config_data' => \Mage_Core_Model_Resource_Config_Data::class,
+            'core_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
             'payment_resource/config_data' => \Mage_Core_Model_Resource_Config_Data::class,
-            'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'core_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'core/resource_config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
-            'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
-            'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
+            'payment_resource/config_data_collection' => \Mage_Core_Model_Resource_Config_Data_Collection::class,
             'payment_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
-            'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
+            'core/resource_db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
+            'core_resource/db_abstract' => \Mage_Core_Model_Resource_Db_Abstract::class,
             'core_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
             'core/resource_db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
-            'core/resource_design' => \Mage_Core_Model_Resource_Design::class,
+            'payment_resource/db_collection_abstract' => \Mage_Core_Model_Resource_Db_Collection_Abstract::class,
             'core_resource/design' => \Mage_Core_Model_Resource_Design::class,
+            'core/resource_design' => \Mage_Core_Model_Resource_Design::class,
             'payment_resource/design' => \Mage_Core_Model_Resource_Design::class,
             'payment_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
-            'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
             'core/resource_design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
-            'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
+            'core_resource/design_collection' => \Mage_Core_Model_Resource_Design_Collection::class,
             'payment_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
             'core/resource_design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
+            'core_resource/design_package_collection' => \Mage_Core_Model_Resource_Design_Package_Collection::class,
             'core_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
             'payment_resource/email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
             'core/resource_email_queue' => \Mage_Core_Model_Resource_Email_Queue::class,
-            'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
-            'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
             'payment_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
-            'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
+            'core_resource/email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
+            'core/resource_email_queue_collection' => \Mage_Core_Model_Resource_Email_Queue_Collection::class,
             'core/resource_email_template' => \Mage_Core_Model_Resource_Email_Template::class,
             'core_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
-            'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
+            'payment_resource/email_template' => \Mage_Core_Model_Resource_Email_Template::class,
             'core/resource_email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
+            'payment_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
             'core_resource/email_template_collection' => \Mage_Core_Model_Resource_Email_Template_Collection::class,
-            'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
-            'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
             'core_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
-            'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
-            'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'core/resource_entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
+            'payment_resource/entity_abstract' => \Mage_Core_Model_Resource_Entity_Abstract::class,
             'core_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'payment_resource/entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'core/resource_entity_table' => \Mage_Core_Model_Resource_Entity_Table::class,
+            'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
             'payment_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
             'core/resource_file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
-            'core_resource/file_storage_abstract' => \Mage_Core_Model_Resource_File_Storage_Abstract::class,
+            'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
             'payment_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
             'core/resource_file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
-            'core_resource/file_storage_database' => \Mage_Core_Model_Resource_File_Storage_Database::class,
+            'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
             'core_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
             'core/resource_file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
-            'payment_resource/file_storage_directory_database' => \Mage_Core_Model_Resource_File_Storage_Directory_Database::class,
-            'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
-            'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
             'core/resource_file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
-            'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
+            'payment_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
+            'core_resource/file_storage_file' => \Mage_Core_Model_Resource_File_Storage_File::class,
             'payment_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
+            'core_resource/flag' => \Mage_Core_Model_Resource_Flag::class,
             'core/resource_flag' => \Mage_Core_Model_Resource_Flag::class,
             'payment_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
-            'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
             'core_resource/helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
-            'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
+            'core/resource_helper_abstract' => \Mage_Core_Model_Resource_Helper_Abstract::class,
             'core/resource_helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
+            'payment_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
             'core_resource/helper_mysql4' => \Mage_Core_Model_Resource_Helper_Mysql4::class,
             'core_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
             'payment_resource/iterator' => \Mage_Core_Model_Resource_Iterator::class,
             'core/resource_iterator' => \Mage_Core_Model_Resource_Iterator::class,
             'payment_resource/language' => \Mage_Core_Model_Resource_Language::class,
-            'core/resource_language' => \Mage_Core_Model_Resource_Language::class,
             'core_resource/language' => \Mage_Core_Model_Resource_Language::class,
+            'core/resource_language' => \Mage_Core_Model_Resource_Language::class,
             'payment_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
-            'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
             'core/resource_language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
-            'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
+            'core_resource/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
             'core_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
             'core/resource_layout' => \Mage_Core_Model_Resource_Layout::class,
+            'payment_resource/layout' => \Mage_Core_Model_Resource_Layout::class,
             'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
-            'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class,
             'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
+            'core/resource_resource' => \Mage_Core_Model_Resource_Resource::class,
             'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
-            'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'payment_resource/session' => \Mage_Core_Model_Resource_Session::class,
+            'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
             'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class,
             'payment_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
-            'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core/resource_setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
+            'payment_resource/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'payment_resource/store' => \Mage_Core_Model_Resource_Store::class,
             'core_resource/store' => \Mage_Core_Model_Resource_Store::class,
             'core/resource_store' => \Mage_Core_Model_Resource_Store::class,
-            'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
             'core/resource_store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
+            'core_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
             'payment_resource/store_collection' => \Mage_Core_Model_Resource_Store_Collection::class,
-            'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'core/resource_store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'payment_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
-            'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
-            'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
+            'core_resource/store_group' => \Mage_Core_Model_Resource_Store_Group::class,
             'payment_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
-            'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
-            'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class,
+            'core/resource_store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
+            'core_resource/store_group_collection' => \Mage_Core_Model_Resource_Store_Group_Collection::class,
             'core_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
-            'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class,
+            'core/resource_transaction' => \Mage_Core_Model_Resource_Transaction::class,
+            'payment_resource/transaction' => \Mage_Core_Model_Resource_Transaction::class,
             'core_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
+            'core/resource_translate' => \Mage_Core_Model_Resource_Translate::class,
             'payment_resource/translate' => \Mage_Core_Model_Resource_Translate::class,
-            'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
-            'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
             'payment_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
-            'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'core/resource_translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
+            'core_resource/translate_string' => \Mage_Core_Model_Resource_Translate_String::class,
             'core/resource_type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'core_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
             'payment_resource/type_abstract' => \Mage_Core_Model_Resource_Type_Abstract::class,
+            'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'core_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'core/resource_type_db' => \Mage_Core_Model_Resource_Type_Db::class,
-            'payment_resource/type_db' => \Mage_Core_Model_Resource_Type_Db::class,
             'core_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
             'payment_resource/type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
             'core/resource_type_db_mysqli' => \Mage_Core_Model_Resource_Type_Db_Mysqli::class,
-            'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
-            'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
             'payment_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'core/resource_type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
+            'core_resource/type_db_mysqli_setup' => \Mage_Core_Model_Resource_Type_Db_Mysqli_Setup::class,
             'payment_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
-            'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
             'core_resource/type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
-            'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
-            'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
+            'core/resource_type_db_pdo_mysql' => \Mage_Core_Model_Resource_Type_Db_Pdo_Mysql::class,
             'payment_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
+            'core/resource_url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
+            'core_resource/url_rewrite' => \Mage_Core_Model_Resource_Url_Rewrite::class,
             'core_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'payment_resource/url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'core/resource_url_rewrite_collection' => \Mage_Core_Model_Resource_Url_Rewrite_Collection::class,
             'core_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
-            'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
             'core/resource_variable' => \Mage_Core_Model_Resource_Variable::class,
+            'payment_resource/variable' => \Mage_Core_Model_Resource_Variable::class,
             'core/resource_variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
-            'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
             'core_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
+            'payment_resource/variable_collection' => \Mage_Core_Model_Resource_Variable_Collection::class,
+            'core/resource_website' => \Mage_Core_Model_Resource_Website::class,
             'core_resource/website' => \Mage_Core_Model_Resource_Website::class,
             'payment_resource/website' => \Mage_Core_Model_Resource_Website::class,
-            'core/resource_website' => \Mage_Core_Model_Resource_Website::class,
-            'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core/resource_website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
+            'payment_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core_resource/website_collection' => \Mage_Core_Model_Resource_Website_Collection::class,
             'core/session' => \Mage_Core_Model_Session::class,
             'core/session_abstract' => \Mage_Core_Model_Session_Abstract::class,
@@ -26799,10 +26736,10 @@
             'cron/mysql4_schedule' => \Mage_Cron_Model_Mysql4_Schedule::class,
             'cron/mysql4_schedule_collection' => \Mage_Cron_Model_Mysql4_Schedule_Collection::class,
             'cron/observer' => \Mage_Cron_Model_Observer::class,
-            'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class,
             'cron/resource_schedule' => \Mage_Cron_Model_Resource_Schedule::class,
-            'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
+            'cron_resource/schedule' => \Mage_Cron_Model_Resource_Schedule::class,
             'cron/resource_schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
+            'cron_resource/schedule_collection' => \Mage_Cron_Model_Resource_Schedule_Collection::class,
             'cron/schedule' => \Mage_Cron_Model_Schedule::class,
             'currencysymbol/observer' => \Mage_CurrencySymbol_Model_Observer::class,
             'currencysymbol/system_currencysymbol' => \Mage_CurrencySymbol_Model_System_Currencysymbol::class,
@@ -26877,16 +26814,16 @@
             'customer_resource/address' => \Mage_Customer_Model_Resource_Address::class,
             'customer/resource_address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class,
             'customer_resource/address_attribute_backend_region' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Region::class,
-            'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
             'customer_resource/address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
-            'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
+            'customer/resource_address_attribute_backend_street' => \Mage_Customer_Model_Resource_Address_Attribute_Backend_Street::class,
             'customer/resource_address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
-            'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
+            'customer_resource/address_attribute_collection' => \Mage_Customer_Model_Resource_Address_Attribute_Collection::class,
             'customer/resource_address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
-            'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
+            'customer_resource/address_attribute_source_country' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Country::class,
             'customer_resource/address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
-            'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
+            'customer/resource_address_attribute_source_region' => \Mage_Customer_Model_Resource_Address_Attribute_Source_Region::class,
             'customer_resource/address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
+            'customer/resource_address_collection' => \Mage_Customer_Model_Resource_Address_Collection::class,
             'customer/resource_attribute' => \Mage_Customer_Model_Resource_Attribute::class,
             'customer_resource/attribute' => \Mage_Customer_Model_Resource_Attribute::class,
             'customer_resource/attribute_collection' => \Mage_Customer_Model_Resource_Attribute_Collection::class,
@@ -26895,22 +26832,22 @@
             'customer_resource/customer' => \Mage_Customer_Model_Resource_Customer::class,
             'customer_resource/customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class,
             'customer/resource_customer_collection' => \Mage_Customer_Model_Resource_Customer_Collection::class,
-            'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
             'customer/resource_flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
-            'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
+            'customer_resource/flowpassword' => \Mage_Customer_Model_Resource_Flowpassword::class,
             'customer/resource_flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
-            'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
+            'customer_resource/flowpassword_collection' => \Mage_Customer_Model_Resource_Flowpassword_Collection::class,
             'customer/resource_form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
-            'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
+            'customer_resource/form_attribute' => \Mage_Customer_Model_Resource_Form_Attribute::class,
             'customer/resource_form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
+            'customer_resource/form_attribute_collection' => \Mage_Customer_Model_Resource_Form_Attribute_Collection::class,
             'customer/resource_group' => \Mage_Customer_Model_Resource_Group::class,
             'customer_resource/group' => \Mage_Customer_Model_Resource_Group::class,
             'customer_resource/group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class,
             'customer/resource_group_collection' => \Mage_Customer_Model_Resource_Group_Collection::class,
-            'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class,
             'customer_resource/setup' => \Mage_Customer_Model_Resource_Setup::class,
-            'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
+            'customer/resource_setup' => \Mage_Customer_Model_Resource_Setup::class,
             'customer_resource/wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
+            'customer/resource_wishlist_collection' => \Mage_Customer_Model_Resource_Wishlist_Collection::class,
             'customer/session' => \Mage_Customer_Model_Session::class,
             'dataflow/batch' => \Mage_Dataflow_Model_Batch::class,
             'dataflow/batch_abstract' => \Mage_Dataflow_Model_Batch_Abstract::class,
@@ -26962,10 +26899,10 @@
             'dataflow/mysql4_session' => \Mage_Dataflow_Model_Mysql4_Session::class,
             'dataflow/profile' => \Mage_Dataflow_Model_Profile::class,
             'dataflow/profile_history' => \Mage_Dataflow_Model_Profile_History::class,
-            'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class,
             'dataflow/resource_batch' => \Mage_Dataflow_Model_Resource_Batch::class,
-            'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
+            'dataflow_resource/batch' => \Mage_Dataflow_Model_Resource_Batch::class,
             'dataflow/resource_batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
+            'dataflow_resource/batch_abstract' => \Mage_Dataflow_Model_Resource_Batch_Abstract::class,
             'dataflow/resource_batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class,
             'dataflow_resource/batch_collection' => \Mage_Dataflow_Model_Resource_Batch_Collection::class,
             'dataflow_resource/batch_export' => \Mage_Dataflow_Model_Resource_Batch_Export::class,
@@ -26976,12 +26913,12 @@
             'dataflow/resource_import' => \Mage_Dataflow_Model_Resource_Import::class,
             'dataflow_resource/import_collection' => \Mage_Dataflow_Model_Resource_Import_Collection::class,
             'dataflow/resource_import_collection' => \Mage_Dataflow_Model_Resource_Import_Collection::class,
-            'dataflow_resource/profile' => \Mage_Dataflow_Model_Resource_Profile::class,
             'dataflow/resource_profile' => \Mage_Dataflow_Model_Resource_Profile::class,
+            'dataflow_resource/profile' => \Mage_Dataflow_Model_Resource_Profile::class,
             'dataflow/resource_profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class,
             'dataflow_resource/profile_collection' => \Mage_Dataflow_Model_Resource_Profile_Collection::class,
-            'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
             'dataflow_resource/profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
+            'dataflow/resource_profile_history' => \Mage_Dataflow_Model_Resource_Profile_History::class,
             'dataflow_resource/profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class,
             'dataflow/resource_profile_history_collection' => \Mage_Dataflow_Model_Resource_Profile_History_Collection::class,
             'dataflow_resource/session' => \Mage_Dataflow_Model_Resource_Session::class,
@@ -27015,8 +26952,8 @@
             'directory/resource_country' => \Mage_Directory_Model_Resource_Country::class,
             'directory_resource/country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class,
             'directory/resource_country_collection' => \Mage_Directory_Model_Resource_Country_Collection::class,
-            'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
             'directory/resource_country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
+            'directory_resource/country_format' => \Mage_Directory_Model_Resource_Country_Format::class,
             'directory_resource/country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class,
             'directory/resource_country_format_collection' => \Mage_Directory_Model_Resource_Country_Format_Collection::class,
             'directory_resource/currency' => \Mage_Directory_Model_Resource_Currency::class,
@@ -27047,8 +26984,8 @@
             'downloadable/observer' => \Mage_Downloadable_Model_Observer::class,
             'downloadable/product_price' => \Mage_Downloadable_Model_Product_Price::class,
             'downloadable/product_type' => \Mage_Downloadable_Model_Product_Type::class,
-            'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
             'downloadable_resource/indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
+            'downloadable/resource_indexer_price' => \Mage_Downloadable_Model_Resource_Indexer_Price::class,
             'downloadable/resource_link' => \Mage_Downloadable_Model_Resource_Link::class,
             'downloadable_resource/link' => \Mage_Downloadable_Model_Resource_Link::class,
             'downloadable/resource_link_collection' => \Mage_Downloadable_Model_Resource_Link_Collection::class,
@@ -27057,12 +26994,12 @@
             'downloadable_resource/link_purchased' => \Mage_Downloadable_Model_Resource_Link_Purchased::class,
             'downloadable/resource_link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class,
             'downloadable_resource/link_purchased_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Collection::class,
-            'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
             'downloadable/resource_link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
+            'downloadable_resource/link_purchased_item' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item::class,
             'downloadable/resource_link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
             'downloadable_resource/link_purchased_item_collection' => \Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection::class,
-            'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class,
             'downloadable/resource_sample' => \Mage_Downloadable_Model_Resource_Sample::class,
+            'downloadable_resource/sample' => \Mage_Downloadable_Model_Resource_Sample::class,
             'downloadable_resource/sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
             'downloadable/resource_sample_collection' => \Mage_Downloadable_Model_Resource_Sample_Collection::class,
             'downloadable/sales_order_pdf_items_abstract' => \Mage_Downloadable_Model_Sales_Order_Pdf_Items_Abstract::class,
@@ -27150,46 +27087,46 @@
             'eav/resource_attribute' => \Mage_Eav_Model_Resource_Attribute::class,
             'eav_resource/attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class,
             'eav/resource_attribute_collection' => \Mage_Eav_Model_Resource_Attribute_Collection::class,
-            'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class,
             'eav_resource/config' => \Mage_Eav_Model_Resource_Config::class,
+            'eav/resource_config' => \Mage_Eav_Model_Resource_Config::class,
             'eav/resource_entity_attribute' => \Mage_Eav_Model_Resource_Entity_Attribute::class,
             'eav_resource/entity_attribute' => \Mage_Eav_Model_Resource_Entity_Attribute::class,
             'eav_resource/entity_attribute_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Collection::class,
             'eav/resource_entity_attribute_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Collection::class,
             'eav_resource/entity_attribute_group' => \Mage_Eav_Model_Resource_Entity_Attribute_Group::class,
             'eav/resource_entity_attribute_group' => \Mage_Eav_Model_Resource_Entity_Attribute_Group::class,
-            'eav/resource_entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class,
             'eav_resource/entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class,
+            'eav/resource_entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class,
             'eav/resource_entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
             'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
-            'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
-            'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
+            'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
-            'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
+            'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
+            'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
             'eav_resource/entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class,
             'eav/resource_entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class,
             'eav_resource/entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class,
             'eav/resource_entity_type' => \Mage_Eav_Model_Resource_Entity_Type::class,
-            'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
             'eav_resource/entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
+            'eav/resource_entity_type_collection' => \Mage_Eav_Model_Resource_Entity_Type_Collection::class,
             'eav/resource_form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class,
             'eav_resource/form_attribute' => \Mage_Eav_Model_Resource_Form_Attribute::class,
-            'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
             'eav/resource_form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
+            'eav_resource/form_attribute_collection' => \Mage_Eav_Model_Resource_Form_Attribute_Collection::class,
             'eav/resource_form_element' => \Mage_Eav_Model_Resource_Form_Element::class,
             'eav_resource/form_element' => \Mage_Eav_Model_Resource_Form_Element::class,
-            'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
             'eav_resource/form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
-            'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
+            'eav/resource_form_element_collection' => \Mage_Eav_Model_Resource_Form_Element_Collection::class,
             'eav/resource_form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
+            'eav_resource/form_fieldset' => \Mage_Eav_Model_Resource_Form_Fieldset::class,
             'eav_resource/form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
             'eav/resource_form_fieldset_collection' => \Mage_Eav_Model_Resource_Form_Fieldset_Collection::class,
             'eav/resource_form_type' => \Mage_Eav_Model_Resource_Form_Type::class,
             'eav_resource/form_type' => \Mage_Eav_Model_Resource_Form_Type::class,
-            'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class,
             'eav_resource/form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class,
+            'eav/resource_form_type_collection' => \Mage_Eav_Model_Resource_Form_Type_Collection::class,
             'eav_resource/helper_mysql4' => \Mage_Eav_Model_Resource_Helper_Mysql4::class,
             'eav/resource_helper_mysql4' => \Mage_Eav_Model_Resource_Helper_Mysql4::class,
             'giftmessage/api' => \Mage_GiftMessage_Model_Api::class,
@@ -27201,12 +27138,12 @@
             'giftmessage/mysql4_message_collection' => \Mage_GiftMessage_Model_Mysql4_Message_Collection::class,
             'giftmessage/mysql4_setup' => \Mage_GiftMessage_Model_Mysql4_Setup::class,
             'giftmessage/observer' => \Mage_GiftMessage_Model_Observer::class,
-            'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class,
             'giftmessage/resource_message' => \Mage_GiftMessage_Model_Resource_Message::class,
-            'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
+            'giftmessage_resource/message' => \Mage_GiftMessage_Model_Resource_Message::class,
             'giftmessage_resource/message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
-            'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
+            'giftmessage/resource_message_collection' => \Mage_GiftMessage_Model_Resource_Message_Collection::class,
             'giftmessage_resource/setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
+            'giftmessage/resource_setup' => \Mage_GiftMessage_Model_Resource_Setup::class,
             'googleanalytics/observer' => \Mage_GoogleAnalytics_Model_Observer::class,
             'googleanalytics/system_config_source_type' => \Mage_GoogleAnalytics_Model_System_Config_Source_Type::class,
             'googlecheckout/payment' => \Mage_GoogleCheckout_Model_Payment::class,
@@ -27242,8 +27179,8 @@
             'importexport/product_attribute_backend_urlkey' => \Mage_ImportExport_Model_Product_Attribute_Backend_Urlkey::class,
             'importexport_resource/helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class,
             'importexport/resource_helper_mysql4' => \Mage_ImportExport_Model_Resource_Helper_Mysql4::class,
-            'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
             'importexport_resource/import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
+            'importexport/resource_import_data' => \Mage_ImportExport_Model_Resource_Import_Data::class,
             'importexport_resource/setup' => \Mage_ImportExport_Model_Resource_Setup::class,
             'importexport/resource_setup' => \Mage_ImportExport_Model_Resource_Setup::class,
             'importexport/source_export_entity' => \Mage_ImportExport_Model_Source_Export_Entity::class,
@@ -27265,16 +27202,16 @@
             'index/process' => \Mage_Index_Model_Process::class,
             'index_resource/abstract' => \Mage_Index_Model_Resource_Abstract::class,
             'index/resource_abstract' => \Mage_Index_Model_Resource_Abstract::class,
-            'index/resource_event' => \Mage_Index_Model_Resource_Event::class,
             'index_resource/event' => \Mage_Index_Model_Resource_Event::class,
+            'index/resource_event' => \Mage_Index_Model_Resource_Event::class,
             'index/resource_event_collection' => \Mage_Index_Model_Resource_Event_Collection::class,
             'index_resource/event_collection' => \Mage_Index_Model_Resource_Event_Collection::class,
             'index/resource_helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class,
             'index_resource/helper_mysql4' => \Mage_Index_Model_Resource_Helper_Mysql4::class,
-            'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
             'index/resource_lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
-            'index_resource/process' => \Mage_Index_Model_Resource_Process::class,
+            'index_resource/lock_resource' => \Mage_Index_Model_Resource_Lock_Resource::class,
             'index/resource_process' => \Mage_Index_Model_Resource_Process::class,
+            'index_resource/process' => \Mage_Index_Model_Resource_Process::class,
             'index/resource_process_collection' => \Mage_Index_Model_Resource_Process_Collection::class,
             'index_resource/process_collection' => \Mage_Index_Model_Resource_Process_Collection::class,
             'index/resource_setup' => \Mage_Index_Model_Resource_Setup::class,
@@ -27307,22 +27244,22 @@
             'log/mysql4_visitor_online_collection' => \Mage_Log_Model_Mysql4_Visitor_Online_Collection::class,
             'log_resource/aggregation' => \Mage_Log_Model_Resource_Aggregation::class,
             'log/resource_aggregation' => \Mage_Log_Model_Resource_Aggregation::class,
-            'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class,
             'log/resource_customer' => \Mage_Log_Model_Resource_Customer::class,
+            'log_resource/customer' => \Mage_Log_Model_Resource_Customer::class,
             'log/resource_log' => \Mage_Log_Model_Resource_Log::class,
             'log_resource/log' => \Mage_Log_Model_Resource_Log::class,
             'log_resource/visitor' => \Mage_Log_Model_Resource_Visitor::class,
             'log/resource_visitor' => \Mage_Log_Model_Resource_Visitor::class,
             'log_resource/visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class,
             'log/resource_visitor_collection' => \Mage_Log_Model_Resource_Visitor_Collection::class,
-            'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
             'log_resource/visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
-            'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
+            'log/resource_visitor_online' => \Mage_Log_Model_Resource_Visitor_Online::class,
             'log_resource/visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
+            'log/resource_visitor_online_collection' => \Mage_Log_Model_Resource_Visitor_Online_Collection::class,
             'log/visitor' => \Mage_Log_Model_Visitor::class,
             'log/visitor_online' => \Mage_Log_Model_Visitor_Online::class,
-            'media_resource/image' => \Mage_Media_Model_File_Image::class,
             'media/file_image' => \Mage_Media_Model_File_Image::class,
+            'media_resource/image' => \Mage_Media_Model_File_Image::class,
             'media/image' => \Mage_Media_Model_Image::class,
             'newsletter/message' => \Mage_Newsletter_Model_Message::class,
             'newsletter/mysql4_problem' => \Mage_Newsletter_Model_Mysql4_Problem::class,
@@ -27340,14 +27277,14 @@
             'newsletter_resource/problem' => \Mage_Newsletter_Model_Resource_Problem::class,
             'newsletter/resource_problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class,
             'newsletter_resource/problem_collection' => \Mage_Newsletter_Model_Resource_Problem_Collection::class,
-            'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class,
             'newsletter/resource_queue' => \Mage_Newsletter_Model_Resource_Queue::class,
-            'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
+            'newsletter_resource/queue' => \Mage_Newsletter_Model_Resource_Queue::class,
             'newsletter/resource_queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
-            'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
+            'newsletter_resource/queue_collection' => \Mage_Newsletter_Model_Resource_Queue_Collection::class,
             'newsletter/resource_subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
-            'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
+            'newsletter_resource/subscriber' => \Mage_Newsletter_Model_Resource_Subscriber::class,
             'newsletter/resource_subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
+            'newsletter_resource/subscriber_collection' => \Mage_Newsletter_Model_Resource_Subscriber_Collection::class,
             'newsletter_resource/template' => \Mage_Newsletter_Model_Resource_Template::class,
             'newsletter/resource_template' => \Mage_Newsletter_Model_Resource_Template::class,
             'newsletter_resource/template_collection' => \Mage_Newsletter_Model_Resource_Template_Collection::class,
@@ -27360,20 +27297,20 @@
             'oauth/consumer_validator_keyLength' => \Mage_Oauth_Model_Consumer_Validator_KeyLength::class,
             'oauth/nonce' => \Mage_Oauth_Model_Nonce::class,
             'oauth/observer' => \Mage_Oauth_Model_Observer::class,
-            'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
             'oauth/resource_consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
+            'oauth_resource/consumer' => \Mage_Oauth_Model_Resource_Consumer::class,
             'oauth/resource_consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class,
             'oauth_resource/consumer_collection' => \Mage_Oauth_Model_Resource_Consumer_Collection::class,
             'oauth_resource/nonce' => \Mage_Oauth_Model_Resource_Nonce::class,
             'oauth/resource_nonce' => \Mage_Oauth_Model_Resource_Nonce::class,
             'oauth_resource/nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class,
             'oauth/resource_nonce_collection' => \Mage_Oauth_Model_Resource_Nonce_Collection::class,
-            'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class,
             'oauth/resource_setup' => \Mage_Oauth_Model_Resource_Setup::class,
-            'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class,
+            'oauth_resource/setup' => \Mage_Oauth_Model_Resource_Setup::class,
             'oauth_resource/token' => \Mage_Oauth_Model_Resource_Token::class,
-            'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
+            'oauth/resource_token' => \Mage_Oauth_Model_Resource_Token::class,
             'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
+            'oauth/resource_token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
             'oauth/server' => \Mage_Oauth_Model_Server::class,
             'oauth/token' => \Mage_Oauth_Model_Token::class,
             'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class,
@@ -27390,8 +27327,8 @@
             'paygate/authorizenet_source_paymentAction' => \Mage_Paygate_Model_Authorizenet_Source_PaymentAction::class,
             'paygate/mysql4_authorizenet_debug' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug::class,
             'paygate/mysql4_authorizenet_debug_collection' => \Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection::class,
-            'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
             'paygate/resource_authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
+            'paygate_resource/authorizenet_debug' => \Mage_Paygate_Model_Resource_Authorizenet_Debug::class,
             'paygate_resource/authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class,
             'paygate/resource_authorizenet_debug_collection' => \Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection::class,
             'payment/billing_agreementAbstract' => \Mage_Payment_Model_Billing_AgreementAbstract::class,
@@ -27454,12 +27391,12 @@
             'paypal/resource_cert' => \Mage_Paypal_Model_Resource_Cert::class,
             'paypal_resource/payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class,
             'paypal/resource_payment_transaction' => \Mage_Paypal_Model_Resource_Payment_Transaction::class,
-            'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
             'paypal/resource_payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
+            'paypal_resource/payment_transaction_collection' => \Mage_Paypal_Model_Resource_Payment_Transaction_Collection::class,
             'paypal/resource_report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class,
             'paypal_resource/report_settlement' => \Mage_Paypal_Model_Resource_Report_Settlement::class,
-            'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
             'paypal/resource_report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
+            'paypal_resource/report_settlement_row' => \Mage_Paypal_Model_Resource_Report_Settlement_Row::class,
             'paypal_resource/report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
             'paypal/resource_report_settlement_row_collection' => \Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection::class,
             'paypal/resource_setup' => \Mage_Paypal_Model_Resource_Setup::class,
@@ -27484,8 +27421,8 @@
             'persistent/observer' => \Mage_Persistent_Model_Observer::class,
             'persistent/observer_session' => \Mage_Persistent_Model_Observer_Session::class,
             'persistent/persistent_config' => \Mage_Persistent_Model_Persistent_Config::class,
-            'persistent/resource_session' => \Mage_Persistent_Model_Resource_Session::class,
             'persistent_resource/session' => \Mage_Persistent_Model_Resource_Session::class,
+            'persistent/resource_session' => \Mage_Persistent_Model_Resource_Session::class,
             'persistent/session' => \Mage_Persistent_Model_Session::class,
             'poll/mysql4_poll' => \Mage_Poll_Model_Mysql4_Poll::class,
             'poll/mysql4_poll_answer' => \Mage_Poll_Model_Mysql4_Poll_Answer::class,
@@ -27495,16 +27432,16 @@
             'poll/poll' => \Mage_Poll_Model_Poll::class,
             'poll/poll_answer' => \Mage_Poll_Model_Poll_Answer::class,
             'poll/poll_vote' => \Mage_Poll_Model_Poll_Vote::class,
-            'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class,
             'poll_resource/poll' => \Mage_Poll_Model_Resource_Poll::class,
+            'poll/resource_poll' => \Mage_Poll_Model_Resource_Poll::class,
             'poll_resource/poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
             'poll/resource_poll_answer' => \Mage_Poll_Model_Resource_Poll_Answer::class,
-            'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
             'poll_resource/poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
-            'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
+            'poll/resource_poll_answer_collection' => \Mage_Poll_Model_Resource_Poll_Answer_Collection::class,
             'poll_resource/poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
-            'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
+            'poll/resource_poll_collection' => \Mage_Poll_Model_Resource_Poll_Collection::class,
             'poll/resource_poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
+            'poll_resource/poll_vote' => \Mage_Poll_Model_Resource_Poll_Vote::class,
             'productalert/email' => \Mage_ProductAlert_Model_Email::class,
             'productalert/mysql4_price' => \Mage_ProductAlert_Model_Mysql4_Price::class,
             'productalert/mysql4_price_collection' => \Mage_ProductAlert_Model_Mysql4_Price_Collection::class,
@@ -27514,20 +27451,20 @@
             'productalert/mysql4_stock_customer_collection' => \Mage_ProductAlert_Model_Mysql4_Stock_Customer_Collection::class,
             'productalert/observer' => \Mage_ProductAlert_Model_Observer::class,
             'productalert/price' => \Mage_ProductAlert_Model_Price::class,
-            'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
             'productalert_resource/abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
-            'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class,
+            'productalert/resource_abstract' => \Mage_ProductAlert_Model_Resource_Abstract::class,
             'productalert_resource/price' => \Mage_ProductAlert_Model_Resource_Price::class,
-            'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
+            'productalert/resource_price' => \Mage_ProductAlert_Model_Resource_Price::class,
             'productalert/resource_price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
-            'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
+            'productalert_resource/price_collection' => \Mage_ProductAlert_Model_Resource_Price_Collection::class,
             'productalert/resource_price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
+            'productalert_resource/price_customer_collection' => \Mage_ProductAlert_Model_Resource_Price_Customer_Collection::class,
             'productalert_resource/stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
             'productalert/resource_stock' => \Mage_ProductAlert_Model_Resource_Stock::class,
-            'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
             'productalert/resource_stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
-            'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
+            'productalert_resource/stock_collection' => \Mage_ProductAlert_Model_Resource_Stock_Collection::class,
             'productalert/resource_stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
+            'productalert_resource/stock_customer_collection' => \Mage_ProductAlert_Model_Resource_Stock_Customer_Collection::class,
             'productalert/stock' => \Mage_ProductAlert_Model_Stock::class,
             'rating/mysql4_rating' => \Mage_Rating_Model_Mysql4_Rating::class,
             'rating/mysql4_rating_collection' => \Mage_Rating_Model_Mysql4_Rating_Collection::class,
@@ -27541,20 +27478,20 @@
             'rating/rating_entity' => \Mage_Rating_Model_Rating_Entity::class,
             'rating/rating_option' => \Mage_Rating_Model_Rating_Option::class,
             'rating/rating_option_vote' => \Mage_Rating_Model_Rating_Option_Vote::class,
-            'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class,
             'rating/resource_rating' => \Mage_Rating_Model_Resource_Rating::class,
+            'rating_resource/rating' => \Mage_Rating_Model_Resource_Rating::class,
             'rating_resource/rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class,
             'rating/resource_rating_collection' => \Mage_Rating_Model_Resource_Rating_Collection::class,
             'rating/resource_rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class,
             'rating_resource/rating_entity' => \Mage_Rating_Model_Resource_Rating_Entity::class,
-            'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
             'rating/resource_rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
-            'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
+            'rating_resource/rating_option' => \Mage_Rating_Model_Resource_Rating_Option::class,
             'rating_resource/rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
+            'rating/resource_rating_option_collection' => \Mage_Rating_Model_Resource_Rating_Option_Collection::class,
             'rating_resource/rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class,
             'rating/resource_rating_option_vote' => \Mage_Rating_Model_Resource_Rating_Option_Vote::class,
-            'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
             'rating/resource_rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
+            'rating_resource/rating_option_vote_collection' => \Mage_Rating_Model_Resource_Rating_Option_Vote_Collection::class,
             'reports/config' => \Mage_Reports_Model_Config::class,
             'reports/event' => \Mage_Reports_Model_Event::class,
             'reports/event_observer' => \Mage_Reports_Model_Event_Observer::class,
@@ -27600,6 +27537,7 @@
             'reports/mysql4_tax_collection' => \Mage_Reports_Model_Mysql4_Tax_Collection::class,
             'reports/mysql4_wishlist_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Collection::class,
             'reports/mysql4_wishlist_product_collection' => \Mage_Reports_Model_Mysql4_Wishlist_Product_Collection::class,
+            'reports/observer' => \Mage_Reports_Model_Observer::class,
             'reports/product_index_abstract' => \Mage_Reports_Model_Product_Index_Abstract::class,
             'reports/product_index_compared' => \Mage_Reports_Model_Product_Index_Compared::class,
             'reports/product_index_viewed' => \Mage_Reports_Model_Product_Index_Viewed::class,
@@ -27608,88 +27546,88 @@
             'reports_resource/accounts_collection' => \Mage_Reports_Model_Resource_Accounts_Collection::class,
             'reports/resource_coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class,
             'reports_resource/coupons_collection' => \Mage_Reports_Model_Resource_Coupons_Collection::class,
-            'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
             'reports/resource_customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
-            'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
+            'reports_resource/customer_collection' => \Mage_Reports_Model_Resource_Customer_Collection::class,
             'reports/resource_customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
-            'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
+            'reports_resource/customer_orders_collection' => \Mage_Reports_Model_Resource_Customer_Orders_Collection::class,
             'reports_resource/customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
-            'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
+            'reports/resource_customer_totals_collection' => \Mage_Reports_Model_Resource_Customer_Totals_Collection::class,
             'reports/resource_entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
+            'reports_resource/entity_summary_collection_abstract' => \Mage_Reports_Model_Resource_Entity_Summary_Collection_Abstract::class,
             'reports_resource/event' => \Mage_Reports_Model_Resource_Event::class,
             'reports/resource_event' => \Mage_Reports_Model_Resource_Event::class,
             'reports_resource/event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
             'reports/resource_event_collection' => \Mage_Reports_Model_Resource_Event_Collection::class,
             'reports_resource/event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
             'reports/resource_event_type' => \Mage_Reports_Model_Resource_Event_Type::class,
-            'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
             'reports/resource_event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
-            'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
+            'reports_resource/event_type_collection' => \Mage_Reports_Model_Resource_Event_Type_Collection::class,
             'reports_resource/helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
-            'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
+            'reports/resource_helper_mysql4' => \Mage_Reports_Model_Resource_Helper_Mysql4::class,
             'reports/resource_invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
-            'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
+            'reports_resource/invoiced_collection' => \Mage_Reports_Model_Resource_Invoiced_Collection::class,
             'reports_resource/order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
-            'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
+            'reports/resource_order_collection' => \Mage_Reports_Model_Resource_Order_Collection::class,
             'reports_resource/product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
+            'reports/resource_product_collection' => \Mage_Reports_Model_Resource_Product_Collection::class,
             'reports/resource_product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class,
             'reports_resource/product_downloads_collection' => \Mage_Reports_Model_Resource_Product_Downloads_Collection::class,
             'reports_resource/product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class,
             'reports/resource_product_index_abstract' => \Mage_Reports_Model_Resource_Product_Index_Abstract::class,
-            'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
             'reports/resource_product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
+            'reports_resource/product_index_collection_abstract' => \Mage_Reports_Model_Resource_Product_Index_Collection_Abstract::class,
             'reports_resource/product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class,
             'reports/resource_product_index_compared' => \Mage_Reports_Model_Resource_Product_Index_Compared::class,
-            'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
             'reports_resource/product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
-            'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
+            'reports/resource_product_index_compared_collection' => \Mage_Reports_Model_Resource_Product_Index_Compared_Collection::class,
             'reports/resource_product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
-            'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
+            'reports_resource/product_index_viewed' => \Mage_Reports_Model_Resource_Product_Index_Viewed::class,
             'reports_resource/product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
-            'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
+            'reports/resource_product_index_viewed_collection' => \Mage_Reports_Model_Resource_Product_Index_Viewed_Collection::class,
             'reports/resource_product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
+            'reports_resource/product_lowstock_collection' => \Mage_Reports_Model_Resource_Product_Lowstock_Collection::class,
             'reports_resource/product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class,
             'reports/resource_product_ordered_collection' => \Mage_Reports_Model_Resource_Product_Ordered_Collection::class,
-            'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
             'reports_resource/product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
-            'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
+            'reports/resource_product_sold_collection' => \Mage_Reports_Model_Resource_Product_Sold_Collection::class,
             'reports_resource/product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
-            'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
+            'reports/resource_product_viewed_collection' => \Mage_Reports_Model_Resource_Product_Viewed_Collection::class,
             'reports/resource_quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
-            'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class,
+            'reports_resource/quote_collection' => \Mage_Reports_Model_Resource_Quote_Collection::class,
             'reports_resource/refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class,
+            'reports/resource_refunded_collection' => \Mage_Reports_Model_Resource_Refunded_Collection::class,
             'reports/resource_report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class,
             'reports_resource/report_abstract' => \Mage_Reports_Model_Resource_Report_Abstract::class,
             'reports/resource_report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class,
             'reports_resource/report_collection' => \Mage_Reports_Model_Resource_Report_Collection::class,
-            'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
             'reports_resource/report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
+            'reports/resource_report_collection_abstract' => \Mage_Reports_Model_Resource_Report_Collection_Abstract::class,
             'reports/resource_report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class,
             'reports_resource/report_product_viewed' => \Mage_Reports_Model_Resource_Report_Product_Viewed::class,
-            'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
             'reports/resource_report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
+            'reports_resource/report_product_viewed_collection' => \Mage_Reports_Model_Resource_Report_Product_Viewed_Collection::class,
             'reports_resource/review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
             'reports/resource_review_collection' => \Mage_Reports_Model_Resource_Review_Collection::class,
-            'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
             'reports_resource/review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
+            'reports/resource_review_customer_collection' => \Mage_Reports_Model_Resource_Review_Customer_Collection::class,
             'reports_resource/review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class,
             'reports/resource_review_product_collection' => \Mage_Reports_Model_Resource_Review_Product_Collection::class,
             'reports_resource/shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class,
             'reports/resource_shipping_collection' => \Mage_Reports_Model_Resource_Shipping_Collection::class,
-            'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
             'reports_resource/shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
+            'reports/resource_shopcart_product_collection' => \Mage_Reports_Model_Resource_Shopcart_Product_Collection::class,
             'reports_resource/tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class,
             'reports/resource_tag_collection' => \Mage_Reports_Model_Resource_Tag_Collection::class,
-            'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
             'reports/resource_tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
-            'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
+            'reports_resource/tag_customer_collection' => \Mage_Reports_Model_Resource_Tag_Customer_Collection::class,
             'reports/resource_tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
-            'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
+            'reports_resource/tag_product_collection' => \Mage_Reports_Model_Resource_Tag_Product_Collection::class,
             'reports/resource_tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
+            'reports_resource/tax_collection' => \Mage_Reports_Model_Resource_Tax_Collection::class,
             'reports_resource/wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class,
             'reports/resource_wishlist_collection' => \Mage_Reports_Model_Resource_Wishlist_Collection::class,
-            'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
             'reports_resource/wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
+            'reports/resource_wishlist_product_collection' => \Mage_Reports_Model_Resource_Wishlist_Product_Collection::class,
             'reports/session' => \Mage_Reports_Model_Session::class,
             'reports/test' => \Mage_Reports_Model_Test::class,
             'reports/totals' => \Mage_Reports_Model_Totals::class,
@@ -27706,14 +27644,14 @@
             'review/resource_review_collection' => \Mage_Review_Model_Resource_Review_Collection::class,
             'review_resource/review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class,
             'review/resource_review_product_collection' => \Mage_Review_Model_Resource_Review_Product_Collection::class,
-            'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class,
             'review_resource/review_status' => \Mage_Review_Model_Resource_Review_Status::class,
-            'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
+            'review/resource_review_status' => \Mage_Review_Model_Resource_Review_Status::class,
             'review_resource/review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
+            'review/resource_review_status_collection' => \Mage_Review_Model_Resource_Review_Status_Collection::class,
             'review/resource_review_summary' => \Mage_Review_Model_Resource_Review_Summary::class,
             'review_resource/review_summary' => \Mage_Review_Model_Resource_Review_Summary::class,
-            'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
             'review/resource_review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
+            'review_resource/review_summary_collection' => \Mage_Review_Model_Resource_Review_Summary_Collection::class,
             'review/review' => \Mage_Review_Model_Review::class,
             'review/review_status' => \Mage_Review_Model_Review_Status::class,
             'review/review_summary' => \Mage_Review_Model_Review_Summary::class,
@@ -27736,14 +27674,14 @@
             'rule/mysql4_rule_collection' => \Mage_Rule_Model_Mysql4_Rule_Collection::class,
             'rule/renderer_actions' => \Mage_Rule_Model_Renderer_Actions::class,
             'rule/renderer_conditions' => \Mage_Rule_Model_Renderer_Conditions::class,
-            'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class,
             'rule/resource_abstract' => \Mage_Rule_Model_Resource_Abstract::class,
-            'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class,
+            'rule_resource/abstract' => \Mage_Rule_Model_Resource_Abstract::class,
             'rule/resource_rule' => \Mage_Rule_Model_Resource_Rule::class,
-            'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
+            'rule_resource/rule' => \Mage_Rule_Model_Resource_Rule::class,
             'rule_resource/rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
-            'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
+            'rule/resource_rule_collection' => \Mage_Rule_Model_Resource_Rule_Collection::class,
             'rule_resource/rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
+            'rule/resource_rule_collection_abstract' => \Mage_Rule_Model_Resource_Rule_Collection_Abstract::class,
             'rule/resource_rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class,
             'rule_resource/rule_condition_sqlBuilder' => \Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder::class,
             'rule/rule' => \Mage_Rule_Model_Rule::class,
@@ -27772,24 +27710,24 @@
             'salesrule/resource_coupon_collection' => \Mage_SalesRule_Model_Resource_Coupon_Collection::class,
             'salesrule/resource_coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class,
             'salesrule_resource/coupon_usage' => \Mage_SalesRule_Model_Resource_Coupon_Usage::class,
-            'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
             'salesrule_resource/report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
-            'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
+            'salesrule/resource_report_collection' => \Mage_SalesRule_Model_Resource_Report_Collection::class,
             'salesrule_resource/report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
+            'salesrule/resource_report_rule' => \Mage_SalesRule_Model_Resource_Report_Rule::class,
             'salesrule_resource/report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class,
             'salesrule/resource_report_rule_createdat' => \Mage_SalesRule_Model_Resource_Report_Rule_Createdat::class,
             'salesrule_resource/report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class,
             'salesrule/resource_report_rule_updatedat' => \Mage_SalesRule_Model_Resource_Report_Rule_Updatedat::class,
             'salesrule_resource/report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class,
             'salesrule/resource_report_updatedat_collection' => \Mage_SalesRule_Model_Resource_Report_Updatedat_Collection::class,
-            'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class,
             'salesrule_resource/rule' => \Mage_SalesRule_Model_Resource_Rule::class,
-            'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
+            'salesrule/resource_rule' => \Mage_SalesRule_Model_Resource_Rule::class,
             'salesrule_resource/rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
-            'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
+            'salesrule/resource_rule_collection' => \Mage_SalesRule_Model_Resource_Rule_Collection::class,
             'salesrule_resource/rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
-            'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
+            'salesrule/resource_rule_customer' => \Mage_SalesRule_Model_Resource_Rule_Customer::class,
             'salesrule/resource_rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
+            'salesrule_resource/rule_customer_collection' => \Mage_SalesRule_Model_Resource_Rule_Customer_Collection::class,
             'salesrule_resource/rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class,
             'salesrule/resource_rule_product' => \Mage_SalesRule_Model_Resource_Rule_Product::class,
             'salesrule_resource/rule_product_collection' => \Mage_SalesRule_Model_Resource_Rule_Product_Collection::class,
@@ -27834,14 +27772,14 @@
             'sales/email_template' => \Mage_Sales_Model_Email_Template::class,
             'sales/entity_order' => \Mage_Sales_Model_Entity_Order::class,
             'sales_entity/order' => \Mage_Sales_Model_Entity_Order::class,
-            'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
             'sales_entity/order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
-            'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
+            'sales/entity_order_address' => \Mage_Sales_Model_Entity_Order_Address::class,
             'sales/entity_order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
-            'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
+            'sales_entity/order_address_collection' => \Mage_Sales_Model_Entity_Order_Address_Collection::class,
             'sales_entity/order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
-            'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
+            'sales/entity_order_attribute_backend_billing' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Billing::class,
             'sales_entity/order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
+            'sales/entity_order_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Child::class,
             'sales/entity_order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class,
             'sales_entity/order_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Parent::class,
             'sales/entity_order_attribute_backend_shipping' => \Mage_Sales_Model_Entity_Order_Attribute_Backend_Shipping::class,
@@ -27850,22 +27788,22 @@
             'sales/entity_order_collection' => \Mage_Sales_Model_Entity_Order_Collection::class,
             'sales_entity/order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class,
             'sales/entity_order_creditmemo' => \Mage_Sales_Model_Entity_Order_Creditmemo::class,
-            'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales_entity/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
-            'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
+            'sales/entity_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales/entity_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
-            'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
+            'sales_entity/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Creditmemo_Attribute_Backend_Parent::class,
             'sales/entity_order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
+            'sales_entity/order_creditmemo_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Collection::class,
             'sales/entity_order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class,
             'sales_entity/order_creditmemo_comment' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment::class,
             'sales/entity_order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class,
             'sales_entity/order_creditmemo_comment_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection::class,
             'sales_entity/order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class,
             'sales/entity_order_creditmemo_item' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item::class,
-            'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
             'sales/entity_order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
-            'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
+            'sales_entity/order_creditmemo_item_collection' => \Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection::class,
             'sales_entity/order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
+            'sales/entity_order_invoice' => \Mage_Sales_Model_Entity_Order_Invoice::class,
             'sales/entity_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class,
             'sales_entity/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Child::class,
             'sales_entity/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Item::class,
@@ -27876,28 +27814,28 @@
             'sales/entity_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/entity_order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class,
             'sales_entity/order_invoice_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Collection::class,
-            'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
             'sales/entity_order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
+            'sales_entity/order_invoice_comment' => \Mage_Sales_Model_Entity_Order_Invoice_Comment::class,
             'sales_entity/order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class,
             'sales/entity_order_invoice_comment_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection::class,
             'sales_entity/order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class,
             'sales/entity_order_invoice_item' => \Mage_Sales_Model_Entity_Order_Invoice_Item::class,
-            'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
             'sales/entity_order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
+            'sales_entity/order_invoice_item_collection' => \Mage_Sales_Model_Entity_Order_Invoice_Item_Collection::class,
             'sales/entity_order_item' => \Mage_Sales_Model_Entity_Order_Item::class,
             'sales_entity/order_item' => \Mage_Sales_Model_Entity_Order_Item::class,
             'sales/entity_order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class,
             'sales_entity/order_item_collection' => \Mage_Sales_Model_Entity_Order_Item_Collection::class,
-            'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
             'sales/entity_order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
+            'sales_entity/order_payment' => \Mage_Sales_Model_Entity_Order_Payment::class,
             'sales_entity/order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class,
             'sales/entity_order_payment_collection' => \Mage_Sales_Model_Entity_Order_Payment_Collection::class,
             'sales_entity/order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class,
             'sales/entity_order_shipment' => \Mage_Sales_Model_Entity_Order_Shipment::class,
-            'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
             'sales_entity/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
-            'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
+            'sales/entity_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Child::class,
             'sales/entity_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
+            'sales_entity/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Entity_Order_Shipment_Attribute_Backend_Parent::class,
             'sales/entity_order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class,
             'sales_entity/order_shipment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Collection::class,
             'sales/entity_order_shipment_comment' => \Mage_Sales_Model_Entity_Order_Shipment_Comment::class,
@@ -27906,66 +27844,66 @@
             'sales_entity/order_shipment_comment_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Comment_Collection::class,
             'sales/entity_order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class,
             'sales_entity/order_shipment_item' => \Mage_Sales_Model_Entity_Order_Shipment_Item::class,
-            'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
             'sales/entity_order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
-            'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
+            'sales_entity/order_shipment_item_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Item_Collection::class,
             'sales_entity/order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
-            'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
+            'sales/entity_order_shipment_track' => \Mage_Sales_Model_Entity_Order_Shipment_Track::class,
             'sales_entity/order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
-            'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
+            'sales/entity_order_shipment_track_collection' => \Mage_Sales_Model_Entity_Order_Shipment_Track_Collection::class,
             'sales_entity/order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
-            'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
+            'sales/entity_order_status_history' => \Mage_Sales_Model_Entity_Order_Status_History::class,
             'sales_entity/order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
+            'sales/entity_order_status_history_collection' => \Mage_Sales_Model_Entity_Order_Status_History_Collection::class,
             'sales_entity/quote' => \Mage_Sales_Model_Entity_Quote::class,
             'sales/entity_quote' => \Mage_Sales_Model_Entity_Quote::class,
-            'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
             'sales_entity/quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
+            'sales/entity_quote_address' => \Mage_Sales_Model_Entity_Quote_Address::class,
             'sales_entity/quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class,
             'sales/entity_quote_address_attribute_backend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend::class,
-            'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
             'sales/entity_quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
-            'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
+            'sales_entity/quote_address_attribute_backend_child' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Child::class,
             'sales/entity_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
-            'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
+            'sales_entity/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Parent::class,
             'sales_entity/quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
-            'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
+            'sales/entity_quote_address_attribute_backend_region' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region::class,
             'sales/entity_quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
+            'sales_entity/quote_address_attribute_frontend' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend::class,
             'sales_entity/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales/entity_quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance::class,
             'sales_entity/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class,
             'sales/entity_quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount::class,
-            'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
             'sales_entity/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
-            'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales/entity_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand::class,
             'sales/entity_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
+            'sales_entity/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/entity_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales_entity/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales/entity_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class,
             'sales_entity/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax::class,
             'sales/entity_quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class,
             'sales_entity/quote_address_collection' => \Mage_Sales_Model_Entity_Quote_Address_Collection::class,
-            'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
             'sales_entity/quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
-            'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
+            'sales/entity_quote_address_item' => \Mage_Sales_Model_Entity_Quote_Address_Item::class,
             'sales/entity_quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
-            'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
+            'sales_entity/quote_address_item_collection' => \Mage_Sales_Model_Entity_Quote_Address_Item_Collection::class,
             'sales_entity/quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
+            'sales/entity_quote_address_rate' => \Mage_Sales_Model_Entity_Quote_Address_Rate::class,
             'sales/entity_quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class,
             'sales_entity/quote_address_rate_collection' => \Mage_Sales_Model_Entity_Quote_Address_Rate_Collection::class,
             'sales/entity_quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class,
             'sales_entity/quote_collection' => \Mage_Sales_Model_Entity_Quote_Collection::class,
-            'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
             'sales_entity/quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
-            'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
+            'sales/entity_quote_item' => \Mage_Sales_Model_Entity_Quote_Item::class,
             'sales/entity_quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
-            'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
+            'sales_entity/quote_item_collection' => \Mage_Sales_Model_Entity_Quote_Item_Collection::class,
             'sales/entity_quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
+            'sales_entity/quote_payment' => \Mage_Sales_Model_Entity_Quote_Payment::class,
             'sales_entity/quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class,
             'sales/entity_quote_payment_collection' => \Mage_Sales_Model_Entity_Quote_Payment_Collection::class,
-            'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
             'sales_entity/sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
-            'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class,
+            'sales/entity_sale_collection' => \Mage_Sales_Model_Entity_Sale_Collection::class,
             'sales_entity/setup' => \Mage_Sales_Model_Entity_Setup::class,
+            'sales/entity_setup' => \Mage_Sales_Model_Entity_Setup::class,
             'sales/mysql4_abstract' => \Mage_Sales_Model_Mysql4_Abstract::class,
             'sales/mysql4_billing_agreement' => \Mage_Sales_Model_Mysql4_Billing_Agreement::class,
             'sales/mysql4_billing_agreement_collection' => \Mage_Sales_Model_Mysql4_Billing_Agreement_Collection::class,
@@ -28160,48 +28098,48 @@
             'sales/recurring_profile' => \Mage_Sales_Model_Recurring_Profile::class,
             'sales_resource/abstract' => \Mage_Sales_Model_Resource_Abstract::class,
             'sales/resource_abstract' => \Mage_Sales_Model_Resource_Abstract::class,
-            'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
             'sales_resource/billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
-            'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
+            'sales/resource_billing_agreement' => \Mage_Sales_Model_Resource_Billing_Agreement::class,
             'sales_resource/billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
-            'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
+            'sales/resource_billing_agreement_collection' => \Mage_Sales_Model_Resource_Billing_Agreement_Collection::class,
             'sales/resource_collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
-            'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
+            'sales_resource/collection_abstract' => \Mage_Sales_Model_Resource_Collection_Abstract::class,
             'sales_resource/helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
-            'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class,
+            'sales/resource_helper_mysql4' => \Mage_Sales_Model_Resource_Helper_Mysql4::class,
             'sales_resource/order' => \Mage_Sales_Model_Resource_Order::class,
+            'sales/resource_order' => \Mage_Sales_Model_Resource_Order::class,
             'sales_resource/order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class,
             'sales/resource_order_abstract' => \Mage_Sales_Model_Resource_Order_Abstract::class,
-            'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
             'sales_resource/order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
+            'sales/resource_order_address' => \Mage_Sales_Model_Resource_Order_Address::class,
             'sales/resource_order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class,
             'sales_resource/order_address_collection' => \Mage_Sales_Model_Resource_Order_Address_Collection::class,
             'sales/resource_order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class,
             'sales_resource/order_attribute_backend_billing' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing::class,
             'sales/resource_order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class,
             'sales_resource/order_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Child::class,
-            'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
             'sales/resource_order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
+            'sales_resource/order_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent::class,
             'sales_resource/order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class,
             'sales/resource_order_attribute_backend_shipping' => \Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping::class,
             'sales/resource_order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class,
             'sales_resource/order_collection' => \Mage_Sales_Model_Resource_Order_Collection::class,
-            'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
             'sales/resource_order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
+            'sales_resource/order_collection_abstract' => \Mage_Sales_Model_Resource_Order_Collection_Abstract::class,
             'sales_resource/order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
             'sales/resource_order_comment_collection_abstract' => \Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract::class,
             'sales/resource_order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
             'sales_resource/order_creditmemo' => \Mage_Sales_Model_Resource_Order_Creditmemo::class,
-            'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales_resource/order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
+            'sales/resource_order_creditmemo_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Child::class,
             'sales/resource_order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class,
             'sales_resource/order_creditmemo_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent::class,
-            'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
             'sales/resource_order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
-            'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
+            'sales_resource/order_creditmemo_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Collection::class,
             'sales_resource/order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
-            'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
+            'sales/resource_order_creditmemo_comment' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment::class,
             'sales/resource_order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
+            'sales_resource/order_creditmemo_comment_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection::class,
             'sales/resource_order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
             'sales_resource/order_creditmemo_grid_collection' => \Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection::class,
             'sales_resource/order_creditmemo_item' => \Mage_Sales_Model_Resource_Order_Creditmemo_Item::class,
@@ -28212,84 +28150,84 @@
             'sales/resource_order_grid_collection' => \Mage_Sales_Model_Resource_Order_Grid_Collection::class,
             'sales/resource_order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class,
             'sales_resource/order_invoice' => \Mage_Sales_Model_Resource_Order_Invoice::class,
-            'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
             'sales/resource_order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
-            'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
+            'sales_resource/order_invoice_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Child::class,
             'sales_resource/order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
+            'sales/resource_order_invoice_attribute_backend_item' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item::class,
             'sales_resource/order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class,
             'sales/resource_order_invoice_attribute_backend_order' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order::class,
             'sales/resource_order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class,
             'sales_resource/order_invoice_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent::class,
             'sales/resource_order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class,
             'sales_resource/order_invoice_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Collection::class,
-            'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
             'sales/resource_order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
+            'sales_resource/order_invoice_comment' => \Mage_Sales_Model_Resource_Order_Invoice_Comment::class,
             'sales/resource_order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class,
             'sales_resource/order_invoice_comment_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::class,
-            'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
             'sales/resource_order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
-            'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
+            'sales_resource/order_invoice_grid_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection::class,
             'sales_resource/order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
+            'sales/resource_order_invoice_item' => \Mage_Sales_Model_Resource_Order_Invoice_Item::class,
             'sales/resource_order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class,
             'sales_resource/order_invoice_item_collection' => \Mage_Sales_Model_Resource_Order_Invoice_Item_Collection::class,
-            'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
             'sales_resource/order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
+            'sales/resource_order_item' => \Mage_Sales_Model_Resource_Order_Item::class,
             'sales/resource_order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class,
             'sales_resource/order_item_collection' => \Mage_Sales_Model_Resource_Order_Item_Collection::class,
-            'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
             'sales_resource/order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
+            'sales/resource_order_payment' => \Mage_Sales_Model_Resource_Order_Payment::class,
             'sales_resource/order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
             'sales/resource_order_payment_collection' => \Mage_Sales_Model_Resource_Order_Payment_Collection::class,
-            'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
             'sales_resource/order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
-            'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
+            'sales/resource_order_payment_transaction' => \Mage_Sales_Model_Resource_Order_Payment_Transaction::class,
             'sales_resource/order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
-            'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
+            'sales/resource_order_payment_transaction_collection' => \Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection::class,
             'sales_resource/order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
-            'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
+            'sales/resource_order_shipment' => \Mage_Sales_Model_Resource_Order_Shipment::class,
             'sales/resource_order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
+            'sales_resource/order_shipment_attribute_backend_child' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Child::class,
             'sales_resource/order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class,
             'sales/resource_order_shipment_attribute_backend_parent' => \Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent::class,
-            'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
             'sales/resource_order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
+            'sales_resource/order_shipment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Collection::class,
             'sales/resource_order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
             'sales_resource/order_shipment_comment' => \Mage_Sales_Model_Resource_Order_Shipment_Comment::class,
-            'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
             'sales/resource_order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
+            'sales_resource/order_shipment_comment_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::class,
             'sales_resource/order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class,
             'sales/resource_order_shipment_grid_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection::class,
-            'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
             'sales_resource/order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
-            'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
+            'sales/resource_order_shipment_item' => \Mage_Sales_Model_Resource_Order_Shipment_Item::class,
             'sales_resource/order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
-            'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
+            'sales/resource_order_shipment_item_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Item_Collection::class,
             'sales_resource/order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
+            'sales/resource_order_shipment_track' => \Mage_Sales_Model_Resource_Order_Shipment_Track::class,
             'sales/resource_order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
             'sales_resource/order_shipment_track_collection' => \Mage_Sales_Model_Resource_Order_Shipment_Track_Collection::class,
             'sales_resource/order_status' => \Mage_Sales_Model_Resource_Order_Status::class,
             'sales/resource_order_status' => \Mage_Sales_Model_Resource_Order_Status::class,
             'sales_resource/order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class,
             'sales/resource_order_status_collection' => \Mage_Sales_Model_Resource_Order_Status_Collection::class,
-            'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
             'sales_resource/order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
-            'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
+            'sales/resource_order_status_history' => \Mage_Sales_Model_Resource_Order_Status_History::class,
             'sales_resource/order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
-            'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
+            'sales/resource_order_status_history_collection' => \Mage_Sales_Model_Resource_Order_Status_History_Collection::class,
             'sales/resource_order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
-            'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
+            'sales_resource/order_tax' => \Mage_Sales_Model_Resource_Order_Tax::class,
             'sales_resource/order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
-            'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class,
+            'sales/resource_order_tax_collection' => \Mage_Sales_Model_Resource_Order_Tax_Collection::class,
             'sales/resource_quote' => \Mage_Sales_Model_Resource_Quote::class,
+            'sales_resource/quote' => \Mage_Sales_Model_Resource_Quote::class,
             'sales_resource/quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class,
             'sales/resource_quote_address' => \Mage_Sales_Model_Resource_Quote_Address::class,
             'sales/resource_quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class,
             'sales_resource/quote_address_attribute_backend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend::class,
             'sales/resource_quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class,
             'sales_resource/quote_address_attribute_backend_child' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Child::class,
-            'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
             'sales/resource_quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
-            'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
+            'sales_resource/quote_address_attribute_backend_parent' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent::class,
             'sales/resource_quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
+            'sales_resource/quote_address_attribute_backend_region' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region::class,
             'sales_resource/quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
             'sales/resource_quote_address_attribute_frontend' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend::class,
             'sales_resource/quote_address_attribute_frontend_custbalance' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance::class,
@@ -28298,82 +28236,82 @@
             'sales_resource/quote_address_attribute_frontend_discount' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount::class,
             'sales/resource_quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class,
             'sales_resource/quote_address_attribute_frontend_grand' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand::class,
-            'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/resource_quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
-            'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
+            'sales_resource/quote_address_attribute_frontend_shipping' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping::class,
             'sales/resource_quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
+            'sales_resource/quote_address_attribute_frontend_subtotal' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal::class,
             'sales_resource/quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
             'sales/resource_quote_address_attribute_frontend_tax' => \Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax::class,
-            'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
             'sales/resource_quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
+            'sales_resource/quote_address_collection' => \Mage_Sales_Model_Resource_Quote_Address_Collection::class,
             'sales_resource/quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class,
             'sales/resource_quote_address_item' => \Mage_Sales_Model_Resource_Quote_Address_Item::class,
-            'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
             'sales/resource_quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
-            'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
+            'sales_resource/quote_address_item_collection' => \Mage_Sales_Model_Resource_Quote_Address_Item_Collection::class,
             'sales_resource/quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
-            'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
+            'sales/resource_quote_address_rate' => \Mage_Sales_Model_Resource_Quote_Address_Rate::class,
             'sales_resource/quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
+            'sales/resource_quote_address_rate_collection' => \Mage_Sales_Model_Resource_Quote_Address_Rate_Collection::class,
             'sales_resource/quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class,
             'sales/resource_quote_collection' => \Mage_Sales_Model_Resource_Quote_Collection::class,
-            'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
             'sales/resource_quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
+            'sales_resource/quote_item' => \Mage_Sales_Model_Resource_Quote_Item::class,
             'sales/resource_quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class,
             'sales_resource/quote_item_collection' => \Mage_Sales_Model_Resource_Quote_Item_Collection::class,
-            'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
             'sales/resource_quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
-            'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
+            'sales_resource/quote_item_option' => \Mage_Sales_Model_Resource_Quote_Item_Option::class,
             'sales/resource_quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
-            'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
+            'sales_resource/quote_item_option_collection' => \Mage_Sales_Model_Resource_Quote_Item_Option_Collection::class,
             'sales_resource/quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
-            'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
+            'sales/resource_quote_payment' => \Mage_Sales_Model_Resource_Quote_Payment::class,
             'sales/resource_quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
-            'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
+            'sales_resource/quote_payment_collection' => \Mage_Sales_Model_Resource_Quote_Payment_Collection::class,
             'sales/resource_recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
+            'sales_resource/recurring_profile' => \Mage_Sales_Model_Resource_Recurring_Profile::class,
             'sales/resource_recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class,
             'sales_resource/recurring_profile_collection' => \Mage_Sales_Model_Resource_Recurring_Profile_Collection::class,
-            'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class,
             'sales/resource_report' => \Mage_Sales_Model_Resource_Report::class,
+            'sales_resource/report' => \Mage_Sales_Model_Resource_Report::class,
             'sales/resource_report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class,
             'sales_resource/report_abstract' => \Mage_Sales_Model_Resource_Report_Abstract::class,
-            'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
             'sales/resource_report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
-            'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
+            'sales_resource/report_bestsellers' => \Mage_Sales_Model_Resource_Report_Bestsellers::class,
             'sales/resource_report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
+            'sales_resource/report_bestsellers_collection' => \Mage_Sales_Model_Resource_Report_Bestsellers_Collection::class,
             'sales_resource/report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
             'sales/resource_report_collection_abstract' => \Mage_Sales_Model_Resource_Report_Collection_Abstract::class,
-            'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
             'sales_resource/report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
+            'sales/resource_report_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced::class,
             'sales/resource_report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class,
             'sales_resource/report_invoiced_collection_invoiced' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced::class,
             'sales_resource/report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class,
             'sales/resource_report_invoiced_collection_order' => \Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order::class,
             'sales/resource_report_order' => \Mage_Sales_Model_Resource_Report_Order::class,
             'sales_resource/report_order' => \Mage_Sales_Model_Resource_Report_Order::class,
-            'sales/resource_report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class,
             'sales_resource/report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class,
-            'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class,
+            'sales/resource_report_order_collection' => \Mage_Sales_Model_Resource_Report_Order_Collection::class,
             'sales/resource_report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class,
+            'sales_resource/report_order_createdat' => \Mage_Sales_Model_Resource_Report_Order_Createdat::class,
             'sales_resource/report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class,
             'sales/resource_report_order_updatedat' => \Mage_Sales_Model_Resource_Report_Order_Updatedat::class,
-            'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
             'sales/resource_report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
-            'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
+            'sales_resource/report_order_updatedat_collection' => \Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection::class,
             'sales_resource/report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
+            'sales/resource_report_refunded' => \Mage_Sales_Model_Resource_Report_Refunded::class,
             'sales_resource/report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class,
             'sales/resource_report_refunded_collection_order' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Order::class,
             'sales_resource/report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class,
             'sales/resource_report_refunded_collection_refunded' => \Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded::class,
-            'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
             'sales_resource/report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
+            'sales/resource_report_shipping' => \Mage_Sales_Model_Resource_Report_Shipping::class,
             'sales_resource/report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class,
             'sales/resource_report_shipping_collection_order' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Order::class,
             'sales_resource/report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class,
             'sales/resource_report_shipping_collection_shipment' => \Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment::class,
-            'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
             'sales/resource_sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
-            'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class,
+            'sales_resource/sale_collection' => \Mage_Sales_Model_Resource_Sale_Collection::class,
             'sales/resource_setup' => \Mage_Sales_Model_Resource_Setup::class,
+            'sales_resource/setup' => \Mage_Sales_Model_Resource_Setup::class,
             'sales/service_order' => \Mage_Sales_Model_Service_Order::class,
             'sales/service_quote' => \Mage_Sales_Model_Service_Quote::class,
             'sales/status_list' => \Mage_Sales_Model_Status_List::class,
@@ -28383,8 +28321,8 @@
             'sendfriend/observer' => \Mage_Sendfriend_Model_Observer::class,
             'sendfriend_resource/sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class,
             'sendfriend/resource_sendfriend' => \Mage_Sendfriend_Model_Resource_Sendfriend::class,
-            'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
             'sendfriend/resource_sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
+            'sendfriend_resource/sendfriend_collection' => \Mage_Sendfriend_Model_Resource_Sendfriend_Collection::class,
             'sendfriend/resource_setup' => \Mage_Sendfriend_Model_Resource_Setup::class,
             'sendfriend_resource/setup' => \Mage_Sendfriend_Model_Resource_Setup::class,
             'sendfriend/sendfriend' => \Mage_Sendfriend_Model_Sendfriend::class,
@@ -28424,16 +28362,16 @@
             'sitemap/observer' => \Mage_Sitemap_Model_Observer::class,
             'sitemap_resource/catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class,
             'sitemap/resource_catalog_abstract' => \Mage_Sitemap_Model_Resource_Catalog_Abstract::class,
-            'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
             'sitemap/resource_catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
+            'sitemap_resource/catalog_category' => \Mage_Sitemap_Model_Resource_Catalog_Category::class,
             'sitemap/resource_catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
             'sitemap_resource/catalog_product' => \Mage_Sitemap_Model_Resource_Catalog_Product::class,
             'sitemap_resource/cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
             'sitemap/resource_cms_page' => \Mage_Sitemap_Model_Resource_Cms_Page::class,
             'sitemap_resource/sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class,
             'sitemap/resource_sitemap' => \Mage_Sitemap_Model_Resource_Sitemap::class,
-            'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
             'sitemap_resource/sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
+            'sitemap/resource_sitemap_collection' => \Mage_Sitemap_Model_Resource_Sitemap_Collection::class,
             'sitemap/sitemap' => \Mage_Sitemap_Model_Sitemap::class,
             'tag/api' => \Mage_Tag_Model_Api::class,
             'tag/api_v2' => \Mage_Tag_Model_Api_V2::class,
@@ -28446,21 +28384,21 @@
             'tag/mysql4_tag' => \Mage_Tag_Model_Mysql4_Tag::class,
             'tag/mysql4_tag_collection' => \Mage_Tag_Model_Mysql4_Tag_Collection::class,
             'tag/mysql4_tag_relation' => \Mage_Tag_Model_Mysql4_Tag_Relation::class,
-            'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag/resource_customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag_resource/customer_collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
-            'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
+            'tag_customer_resource/collection' => \Mage_Tag_Model_Resource_Customer_Collection::class,
             'tag_resource/indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
-            'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
+            'tag/resource_indexer_summary' => \Mage_Tag_Model_Resource_Indexer_Summary::class,
             'tag_resource/popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
+            'tag/resource_popular_collection' => \Mage_Tag_Model_Resource_Popular_Collection::class,
             'tag_resource/product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class,
             'tag/resource_product_collection' => \Mage_Tag_Model_Resource_Product_Collection::class,
             'tag_resource/tag' => \Mage_Tag_Model_Resource_Tag::class,
             'tag/resource_tag' => \Mage_Tag_Model_Resource_Tag::class,
-            'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
             'tag_resource/tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
-            'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
+            'tag/resource_tag_collection' => \Mage_Tag_Model_Resource_Tag_Collection::class,
             'tag_resource/tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
+            'tag/resource_tag_relation' => \Mage_Tag_Model_Resource_Tag_Relation::class,
             'tag/session' => \Mage_Tag_Model_Session::class,
             'tag/tag' => \Mage_Tag_Model_Tag::class,
             'tag/tag_relation' => \Mage_Tag_Model_Tag_Relation::class,
@@ -28499,16 +28437,16 @@
             'tax/resource_calculation_rate' => \Mage_Tax_Model_Resource_Calculation_Rate::class,
             'tax/resource_calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class,
             'tax_resource/calculation_rate_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Collection::class,
-            'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
             'tax/resource_calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
-            'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
+            'tax_resource/calculation_rate_title' => \Mage_Tax_Model_Resource_Calculation_Rate_Title::class,
             'tax/resource_calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
-            'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
+            'tax_resource/calculation_rate_title_collection' => \Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection::class,
             'tax/resource_calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
-            'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
+            'tax_resource/calculation_rule' => \Mage_Tax_Model_Resource_Calculation_Rule::class,
             'tax_resource/calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
-            'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class,
+            'tax/resource_calculation_rule_collection' => \Mage_Tax_Model_Resource_Calculation_Rule_Collection::class,
             'tax/resource_class' => \Mage_Tax_Model_Resource_Class::class,
+            'tax_resource/class' => \Mage_Tax_Model_Resource_Class::class,
             'tax/resource_class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class,
             'tax_resource/class_collection' => \Mage_Tax_Model_Resource_Class_Collection::class,
             'tax_resource/report_collection' => \Mage_Tax_Model_Resource_Report_Collection::class,
@@ -28519,10 +28457,10 @@
             'tax/resource_report_tax_createdat' => \Mage_Tax_Model_Resource_Report_Tax_Createdat::class,
             'tax_resource/report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class,
             'tax/resource_report_tax_updatedat' => \Mage_Tax_Model_Resource_Report_Tax_Updatedat::class,
-            'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
             'tax/resource_report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
-            'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
+            'tax_resource/report_updatedat_collection' => \Mage_Tax_Model_Resource_Report_Updatedat_Collection::class,
             'tax_resource/sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
+            'tax/resource_sales_order_tax' => \Mage_Tax_Model_Resource_Sales_Order_Tax::class,
             'tax_resource/sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class,
             'tax/resource_sales_order_tax_collection' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Collection::class,
             'tax_resource/sales_order_tax_item' => \Mage_Tax_Model_Resource_Sales_Order_Tax_Item::class,
@@ -28611,8 +28549,8 @@
             'weee/observer' => \Mage_Weee_Model_Observer::class,
             'weee/resource_attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class,
             'weee_resource/attribute_backend_weee_tax' => \Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax::class,
-            'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class,
             'weee/resource_setup' => \Mage_Weee_Model_Resource_Setup::class,
+            'weee_resource/setup' => \Mage_Weee_Model_Resource_Setup::class,
             'weee/resource_tax' => \Mage_Weee_Model_Resource_Tax::class,
             'weee_resource/tax' => \Mage_Weee_Model_Resource_Tax::class,
             'weee/tax' => \Mage_Weee_Model_Tax::class,
@@ -28624,12 +28562,12 @@
             'widget/mysql4_widget_instance' => \Mage_Widget_Model_Mysql4_Widget_Instance::class,
             'widget/mysql4_widget_instance_collection' => \Mage_Widget_Model_Mysql4_Widget_Instance_Collection::class,
             'widget/observer' => \Mage_Widget_Model_Observer::class,
-            'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class,
             'widget/resource_widget' => \Mage_Widget_Model_Resource_Widget::class,
+            'widget_resource/widget' => \Mage_Widget_Model_Resource_Widget::class,
             'widget_resource/widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class,
             'widget/resource_widget_instance' => \Mage_Widget_Model_Resource_Widget_Instance::class,
-            'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
             'widget_resource/widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
+            'widget/resource_widget_instance_collection' => \Mage_Widget_Model_Resource_Widget_Instance_Collection::class,
             'widget/template_filter' => \Mage_Widget_Model_Template_Filter::class,
             'widget/widget' => \Mage_Widget_Model_Widget::class,
             'widget/widget_config' => \Mage_Widget_Model_Widget_Config::class,
@@ -28646,14 +28584,14 @@
             'wishlist/mysql4_wishlist' => \Mage_Wishlist_Model_Mysql4_Wishlist::class,
             'wishlist/mysql4_wishlist_collection' => \Mage_Wishlist_Model_Mysql4_Wishlist_Collection::class,
             'wishlist/observer' => \Mage_Wishlist_Model_Observer::class,
-            'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class,
             'wishlist_resource/item' => \Mage_Wishlist_Model_Resource_Item::class,
+            'wishlist/resource_item' => \Mage_Wishlist_Model_Resource_Item::class,
             'wishlist_resource/item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class,
             'wishlist/resource_item_collection' => \Mage_Wishlist_Model_Resource_Item_Collection::class,
-            'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
             'wishlist/resource_item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
-            'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
+            'wishlist_resource/item_option' => \Mage_Wishlist_Model_Resource_Item_Option::class,
             'wishlist_resource/item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
+            'wishlist/resource_item_option_collection' => \Mage_Wishlist_Model_Resource_Item_Option_Collection::class,
             'wishlist_resource/product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class,
             'wishlist/resource_product_collection' => \Mage_Wishlist_Model_Resource_Product_Collection::class,
             'wishlist/resource_wishlist' => \Mage_Wishlist_Model_Resource_Wishlist::class,
@@ -28662,7 +28600,6 @@
             'wishlist/resource_wishlist_collection' => \Mage_Wishlist_Model_Resource_Wishlist_Collection::class,
             'wishlist/session' => \Mage_Wishlist_Model_Session::class,
             'wishlist/wishlist' => \Mage_Wishlist_Model_Wishlist::class,
-            'varien/autoload' => \Varien_Autoload::class,
         ])
     );
 }
\ No newline at end of file