Skip to content

Commit 1eb6a06

Browse files
fballianofballiano
authored
Merge branch 'next' into tinymce6
2 parents 9b48a81 + 146e878 commit 1eb6a06

16 files changed

+4652
-4781
lines changed

‎.phpstorm.meta.php/magento_blocks.meta.php

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,6 @@
241241
'adminhtml/denied' => \Mage_Adminhtml_Block_Denied::class,
242242
'adminhtml/html_date' => \Mage_Adminhtml_Block_Html_Date::class,
243243
'adminhtml/html_select' => \Mage_Adminhtml_Block_Html_Select::class,
244-
'adminhtml/media_editor' => \Mage_Adminhtml_Block_Media_Editor::class,
245-
'adminhtml/media_uploader' => \Mage_Adminhtml_Block_Media_Uploader::class,
246244
'adminhtml/messages' => \Mage_Adminhtml_Block_Messages::class,
247245
'adminhtml/newsletter_problem' => \Mage_Adminhtml_Block_Newsletter_Problem::class,
248246
'adminhtml/newsletter_problem_grid' => \Mage_Adminhtml_Block_Newsletter_Problem_Grid::class,
@@ -313,18 +311,6 @@
313311
'adminhtml/permissions_variable_edit' => \Mage_Adminhtml_Block_Permissions_Variable_Edit::class,
314312
'adminhtml/permissions_variable_edit_form' => \Mage_Adminhtml_Block_Permissions_Variable_Edit_Form::class,
315313
'adminhtml/permissions_variable_grid' => \Mage_Adminhtml_Block_Permissions_Variable_Grid::class,
316-
'adminhtml/poll_answer_edit' => \Mage_Adminhtml_Block_Poll_Answer_Edit::class,
317-
'adminhtml/poll_answer_edit_form' => \Mage_Adminhtml_Block_Poll_Answer_Edit_Form::class,
318-
'adminhtml/poll_edit' => \Mage_Adminhtml_Block_Poll_Edit::class,
319-
'adminhtml/poll_edit_form' => \Mage_Adminhtml_Block_Poll_Edit_Form::class,
320-
'adminhtml/poll_edit_tab_answers' => \Mage_Adminhtml_Block_Poll_Edit_Tab_Answers::class,
321-
'adminhtml/poll_edit_tab_answers_form' => \Mage_Adminhtml_Block_Poll_Edit_Tab_Answers_Form::class,
322-
'adminhtml/poll_edit_tab_answers_grid' => \Mage_Adminhtml_Block_Poll_Edit_Tab_Answers_Grid::class,
323-
'adminhtml/poll_edit_tab_answers_list' => \Mage_Adminhtml_Block_Poll_Edit_Tab_Answers_List::class,
324-
'adminhtml/poll_edit_tab_form' => \Mage_Adminhtml_Block_Poll_Edit_Tab_Form::class,
325-
'adminhtml/poll_edit_tabs' => \Mage_Adminhtml_Block_Poll_Edit_Tabs::class,
326-
'adminhtml/poll_grid' => \Mage_Adminhtml_Block_Poll_Grid::class,
327-
'adminhtml/poll_poll' => \Mage_Adminhtml_Block_Poll_Poll::class,
328314
'adminhtml/promo_catalog' => \Mage_Adminhtml_Block_Promo_Catalog::class,
329315
'adminhtml/promo_catalog_edit' => \Mage_Adminhtml_Block_Promo_Catalog_Edit::class,
330316
'adminhtml/promo_catalog_edit_form' => \Mage_Adminhtml_Block_Promo_Catalog_Edit_Form::class,
@@ -1039,6 +1025,7 @@
10391025
'giftmessage/message_helper' => \Mage_GiftMessage_Block_Message_Helper::class,
10401026
'giftmessage/message_inline' => \Mage_GiftMessage_Block_Message_Inline::class,
10411027
'googleanalytics/ga' => \Mage_GoogleAnalytics_Block_Ga::class,
1028+
'googleanalytics/gtm' => \Mage_GoogleAnalytics_Block_Gtm::class,
10421029
'importexport/adminhtml_export_edit' => \Mage_ImportExport_Block_Adminhtml_Export_Edit::class,
10431030
'importexport/adminhtml_export_edit_form' => \Mage_ImportExport_Block_Adminhtml_Export_Edit_Form::class,
10441031
'importexport/adminhtml_export_filter' => \Mage_ImportExport_Block_Adminhtml_Export_Filter::class,
@@ -1165,8 +1152,6 @@
11651152
'paypal/standard_redirect' => \Mage_Paypal_Block_Standard_Redirect::class,
11661153
'persistent/form_remember' => \Mage_Persistent_Block_Form_Remember::class,
11671154
'persistent/header_additional' => \Mage_Persistent_Block_Header_Additional::class,
1168-
'poll/activePoll' => \Mage_Poll_Block_ActivePoll::class,
1169-
'poll/poll' => \Mage_Poll_Block_Poll::class,
11701155
'productalert/email_abstract' => \Mage_ProductAlert_Block_Email_Abstract::class,
11711156
'productalert/email_price' => \Mage_ProductAlert_Block_Email_Price::class,
11721157
'productalert/email_stock' => \Mage_ProductAlert_Block_Email_Stock::class,

