Skip to content

Commit

Permalink
Merge branch 'main' into rework-buttons
Browse files Browse the repository at this point in the history
  • Loading branch information
sreichel authored Dec 9, 2024
2 parents ccc2f9c + c47df5b commit 3a562d5
Show file tree
Hide file tree
Showing 404 changed files with 5,211 additions and 12,631 deletions.
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
/.all-contributorsrc export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.gitpod.yml export-ignore

/.php-cs-fixer.dist.php export-ignore
/.phpcs.ecg.xml.dist export-ignore
Expand Down
1 change: 1 addition & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -910,6 +910,7 @@
- any-glob-to-any-file: [
.phpunit*,
tests/*,
tests/**/*,
.github/workflows/phpunit.yml
]

Expand Down
6 changes: 2 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,8 @@
/app/etc/modules/Cm_RedisSession.xml
/lib/Credis

# Add Gitpod online IDE config
# https://github.com/OpenMage/magento-lts/pull/1836
/dev/gitpod/docker-magento
/dev/gitpod/.env
# TinyMCE library
/js/tinymce

# Add development environment setup files and README
# https://github.com/OpenMage/magento-lts/pull/1012
Expand Down
39 changes: 0 additions & 39 deletions .gitpod.yml

This file was deleted.

10 changes: 0 additions & 10 deletions .phpstan.dist.baseline.neon
Original file line number Diff line number Diff line change
Expand Up @@ -2520,16 +2520,6 @@ parameters:
count: 1
path: app/code/core/Mage/Core/Controller/Front/Action.php

-
message: "#^Call to an undefined method Zend_Controller_Router_Interface\\:\\:addRoute\\(\\)\\.$#"
count: 1
path: app/code/core/Mage/Core/Controller/Front/Router.php

-
message: "#^Parameter \\#1 \\$type of static method Mage\\:\\:getBaseUrl\\(\\) expects string, array given\\.$#"
count: 1
path: app/code/core/Mage/Core/Controller/Front/Router.php

