Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge v19 -> v20 #2766

Merged
merged 95 commits into from
Jan 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
4a4a76f
Moved file (#2764)
sreichel Nov 29, 2022
cf9576b
Add php-cs-fixer & PHPCompatibility check to workflow (#2744)
sreichel Nov 29, 2022
4a13f41
PhpStan L5 fixes for Mage/Admin (#2761)
sreichel Nov 30, 2022
130957c
Add getInvoicesCollection (#2703)
luigifab Nov 30, 2022
7cbd697
Adminhtml: better highlight for selected items in menu (#2738)
luigifab Dec 1, 2022
cf9b6de
Update title size of unsubscription email (#2722)
luigifab Dec 1, 2022
326e200
Adminhhtml: A parent category is not required in order to add a sub c…
luigifab Dec 1, 2022
3880b0e
Version bump for next release (#2769)
fballiano Dec 1, 2022
3ac3e1a
"Sales order items" now read product data from the store they were cr…
luigifab Dec 2, 2022
9a1c292
Fixed error when payment methods have been deleted (#2772)
sreichel Dec 2, 2022
955a138
Fixed sort order in Manage Tax Rates grid (#2757)
sreichel Dec 2, 2022
055e41a
Used default paths for external tools' config files (#2765)
sreichel Dec 2, 2022
ce5e4d1
Moved phpseclib, mcrypt_compat, Cm_RedisSession, Cm_Cache_Backend_Red…
fballiano Dec 3, 2022
04bab6a
Fixed workflow issues, ref #2770 (#2773)
sreichel Dec 3, 2022
62cf4fc
Added Cm_Redis files to .gitignore (#2779)
sreichel Dec 4, 2022
33bb109
Fixes broken workflow (#2778)
sreichel Dec 4, 2022
cdec09a
Removed unreachable code (#2775)
sreichel Dec 4, 2022
aef696f
Avoid to use unavailable $data var in Curl HTTP Client (#2785)
maximehuran Dec 5, 2022
573417e
PHPStan: added lib/Mage and lib/Magento (#2780)
sreichel Dec 6, 2022
dff1e2e
Updated DOCblocks (fixed param null) (#2776)
sreichel Dec 7, 2022
1d0c5ce
PHPStan: Fixed baseline, ref #2785 (#2789)
sreichel Dec 7, 2022
af4850a
PHPStan: removed excluded directories (#2790)
sreichel Dec 7, 2022
453e8c9
Reverted composer autoloader patch (#2791)
sreichel Dec 7, 2022
6dcd833
PHPStan: Level 0 update (#2794)
sreichel Dec 9, 2022
8fbd533
Check $sessionData is an array in Mage_Captcha_Model_Zend (#2804)
fballiano Dec 13, 2022
919ae04
Moved null-byte fix from lib/Zend to lib/Magento (#2807)
sreichel Dec 13, 2022
4fb4c23
Updated phpstan to 1.9.3 (#2808)
sreichel Dec 14, 2022
b32f2c5
PHPStan: updated lib/Varien (#2795)
sreichel Dec 15, 2022
96b3cdf
Replaced MySql4 classes in installer's dockblock (#2797)
sreichel Dec 15, 2022
06e0fc4
Updated phpdocs (#2796)
sreichel Dec 15, 2022
80f757d
PHPDocs: Undefined methods (OpenMage#2613)
sreichel Sep 21, 2022
e2c1169
Some code alignments between v19 and v20 (#2810)
sreichel Dec 16, 2022
071cdcd
Created a release builder workflow (#2165)
fballiano Dec 17, 2022
1818ae9
PHPStan: Mage.php (#2819)
sreichel Dec 17, 2022
8e20268
PHPStan: Mage_Poll (#2816)
sreichel Dec 17, 2022
512004a
PHPStan: Mage_Rss (#2817)
sreichel Dec 17, 2022
2f3e729
PHPStan: Mage_Page (#2820)
sreichel Dec 17, 2022
0d7c12b
Added confirm dialog to critical massactions (#2814)
sreichel Dec 17, 2022
e3bd842
Added cweagans/composer-patches to composer.json (#2822)
sreichel Dec 18, 2022
44e2f22
[Backport] Remove documentation hints, ref #1536 (#2815)
sreichel Dec 18, 2022
7c861b0
PHPStan: Mage_Cms (#2818)
sreichel Dec 18, 2022
95984a0
Optimized Varien_Object::_addFullNames() (#2821)
AGelzer Dec 18, 2022
d71ffe5
Fixed array to string conversion error in Mage::getStoreConfigFlag() …
sreichel Dec 18, 2022
64c0bb7
Fixed php8.1 deprecation warning (ZF1-future) (#2805)
sreichel Dec 19, 2022
eb733a8
Revert "Some code alignments between v19 and v20 (#2810)"
fballiano Dec 19, 2022
7de40d2
Merged 20.0 branch
fballiano Dec 22, 2022
1c64e77
PHPStan: Sitemap, Newsletter and more (#2823)
sreichel Dec 20, 2022
8aade49
PHPStan: added missing returns (#2832)
sreichel Dec 22, 2022
31fef1e
Replaced lib/Zend with shardj/zf1-future (#2827)
sreichel Dec 22, 2022
780bcdc
PHPStan: fixes "Call to function is_null ..." (#2831)
sreichel Dec 22, 2022
abdd754
Fixed path to lib/Zend (#2834)
sreichel Dec 22, 2022
7b95491
Fixed bugs for adminhtml save base urls (#2800)
sreichel Dec 22, 2022
12cfca7
Added getApplyTo() to Mage_Eav_Model_Entity_Attribute_Abstract. ref #…
sreichel Dec 23, 2022
2671459
PHPStan: step back to level 4 (#2837)
sreichel Dec 23, 2022
af6d75c
Removed Mage_PageCache (#2813)
sreichel Dec 23, 2022
5cf8e57
Merge branch '20.0' into merge_v19_v20
fballiano Dec 23, 2022
9be0e96
Updated phpstan.dist.baseline.neon
sreichel Dec 23, 2022
50928bf
PHPStan: step back to level 4 (#2837)
sreichel Dec 23, 2022
14b760e
Version bump (#2835)
fballiano Dec 23, 2022
7c5b68e
Change OpenMage version compare (#2839)
sreichel Dec 23, 2022
23e49e6
PHPStan: working on level 3 (#2840)
sreichel Dec 24, 2022
6c17c78
Added dependabot.yml (#2841)
sreichel Dec 24, 2022
ca5eed5
Moved note about PHP7.2 since it is not supported anymore (#2842)
fballiano Dec 24, 2022
6603a56
Bump tj-actions/changed-files from 34 to 35 (#2843)
dependabot[bot] Dec 24, 2022
3da6629
Bump symfonycorp/security-checker-action from 4 to 5 (#2845)
dependabot[bot] Dec 24, 2022
79aa866
Bump EnricoMi/publish-unit-test-result-action from 1.6 to 1.40 (#2846)
dependabot[bot] Dec 25, 2022
29b61b0
Bump pelago/emogrifier from 6.0.0 to 7.0.0 (#2844)
dependabot[bot] Dec 25, 2022
f817659
Added helper for admin button onclick actions (#2784)
sreichel Dec 25, 2022
ca2ee60
Added shell/ to checks (#2848)
sreichel Dec 25, 2022
f177532
Autoload without hiding errors (#2300)
Flyingmana Dec 25, 2022
60eb999
Updated phpstan.dist.baseline.neon
sreichel Dec 26, 2022
373091b
Use correct country code for Greece VAT validation (#2849)
elidrissidev Dec 25, 2022
e90fa82
Updated lib/Varien for PHP8.1 (#2802)
sreichel Dec 25, 2022
bdfd416
Added .dist and .neon to "deny from all" in .htaccess (#2852)
fballiano Dec 26, 2022
b85eea0
Added notes about composer library/modules to README (for 19.5.x and …
fballiano Dec 26, 2022
ef7e408
Remove `mixed` type usage to support PHP7 (#2856)
sreichel Dec 27, 2022
e9ae9c8
Added translation helper shell script (#2332)
justinbeaty Dec 27, 2022
cce33d0
PHPMD: added basic config (#2771)
sreichel Dec 28, 2022
dc446c0
Load dev shell scripts as composer module (#2853)
sreichel Dec 28, 2022
e5bf8cb
Fixed tag aggregation indexer query (#2858)
fballiano Dec 28, 2022
9db9c4d
Updated workflows to run on file delete too (#2860)
sreichel Dec 29, 2022
588ed1a
Rewrote Mage_Reports_Model_Resource_Review_Product_Collection/Mage_Re…
fballiano Dec 29, 2022
350c0d8
Backport 2271, removed lib/flex (#2862)
fballiano Dec 29, 2022
c8ecedd
Updated copyright blocks (#2866)
sreichel Dec 29, 2022
9181dbe
Apply fix in #2300 to all autoloaders (#2867)
sreichel Dec 30, 2022
965b4d0
Added more log information to Gd2.php exceptions (#1339)
loekvangool Dec 30, 2022
e2f0917
Added ddev command shortcuts (#2868)
sreichel Dec 30, 2022
c6433ef
Use github URL for patch files (#2871)
sreichel Dec 30, 2022
bcacbeb
Removed "was" from error messages (#2869)
loekvangool Dec 30, 2022
fa22deb
Added autocomplete attribute to known password fields (#2700)
rfeese Dec 30, 2022
b4baa7d
Create codeql-analysis.yml (#2644)
Flyingmana Dec 31, 2022
28322a9
Cast type, ref #735 (#2872)
sreichel Dec 31, 2022
9e00a05
fix error on add new contributor (#2877)
AGelzer Jan 1, 2023
1c99281
Fixed "must be of type string, null given" ref #2874 (#2878)
sreichel Jan 1, 2023
9518830
Bump colinmollenhour/cache-backend-redis from 1.14.4 to 1.15.0 (#2881)
dependabot[bot] Jan 2, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
14 changes: 13 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -1332,7 +1332,10 @@
"login": "cebe",
"name": "Carsten Brandt",
"avatar_url": "https://avatars.githubusercontent.com/u/189796?v=4",
"profile": "http://cebe.cc/"
"profile": "http://cebe.cc/",
"contributions": [
"code"
]
},
{
"login": "eneiasramos",
Expand All @@ -1351,6 +1354,15 @@
"contributions": [
"code"
]
},
{
"login": "rfeese",
"name": "Roger Feese",
"avatar_url": "https://avatars.githubusercontent.com/u/7074181?v=4",
"profile": "https://github.com/rfeese",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7
Expand Down
7 changes: 7 additions & 0 deletions .ddev/commands/web/php-cs-fixer
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash

## Description: run PHP-CS-Fixer
## Usage: php-cs-fixer
## Example: ddev php-cs-fixer <path-to-files>

php vendor/bin/php-cs-fixer fix "$@"
7 changes: 7 additions & 0 deletions .ddev/commands/web/phpcbf
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash

## Description: run PHPCodeBeautifier
## Usage: phpcbf
## Example: ddev phpcbf <path-to-files>

php vendor/bin/phpcbf -s -p --report=full,source,summary "$@"
7 changes: 7 additions & 0 deletions .ddev/commands/web/phpcs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash

## Description: run PHPCodeSniffer
## Usage: phpcs
## Example: ddev phpcs <path-to-files>

php vendor/bin/phpcs -s -p --report=full,summary "$@"
7 changes: 7 additions & 0 deletions .ddev/commands/web/phpmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash

## Description: run PHPMD
## Usage: phpmd
## Example: ddev phpmd <path-to-files>

php vendor/bin/phpmd "$@" text .phpmd.dist.xml
7 changes: 7 additions & 0 deletions .ddev/commands/web/phpstan
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash

## Description: run PHPStan
## Usage: phpstan
## Example: ddev phpstan <path-to-files>

XDEBUG_MODE=off php vendor/bin/phpstan analyze "$@"
22 changes: 22 additions & 0 deletions .github/codeql-config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@

paths-ignore:
- 'js/prototype/prototype.js'
- 'skin/frontend/rwd/default/js/lib/selectivizr.js'
- 'js/mage/adminhtml/flexuploader.js'
- 'js/mage/adminhtml/sales/packaging.js'
- 'js/mage/adminhtml/uploader/instance.js'
- 'js/mage/adminhtml/wysiwyg/tiny_mce/setup.js'
- 'js/prototype/validation.js'
- 'js/tiny_mce/tiny_mce_dev.js'
- 'js/tiny_mce/tiny_mce.js'
- 'js/tiny_mce/tiny_mce_src.js'
- 'js/tiny_mce/tiny_mce_jquery.js'
- 'js/tiny_mce/tiny_mce_jquery_src.js'
- 'js/tiny_mce/tiny_mce_prototype.js'
- 'js/tiny_mce/tiny_mce_prototype_src.js'
- 'js/tiny_mce/classes/**/*.js'
- 'js/tiny_mce/utils/**/*.js'
- 'js/tiny_mce/plugins/**/*.js'
- 'js/lib/jquery/jquery-1.12.4.js'
- 'js/extjs/ext-tree.js'
- '**/*.test.js'
10 changes: 10 additions & 0 deletions .github/dependabot.yml
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"
38 changes: 31 additions & 7 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
'Environment':
- .github/*
- .github/**/*
- .phpstorm.meta.php/*
- .travis.yml

'phpstan':
- .github/phpstan.neon
- .github/phpstan-baseline.neon
- .github/phpstan_experimental_level.neon

'htaccess':
- .htaccess

'composer':
- composer.json
- composer.lock

'downloader':
- downloader/*
Expand All @@ -32,6 +26,10 @@
- lib/Mage/*
- lib/Mage/**/*

'Component: lib/Magento':
- lib/Magento/*
- lib/Magento/**/*

'Component: lib/Varien':
- lib/Varien/*
- lib/Varien/**/*
Expand Down Expand Up @@ -603,3 +601,29 @@
# Add Documentation Label
'Documentation':
- '*.md'

'PHPStorm':
- .phpstorm.meta.php/*

'phpcs':
- .phpcs*
- .github/workflows/phpcs.yml

'php-cs-fixer':
- .php-cs-fixer*
- .github/workflows/php-cs-fixer.yml

'phpstan':
- phpstan*
- .github/workflows/phpstan.yml

'phpunit':
- dev/test/*
- dev/phpunit*
- dev/sonar*
- .github/workflows/phpunit.yml
- .github/workflows/sonar.yml

'ddev':
- .ddev/*
- .ddev/**/*
31 changes: 0 additions & 31 deletions .github/phpcs-ruleset.xml

This file was deleted.

Loading