Skip to content

Commit 0e55d35

Browse files
sreichelsreichel
committed
Merge branch 'main' into carbon
# Conflicts: # .phpstan.dist.baseline.neon # composer.lock # lib/Varien/Cache/Backend/Database.php # tests/unit/Mage/Catalog/Model/UrlTest.php # tests/unit/Mage/Sitemap/Model/SitemapTest.php
2 parents d75edd0 + fe44f34 commit 0e55d35

File tree

6,845 files changed

+38139
-78064
lines changed

Some content is hidden

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

6,845 files changed

+38139
-78064
lines changed

‎.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1689,6 +1689,15 @@
16891689
"code",
16901690
"bug"
16911691
]
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+
]
16921701
}
16931702
],
16941703
"commitType": "docs"

‎.cypress.config.js

Lines changed: 6 additions & 6 deletions
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

Lines changed: 2 additions & 0 deletions
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

Lines changed: 1 addition & 1 deletion
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 security@openmage.org 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 security@openmage.org 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

Lines changed: 7 additions & 1 deletion
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

Lines changed: 8 additions & 0 deletions
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

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

‎.github/spellcheck.yml

Lines changed: 29 additions & 0 deletions
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

Lines changed: 28 additions & 3 deletions
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-markdown.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
@@ -79,11 +87,12 @@ jobs:
7987

8088
- name: Get changed files
8189
id: changed-files-specific
82-
uses: tj-actions/changed-files@v45
90+
uses: tj-actions/changed-files@v46
8391
with:
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

Lines changed: 39 additions & 0 deletions
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

0 commit comments

Comments
 (0)