Skip to content

Commit d521531

Browse files
sreichelsreichel
committed
Merge branch 'main' into validation
# Conflicts: # .phpstan.dist.neon # composer.json # composer.lock
2 parents f718560 + ab1d4f5 commit d521531

File tree

508 files changed

+3403
-3545
lines changed

Some content is hidden

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

508 files changed

+3403
-3545
lines changed

‎.all-contributorsrc

+19
Original file line numberDiff line numberDiff line change
@@ -1679,6 +1679,25 @@
16791679
"contributions": [
16801680
"review"
16811681
]
1682+
},
1683+
{
1684+
"login": "gdemarsico",
1685+
"name": "Gastón De Mársico",
1686+
"avatar_url": "https://avatars.githubusercontent.com/u/2066819?v=4",
1687+
"profile": "https://github.com/gdemarsico",
1688+
"contributions": [
1689+
"code",
1690+
"bug"
1691+
]
1692+
},
1693+
{
1694+
"login": "denisahac",
1695+
"name": "Den Isahac",
1696+
"avatar_url": "https://avatars.githubusercontent.com/u/6700576?v=4",
1697+
"profile": "http://www.denisahac.xyz",
1698+
"contributions": [
1699+
"doc"
1700+
]
16821701
}
16831702
],
16841703
"commitType": "docs"

‎.cypress.config.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module.exports = {
2-
e2e: {
3-
setupNodeEvents(on, config) {
4-
// implement node event listeners here
5-
},
6-
baseUrl: 'https://magento-lts.ddev.site'
7-
},
2+
e2e: {
3+
setupNodeEvents(on, config) {
4+
// implement node event listeners here
5+
},
6+
baseUrl: 'https://magento-lts.ddev.site',
7+
}
88
};

‎.gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
/README.md export-ignore
2525

26+
/Makefile export-ignore
27+
2628
# Enforce checkout with linux lf consistent over all platforms
2729
*.html text eol=lf
2830
*.css text eol=lf

‎.github/SECURITY.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ We will keep the details of your security vulnerability report private and only
1616

1717
To report a vulnerability, please *DO NOT* open a public Issue or Pull Request.
1818

19-
Please email your security vulnerability report to [email protected] along with your Github user name so that once we create a security advisory you may be added to it as a collaborator for further review.
19+
Please email your security vulnerability report to [email protected] along with your GitHub username so that once we create a security advisory you may be added to it as a collaborator for further review.
2020

2121
We will review the advisory and work with you to find a suitable solution. We will publicly disclose the vulnerability once a patch is prepared and our community and partners have an easy path forward to apply the patch promptly. We will be sure to give you credit for the vulnerability discovery unless you request otherwise.
2222

