Skip to content

Commit 5621eac

Browse files
authored
Merged v19 -> v20
2 parents 4a2475c + 9518830 commit 5621eac

File tree

4,521 files changed

+10633
-1159838
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,521 files changed

+10633
-1159838
lines changed

.all-contributorsrc

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1332,7 +1332,10 @@
13321332
"login": "cebe",
13331333
"name": "Carsten Brandt",
13341334
"avatar_url": "https://avatars.githubusercontent.com/u/189796?v=4",
1335-
"profile": "http://cebe.cc/"
1335+
"profile": "http://cebe.cc/",
1336+
"contributions": [
1337+
"code"
1338+
]
13361339
},
13371340
{
13381341
"login": "eneiasramos",
@@ -1351,6 +1354,15 @@
13511354
"contributions": [
13521355
"code"
13531356
]
1357+
},
1358+
{
1359+
"login": "rfeese",
1360+
"name": "Roger Feese",
1361+
"avatar_url": "https://avatars.githubusercontent.com/u/7074181?v=4",
1362+
"profile": "https://github.com/rfeese",
1363+
"contributions": [
1364+
"code"
1365+
]
13541366
}
13551367
],
13561368
"contributorsPerLine": 7

.ddev/commands/web/php-cs-fixer

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
3+
## Description: run PHP-CS-Fixer
4+
## Usage: php-cs-fixer
5+
## Example: ddev php-cs-fixer <path-to-files>
6+
7+
php vendor/bin/php-cs-fixer fix "$@"

.ddev/commands/web/phpcbf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
3+
## Description: run PHPCodeBeautifier
4+
## Usage: phpcbf
5+
## Example: ddev phpcbf <path-to-files>
6+
7+
php vendor/bin/phpcbf -s -p --report=full,source,summary "$@"

.ddev/commands/web/phpcs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
3+
## Description: run PHPCodeSniffer
4+
## Usage: phpcs
5+
## Example: ddev phpcs <path-to-files>
6+
7+
php vendor/bin/phpcs -s -p --report=full,summary "$@"

.ddev/commands/web/phpmd

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
3+
## Description: run PHPMD
4+
## Usage: phpmd
5+
## Example: ddev phpmd <path-to-files>
6+
7+
php vendor/bin/phpmd "$@" text .phpmd.dist.xml

.ddev/commands/web/phpstan

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
3+
## Description: run PHPStan
4+
## Usage: phpstan
5+
## Example: ddev phpstan <path-to-files>
6+
7+
XDEBUG_MODE=off php vendor/bin/phpstan analyze "$@"

.github/codeql-config.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
paths-ignore:
3+
- 'js/prototype/prototype.js'
4+
- 'skin/frontend/rwd/default/js/lib/selectivizr.js'
5+
- 'js/mage/adminhtml/flexuploader.js'
6+
- 'js/mage/adminhtml/sales/packaging.js'
7+
- 'js/mage/adminhtml/uploader/instance.js'
8+
- 'js/mage/adminhtml/wysiwyg/tiny_mce/setup.js'
9+
- 'js/prototype/validation.js'
10+
- 'js/tiny_mce/tiny_mce_dev.js'
11+
- 'js/tiny_mce/tiny_mce.js'
12+
- 'js/tiny_mce/tiny_mce_src.js'
13+
- 'js/tiny_mce/tiny_mce_jquery.js'
14+
- 'js/tiny_mce/tiny_mce_jquery_src.js'
15+
- 'js/tiny_mce/tiny_mce_prototype.js'
16+
- 'js/tiny_mce/tiny_mce_prototype_src.js'
17+
- 'js/tiny_mce/classes/**/*.js'
18+
- 'js/tiny_mce/utils/**/*.js'
19+
- 'js/tiny_mce/plugins/**/*.js'
20+
- 'js/lib/jquery/jquery-1.12.4.js'
21+
- 'js/extjs/ext-tree.js'
22+
- '**/*.test.js'

.github/dependabot.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "composer"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"
7+
- package-ecosystem: "github-actions"
8+
directory: "/"
9+
schedule:
10+
interval: "weekly"

.github/labeler.yml

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
'Environment':
22
- .github/*
33
- .github/**/*
4-
- .phpstorm.meta.php/*
5-
- .travis.yml
6-
7-
'phpstan':
8-
- .github/phpstan.neon
9-
- .github/phpstan-baseline.neon
10-
- .github/phpstan_experimental_level.neon
114

125
'htaccess':
136
- .htaccess
147

158
'composer':
169
- composer.json
10+
- composer.lock
1711

1812
'downloader':
1913
- downloader/*
@@ -32,6 +26,10 @@
3226
- lib/Mage/*
3327
- lib/Mage/**/*
3428

29+
'Component: lib/Magento':
30+
- lib/Magento/*
31+
- lib/Magento/**/*
32+
3533
'Component: lib/Varien':
3634
- lib/Varien/*
3735
- lib/Varien/**/*
@@ -603,3 +601,29 @@
603601
# Add Documentation Label
604602
'Documentation':
605603
- '*.md'
604+
605+
'PHPStorm':
606+
- .phpstorm.meta.php/*
607+
608+
'phpcs':
609+
- .phpcs*
610+
- .github/workflows/phpcs.yml
611+
612+
'php-cs-fixer':
613+
- .php-cs-fixer*
614+
- .github/workflows/php-cs-fixer.yml
615+
616+
'phpstan':
617+
- phpstan*
618+
- .github/workflows/phpstan.yml
619+
620+
'phpunit':
621+
- dev/test/*
622+
- dev/phpunit*
623+
- dev/sonar*
624+
- .github/workflows/phpunit.yml
625+
- .github/workflows/sonar.yml
626+
627+
'ddev':
628+
- .ddev/*
629+
- .ddev/**/*

.github/phpcs-ruleset.xml

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)