Skip to content

Commit

Permalink
Merge branch 'next' into tinymce6
Browse files Browse the repository at this point in the history
  • Loading branch information
@fballiano
fballiano committed Aug 15, 2023
2 parents 9b48a81 + 146e878 commit 1eb6a06
Show file tree
Hide file tree
Showing 16 changed files with 4,652 additions and 4,781 deletions.
17 changes: 1 addition & 16 deletions .phpstorm.meta.php/magento_blocks.meta.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,6 @@
'adminhtml/denied' => \Mage_Adminhtml_Block_Denied::class,
'adminhtml/html_date' => \Mage_Adminhtml_Block_Html_Date::class,
'adminhtml/html_select' => \Mage_Adminhtml_Block_Html_Select::class,
'adminhtml/media_editor' => \Mage_Adminhtml_Block_Media_Editor::class,
'adminhtml/media_uploader' => \Mage_Adminhtml_Block_Media_Uploader::class,
'adminhtml/messages' => \Mage_Adminhtml_Block_Messages::class,
'adminhtml/newsletter_problem' => \Mage_Adminhtml_Block_Newsletter_Problem::class,
'adminhtml/newsletter_problem_grid' => \Mage_Adminhtml_Block_Newsletter_Problem_Grid::class,
Expand Down Expand Up @@ -313,18 +311,6 @@
'adminhtml/permissions_variable_edit' => \Mage_Adminhtml_Block_Permissions_Variable_Edit::class,
'adminhtml/permissions_variable_edit_form' => \Mage_Adminhtml_Block_Permissions_Variable_Edit_Form::class,
'adminhtml/permissions_variable_grid' => \Mage_Adminhtml_Block_Permissions_Variable_Grid::class,
'adminhtml/poll_answer_edit' => \Mage_Adminhtml_Block_Poll_Answer_Edit::class,
'adminhtml/poll_answer_edit_form' => \Mage_Adminhtml_Block_Poll_Answer_Edit_Form::class,
'adminhtml/poll_edit' => \Mage_Adminhtml_Block_Poll_Edit::class,
'adminhtml/poll_edit_form' => \Mage_Adminhtml_Block_Poll_Edit_Form::class,
'adminhtml/poll_edit_tab_answers' => \Mage_Adminhtml_Block_Poll_Edit_Tab_Answers::class,
'adminhtml/poll_edit_tab_answers_form' => \Mage_Adminhtml_Block_Poll_Edit_Tab_Answers_Form::class,
'adminhtml/poll_edit_tab_answers_grid' => \Mage_Adminhtml_Block_Poll_Edit_Tab_Answers_Grid::class,
'adminhtml/poll_edit_tab_answers_list' => \Mage_Adminhtml_Block_Poll_Edit_Tab_Answers_List::class,
'adminhtml/poll_edit_tab_form' => \Mage_Adminhtml_Block_Poll_Edit_Tab_Form::class,
'adminhtml/poll_edit_tabs' => \Mage_Adminhtml_Block_Poll_Edit_Tabs::class,
'adminhtml/poll_grid' => \Mage_Adminhtml_Block_Poll_Grid::class,
'adminhtml/poll_poll' => \Mage_Adminhtml_Block_Poll_Poll::class,
'adminhtml/promo_catalog' => \Mage_Adminhtml_Block_Promo_Catalog::class,
'adminhtml/promo_catalog_edit' => \Mage_Adminhtml_Block_Promo_Catalog_Edit::class,
'adminhtml/promo_catalog_edit_form' => \Mage_Adminhtml_Block_Promo_Catalog_Edit_Form::class,
Expand Down Expand Up @@ -1039,6 +1025,7 @@
'giftmessage/message_helper' => \Mage_GiftMessage_Block_Message_Helper::class,
'giftmessage/message_inline' => \Mage_GiftMessage_Block_Message_Inline::class,
'googleanalytics/ga' => \Mage_GoogleAnalytics_Block_Ga::class,
'googleanalytics/gtm' => \Mage_GoogleAnalytics_Block_Gtm::class,
'importexport/adminhtml_export_edit' => \Mage_ImportExport_Block_Adminhtml_Export_Edit::class,
'importexport/adminhtml_export_edit_form' => \Mage_ImportExport_Block_Adminhtml_Export_Edit_Form::class,
'importexport/adminhtml_export_filter' => \Mage_ImportExport_Block_Adminhtml_Export_Filter::class,
Expand Down Expand Up @@ -1165,8 +1152,6 @@
'paypal/standard_redirect' => \Mage_Paypal_Block_Standard_Redirect::class,
'persistent/form_remember' => \Mage_Persistent_Block_Form_Remember::class,
'persistent/header_additional' => \Mage_Persistent_Block_Header_Additional::class,
'poll/activePoll' => \Mage_Poll_Block_ActivePoll::class,
'poll/poll' => \Mage_Poll_Block_Poll::class,
'productalert/email_abstract' => \Mage_ProductAlert_Block_Email_Abstract::class,
'productalert/email_price' => \Mage_ProductAlert_Block_Email_Price::class,
'productalert/email_stock' => \Mage_ProductAlert_Block_Email_Stock::class,
Expand Down
17 changes: 1 addition & 16 deletions .phpstorm.meta.php/magento_blocks_methods.meta.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,6 @@
'adminhtml/denied' => \Mage_Adminhtml_Block_Denied::class,
'adminhtml/html_date' => \Mage_Adminhtml_Block_Html_Date::class,
'adminhtml/html_select' => \Mage_Adminhtml_Block_Html_Select::class,
'adminhtml/media_editor' => \Mage_Adminhtml_Block_Media_Editor::class,
'adminhtml/media_uploader' => \Mage_Adminhtml_Block_Media_Uploader::class,
'adminhtml/messages' => \Mage_Adminhtml_Block_Messages::class,
'adminhtml/newsletter_problem' => \Mage_Adminhtml_Block_Newsletter_Problem::class,
'adminhtml/newsletter_problem_grid' => \Mage_Adminhtml_Block_Newsletter_Problem_Grid::class,
Expand Down Expand Up @@ -313,18 +311,6 @@
'adminhtml/permissions_variable_edit' => \Mage_Adminhtml_Block_Permissions_Variable_Edit::class,
'adminhtml/permissions_variable_edit_form' => \Mage_Adminhtml_Block_Permissions_Variable_Edit_Form::class,
'adminhtml/permissions_variable_grid' => \Mage_Adminhtml_Block_Permissions_Variable_Grid::class,
'adminhtml/poll_answer_edit' => \Mage_Adminhtml_Block_Poll_Answer_Edit::class,
'adminhtml/poll_answer_edit_form' => \Mage_Adminhtml_Block_Poll_Answer_Edit_Form::class,
'adminhtml/poll_edit' => \Mage_Adminhtml_Block_Poll_Edit::class,
'adminhtml/poll_edit_form' => \Mage_Adminhtml_Block_Poll_Edit_Form::class,
'adminhtml/poll_edit_tab_answers' => \Mage_Adminhtml_Block_Poll_Edit_Tab_Answers::class,
'adminhtml/poll_edit_tab_answers_form' => \Mage_Adminhtml_Block_Poll_Edit_Tab_Answers_Form::class,
'adminhtml/poll_edit_tab_answers_grid' => \Mage_Adminhtml_Block_Poll_Edit_Tab_Answers_Grid::class,
'adminhtml/poll_edit_tab_answers_list' => \Mage_Adminhtml_Block_Poll_Edit_Tab_Answers_List::class,
'adminhtml/poll_edit_tab_form' => \Mage_Adminhtml_Block_Poll_Edit_Tab_Form::class,
'adminhtml/poll_edit_tabs' => \Mage_Adminhtml_Block_Poll_Edit_Tabs::class,
'adminhtml/poll_grid' => \Mage_Adminhtml_Block_Poll_Grid::class,
'adminhtml/poll_poll' => \Mage_Adminhtml_Block_Poll_Poll::class,
'adminhtml/promo_catalog' => \Mage_Adminhtml_Block_Promo_Catalog::class,
'adminhtml/promo_catalog_edit' => \Mage_Adminhtml_Block_Promo_Catalog_Edit::class,
'adminhtml/promo_catalog_edit_form' => \Mage_Adminhtml_Block_Promo_Catalog_Edit_Form::class,
Expand Down Expand Up @@ -1039,6 +1025,7 @@
'giftmessage/message_helper' => \Mage_GiftMessage_Block_Message_Helper::class,
'giftmessage/message_inline' => \Mage_GiftMessage_Block_Message_Inline::class,
'googleanalytics/ga' => \Mage_GoogleAnalytics_Block_Ga::class,
'googleanalytics/gtm' => \Mage_GoogleAnalytics_Block_Gtm::class,
'importexport/adminhtml_export_edit' => \Mage_ImportExport_Block_Adminhtml_Export_Edit::class,
'importexport/adminhtml_export_edit_form' => \Mage_ImportExport_Block_Adminhtml_Export_Edit_Form::class,
'importexport/adminhtml_export_filter' => \Mage_ImportExport_Block_Adminhtml_Export_Filter::class,
Expand Down Expand Up @@ -1165,8 +1152,6 @@
'paypal/standard_redirect' => \Mage_Paypal_Block_Standard_Redirect::class,
'persistent/form_remember' => \Mage_Persistent_Block_Form_Remember::class,
'persistent/header_additional' => \Mage_Persistent_Block_Header_Additional::class,
'poll/activePoll' => \Mage_Poll_Block_ActivePoll::class,
'poll/poll' => \Mage_Poll_Block_Poll::class,
'productalert/email_abstract' => \Mage_ProductAlert_Block_Email_Abstract::class,
'productalert/email_price' => \Mage_ProductAlert_Block_Email_Price::class,
'productalert/email_stock' => \Mage_ProductAlert_Block_Email_Stock::class,
Expand Down
39 changes: 19 additions & 20 deletions .phpstorm.meta.php/magento_helpers.meta.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
'adminhtml/catalog' => \Mage_Adminhtml_Helper_Catalog::class,
'adminhtml/catalog_product_composite' => \Mage_Adminhtml_Helper_Catalog_Product_Composite::class,
'adminhtml/catalog_product_edit_action_attribute' => \Mage_Adminhtml_Helper_Catalog_Product_Edit_Action_Attribute::class,
'adminhtml/config' => \Mage_Adminhtml_Helper_Config::class,
'adminhtml/dashboard_abstract' => \Mage_Adminhtml_Helper_Dashboard_Abstract::class,
'adminhtml/dashboard_data' => \Mage_Adminhtml_Helper_Dashboard_Data::class,
'adminhtml/dashboard_order' => \Mage_Adminhtml_Helper_Dashboard_Order::class,
Expand All @@ -23,10 +24,10 @@
'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,
Expand All @@ -38,10 +39,10 @@
'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,
'catalogsearch' => \Mage_CatalogSearch_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,
Expand All @@ -60,8 +61,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' => \Mage_Centinel_Helper_Data::class,
'centinel/data' => \Mage_Centinel_Helper_Data::class,
'centinel' => \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,
Expand Down Expand Up @@ -93,19 +94,19 @@
'core/unserializeArray' => \Mage_Core_Helper_UnserializeArray::class,
'core/url' => \Mage_Core_Helper_Url::class,
'core/url_rewrite' => \Mage_Core_Helper_Url_Rewrite::class,
'currencysymbol' => \Mage_CurrencySymbol_Helper_Data::class,
'currencysymbol/data' => \Mage_CurrencySymbol_Helper_Data::class,
'currencysymbol' => \Mage_CurrencySymbol_Helper_Data::class,
'customer/address' => \Mage_Customer_Helper_Address::class,
'customer' => \Mage_Customer_Helper_Data::class,
'customer/data' => \Mage_Customer_Helper_Data::class,
'customer' => \Mage_Customer_Helper_Data::class,
'dataflow' => \Mage_Dataflow_Helper_Data::class,
'dataflow/data' => \Mage_Dataflow_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' => \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,
Expand All @@ -114,24 +115,24 @@
'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class,
'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class,
'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class,
'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class,
'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class,
'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class,
'importexport' => \Mage_ImportExport_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' => \Mage_Log_Helper_Data::class,
'install' => \Mage_Install_Helper_Data::class,
'log/data' => \Mage_Log_Helper_Data::class,
'media' => \Mage_Media_Helper_Data::class,
'log' => \Mage_Log_Helper_Data::class,
'media/data' => \Mage_Media_Helper_Data::class,
'media' => \Mage_Media_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,
'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,
Expand All @@ -145,31 +146,29 @@
'persistent' => \Mage_Persistent_Helper_Data::class,
'persistent/data' => \Mage_Persistent_Helper_Data::class,
'persistent/session' => \Mage_Persistent_Helper_Session::class,
'poll' => \Mage_Poll_Helper_Data::class,
'poll/data' => \Mage_Poll_Helper_Data::class,
'productalert' => \Mage_ProductAlert_Helper_Data::class,
'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
'rating' => \Mage_Rating_Helper_Data::class,
'rating/data' => \Mage_Rating_Helper_Data::class,
'reports' => \Mage_Reports_Helper_Data::class,
'reports/data' => \Mage_Reports_Helper_Data::class,
'review' => \Mage_Review_Helper_Data::class,
'review/data' => \Mage_Review_Helper_Data::class,
'review' => \Mage_Review_Helper_Data::class,
'rss/catalog' => \Mage_Rss_Helper_Catalog::class,
'rss' => \Mage_Rss_Helper_Data::class,
'rss/data' => \Mage_Rss_Helper_Data::class,
'rss/order' => \Mage_Rss_Helper_Order::class,
'rule' => \Mage_Rule_Helper_Data::class,
'rule/data' => \Mage_Rule_Helper_Data::class,
'salesrule/coupon' => \Mage_SalesRule_Helper_Coupon::class,
'salesrule' => \Mage_SalesRule_Helper_Data::class,
'salesrule/data' => \Mage_SalesRule_Helper_Data::class,
'sales' => \Mage_Sales_Helper_Data::class,
'salesrule' => \Mage_SalesRule_Helper_Data::class,
'sales/data' => \Mage_Sales_Helper_Data::class,
'sales' => \Mage_Sales_Helper_Data::class,
'sales/guest' => \Mage_Sales_Helper_Guest::class,
'sales/reorder' => \Mage_Sales_Helper_Reorder::class,
'sendfriend' => \Mage_Sendfriend_Helper_Data::class,
'sendfriend/data' => \Mage_Sendfriend_Helper_Data::class,
'sendfriend' => \Mage_Sendfriend_Helper_Data::class,
'shipping' => \Mage_Shipping_Helper_Data::class,
'shipping/data' => \Mage_Shipping_Helper_Data::class,
'sitemap' => \Mage_Sitemap_Helper_Data::class,
Expand All @@ -178,8 +177,8 @@
'tag/data' => \Mage_Tag_Helper_Data::class,
'tax' => \Mage_Tax_Helper_Data::class,
'tax/data' => \Mage_Tax_Helper_Data::class,
'uploader' => \Mage_Uploader_Helper_Data::class,
'uploader/data' => \Mage_Uploader_Helper_Data::class,
'uploader' => \Mage_Uploader_Helper_Data::class,
'uploader/file' => \Mage_Uploader_Helper_File::class,
'usa' => \Mage_Usa_Helper_Data::class,
'usa/data' => \Mage_Usa_Helper_Data::class,
Expand Down
Loading

0 comments on commit 1eb6a06

Please sign in to comment.