Skip to content

Commit

Permalink
Merged v19 -> v20
Browse files Browse the repository at this point in the history
  • Loading branch information
fballiano authored Jan 3, 2023
2 parents 4a2475c + 9518830 commit 5621eac
Show file tree
Hide file tree
Showing 4,521 changed files with 10,633 additions and 1,159,838 deletions.
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

0 comments on commit 5621eac

Please sign in to comment.