‎.github/labeler.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -934,4 +934,10 @@
934934
- any-glob-to-any-file: [
935935
.rector.php,
936936
.github/workflows/rector.yml
937-
]
937+
]
938+
939+
'cypress':
940+
- changed-files:
941+
- any-glob-to-any-file: [
942+
cypress/*
943+
]

‎.github/spellcheck-usernames.txt

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
addison
2+
bucha
3+
colinmollenhour
4+
fballiano
5+
Flyingmana
6+
kiatng
7+
robertrogge
8+
sreichel

‎.github/spellcheck-wordlist.txt

+77
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
ACL
2+
ActionScript
3+
bool
4+
Braintree
5+
Browsersync
6+
Captcha
7+
CLI
8+
Cloudflare
9+
CMS
10+
Cron
11+
CVE
12+
CodeQL
13+
DevOps
14+
DDEV
15+
DNS
16+
DocBlock
17+
EAV
18+
Emmet
19+
FireGento
20+
FPC
21+
Gitpod
22+
HiPay
23+
Homebrew
24+
HMAC
25+
ImageMagick
26+
IntelliSense
27+
jQuery
28+
JS
29+
JSON
30+
LTS
31+
macOS
32+
Magento
33+
magerun
34+
Mailpit
35+
mkcert
36+
MkDocs
37+
Matomo
38+
MTF
39+
nginx
40+
npm
41+
OAuth
42+
OpenMage
43+
OpenNode
44+
PageSpeed
45+
PHPCompatibility
46+
PHPCS
47+
PHPMD
48+
phpMyAdmin
49+
PHPStan
50+
PhpStorm
51+
PHPUnit
52+
PLAINTEXT
53+
RCE
54+
reCaptcha
55+
Redis
56+
RPC
57+
RSS
58+
RWD
59+
SCSS
60+
SHA
61+
SMTP
62+
SSL
63+
TinyMCE
64+
toc
65+
URI
66+
Varien
67+
VMware
68+
WAMP
69+
WebP
70+
WSDL
71+
WSL
72+
XAMPP
73+
Xdebug
74+
XSS
75+
Zend
76+
ZF
77+

‎.github/spellcheck.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
matrix:
2+
- name: Markdown
3+
expect_match: false
4+
apsell:
5+
mode: en
6+
dictionary:
7+
wordlists:
8+
- .github/spellcheck-usernames.txt
9+
- .github/spellcheck-wordlist.txt
10+
output: wordlist.dic
11+
encoding: utf-8
12+
pipeline:
13+
- pyspelling.filters.markdown:
14+
markdown_extensions:
15+
- markdown.extensions.extra:
16+
- pyspelling.filters.html:
17+
comments: false
18+
attributes:
19+
- alt
20+
ignores:
21+
- ':matches(code, pre)'
22+
- ':matches(.magiclink)'
23+
- ':matches(.events-list-table + table)'
24+
- 'a'
25+
- 'code'
26+
- 'pre'
27+
- 'blockquote'
28+
sources:
29+
- 'docs/**/*.md'

‎.github/workflows/check-files.yml

+27-2
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,17 @@ on:
3434
description: "Count changed PHPStan files"
3535
value: ${{ jobs.check.outputs.phpstan }}
3636
phpunit-test:
37-
description: "Count changed PhpUnit test files"
37+
description: "Count changed PHPUnit test files"
3838
value: ${{ jobs.check.outputs.phpunit-test }}
3939
phpunit:
40-
description: "Count changed PhpUnit files"
40+
description: "Count changed PHPUnit files"
4141
value: ${{ jobs.check.outputs.phpunit }}
42+
markdown:
43+
description: "Count changed markdown files"
44+
value: ${{ jobs.check.outputs.markdown }}
45+
cypress:
46+
description: "Count changed Cypress files"
47+
value: ${{ jobs.check.outputs.cypress }}
4248
# Allow manually triggering the workflow.
4349
workflow_dispatch:
4450

@@ -49,6 +55,7 @@ jobs:
4955
outputs:
5056
composer: ${{ steps.changes-composer.outputs.composer }}
5157
js: ${{ steps.changes-js.outputs.js }}
58+
markdown: ${{ steps.changes-php.outputs.markdown }}
5259
php: ${{ steps.changes-php.outputs.php }}
5360
phtml: ${{ steps.all.outputs.phtml }}
5461
xml: ${{ steps.changes-xml.outputs.xml }}
@@ -59,6 +66,7 @@ jobs:
5966
phpstan: ${{ steps.changes-phpstan.outputs.phpstan }}
6067
phpunit-test: ${{ steps.changes-phpunit-test.outputs.phpunit-test }}
6168
phpunit: ${{ steps.changes-phpunit.outputs.phpunit }}
69+
cypress: ${{ steps.changes-cypress.outputs.cypress }}
6270

6371
steps:
6472
- name: Checkout code
@@ -84,6 +92,7 @@ jobs:
8492
files: |
8593
composer.*
8694
*.php
95+
**/*.md
8796
**/*.php
8897
**/*.phtml
8998
**/*.xml
@@ -194,3 +203,19 @@ jobs:
194203
count="$(grep -oE "**phpunit**" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
195204
echo "$count PHPUnit file(s) changed"
196205
echo "phpunit=$count" >> $GITHUB_OUTPUT
206+
207+
- name: Check if Markdown files changed
208+
id: changes-markdown
209+
if: steps.changed-files-specific.outputs.any_modified == 'true'
210+
run: |
211+
count="$(grep -oE "*.md" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
212+
echo "$count Markdown file(s) changed"
213+
echo "markdown=$count" >> $GITHUB_OUTPUT
214+
215+
- name: Check if Cypress files changed
216+
id: changes-cypress
217+
if: steps.changed-files-specific.outputs.any_modified == 'true'
218+
run: |
219+
count="$(grep -oE "cypress/" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
220+
echo "$count Cypress file(s) changed"
221+
echo "cypress=$count" >> $GITHUB_OUTPUT

‎.github/workflows/cypress.yml

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Cypress
2+
3+
on:
4+
workflow_call:
5+
# Allow manually triggering the workflow.
6+
workflow_dispatch:
7+
8+
jobs:
9+
test:
10+
name: Cypress
11+
runs-on: [ubuntu-latest]
12+
strategy:
13+
matrix:
14+
webserver: ['apache-fpm', 'nginx-fpm']
15+
16+
steps:
17+
- uses: actions/checkout@v4
18+
- name: Setup DDEV
19+
uses: ddev/github-action-setup-ddev@v1
20+
with:
21+
autostart: false
22+
23+
# install DDEV configuration
24+
- run: ddev config --project-type=magento --php-version=8.1 --webserver-type=${{ matrix.webserver }}
25+
26+
# install composer dependencies
27+
- run: ddev composer install
28+
29+
# install openmage
30+
- run: ddev openmage-install -q
31+
32+
# install cypress-addon
33+
- run: ddev add-on get tyler36/ddev-cypress
34+
35+
# start ddev
36+
- run: ddev start
37+
38+
# run cypress
39+
- run: ddev cypress-run --config-file .cypress.config.js

‎.github/workflows/php-cs-fixer.yml

+15
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,20 @@ jobs:
3333
- name: Install dependencies
3434
run: composer install --prefer-dist --no-progress --ignore-platform-req=ext-*
3535

36+
- name: Restore result cache
37+
uses: actions/cache/restore@v4
38+
with:
39+
path: .php-cs-fixer.cache
40+
key: php-cs-fixer-result-cache-${{ github.run_id }}
41+
restore-keys: |
42+
php-cs-fixer-result-cache-
43+
3644
- name: PHP-CS-Fixer
3745
run: php vendor/bin/php-cs-fixer fix --diff --dry-run
46+
47+
- name: Save result cache
48+
uses: actions/cache/save@v4
49+
if: always()
50+
with:
51+
path: .php-cs-fixer.cache
52+
key: php-cs-fixer-result-cache-${{ github.run_id }}

‎.github/workflows/phpcs.yml

+16-1
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,20 @@ jobs:
3333
- name: Install dependencies
3434
run: composer install --prefer-dist --no-progress --ignore-platform-req=ext-*
3535

36+
- name: Restore result cache
37+
uses: actions/cache/restore@v4
38+
with:
39+
path: .phpcs.result.cache
40+
key: phpcs-result-cache-${{ github.run_id }}
41+
restore-keys: |
42+
phpcs-result-cache-
43+
3644
- name: PHPCodeSniffer
37-
run: php vendor/bin/phpcs -s -p --report=full --standard=.phpcs.dist.xml
45+
run: php vendor/bin/phpcs -s -p --cache=.phpcs.result.cache --report=full --standard=.phpcs.dist.xml
46+
47+
- name: Save result cache
48+
uses: actions/cache/save@v4
49+
if: always()
50+
with:
51+
path: .phpcs.result.cache
52+
key: phpcs-result-cache-${{ github.run_id }}

‎.github/workflows/phpmd.yml

+16-1
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,20 @@ jobs:
2828
- name: Install dependencies
2929
run: composer install --prefer-dist --no-progress --ignore-platform-req=ext-*
3030

31+
- name: Restore result cache
32+
uses: actions/cache/restore@v4
33+
with:
34+
path: .phpmd.result-cache.php
35+
key: phpmd-result-cache-${{ github.run_id }}
36+
restore-keys: |
37+
phpmd-result-cache-
38+
3139
- name: PHPMD
32-
run: php vendor/bin/phpmd app/code/core/Mage/ github .phpmd.dist.xml --baseline-file .phpmd.dist.baseline.xml
40+
run: php vendor/bin/phpmd app/code/core/Mage/ github .phpmd.dist.xml --cache --baseline-file .phpmd.dist.baseline.xml
41+
42+
- name: Save result cache
43+
uses: actions/cache/save@v4
44+
if: always()
45+
with:
46+
path: .phpmd.result-cache.php
47+
key: phpmd-result-cache-${{ github.run_id }}

‎.github/workflows/phpstan.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@ jobs:
4848
if: always()
4949
with:
5050
path: .phpstan.cache
51-
key: phpstan-result-cache-${{ github.run_id }}
51+
key: phpstan-result-cache-${{ github.run_id }}

0 commit comments

Comments
 (0)