From d663dacc4b74c142982d5ecb8c86a5f9f760f06b Mon Sep 17 00:00:00 2001 From: Tino Mewes Date: Fri, 12 Aug 2022 16:09:50 +0200 Subject: [PATCH 1/6] refactor: Split contents of Mage_All into own modules --- app/etc/modules/Mage_Admin.xml | 32 ++ app/etc/modules/Mage_AdminNotification.xml | 33 ++ app/etc/modules/Mage_Adminhtml.xml | 32 ++ app/etc/modules/Mage_All.xml | 402 --------------------- app/etc/modules/Mage_Backup.xml | 32 ++ app/etc/modules/Mage_Catalog.xml | 35 ++ app/etc/modules/Mage_CatalogIndex.xml | 34 ++ app/etc/modules/Mage_CatalogInventory.xml | 32 ++ app/etc/modules/Mage_CatalogRule.xml | 34 ++ app/etc/modules/Mage_CatalogSearch.xml | 32 ++ app/etc/modules/Mage_Checkout.xml | 33 ++ app/etc/modules/Mage_Cms.xml | 32 ++ app/etc/modules/Mage_Contacts.xml | 32 ++ app/etc/modules/Mage_Core.xml | 29 ++ app/etc/modules/Mage_Cron.xml | 32 ++ app/etc/modules/Mage_Customer.xml | 34 ++ app/etc/modules/Mage_Dataflow.xml | 32 ++ app/etc/modules/Mage_Directory.xml | 32 ++ app/etc/modules/Mage_Eav.xml | 32 ++ app/etc/modules/Mage_GiftMessage.xml | 33 ++ app/etc/modules/Mage_GoogleAnalytics.xml | 32 ++ app/etc/modules/Mage_GoogleCheckout.xml | 34 ++ app/etc/modules/Mage_Index.xml | 32 ++ app/etc/modules/Mage_Install.xml | 32 ++ app/etc/modules/Mage_Log.xml | 33 ++ app/etc/modules/Mage_Media.xml | 32 ++ app/etc/modules/Mage_Newsletter.xml | 35 ++ app/etc/modules/Mage_Page.xml | 32 ++ app/etc/modules/Mage_Paygate.xml | 32 ++ app/etc/modules/Mage_Payment.xml | 33 ++ app/etc/modules/Mage_Paypal.xml | 34 ++ app/etc/modules/Mage_PaypalUk.xml | 35 ++ app/etc/modules/Mage_Poll.xml | 33 ++ app/etc/modules/Mage_ProductAlert.xml | 33 ++ app/etc/modules/Mage_Rating.xml | 33 ++ app/etc/modules/Mage_Reports.xml | 35 ++ app/etc/modules/Mage_Review.xml | 33 ++ app/etc/modules/Mage_Rss.xml | 36 ++ app/etc/modules/Mage_Rule.xml | 32 ++ app/etc/modules/Mage_Sales.xml | 35 ++ app/etc/modules/Mage_SalesRule.xml | 34 ++ app/etc/modules/Mage_Sendfriend.xml | 32 ++ app/etc/modules/Mage_Shipping.xml | 33 ++ app/etc/modules/Mage_Sitemap.xml | 32 ++ app/etc/modules/Mage_Tag.xml | 32 ++ app/etc/modules/Mage_Tax.xml | 33 ++ app/etc/modules/Mage_Uploader.xml | 32 ++ app/etc/modules/Mage_Usa.xml | 33 ++ app/etc/modules/Mage_Wishlist.xml | 33 ++ 49 files changed, 1577 insertions(+), 402 deletions(-) create mode 100644 app/etc/modules/Mage_Admin.xml create mode 100644 app/etc/modules/Mage_AdminNotification.xml create mode 100644 app/etc/modules/Mage_Adminhtml.xml delete mode 100644 app/etc/modules/Mage_All.xml create mode 100644 app/etc/modules/Mage_Backup.xml create mode 100644 app/etc/modules/Mage_Catalog.xml create mode 100644 app/etc/modules/Mage_CatalogIndex.xml create mode 100644 app/etc/modules/Mage_CatalogInventory.xml create mode 100644 app/etc/modules/Mage_CatalogRule.xml create mode 100644 app/etc/modules/Mage_CatalogSearch.xml create mode 100644 app/etc/modules/Mage_Checkout.xml create mode 100644 app/etc/modules/Mage_Cms.xml create mode 100644 app/etc/modules/Mage_Contacts.xml create mode 100644 app/etc/modules/Mage_Core.xml create mode 100644 app/etc/modules/Mage_Cron.xml create mode 100644 app/etc/modules/Mage_Customer.xml create mode 100644 app/etc/modules/Mage_Dataflow.xml create mode 100644 app/etc/modules/Mage_Directory.xml create mode 100644 app/etc/modules/Mage_Eav.xml create mode 100644 app/etc/modules/Mage_GiftMessage.xml create mode 100644 app/etc/modules/Mage_GoogleAnalytics.xml create mode 100644 app/etc/modules/Mage_GoogleCheckout.xml create mode 100644 app/etc/modules/Mage_Index.xml create mode 100644 app/etc/modules/Mage_Install.xml create mode 100644 app/etc/modules/Mage_Log.xml create mode 100644 app/etc/modules/Mage_Media.xml create mode 100644 app/etc/modules/Mage_Newsletter.xml create mode 100644 app/etc/modules/Mage_Page.xml create mode 100644 app/etc/modules/Mage_Paygate.xml create mode 100644 app/etc/modules/Mage_Payment.xml create mode 100644 app/etc/modules/Mage_Paypal.xml create mode 100644 app/etc/modules/Mage_PaypalUk.xml create mode 100644 app/etc/modules/Mage_Poll.xml create mode 100644 app/etc/modules/Mage_ProductAlert.xml create mode 100644 app/etc/modules/Mage_Rating.xml create mode 100644 app/etc/modules/Mage_Reports.xml create mode 100644 app/etc/modules/Mage_Review.xml create mode 100644 app/etc/modules/Mage_Rss.xml create mode 100644 app/etc/modules/Mage_Rule.xml create mode 100644 app/etc/modules/Mage_Sales.xml create mode 100644 app/etc/modules/Mage_SalesRule.xml create mode 100644 app/etc/modules/Mage_Sendfriend.xml create mode 100644 app/etc/modules/Mage_Shipping.xml create mode 100644 app/etc/modules/Mage_Sitemap.xml create mode 100644 app/etc/modules/Mage_Tag.xml create mode 100644 app/etc/modules/Mage_Tax.xml create mode 100644 app/etc/modules/Mage_Uploader.xml create mode 100644 app/etc/modules/Mage_Usa.xml create mode 100644 app/etc/modules/Mage_Wishlist.xml diff --git a/app/etc/modules/Mage_Admin.xml b/app/etc/modules/Mage_Admin.xml new file mode 100644 index 00000000000..48f6263f1f5 --- /dev/null +++ b/app/etc/modules/Mage_Admin.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_AdminNotification.xml b/app/etc/modules/Mage_AdminNotification.xml new file mode 100644 index 00000000000..5b95ba6a4dc --- /dev/null +++ b/app/etc/modules/Mage_AdminNotification.xml @@ -0,0 +1,33 @@ + + + + + + true + core + + + + + + + diff --git a/app/etc/modules/Mage_Adminhtml.xml b/app/etc/modules/Mage_Adminhtml.xml new file mode 100644 index 00000000000..d108e1cdc36 --- /dev/null +++ b/app/etc/modules/Mage_Adminhtml.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_All.xml b/app/etc/modules/Mage_All.xml deleted file mode 100644 index eb0a1225639..00000000000 --- a/app/etc/modules/Mage_All.xml +++ /dev/null @@ -1,402 +0,0 @@ - - - - - - true - core - - - true - core - - - - - - true - core - - - - - - true - core - - - - - - true - core - - - - - - true - core - - - - - - true - core - - - - - - true - core - - - - - - - true - core - - - - - - true - core - - - - - - true - core - - - - - - - - true - core - - - - - - - - - true - core - - - - - - - - true - core - - - - - - - - true - core - - - - - - true - core - - - - - - - - - true - core - - - - - - - - true - core - - - - - - - true - core - - - - - - - true - core - - - - - - - true - core - - - - - - - true - core - - - - - - true - core - - - - - - - - true - core - - - - - - - - - true - core - - - - - - - - true - core - - - - - - - false - core - - - - - - true - core - - - - - - - true - core - - - - - - - true - core - - - - - - - true - core - - - - - - true - core - - - - - - true - core - - - - - - - - - true - core - - - - - - - - - true - core - - - - - - - true - core - - - - - - - true - core - - - - - - true - core - - - - - - true - core - - - - - - - true - core - - - - - - true - core - - - - - - true - core - - - - - - true - core - - - - - - true - core - - - - - - true - core - - - - - - - - - - true - core - - - - - - - true - core - - - - - - true - core - - - - - - diff --git a/app/etc/modules/Mage_Backup.xml b/app/etc/modules/Mage_Backup.xml new file mode 100644 index 00000000000..bdc344d44b0 --- /dev/null +++ b/app/etc/modules/Mage_Backup.xml @@ -0,0 +1,32 @@ + + + + + + false + core + + + + + + diff --git a/app/etc/modules/Mage_Catalog.xml b/app/etc/modules/Mage_Catalog.xml new file mode 100644 index 00000000000..62813d473eb --- /dev/null +++ b/app/etc/modules/Mage_Catalog.xml @@ -0,0 +1,35 @@ + + + + + + true + core + + + + + + + + + diff --git a/app/etc/modules/Mage_CatalogIndex.xml b/app/etc/modules/Mage_CatalogIndex.xml new file mode 100644 index 00000000000..54c45c5e707 --- /dev/null +++ b/app/etc/modules/Mage_CatalogIndex.xml @@ -0,0 +1,34 @@ + + + + + + true + core + + + + + + + + diff --git a/app/etc/modules/Mage_CatalogInventory.xml b/app/etc/modules/Mage_CatalogInventory.xml new file mode 100644 index 00000000000..b9d9bd37bf7 --- /dev/null +++ b/app/etc/modules/Mage_CatalogInventory.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_CatalogRule.xml b/app/etc/modules/Mage_CatalogRule.xml new file mode 100644 index 00000000000..9fa81270c6e --- /dev/null +++ b/app/etc/modules/Mage_CatalogRule.xml @@ -0,0 +1,34 @@ + + + + + + true + core + + + + + + + + diff --git a/app/etc/modules/Mage_CatalogSearch.xml b/app/etc/modules/Mage_CatalogSearch.xml new file mode 100644 index 00000000000..8a1aa7109ef --- /dev/null +++ b/app/etc/modules/Mage_CatalogSearch.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Checkout.xml b/app/etc/modules/Mage_Checkout.xml new file mode 100644 index 00000000000..bc0bf7ffc28 --- /dev/null +++ b/app/etc/modules/Mage_Checkout.xml @@ -0,0 +1,33 @@ + + + + + + true + core + + + + + + + diff --git a/app/etc/modules/Mage_Cms.xml b/app/etc/modules/Mage_Cms.xml new file mode 100644 index 00000000000..ebe8ff8120a --- /dev/null +++ b/app/etc/modules/Mage_Cms.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Contacts.xml b/app/etc/modules/Mage_Contacts.xml new file mode 100644 index 00000000000..77a637f2e39 --- /dev/null +++ b/app/etc/modules/Mage_Contacts.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Core.xml b/app/etc/modules/Mage_Core.xml new file mode 100644 index 00000000000..955fc7dc170 --- /dev/null +++ b/app/etc/modules/Mage_Core.xml @@ -0,0 +1,29 @@ + + + + + + true + core + + + diff --git a/app/etc/modules/Mage_Cron.xml b/app/etc/modules/Mage_Cron.xml new file mode 100644 index 00000000000..48aa15b1288 --- /dev/null +++ b/app/etc/modules/Mage_Cron.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Customer.xml b/app/etc/modules/Mage_Customer.xml new file mode 100644 index 00000000000..4862cb1996b --- /dev/null +++ b/app/etc/modules/Mage_Customer.xml @@ -0,0 +1,34 @@ + + + + + + true + core + + + + + + + + diff --git a/app/etc/modules/Mage_Dataflow.xml b/app/etc/modules/Mage_Dataflow.xml new file mode 100644 index 00000000000..e266af97cbc --- /dev/null +++ b/app/etc/modules/Mage_Dataflow.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Directory.xml b/app/etc/modules/Mage_Directory.xml new file mode 100644 index 00000000000..cf2ce744a81 --- /dev/null +++ b/app/etc/modules/Mage_Directory.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Eav.xml b/app/etc/modules/Mage_Eav.xml new file mode 100644 index 00000000000..e2c88cb615d --- /dev/null +++ b/app/etc/modules/Mage_Eav.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_GiftMessage.xml b/app/etc/modules/Mage_GiftMessage.xml new file mode 100644 index 00000000000..ac4efaefd50 --- /dev/null +++ b/app/etc/modules/Mage_GiftMessage.xml @@ -0,0 +1,33 @@ + + + + + + true + core + + + + + + + diff --git a/app/etc/modules/Mage_GoogleAnalytics.xml b/app/etc/modules/Mage_GoogleAnalytics.xml new file mode 100644 index 00000000000..718b5457ccd --- /dev/null +++ b/app/etc/modules/Mage_GoogleAnalytics.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_GoogleCheckout.xml b/app/etc/modules/Mage_GoogleCheckout.xml new file mode 100644 index 00000000000..7b0f127eb3e --- /dev/null +++ b/app/etc/modules/Mage_GoogleCheckout.xml @@ -0,0 +1,34 @@ + + + + + + true + core + + + + + + + + diff --git a/app/etc/modules/Mage_Index.xml b/app/etc/modules/Mage_Index.xml new file mode 100644 index 00000000000..7ff9b603ecf --- /dev/null +++ b/app/etc/modules/Mage_Index.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Install.xml b/app/etc/modules/Mage_Install.xml new file mode 100644 index 00000000000..9b21b6ac25e --- /dev/null +++ b/app/etc/modules/Mage_Install.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Log.xml b/app/etc/modules/Mage_Log.xml new file mode 100644 index 00000000000..ff75e3a2fb9 --- /dev/null +++ b/app/etc/modules/Mage_Log.xml @@ -0,0 +1,33 @@ + + + + + + true + core + + + + + + + diff --git a/app/etc/modules/Mage_Media.xml b/app/etc/modules/Mage_Media.xml new file mode 100644 index 00000000000..3a49ab4890c --- /dev/null +++ b/app/etc/modules/Mage_Media.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Newsletter.xml b/app/etc/modules/Mage_Newsletter.xml new file mode 100644 index 00000000000..aba2e8d9725 --- /dev/null +++ b/app/etc/modules/Mage_Newsletter.xml @@ -0,0 +1,35 @@ + + + + + + true + core + + + + + + + + + diff --git a/app/etc/modules/Mage_Page.xml b/app/etc/modules/Mage_Page.xml new file mode 100644 index 00000000000..4c07d013c15 --- /dev/null +++ b/app/etc/modules/Mage_Page.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Paygate.xml b/app/etc/modules/Mage_Paygate.xml new file mode 100644 index 00000000000..d1455aa98ad --- /dev/null +++ b/app/etc/modules/Mage_Paygate.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Payment.xml b/app/etc/modules/Mage_Payment.xml new file mode 100644 index 00000000000..13c5bf9952f --- /dev/null +++ b/app/etc/modules/Mage_Payment.xml @@ -0,0 +1,33 @@ + + + + + + true + core + + + + + + + diff --git a/app/etc/modules/Mage_Paypal.xml b/app/etc/modules/Mage_Paypal.xml new file mode 100644 index 00000000000..1e4b0c219da --- /dev/null +++ b/app/etc/modules/Mage_Paypal.xml @@ -0,0 +1,34 @@ + + + + + + true + core + + + + + + + + diff --git a/app/etc/modules/Mage_PaypalUk.xml b/app/etc/modules/Mage_PaypalUk.xml new file mode 100644 index 00000000000..0c86821942d --- /dev/null +++ b/app/etc/modules/Mage_PaypalUk.xml @@ -0,0 +1,35 @@ + + + + + + true + core + + + + + + + + + diff --git a/app/etc/modules/Mage_Poll.xml b/app/etc/modules/Mage_Poll.xml new file mode 100644 index 00000000000..49476f53221 --- /dev/null +++ b/app/etc/modules/Mage_Poll.xml @@ -0,0 +1,33 @@ + + + + + + true + core + + + + + + + diff --git a/app/etc/modules/Mage_ProductAlert.xml b/app/etc/modules/Mage_ProductAlert.xml new file mode 100644 index 00000000000..9e021b39d1a --- /dev/null +++ b/app/etc/modules/Mage_ProductAlert.xml @@ -0,0 +1,33 @@ + + + + + + true + core + + + + + + + diff --git a/app/etc/modules/Mage_Rating.xml b/app/etc/modules/Mage_Rating.xml new file mode 100644 index 00000000000..af78ea9dc3c --- /dev/null +++ b/app/etc/modules/Mage_Rating.xml @@ -0,0 +1,33 @@ + + + + + + true + core + + + + + + + diff --git a/app/etc/modules/Mage_Reports.xml b/app/etc/modules/Mage_Reports.xml new file mode 100644 index 00000000000..5bbfb9e1d6b --- /dev/null +++ b/app/etc/modules/Mage_Reports.xml @@ -0,0 +1,35 @@ + + + + + + true + core + + + + + + + + + diff --git a/app/etc/modules/Mage_Review.xml b/app/etc/modules/Mage_Review.xml new file mode 100644 index 00000000000..417c1708f80 --- /dev/null +++ b/app/etc/modules/Mage_Review.xml @@ -0,0 +1,33 @@ + + + + + + true + core + + + + + + + diff --git a/app/etc/modules/Mage_Rss.xml b/app/etc/modules/Mage_Rss.xml new file mode 100644 index 00000000000..34d10429fcb --- /dev/null +++ b/app/etc/modules/Mage_Rss.xml @@ -0,0 +1,36 @@ + + + + + + true + core + + + + + + + + + + diff --git a/app/etc/modules/Mage_Rule.xml b/app/etc/modules/Mage_Rule.xml new file mode 100644 index 00000000000..14f53bf140b --- /dev/null +++ b/app/etc/modules/Mage_Rule.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Sales.xml b/app/etc/modules/Mage_Sales.xml new file mode 100644 index 00000000000..29c6b5e7066 --- /dev/null +++ b/app/etc/modules/Mage_Sales.xml @@ -0,0 +1,35 @@ + + + + + + true + core + + + + + + + + + diff --git a/app/etc/modules/Mage_SalesRule.xml b/app/etc/modules/Mage_SalesRule.xml new file mode 100644 index 00000000000..6b343b49559 --- /dev/null +++ b/app/etc/modules/Mage_SalesRule.xml @@ -0,0 +1,34 @@ + + + + + + true + core + + + + + + + + diff --git a/app/etc/modules/Mage_Sendfriend.xml b/app/etc/modules/Mage_Sendfriend.xml new file mode 100644 index 00000000000..31a23bb72b6 --- /dev/null +++ b/app/etc/modules/Mage_Sendfriend.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Shipping.xml b/app/etc/modules/Mage_Shipping.xml new file mode 100644 index 00000000000..e22d7c9e350 --- /dev/null +++ b/app/etc/modules/Mage_Shipping.xml @@ -0,0 +1,33 @@ + + + + + + true + core + + + + + + + diff --git a/app/etc/modules/Mage_Sitemap.xml b/app/etc/modules/Mage_Sitemap.xml new file mode 100644 index 00000000000..1f6d21024ed --- /dev/null +++ b/app/etc/modules/Mage_Sitemap.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Tag.xml b/app/etc/modules/Mage_Tag.xml new file mode 100644 index 00000000000..5763eb40812 --- /dev/null +++ b/app/etc/modules/Mage_Tag.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Tax.xml b/app/etc/modules/Mage_Tax.xml new file mode 100644 index 00000000000..3dfeb3de677 --- /dev/null +++ b/app/etc/modules/Mage_Tax.xml @@ -0,0 +1,33 @@ + + + + + + true + core + + + + + + + diff --git a/app/etc/modules/Mage_Uploader.xml b/app/etc/modules/Mage_Uploader.xml new file mode 100644 index 00000000000..9c26f23dd4b --- /dev/null +++ b/app/etc/modules/Mage_Uploader.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Usa.xml b/app/etc/modules/Mage_Usa.xml new file mode 100644 index 00000000000..8a5583f203b --- /dev/null +++ b/app/etc/modules/Mage_Usa.xml @@ -0,0 +1,33 @@ + + + + + + true + core + + + + + + + diff --git a/app/etc/modules/Mage_Wishlist.xml b/app/etc/modules/Mage_Wishlist.xml new file mode 100644 index 00000000000..af1dbdc220b --- /dev/null +++ b/app/etc/modules/Mage_Wishlist.xml @@ -0,0 +1,33 @@ + + + + + + true + core + + + + + + + From 422c9d5ab5a10f18eb0d3530d8e2e29d06fa3149 Mon Sep 17 00:00:00 2001 From: Tino Mewes Date: Sat, 20 Aug 2022 14:58:50 +0200 Subject: [PATCH 2/6] refactor: Restore sort order of Mage module xml loading --- app/code/core/Mage/Core/Model/Config.php | 80 +++++++++++++++++++++--- 1 file changed, 72 insertions(+), 8 deletions(-) diff --git a/app/code/core/Mage/Core/Model/Config.php b/app/code/core/Mage/Core/Model/Config.php index 2bb3374be54..8dc8f768dcf 100644 --- a/app/code/core/Mage/Core/Model/Config.php +++ b/app/code/core/Mage/Core/Model/Config.php @@ -28,6 +28,72 @@ */ class Mage_Core_Model_Config extends Mage_Core_Model_Config_Base { + const MAGE_MODULES = [ + 'Mage_Core', + 'Mage_Eav', + 'Mage_Page', + 'Mage_Install', + 'Mage_Admin', + 'Mage_Rule', + 'Mage_Adminhtml', + 'Mage_AdminNotification', + 'Mage_Cron', + 'Mage_Directory', + 'Mage_Dataflow', + 'Mage_Index', + 'Mage_Uploader', + 'Mage_Customer', + 'Mage_Cms', + 'Mage_Catalog', + 'Mage_CatalogRule', + 'Mage_CatalogIndex', + 'Mage_CatalogSearch', + 'Mage_Payment', + 'Mage_Sales', + 'Mage_CatalogInventory', + 'Mage_Shipping', + 'Mage_SalesRule', + 'Mage_Usa', + 'Mage_Paygate', + 'Mage_Backup', + 'Mage_Checkout', + 'Mage_Paypal', + 'Mage_GoogleCheckout', + 'Mage_Log', + 'Mage_Poll', + 'Mage_Review', + 'Mage_Rating', + 'Mage_Tag', + 'Mage_Reports', + 'Mage_GoogleAnalytics', + 'Mage_Widget', + 'Mage_Tax', + 'Mage_Wishlist', + 'Mage_Media', + 'Mage_PaypalUk', + 'Mage_Contacts', + 'Mage_GiftMessage', + 'Mage_Sendfriend', + 'Mage_Sitemap', + 'Mage_Rss', + 'Mage_ProductAlert', + 'Mage_Api', + 'Mage_Oauth', + 'Mage_Authorizenet', + 'Mage_Bundle', + 'Mage_Captcha', + 'Mage_Centinel', + 'Mage_ConfigurableSwatches', + 'Mage_Newsletter', + 'Mage_Downloadable', + 'Mage_ImportExport', + 'Mage_Api2', + 'Mage_PageCache', + 'Mage_Persistent', + 'Mage_Weee', + 'Mage_CurrencySymbol' + ]; + const CACHE_TAG = 'CONFIG'; /** @@ -162,7 +228,7 @@ class Mage_Core_Model_Config extends Mage_Core_Model_Config_Base protected $_isLocalConfigLoaded = false; /** - * Depricated properties + * Deprecated properties * * @deprecated */ @@ -727,7 +793,6 @@ protected function _getDeclaredModuleFiles() } $collectModuleFiles = array( - 'base' => array(), 'mage' => array(), 'custom' => array() ); @@ -736,17 +801,16 @@ protected function _getDeclaredModuleFiles() $name = explode(DIRECTORY_SEPARATOR, $v); $name = substr($name[count($name) - 1], 0, -4); - if ($name == 'Mage_All') { - $collectModuleFiles['base'][] = $v; - } elseif (substr($name, 0, 5) == 'Mage_') { - $collectModuleFiles['mage'][] = $v; + if (in_array($name, self::MAGE_MODULES, true)) { + $collectModuleFiles['mage'][array_search($name, self::MAGE_MODULES, true)] = $v; } else { $collectModuleFiles['custom'][] = $v; } } + ksort($collectModuleFiles['mage']); + return array_merge( - $collectModuleFiles['base'], $collectModuleFiles['mage'], $collectModuleFiles['custom'] ); @@ -789,7 +853,7 @@ protected function _isAllowedModule($moduleName) /** * Load declared modules configuration * - * @param null $mergeConfig depricated + * @param null $mergeConfig deprecated * @return $this|void */ protected function _loadDeclaredModules($mergeConfig = null) From 8c81fa6d493a1c9f1850d59d575444003e7b9f2c Mon Sep 17 00:00:00 2001 From: Tino Mewes Date: Sat, 20 Aug 2022 15:35:42 +0200 Subject: [PATCH 3/6] refactor: Check Mage modules via array_key_exists instead of in_array to improve performance --- app/code/core/Mage/Core/Model/Config.php | 130 +++++++++++------------ 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/app/code/core/Mage/Core/Model/Config.php b/app/code/core/Mage/Core/Model/Config.php index 8dc8f768dcf..e73acba39f0 100644 --- a/app/code/core/Mage/Core/Model/Config.php +++ b/app/code/core/Mage/Core/Model/Config.php @@ -29,69 +29,69 @@ class Mage_Core_Model_Config extends Mage_Core_Model_Config_Base { const MAGE_MODULES = [ - 'Mage_Core', - 'Mage_Eav', - 'Mage_Page', - 'Mage_Install', - 'Mage_Admin', - 'Mage_Rule', - 'Mage_Adminhtml', - 'Mage_AdminNotification', - 'Mage_Cron', - 'Mage_Directory', - 'Mage_Dataflow', - 'Mage_Index', - 'Mage_Uploader', - 'Mage_Customer', - 'Mage_Cms', - 'Mage_Catalog', - 'Mage_CatalogRule', - 'Mage_CatalogIndex', - 'Mage_CatalogSearch', - 'Mage_Payment', - 'Mage_Sales', - 'Mage_CatalogInventory', - 'Mage_Shipping', - 'Mage_SalesRule', - 'Mage_Usa', - 'Mage_Paygate', - 'Mage_Backup', - 'Mage_Checkout', - 'Mage_Paypal', - 'Mage_GoogleCheckout', - 'Mage_Log', - 'Mage_Poll', - 'Mage_Review', - 'Mage_Rating', - 'Mage_Tag', - 'Mage_Reports', - 'Mage_GoogleAnalytics', - 'Mage_Widget', - 'Mage_Tax', - 'Mage_Wishlist', - 'Mage_Media', - 'Mage_PaypalUk', - 'Mage_Contacts', - 'Mage_GiftMessage', - 'Mage_Sendfriend', - 'Mage_Sitemap', - 'Mage_Rss', - 'Mage_ProductAlert', - 'Mage_Api', - 'Mage_Oauth', - 'Mage_Authorizenet', - 'Mage_Bundle', - 'Mage_Captcha', - 'Mage_Centinel', - 'Mage_ConfigurableSwatches', - 'Mage_Newsletter', - 'Mage_Downloadable', - 'Mage_ImportExport', - 'Mage_Api2', - 'Mage_PageCache', - 'Mage_Persistent', - 'Mage_Weee', - 'Mage_CurrencySymbol' + 'Mage_Core' => 0, + 'Mage_Eav' => 1, + 'Mage_Page' => 2, + 'Mage_Install' => 3, + 'Mage_Admin' => 4, + 'Mage_Rule' => 5, + 'Mage_Adminhtml' => 6, + 'Mage_AdminNotification' => 7, + 'Mage_Cron' => 8, + 'Mage_Directory' => 9, + 'Mage_Dataflow' => 10, + 'Mage_Index' => 11, + 'Mage_Uploader' => 12, + 'Mage_Customer' => 13, + 'Mage_Cms' => 14, + 'Mage_Catalog' => 15, + 'Mage_CatalogRule' => 16, + 'Mage_CatalogIndex' => 17, + 'Mage_CatalogSearch' => 18, + 'Mage_Payment' => 19, + 'Mage_Sales' => 20, + 'Mage_CatalogInventory' => 21, + 'Mage_Shipping' => 22, + 'Mage_SalesRule' => 23, + 'Mage_Usa' => 24, + 'Mage_Paygate' => 25, + 'Mage_Backup' => 26, + 'Mage_Checkout' => 27, + 'Mage_Paypal' => 28, + 'Mage_GoogleCheckout' => 29, + 'Mage_Log' => 30, + 'Mage_Poll' => 31, + 'Mage_Review' => 32, + 'Mage_Rating' => 33, + 'Mage_Tag' => 34, + 'Mage_Reports' => 35, + 'Mage_GoogleAnalytics' => 36, + 'Mage_Widget' => 37, + 'Mage_Tax' => 38, + 'Mage_Wishlist' => 39, + 'Mage_Media' => 40, + 'Mage_PaypalUk' => 41, + 'Mage_Contacts' => 42, + 'Mage_GiftMessage' => 43, + 'Mage_Sendfriend' => 44, + 'Mage_Sitemap' => 45, + 'Mage_Rss' => 46, + 'Mage_ProductAlert' => 47, + 'Mage_Api' => 48, + 'Mage_Oauth' => 49, + 'Mage_Authorizenet' => 50, + 'Mage_Bundle' => 51, + 'Mage_Captcha' => 52, + 'Mage_Centinel' => 53, + 'Mage_ConfigurableSwatches' => 54, + 'Mage_Newsletter' => 55, + 'Mage_Downloadable' => 56, + 'Mage_ImportExport' => 57, + 'Mage_Api2' => 58, + 'Mage_PageCache' => 59, + 'Mage_Persistent' => 60, + 'Mage_Weee' => 61, + 'Mage_CurrencySymbol' => 62 ]; const CACHE_TAG = 'CONFIG'; @@ -801,8 +801,8 @@ protected function _getDeclaredModuleFiles() $name = explode(DIRECTORY_SEPARATOR, $v); $name = substr($name[count($name) - 1], 0, -4); - if (in_array($name, self::MAGE_MODULES, true)) { - $collectModuleFiles['mage'][array_search($name, self::MAGE_MODULES, true)] = $v; + if (array_key_exists($name, self::MAGE_MODULES)) { + $collectModuleFiles['mage'][self::MAGE_MODULES[$name]] = $v; } else { $collectModuleFiles['custom'][] = $v; } From fcf08301b90ca07fa89725164cb664608563d7b8 Mon Sep 17 00:00:00 2001 From: Tino Mewes Date: Wed, 24 Aug 2022 16:44:59 +0200 Subject: [PATCH 4/6] refactor: Remove 'base' in $collectModuleFiles again after PR #2458 was merged --- app/code/core/Mage/Core/Model/Config.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/code/core/Mage/Core/Model/Config.php b/app/code/core/Mage/Core/Model/Config.php index 2738dd22ead..4368547fa9f 100644 --- a/app/code/core/Mage/Core/Model/Config.php +++ b/app/code/core/Mage/Core/Model/Config.php @@ -793,7 +793,6 @@ protected function _getDeclaredModuleFiles() } $collectModuleFiles = [ - 'base' => [], 'mage' => [], 'custom' => [] ]; From eb38033a194018382cc4c94ba18f335e95a684fd Mon Sep 17 00:00:00 2001 From: Tino Mewes Date: Thu, 25 Aug 2022 11:04:07 +0200 Subject: [PATCH 5/6] refactor: Sort module dependencies alphabetically --- app/etc/modules/Mage_AdminNotification.xml | 2 +- app/etc/modules/Mage_Api.xml | 2 +- app/etc/modules/Mage_Api2.xml | 4 ++-- app/etc/modules/Mage_Authorizenet.xml | 2 +- app/etc/modules/Mage_Bundle.xml | 2 +- app/etc/modules/Mage_Captcha.xml | 8 ++++---- app/etc/modules/Mage_Catalog.xml | 4 ++-- app/etc/modules/Mage_CatalogIndex.xml | 2 +- app/etc/modules/Mage_CatalogRule.xml | 2 +- app/etc/modules/Mage_Centinel.xml | 2 +- app/etc/modules/Mage_Checkout.xml | 2 +- app/etc/modules/Mage_ConfigurableSwatches.xml | 4 ++-- app/etc/modules/Mage_Customer.xml | 2 +- app/etc/modules/Mage_Downloadable.xml | 3 +-- app/etc/modules/Mage_GoogleCheckout.xml | 2 +- app/etc/modules/Mage_Payment.xml | 2 +- app/etc/modules/Mage_Paypal.xml | 2 +- app/etc/modules/Mage_PaypalUk.xml | 4 ++-- app/etc/modules/Mage_Persistent.xml | 4 ++-- app/etc/modules/Mage_Poll.xml | 2 +- app/etc/modules/Mage_Reports.xml | 4 ++-- app/etc/modules/Mage_Sales.xml | 2 +- app/etc/modules/Mage_SalesRule.xml | 2 +- app/etc/modules/Mage_Shipping.xml | 2 +- app/etc/modules/Mage_Weee.xml | 6 +++--- app/etc/modules/Mage_Widget.xml | 2 +- app/etc/modules/Mage_Wishlist.xml | 2 +- 27 files changed, 38 insertions(+), 39 deletions(-) diff --git a/app/etc/modules/Mage_AdminNotification.xml b/app/etc/modules/Mage_AdminNotification.xml index 5b95ba6a4dc..b5cbaf57cb3 100644 --- a/app/etc/modules/Mage_AdminNotification.xml +++ b/app/etc/modules/Mage_AdminNotification.xml @@ -25,8 +25,8 @@ true core - + diff --git a/app/etc/modules/Mage_Api.xml b/app/etc/modules/Mage_Api.xml index 38be49e0cfc..f81d7e9c50b 100644 --- a/app/etc/modules/Mage_Api.xml +++ b/app/etc/modules/Mage_Api.xml @@ -25,7 +25,7 @@ true core - + diff --git a/app/etc/modules/Mage_Api2.xml b/app/etc/modules/Mage_Api2.xml index 8e039e1391b..ad0c86784d1 100644 --- a/app/etc/modules/Mage_Api2.xml +++ b/app/etc/modules/Mage_Api2.xml @@ -25,8 +25,8 @@ true core - - + + diff --git a/app/etc/modules/Mage_Authorizenet.xml b/app/etc/modules/Mage_Authorizenet.xml index ee61466ab06..95faaf17c32 100644 --- a/app/etc/modules/Mage_Authorizenet.xml +++ b/app/etc/modules/Mage_Authorizenet.xml @@ -25,9 +25,9 @@ true core + - diff --git a/app/etc/modules/Mage_Bundle.xml b/app/etc/modules/Mage_Bundle.xml index d6a25efb539..3c94f8f82a7 100644 --- a/app/etc/modules/Mage_Bundle.xml +++ b/app/etc/modules/Mage_Bundle.xml @@ -25,7 +25,7 @@ true core - + diff --git a/app/etc/modules/Mage_Captcha.xml b/app/etc/modules/Mage_Captcha.xml index 831420ad603..06cc2e31fe9 100644 --- a/app/etc/modules/Mage_Captcha.xml +++ b/app/etc/modules/Mage_Captcha.xml @@ -25,10 +25,10 @@ true core - - - - + + + + diff --git a/app/etc/modules/Mage_Catalog.xml b/app/etc/modules/Mage_Catalog.xml index 62813d473eb..0faf4e7a3c0 100644 --- a/app/etc/modules/Mage_Catalog.xml +++ b/app/etc/modules/Mage_Catalog.xml @@ -25,9 +25,9 @@ true core - - + + diff --git a/app/etc/modules/Mage_CatalogIndex.xml b/app/etc/modules/Mage_CatalogIndex.xml index 54c45c5e707..790d784a710 100644 --- a/app/etc/modules/Mage_CatalogIndex.xml +++ b/app/etc/modules/Mage_CatalogIndex.xml @@ -26,8 +26,8 @@ core - + diff --git a/app/etc/modules/Mage_CatalogRule.xml b/app/etc/modules/Mage_CatalogRule.xml index 9fa81270c6e..27bd49e296b 100644 --- a/app/etc/modules/Mage_CatalogRule.xml +++ b/app/etc/modules/Mage_CatalogRule.xml @@ -25,9 +25,9 @@ true core - + diff --git a/app/etc/modules/Mage_Centinel.xml b/app/etc/modules/Mage_Centinel.xml index b5f9c2e4f96..77c03fca9b8 100644 --- a/app/etc/modules/Mage_Centinel.xml +++ b/app/etc/modules/Mage_Centinel.xml @@ -25,8 +25,8 @@ true core - + diff --git a/app/etc/modules/Mage_Checkout.xml b/app/etc/modules/Mage_Checkout.xml index bc0bf7ffc28..d9d1d1db812 100644 --- a/app/etc/modules/Mage_Checkout.xml +++ b/app/etc/modules/Mage_Checkout.xml @@ -25,8 +25,8 @@ true core - + diff --git a/app/etc/modules/Mage_ConfigurableSwatches.xml b/app/etc/modules/Mage_ConfigurableSwatches.xml index bc756a67a73..68b7ef1892f 100644 --- a/app/etc/modules/Mage_ConfigurableSwatches.xml +++ b/app/etc/modules/Mage_ConfigurableSwatches.xml @@ -25,8 +25,8 @@ true core - - + + diff --git a/app/etc/modules/Mage_Customer.xml b/app/etc/modules/Mage_Customer.xml index 4862cb1996b..01012f9f3a4 100644 --- a/app/etc/modules/Mage_Customer.xml +++ b/app/etc/modules/Mage_Customer.xml @@ -25,9 +25,9 @@ true core - + diff --git a/app/etc/modules/Mage_Downloadable.xml b/app/etc/modules/Mage_Downloadable.xml index 0d9d4d64e89..3899f01a020 100644 --- a/app/etc/modules/Mage_Downloadable.xml +++ b/app/etc/modules/Mage_Downloadable.xml @@ -25,8 +25,7 @@ true core - - + diff --git a/app/etc/modules/Mage_GoogleCheckout.xml b/app/etc/modules/Mage_GoogleCheckout.xml index 7b0f127eb3e..b973010c23d 100644 --- a/app/etc/modules/Mage_GoogleCheckout.xml +++ b/app/etc/modules/Mage_GoogleCheckout.xml @@ -25,8 +25,8 @@ true core - + diff --git a/app/etc/modules/Mage_Payment.xml b/app/etc/modules/Mage_Payment.xml index 13c5bf9952f..faecbc54a86 100644 --- a/app/etc/modules/Mage_Payment.xml +++ b/app/etc/modules/Mage_Payment.xml @@ -25,8 +25,8 @@ true core - + diff --git a/app/etc/modules/Mage_Paypal.xml b/app/etc/modules/Mage_Paypal.xml index 1e4b0c219da..99b53409969 100644 --- a/app/etc/modules/Mage_Paypal.xml +++ b/app/etc/modules/Mage_Paypal.xml @@ -25,8 +25,8 @@ true core - + diff --git a/app/etc/modules/Mage_PaypalUk.xml b/app/etc/modules/Mage_PaypalUk.xml index 0c86821942d..b5030ede121 100644 --- a/app/etc/modules/Mage_PaypalUk.xml +++ b/app/etc/modules/Mage_PaypalUk.xml @@ -25,10 +25,10 @@ true core - - + + diff --git a/app/etc/modules/Mage_Persistent.xml b/app/etc/modules/Mage_Persistent.xml index 424082060f8..a4a13dc11ba 100644 --- a/app/etc/modules/Mage_Persistent.xml +++ b/app/etc/modules/Mage_Persistent.xml @@ -25,8 +25,8 @@ true core - - + + diff --git a/app/etc/modules/Mage_Poll.xml b/app/etc/modules/Mage_Poll.xml index 49476f53221..4dbd700493b 100644 --- a/app/etc/modules/Mage_Poll.xml +++ b/app/etc/modules/Mage_Poll.xml @@ -25,8 +25,8 @@ true core - + diff --git a/app/etc/modules/Mage_Reports.xml b/app/etc/modules/Mage_Reports.xml index 5bbfb9e1d6b..f8f8c7b2f36 100644 --- a/app/etc/modules/Mage_Reports.xml +++ b/app/etc/modules/Mage_Reports.xml @@ -25,10 +25,10 @@ true core - - + + diff --git a/app/etc/modules/Mage_Sales.xml b/app/etc/modules/Mage_Sales.xml index 29c6b5e7066..2f0b31be4a3 100644 --- a/app/etc/modules/Mage_Sales.xml +++ b/app/etc/modules/Mage_Sales.xml @@ -25,10 +25,10 @@ true core - + diff --git a/app/etc/modules/Mage_SalesRule.xml b/app/etc/modules/Mage_SalesRule.xml index 6b343b49559..2dfc961eb6a 100644 --- a/app/etc/modules/Mage_SalesRule.xml +++ b/app/etc/modules/Mage_SalesRule.xml @@ -25,8 +25,8 @@ true core - + diff --git a/app/etc/modules/Mage_Shipping.xml b/app/etc/modules/Mage_Shipping.xml index e22d7c9e350..4509b6d5a1d 100644 --- a/app/etc/modules/Mage_Shipping.xml +++ b/app/etc/modules/Mage_Shipping.xml @@ -25,8 +25,8 @@ true core - + diff --git a/app/etc/modules/Mage_Weee.xml b/app/etc/modules/Mage_Weee.xml index cef07bfbca6..aeca6b88217 100644 --- a/app/etc/modules/Mage_Weee.xml +++ b/app/etc/modules/Mage_Weee.xml @@ -25,9 +25,9 @@ true core - - - + + + diff --git a/app/etc/modules/Mage_Widget.xml b/app/etc/modules/Mage_Widget.xml index 6a7ab827a23..de8991f2294 100644 --- a/app/etc/modules/Mage_Widget.xml +++ b/app/etc/modules/Mage_Widget.xml @@ -25,7 +25,7 @@ true core - + diff --git a/app/etc/modules/Mage_Wishlist.xml b/app/etc/modules/Mage_Wishlist.xml index af1dbdc220b..059a35fe1f4 100644 --- a/app/etc/modules/Mage_Wishlist.xml +++ b/app/etc/modules/Mage_Wishlist.xml @@ -25,8 +25,8 @@ true core - + From cfd99d0441bd95e459da6869725441de36b6fd36 Mon Sep 17 00:00:00 2001 From: Tino Mewes Date: Thu, 25 Aug 2022 11:05:42 +0200 Subject: [PATCH 6/6] chore: Add documentation of the current status and future plans of Mage_All.xml --- app/etc/modules/Mage_All.xml | 45 ++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 app/etc/modules/Mage_All.xml diff --git a/app/etc/modules/Mage_All.xml b/app/etc/modules/Mage_All.xml new file mode 100644 index 00000000000..1fad1e6e010 --- /dev/null +++ b/app/etc/modules/Mage_All.xml @@ -0,0 +1,45 @@ + + +