Skip to content

Commit

Permalink
Merge branch '1.9.4.x' into phpstan/mage-backup
Browse files Browse the repository at this point in the history 
# Conflicts:
#	README.md
#	phpstan.dist.baseline.neon
  • Loading branch information
Sven Reichel committed Dec 25, 2022
2 parents 43ea148 + dab44bb commit 367ac4f
Show file tree
Hide file tree
Showing 3,449 changed files with 4,836 additions and 1,117,083 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
10 changes: 10 additions & 0 deletions .github/dependabot.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: "composer"
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
2 changes: 1 addition & 1 deletion .github/workflows/check-files.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:

- name: Get changed files
id: changed-files-specific
uses: tj-actions/changed-files@v34
uses: tj-actions/changed-files@v35
with:
files: |
composer.*
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpunit.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
run: bash ./run_unit_tests.sh

- name: Publish Unit Test Results
uses: EnricoMi/publish-unit-test-result-action@v1.6
uses: EnricoMi/publish-unit-test-result-action@v1.40
if: always()
continue-on-error: true
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/security-php.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ jobs:
path: ~/.symfony/cache
key: db

- uses: symfonycorp/security-checker-action@v4
- uses: symfonycorp/security-checker-action@v5
1 change: 0 additions & 1 deletion .phpstorm.meta.php/magento_blocks.meta.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1080,7 +1080,6 @@
'oauth/authorize_button' => \Mage_Oauth_Block_Authorize_Button::class,
'oauth/authorize_buttonBaseAbstract' => \Mage_Oauth_Block_Authorize_ButtonBaseAbstract::class,
'oauth/customer_token_list' => \Mage_Oauth_Block_Customer_Token_List::class,
'pagecache/adminhtml_cache_additional' => \Mage_PageCache_Block_Adminhtml_Cache_Additional::class,
'page/html' => \Mage_Page_Block_Html::class,
'page/html_breadcrumbs' => \Mage_Page_Block_Html_Breadcrumbs::class,
'page/html_cookieNotice' => \Mage_Page_Block_Html_CookieNotice::class,
Expand Down
1 change: 0 additions & 1 deletion .phpstorm.meta.php/magento_blocks_methods.meta.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1080,7 +1080,6 @@
'oauth/authorize_button' => \Mage_Oauth_Block_Authorize_Button::class,
'oauth/authorize_buttonBaseAbstract' => \Mage_Oauth_Block_Authorize_ButtonBaseAbstract::class,
'oauth/customer_token_list' => \Mage_Oauth_Block_Customer_Token_List::class,
'pagecache/adminhtml_cache_additional' => \Mage_PageCache_Block_Adminhtml_Cache_Additional::class,
'page/html' => \Mage_Page_Block_Html::class,
'page/html_breadcrumbs' => \Mage_Page_Block_Html_Breadcrumbs::class,
'page/html_cookieNotice' => \Mage_Page_Block_Html_CookieNotice::class,
Expand Down
2 changes: 0 additions & 2 deletions .phpstorm.meta.php/magento_helpers.meta.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,6 @@
'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,
'pagecache/data' => \Mage_PageCache_Helper_Data::class,
'page' => \Mage_Page_Helper_Data::class,
'page/data' => \Mage_Page_Helper_Data::class,
'page/html' => \Mage_Page_Helper_Html::class,
Expand Down
32 changes: 0 additions & 32 deletions .phpstorm.meta.php/magento_helpers_methods.meta.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,6 @@
'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,
'pagecache/data' => \Mage_PageCache_Helper_Data::class,
'page' => \Mage_Page_Helper_Data::class,
'page/data' => \Mage_Page_Helper_Data::class,
'page/html' => \Mage_Page_Helper_Html::class,
Expand Down Expand Up @@ -323,8 +321,6 @@
'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,
'pagecache/data' => \Mage_PageCache_Helper_Data::class,
'page' => \Mage_Page_Helper_Data::class,
'page/data' => \Mage_Page_Helper_Data::class,
'page/html' => \Mage_Page_Helper_Html::class,
Expand Down Expand Up @@ -516,8 +512,6 @@
'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,
'pagecache/data' => \Mage_PageCache_Helper_Data::class,
'page' => \Mage_Page_Helper_Data::class,
'page/data' => \Mage_Page_Helper_Data::class,
'page/html' => \Mage_Page_Helper_Html::class,
Expand Down Expand Up @@ -709,8 +703,6 @@
'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,
'pagecache/data' => \Mage_PageCache_Helper_Data::class,
'page' => \Mage_Page_Helper_Data::class,
'page/data' => \Mage_Page_Helper_Data::class,
'page/html' => \Mage_Page_Helper_Html::class,
Expand Down Expand Up @@ -902,8 +894,6 @@
'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,
'pagecache/data' => \Mage_PageCache_Helper_Data::class,
'page' => \Mage_Page_Helper_Data::class,
'page/data' => \Mage_Page_Helper_Data::class,
'page/html' => \Mage_Page_Helper_Html::class,
Expand Down Expand Up @@ -1095,8 +1085,6 @@
'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,
'pagecache/data' => \Mage_PageCache_Helper_Data::class,
'page' => \Mage_Page_Helper_Data::class,
'page/data' => \Mage_Page_Helper_Data::class,
'page/html' => \Mage_Page_Helper_Html::class,
Expand Down Expand Up @@ -1288,8 +1276,6 @@
'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,
'pagecache/data' => \Mage_PageCache_Helper_Data::class,
'page' => \Mage_Page_Helper_Data::class,
'page/data' => \Mage_Page_Helper_Data::class,
'page/html' => \Mage_Page_Helper_Html::class,
Expand Down Expand Up @@ -1481,8 +1467,6 @@
'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,
'pagecache/data' => \Mage_PageCache_Helper_Data::class,
'page' => \Mage_Page_Helper_Data::class,
'page/data' => \Mage_Page_Helper_Data::class,
'page/html' => \Mage_Page_Helper_Html::class,
Expand Down Expand Up @@ -1674,8 +1658,6 @@
'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,
'pagecache/data' => \Mage_PageCache_Helper_Data::class,
'page' => \Mage_Page_Helper_Data::class,
'page/data' => \Mage_Page_Helper_Data::class,
'page/html' => \Mage_Page_Helper_Html::class,
Expand Down Expand Up @@ -1867,8 +1849,6 @@
'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,
'pagecache/data' => \Mage_PageCache_Helper_Data::class,
'page' => \Mage_Page_Helper_Data::class,
'page/data' => \Mage_Page_Helper_Data::class,
'page/html' => \Mage_Page_Helper_Html::class,
Expand Down Expand Up @@ -2060,8 +2040,6 @@
'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,
'pagecache/data' => \Mage_PageCache_Helper_Data::class,
'page' => \Mage_Page_Helper_Data::class,
'page/data' => \Mage_Page_Helper_Data::class,
'page/html' => \Mage_Page_Helper_Html::class,
Expand Down Expand Up @@ -2253,8 +2231,6 @@
'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,
'pagecache/data' => \Mage_PageCache_Helper_Data::class,
'page' => \Mage_Page_Helper_Data::class,
'page/data' => \Mage_Page_Helper_Data::class,
'page/html' => \Mage_Page_Helper_Html::class,
Expand Down Expand Up @@ -2446,8 +2422,6 @@
'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,
'pagecache/data' => \Mage_PageCache_Helper_Data::class,
'page' => \Mage_Page_Helper_Data::class,
'page/data' => \Mage_Page_Helper_Data::class,
'page/html' => \Mage_Page_Helper_Html::class,
Expand Down Expand Up @@ -2639,8 +2613,6 @@
'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,
'pagecache/data' => \Mage_PageCache_Helper_Data::class,
'page' => \Mage_Page_Helper_Data::class,
'page/data' => \Mage_Page_Helper_Data::class,
'page/html' => \Mage_Page_Helper_Html::class,
Expand Down Expand Up @@ -2832,8 +2804,6 @@
'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,
'pagecache/data' => \Mage_PageCache_Helper_Data::class,
'page' => \Mage_Page_Helper_Data::class,
'page/data' => \Mage_Page_Helper_Data::class,
'page/html' => \Mage_Page_Helper_Html::class,
Expand Down Expand Up @@ -3025,8 +2995,6 @@
'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,
'pagecache/data' => \Mage_PageCache_Helper_Data::class,
'page' => \Mage_Page_Helper_Data::class,
'page/data' => \Mage_Page_Helper_Data::class,
'page/html' => \Mage_Page_Helper_Html::class,
Expand Down
6 changes: 0 additions & 6 deletions .phpstorm.meta.php/magento_models.meta.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1889,9 +1889,6 @@
'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
'oauth/server' => \Mage_Oauth_Model_Server::class,
'oauth/token' => \Mage_Oauth_Model_Token::class,
'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class,
'pagecache/observer' => \Mage_PageCache_Model_Observer::class,
'pagecache/system_config_source_controls' => \Mage_PageCache_Model_System_Config_Source_Controls::class,
'page/config' => \Mage_Page_Model_Config::class,
'page/source_layout' => \Mage_Page_Model_Source_Layout::class,
'paygate/authorizenet' => \Mage_Paygate_Model_Authorizenet::class,
Expand Down Expand Up @@ -5067,9 +5064,6 @@
'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
'oauth/server' => \Mage_Oauth_Model_Server::class,
'oauth/token' => \Mage_Oauth_Model_Token::class,
'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class,
'pagecache/observer' => \Mage_PageCache_Model_Observer::class,
'pagecache/system_config_source_controls' => \Mage_PageCache_Model_System_Config_Source_Controls::class,
'page/config' => \Mage_Page_Model_Config::class,
'page/source_layout' => \Mage_Page_Model_Source_Layout::class,
'paygate/authorizenet' => \Mage_Paygate_Model_Authorizenet::class,
Expand Down
27 changes: 0 additions & 27 deletions .phpstorm.meta.php/magento_models_methods.meta.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1889,9 +1889,6 @@
'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
'oauth/server' => \Mage_Oauth_Model_Server::class,
'oauth/token' => \Mage_Oauth_Model_Token::class,
'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class,
'pagecache/observer' => \Mage_PageCache_Model_Observer::class,
'pagecache/system_config_source_controls' => \Mage_PageCache_Model_System_Config_Source_Controls::class,
'page/config' => \Mage_Page_Model_Config::class,
'page/source_layout' => \Mage_Page_Model_Source_Layout::class,
'paygate/authorizenet' => \Mage_Paygate_Model_Authorizenet::class,
Expand Down Expand Up @@ -5067,9 +5064,6 @@
'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
'oauth/server' => \Mage_Oauth_Model_Server::class,
'oauth/token' => \Mage_Oauth_Model_Token::class,
'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class,
'pagecache/observer' => \Mage_PageCache_Model_Observer::class,
'pagecache/system_config_source_controls' => \Mage_PageCache_Model_System_Config_Source_Controls::class,
'page/config' => \Mage_Page_Model_Config::class,
'page/source_layout' => \Mage_Page_Model_Source_Layout::class,
'paygate/authorizenet' => \Mage_Paygate_Model_Authorizenet::class,
Expand Down Expand Up @@ -8245,9 +8239,6 @@
'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
'oauth/server' => \Mage_Oauth_Model_Server::class,
'oauth/token' => \Mage_Oauth_Model_Token::class,
'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class,
'pagecache/observer' => \Mage_PageCache_Model_Observer::class,
'pagecache/system_config_source_controls' => \Mage_PageCache_Model_System_Config_Source_Controls::class,
'page/config' => \Mage_Page_Model_Config::class,
'page/source_layout' => \Mage_Page_Model_Source_Layout::class,
'paygate/authorizenet' => \Mage_Paygate_Model_Authorizenet::class,
Expand Down Expand Up @@ -11423,9 +11414,6 @@
'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
'oauth/server' => \Mage_Oauth_Model_Server::class,
'oauth/token' => \Mage_Oauth_Model_Token::class,
'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class,
'pagecache/observer' => \Mage_PageCache_Model_Observer::class,
'pagecache/system_config_source_controls' => \Mage_PageCache_Model_System_Config_Source_Controls::class,
'page/config' => \Mage_Page_Model_Config::class,
'page/source_layout' => \Mage_Page_Model_Source_Layout::class,
'paygate/authorizenet' => \Mage_Paygate_Model_Authorizenet::class,
Expand Down Expand Up @@ -14601,9 +14589,6 @@
'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
'oauth/server' => \Mage_Oauth_Model_Server::class,
'oauth/token' => \Mage_Oauth_Model_Token::class,
'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class,
'pagecache/observer' => \Mage_PageCache_Model_Observer::class,
'pagecache/system_config_source_controls' => \Mage_PageCache_Model_System_Config_Source_Controls::class,
'page/config' => \Mage_Page_Model_Config::class,
'page/source_layout' => \Mage_Page_Model_Source_Layout::class,
'paygate/authorizenet' => \Mage_Paygate_Model_Authorizenet::class,
Expand Down Expand Up @@ -17779,9 +17764,6 @@
'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
'oauth/server' => \Mage_Oauth_Model_Server::class,
'oauth/token' => \Mage_Oauth_Model_Token::class,
'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class,
'pagecache/observer' => \Mage_PageCache_Model_Observer::class,
'pagecache/system_config_source_controls' => \Mage_PageCache_Model_System_Config_Source_Controls::class,
'page/config' => \Mage_Page_Model_Config::class,
'page/source_layout' => \Mage_Page_Model_Source_Layout::class,
'paygate/authorizenet' => \Mage_Paygate_Model_Authorizenet::class,
Expand Down Expand Up @@ -20957,9 +20939,6 @@
'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
'oauth/server' => \Mage_Oauth_Model_Server::class,
'oauth/token' => \Mage_Oauth_Model_Token::class,
'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class,
'pagecache/observer' => \Mage_PageCache_Model_Observer::class,
'pagecache/system_config_source_controls' => \Mage_PageCache_Model_System_Config_Source_Controls::class,
'page/config' => \Mage_Page_Model_Config::class,
'page/source_layout' => \Mage_Page_Model_Source_Layout::class,
'paygate/authorizenet' => \Mage_Paygate_Model_Authorizenet::class,
Expand Down Expand Up @@ -24135,9 +24114,6 @@
'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
'oauth/server' => \Mage_Oauth_Model_Server::class,
'oauth/token' => \Mage_Oauth_Model_Token::class,
'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class,
'pagecache/observer' => \Mage_PageCache_Model_Observer::class,
'pagecache/system_config_source_controls' => \Mage_PageCache_Model_System_Config_Source_Controls::class,
'page/config' => \Mage_Page_Model_Config::class,
'page/source_layout' => \Mage_Page_Model_Source_Layout::class,
'paygate/authorizenet' => \Mage_Paygate_Model_Authorizenet::class,
Expand Down Expand Up @@ -27313,9 +27289,6 @@
'oauth_resource/token_collection' => \Mage_Oauth_Model_Resource_Token_Collection::class,
'oauth/server' => \Mage_Oauth_Model_Server::class,
'oauth/token' => \Mage_Oauth_Model_Token::class,
'pagecache/control_zend' => \Mage_PageCache_Model_Control_Zend::class,
'pagecache/observer' => \Mage_PageCache_Model_Observer::class,
'pagecache/system_config_source_controls' => \Mage_PageCache_Model_System_Config_Source_Controls::class,
'page/config' => \Mage_Page_Model_Config::class,
'page/source_layout' => \Mage_Page_Model_Source_Layout::class,
'paygate/authorizenet' => \Mage_Paygate_Model_Authorizenet::class,
Expand Down
Loading

0 comments on commit 367ac4f

Please sign in to comment.