-
message: "#^Constructor of class Mage_Core_Controller_Varien_Action has an unused parameter \\$invokeArgs\\.$#"
count: 1
Expand Down
1 change: 1 addition & 0 deletions .phpstorm.meta.php/magento_blocks.meta.php
Original file line number Diff line number Diff line change
Expand Up @@ -1053,6 +1053,7 @@
'install/locale' => \Mage_Install_Block_Locale::class,
'install/state' => \Mage_Install_Block_State::class,
'newsletter/subscribe' => \Mage_Newsletter_Block_Subscribe::class,
'newsletter/widget_subscribe' => \Mage_Newsletter_Block_Widget_Subscribe::class,
'oauth/adminhtml_oauth_admin_token' => \Mage_Oauth_Block_Adminhtml_Oauth_Admin_Token::class,
'oauth/adminhtml_oauth_admin_token_grid' => \Mage_Oauth_Block_Adminhtml_Oauth_Admin_Token_Grid::class,
'oauth/adminhtml_oauth_authorize' => \Mage_Oauth_Block_Adminhtml_Oauth_Authorize::class,
Expand Down
1 change: 1 addition & 0 deletions .phpstorm.meta.php/magento_blocks_methods.meta.php
Original file line number Diff line number Diff line change
Expand Up @@ -1053,6 +1053,7 @@
'install/locale' => \Mage_Install_Block_Locale::class,
'install/state' => \Mage_Install_Block_State::class,
'newsletter/subscribe' => \Mage_Newsletter_Block_Subscribe::class,
'newsletter/widget_subscribe' => \Mage_Newsletter_Block_Widget_Subscribe::class,
'oauth/adminhtml_oauth_admin_token' => \Mage_Oauth_Block_Adminhtml_Oauth_Admin_Token::class,
'oauth/adminhtml_oauth_admin_token_grid' => \Mage_Oauth_Block_Adminhtml_Oauth_Admin_Token_Grid::class,
'oauth/adminhtml_oauth_authorize' => \Mage_Oauth_Block_Adminhtml_Oauth_Authorize::class,
Expand Down
44 changes: 22 additions & 22 deletions .phpstorm.meta.php/magento_helpers.meta.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
namespace PHPSTORM_META {
override( \Mage::helper(0),
map( [
'adminnotification' => \Mage_AdminNotification_Helper_Data::class,
'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
'adminnotification' => \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,
'admin' => \Mage_Admin_Helper_Data::class,
'admin/rules_fallback' => \Mage_Admin_Helper_Rules_Fallback::class,
'admin/variable' => \Mage_Admin_Helper_Variable::class,
'adminhtml/addresses' => \Mage_Adminhtml_Helper_Addresses::class,
Expand All @@ -24,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/data' => \Mage_Authorizenet_Helper_Data::class,
'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
Expand All @@ -36,8 +36,8 @@
'bundle' => \Mage_Bundle_Helper_Data::class,
'captcha' => \Mage_Captcha_Helper_Data::class,
'captcha/data' => \Mage_Captcha_Helper_Data::class,
'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory' => \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,
Expand All @@ -64,8 +64,8 @@
'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,
'checkout' => \Mage_Checkout_Helper_Data::class,
'checkout/url' => \Mage_Checkout_Helper_Url::class,
'cms' => \Mage_Cms_Helper_Data::class,
'cms/data' => \Mage_Cms_Helper_Data::class,
Expand All @@ -81,8 +81,8 @@
'core/abstract' => \Mage_Core_Helper_Abstract::class,
'core/array' => \Mage_Core_Helper_Array::class,
'core/cookie' => \Mage_Core_Helper_Cookie::class,
'core/data' => \Mage_Core_Helper_Data::class,
'core' => \Mage_Core_Helper_Data::class,
'core/data' => \Mage_Core_Helper_Data::class,
'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
Expand All @@ -99,8 +99,8 @@
'currencysymbol' => \Mage_CurrencySymbol_Helper_Data::class,
'currencysymbol/data' => \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/data' => \Mage_Dataflow_Helper_Data::class,
'dataflow' => \Mage_Dataflow_Helper_Data::class,
'directory' => \Mage_Directory_Helper_Data::class,
Expand All @@ -111,57 +111,57 @@
'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,
'giftmessage' => \Mage_GiftMessage_Helper_Data::class,
'eav' => \Mage_Eav_Helper_Data::class,
'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class,
'giftmessage' => \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' => \Mage_Index_Helper_Data::class,
'index/data' => \Mage_Index_Helper_Data::class,
'index' => \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,
'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,
'page' => \Mage_Page_Helper_Data::class,
'oauth' => \Mage_Oauth_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,
'payment' => \Mage_Payment_Helper_Data::class,
'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
'paypaluk' => \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' => \Mage_Persistent_Helper_Data::class,
'persistent/data' => \Mage_Persistent_Helper_Data::class,
'persistent/session' => \Mage_Persistent_Helper_Session::class,
'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
'productalert' => \Mage_ProductAlert_Helper_Data::class,
'rating/data' => \Mage_Rating_Helper_Data::class,
'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
'rating' => \Mage_Rating_Helper_Data::class,
'reports' => \Mage_Reports_Helper_Data::class,
'rating/data' => \Mage_Rating_Helper_Data::class,
'reports/data' => \Mage_Reports_Helper_Data::class,
'reports' => \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' => \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,
'rule' => \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,
Expand All @@ -175,12 +175,12 @@
'shipping/data' => \Mage_Shipping_Helper_Data::class,
'sitemap' => \Mage_Sitemap_Helper_Data::class,
'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
'tag' => \Mage_Tag_Helper_Data::class,
'tag/data' => \Mage_Tag_Helper_Data::class,
'tag' => \Mage_Tag_Helper_Data::class,
'tax/data' => \Mage_Tax_Helper_Data::class,
'tax' => \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 3a562d5

Please sign in to comment.