‎.phpstorm.meta.php/magento_blocks_methods.meta.php

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,6 @@
241241
'adminhtml/denied' => \Mage_Adminhtml_Block_Denied::class,
242242
'adminhtml/html_date' => \Mage_Adminhtml_Block_Html_Date::class,
243243
'adminhtml/html_select' => \Mage_Adminhtml_Block_Html_Select::class,
244-
'adminhtml/media_editor' => \Mage_Adminhtml_Block_Media_Editor::class,
245-
'adminhtml/media_uploader' => \Mage_Adminhtml_Block_Media_Uploader::class,
246244
'adminhtml/messages' => \Mage_Adminhtml_Block_Messages::class,
247245
'adminhtml/newsletter_problem' => \Mage_Adminhtml_Block_Newsletter_Problem::class,
248246
'adminhtml/newsletter_problem_grid' => \Mage_Adminhtml_Block_Newsletter_Problem_Grid::class,
@@ -313,18 +311,6 @@
313311
'adminhtml/permissions_variable_edit' => \Mage_Adminhtml_Block_Permissions_Variable_Edit::class,
314312
'adminhtml/permissions_variable_edit_form' => \Mage_Adminhtml_Block_Permissions_Variable_Edit_Form::class,
315313
'adminhtml/permissions_variable_grid' => \Mage_Adminhtml_Block_Permissions_Variable_Grid::class,
316-
'adminhtml/poll_answer_edit' => \Mage_Adminhtml_Block_Poll_Answer_Edit::class,
317-
'adminhtml/poll_answer_edit_form' => \Mage_Adminhtml_Block_Poll_Answer_Edit_Form::class,
318-
'adminhtml/poll_edit' => \Mage_Adminhtml_Block_Poll_Edit::class,
319-
'adminhtml/poll_edit_form' => \Mage_Adminhtml_Block_Poll_Edit_Form::class,
320-
'adminhtml/poll_edit_tab_answers' => \Mage_Adminhtml_Block_Poll_Edit_Tab_Answers::class,
321-
'adminhtml/poll_edit_tab_answers_form' => \Mage_Adminhtml_Block_Poll_Edit_Tab_Answers_Form::class,
322-
'adminhtml/poll_edit_tab_answers_grid' => \Mage_Adminhtml_Block_Poll_Edit_Tab_Answers_Grid::class,
323-
'adminhtml/poll_edit_tab_answers_list' => \Mage_Adminhtml_Block_Poll_Edit_Tab_Answers_List::class,
324-
'adminhtml/poll_edit_tab_form' => \Mage_Adminhtml_Block_Poll_Edit_Tab_Form::class,
325-
'adminhtml/poll_edit_tabs' => \Mage_Adminhtml_Block_Poll_Edit_Tabs::class,
326-
'adminhtml/poll_grid' => \Mage_Adminhtml_Block_Poll_Grid::class,
327-
'adminhtml/poll_poll' => \Mage_Adminhtml_Block_Poll_Poll::class,
328314
'adminhtml/promo_catalog' => \Mage_Adminhtml_Block_Promo_Catalog::class,
329315
'adminhtml/promo_catalog_edit' => \Mage_Adminhtml_Block_Promo_Catalog_Edit::class,
330316
'adminhtml/promo_catalog_edit_form' => \Mage_Adminhtml_Block_Promo_Catalog_Edit_Form::class,
@@ -1039,6 +1025,7 @@
10391025
'giftmessage/message_helper' => \Mage_GiftMessage_Block_Message_Helper::class,
10401026
'giftmessage/message_inline' => \Mage_GiftMessage_Block_Message_Inline::class,
10411027
'googleanalytics/ga' => \Mage_GoogleAnalytics_Block_Ga::class,
1028+
'googleanalytics/gtm' => \Mage_GoogleAnalytics_Block_Gtm::class,
10421029
'importexport/adminhtml_export_edit' => \Mage_ImportExport_Block_Adminhtml_Export_Edit::class,
10431030
'importexport/adminhtml_export_edit_form' => \Mage_ImportExport_Block_Adminhtml_Export_Edit_Form::class,
10441031
'importexport/adminhtml_export_filter' => \Mage_ImportExport_Block_Adminhtml_Export_Filter::class,
@@ -1165,8 +1152,6 @@
11651152
'paypal/standard_redirect' => \Mage_Paypal_Block_Standard_Redirect::class,
11661153
'persistent/form_remember' => \Mage_Persistent_Block_Form_Remember::class,
11671154
'persistent/header_additional' => \Mage_Persistent_Block_Header_Additional::class,
1168-
'poll/activePoll' => \Mage_Poll_Block_ActivePoll::class,
1169-
'poll/poll' => \Mage_Poll_Block_Poll::class,
11701155
'productalert/email_abstract' => \Mage_ProductAlert_Block_Email_Abstract::class,
11711156
'productalert/email_price' => \Mage_ProductAlert_Block_Email_Price::class,
11721157
'productalert/email_stock' => \Mage_ProductAlert_Block_Email_Stock::class,

