Skip to content

Commit

Permalink
Merge v19 -> v20
Browse files Browse the repository at this point in the history
  • Loading branch information
@fballiano
fballiano authored Sep 3, 2022
2 parents 59faedd + b885d69 commit d448eeb
Show file tree
Hide file tree
Showing 5,061 changed files with 67,328 additions and 79,882 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
0 SECURITY.md → .github/SECURITY.md
View file
File renamed without changes.
2,769 changes: 155 additions & 2,614 deletions .github/phpstan-baseline.neon
View file

Large diffs are not rendered by default.

31 changes: 0 additions & 31 deletions .github/workflows/php.yml
View file

This file was deleted.

2 changes: 0 additions & 2 deletions .phpstorm.meta.php/magento_blocks.meta.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,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,
Expand Down Expand Up @@ -1274,7 +1273,6 @@
'shipping/tracking_ajax' => \Mage_Shipping_Block_Tracking_Ajax::class,
'shipping/tracking_popup' => \Mage_Shipping_Block_Tracking_Popup::class,
'tag/all' => \Mage_Tag_Block_All::class,
'tag/customer_edit' => \Mage_Tag_Block_Customer_Edit::class,
'tag/customer_recent' => \Mage_Tag_Block_Customer_Recent::class,
'tag/customer_tags' => \Mage_Tag_Block_Customer_Tags::class,
'tag/customer_view' => \Mage_Tag_Block_Customer_View::class,
Expand Down
2 changes: 0 additions & 2 deletions .phpstorm.meta.php/magento_blocks_methods.meta.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,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,
Expand Down Expand Up @@ -1274,7 +1273,6 @@
'shipping/tracking_ajax' => \Mage_Shipping_Block_Tracking_Ajax::class,
'shipping/tracking_popup' => \Mage_Shipping_Block_Tracking_Popup::class,
'tag/all' => \Mage_Tag_Block_All::class,
'tag/customer_edit' => \Mage_Tag_Block_Customer_Edit::class,
'tag/customer_recent' => \Mage_Tag_Block_Customer_Recent::class,
'tag/customer_tags' => \Mage_Tag_Block_Customer_Tags::class,
'tag/customer_view' => \Mage_Tag_Block_Customer_View::class,
Expand Down
59 changes: 30 additions & 29 deletions .phpstorm.meta.php/magento_helpers.meta.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -33,17 +33,17 @@
'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,
'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class,
'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class,
'catalogsearch/data' => \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 @@ -62,8 +62,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,
Expand All @@ -72,8 +72,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,
Expand All @@ -89,20 +89,21 @@
'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,
'core/url' => \Mage_Core_Helper_Url::class,
'core/url_rewrite' => \Mage_Core_Helper_Url_Rewrite::class,
'currencysymbol/data' => \Mage_CurrencySymbol_Helper_Data::class,
'currencysymbol' => \Mage_CurrencySymbol_Helper_Data::class,
'currencysymbol/data' => \Mage_CurrencySymbol_Helper_Data::class,
'customer/address' => \Mage_Customer_Helper_Address::class,
'customer/data' => \Mage_Customer_Helper_Data::class,
'customer' => \Mage_Customer_Helper_Data::class,
'customer/data' => \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,
Expand All @@ -115,20 +116,20 @@
'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,
'googleanalytics/data' => \Mage_GoogleAnalytics_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,
'log/data' => \Mage_Log_Helper_Data::class,
'media' => \Mage_Media_Helper_Data::class,
'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
'media/data' => \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,
'pagecache' => \Mage_PageCache_Helper_Data::class,
Expand All @@ -139,50 +140,50 @@
'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,
'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/data' => \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,
'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/data' => \Mage_Reports_Helper_Data::class,
'reports' => \Mage_Reports_Helper_Data::class,
'review/data' => \Mage_Review_Helper_Data::class,
'reports/data' => \Mage_Reports_Helper_Data::class,
'review' => \Mage_Review_Helper_Data::class,
'review/data' => \Mage_Review_Helper_Data::class,
'rss/catalog' => \Mage_Rss_Helper_Catalog::class,
'rss/data' => \Mage_Rss_Helper_Data::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/data' => \Mage_SalesRule_Helper_Data::class,
'salesrule' => \Mage_SalesRule_Helper_Data::class,
'sales/data' => \Mage_Sales_Helper_Data::class,
'salesrule/data' => \Mage_SalesRule_Helper_Data::class,
'sales' => \Mage_Sales_Helper_Data::class,
'sales/data' => \Mage_Sales_Helper_Data::class,
'sales/guest' => \Mage_Sales_Helper_Guest::class,
'sales/reorder' => \Mage_Sales_Helper_Reorder::class,
'sendfriend/data' => \Mage_Sendfriend_Helper_Data::class,
'sendfriend' => \Mage_Sendfriend_Helper_Data::class,
'sendfriend/data' => \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,
'uploader' => \Mage_Uploader_Helper_Data::class,
'uploader/data' => \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 d448eeb

Please sign in to comment.