‎.phpstorm.meta.php/magento_helpers.meta.php

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
'adminhtml/catalog' => \Mage_Adminhtml_Helper_Catalog::class,
1414
'adminhtml/catalog_product_composite' => \Mage_Adminhtml_Helper_Catalog_Product_Composite::class,
1515
'adminhtml/catalog_product_edit_action_attribute' => \Mage_Adminhtml_Helper_Catalog_Product_Edit_Action_Attribute::class,
16+
'adminhtml/config' => \Mage_Adminhtml_Helper_Config::class,
1617
'adminhtml/dashboard_abstract' => \Mage_Adminhtml_Helper_Dashboard_Abstract::class,
1718
'adminhtml/dashboard_data' => \Mage_Adminhtml_Helper_Dashboard_Data::class,
1819
'adminhtml/dashboard_order' => \Mage_Adminhtml_Helper_Dashboard_Order::class,
@@ -23,10 +24,10 @@
2324
'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class,
2425
'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class,
2526
'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class,
26-
'api2' => \Mage_Api2_Helper_Data::class,
2727
'api2/data' => \Mage_Api2_Helper_Data::class,
28-
'api' => \Mage_Api_Helper_Data::class,
28+
'api2' => \Mage_Api2_Helper_Data::class,
2929
'api/data' => \Mage_Api_Helper_Data::class,
30+
'api' => \Mage_Api_Helper_Data::class,
3031
'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
3132
'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
3233
'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
@@ -38,10 +39,10 @@
3839
'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
3940
'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
4041
'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
41-
'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
4242
'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class,
43-
'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class,
43+
'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
4444
'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class,
45+
'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class,
4546
'catalog/category' => \Mage_Catalog_Helper_Category::class,
4647
'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class,
4748
'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class,
@@ -60,8 +61,8 @@
6061
'catalog/product_url' => \Mage_Catalog_Helper_Product_Url::class,
6162
'catalog/product_url_rewrite' => \Mage_Catalog_Helper_Product_Url_Rewrite::class,
6263
'catalog/product_view' => \Mage_Catalog_Helper_Product_View::class,
63-
'centinel' => \Mage_Centinel_Helper_Data::class,
6464
'centinel/data' => \Mage_Centinel_Helper_Data::class,
65+
'centinel' => \Mage_Centinel_Helper_Data::class,
6566
'checkout/cart' => \Mage_Checkout_Helper_Cart::class,
6667
'checkout' => \Mage_Checkout_Helper_Data::class,
6768
'checkout/data' => \Mage_Checkout_Helper_Data::class,
@@ -93,19 +94,19 @@
9394
'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class,
9495
'core/url' => \Mage_Core_Helper_Url::class,
9596
'core/url_rewrite' => \Mage_Core_Helper_Url_Rewrite::class,
96-
'currencysymbol' => \Mage_CurrencySymbol_Helper_Data::class,
9797
'currencysymbol/data' => \Mage_CurrencySymbol_Helper_Data::class,
98+
'currencysymbol' => \Mage_CurrencySymbol_Helper_Data::class,
9899
'customer/address' => \Mage_Customer_Helper_Address::class,
99-
'customer' => \Mage_Customer_Helper_Data::class,
100100
'customer/data' => \Mage_Customer_Helper_Data::class,
101+
'customer' => \Mage_Customer_Helper_Data::class,
101102
'dataflow' => \Mage_Dataflow_Helper_Data::class,
102103
'dataflow/data' => \Mage_Dataflow_Helper_Data::class,
103104
'directory' => \Mage_Directory_Helper_Data::class,
104105
'directory/data' => \Mage_Directory_Helper_Data::class,
105106
'directory/url' => \Mage_Directory_Helper_Url::class,
106107
'downloadable/catalog_product_configuration' => \Mage_Downloadable_Helper_Catalog_Product_Configuration::class,
107-
'downloadable' => \Mage_Downloadable_Helper_Data::class,
108108
'downloadable/data' => \Mage_Downloadable_Helper_Data::class,
109+
'downloadable' => \Mage_Downloadable_Helper_Data::class,
109110
'downloadable/download' => \Mage_Downloadable_Helper_Download::class,
110111
'downloadable/file' => \Mage_Downloadable_Helper_File::class,
111112
'eav' => \Mage_Eav_Helper_Data::class,
@@ -114,24 +115,24 @@
114115
'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class,
115116
'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class,
116117
'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class,
117-
'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class,
118118
'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class,
119+
'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class,
119120
'importexport' => \Mage_ImportExport_Helper_Data::class,
120121
'importexport/data' => \Mage_ImportExport_Helper_Data::class,
121122
'index' => \Mage_Index_Helper_Data::class,
122123
'index/data' => \Mage_Index_Helper_Data::class,
123-
'install' => \Mage_Install_Helper_Data::class,
124124
'install/data' => \Mage_Install_Helper_Data::class,
125-
'log' => \Mage_Log_Helper_Data::class,
125+
'install' => \Mage_Install_Helper_Data::class,
126126
'log/data' => \Mage_Log_Helper_Data::class,
127-
'media' => \Mage_Media_Helper_Data::class,
127+
'log' => \Mage_Log_Helper_Data::class,
128128
'media/data' => \Mage_Media_Helper_Data::class,
129+
'media' => \Mage_Media_Helper_Data::class,
129130
'newsletter' => \Mage_Newsletter_Helper_Data::class,
130131
'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
131132
'oauth' => \Mage_Oauth_Helper_Data::class,
132133
'oauth/data' => \Mage_Oauth_Helper_Data::class,
133-
'page' => \Mage_Page_Helper_Data::class,
134134
'page/data' => \Mage_Page_Helper_Data::class,
135+
'page' => \Mage_Page_Helper_Data::class,
135136
'page/html' => \Mage_Page_Helper_Html::class,
136137
'page/layout' => \Mage_Page_Helper_Layout::class,
137138
'payment' => \Mage_Payment_Helper_Data::class,
@@ -145,31 +146,29 @@
145146
'persistent' => \Mage_Persistent_Helper_Data::class,
146147
'persistent/data' => \Mage_Persistent_Helper_Data::class,
147148
'persistent/session' => \Mage_Persistent_Helper_Session::class,
148-
'poll' => \Mage_Poll_Helper_Data::class,
149-
'poll/data' => \Mage_Poll_Helper_Data::class,
150149
'productalert' => \Mage_ProductAlert_Helper_Data::class,
151150
'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
152151
'rating' => \Mage_Rating_Helper_Data::class,
153152
'rating/data' => \Mage_Rating_Helper_Data::class,
154153
'reports' => \Mage_Reports_Helper_Data::class,
155154
'reports/data' => \Mage_Reports_Helper_Data::class,
156-
'review' => \Mage_Review_Helper_Data::class,
157155
'review/data' => \Mage_Review_Helper_Data::class,
156+
'review' => \Mage_Review_Helper_Data::class,
158157
'rss/catalog' => \Mage_Rss_Helper_Catalog::class,
159158
'rss' => \Mage_Rss_Helper_Data::class,
160159
'rss/data' => \Mage_Rss_Helper_Data::class,
161160
'rss/order' => \Mage_Rss_Helper_Order::class,
162161
'rule' => \Mage_Rule_Helper_Data::class,
163162
'rule/data' => \Mage_Rule_Helper_Data::class,
164163
'salesrule/coupon' => \Mage_SalesRule_Helper_Coupon::class,
165-
'salesrule' => \Mage_SalesRule_Helper_Data::class,
166164
'salesrule/data' => \Mage_SalesRule_Helper_Data::class,
167-
'sales' => \Mage_Sales_Helper_Data::class,
165+
'salesrule' => \Mage_SalesRule_Helper_Data::class,
168166
'sales/data' => \Mage_Sales_Helper_Data::class,
167+
'sales' => \Mage_Sales_Helper_Data::class,
169168
'sales/guest' => \Mage_Sales_Helper_Guest::class,
170169
'sales/reorder' => \Mage_Sales_Helper_Reorder::class,
171-
'sendfriend' => \Mage_Sendfriend_Helper_Data::class,
172170
'sendfriend/data' => \Mage_Sendfriend_Helper_Data::class,
171+
'sendfriend' => \Mage_Sendfriend_Helper_Data::class,
173172
'shipping' => \Mage_Shipping_Helper_Data::class,
174173
'shipping/data' => \Mage_Shipping_Helper_Data::class,
175174
'sitemap' => \Mage_Sitemap_Helper_Data::class,
@@ -178,8 +177,8 @@
178177
'tag/data' => \Mage_Tag_Helper_Data::class,
179178
'tax' => \Mage_Tax_Helper_Data::class,
180179
'tax/data' => \Mage_Tax_Helper_Data::class,
181-
'uploader' => \Mage_Uploader_Helper_Data::class,
182180
'uploader/data' => \Mage_Uploader_Helper_Data::class,
181+
'uploader' => \Mage_Uploader_Helper_Data::class,
183182
'uploader/file' => \Mage_Uploader_Helper_File::class,
184183
'usa' => \Mage_Usa_Helper_Data::class,
185184
'usa/data' => \Mage_Usa_Helper_Data::class,

0 commit comments

Comments
 (0)