Skip to content

Commit fabc89c

Browse files
committed
Merge branch 'main' of https://github.com/craftcms/webhooks into 3.0
# Conflicts: # composer.json # composer.lock
2 parents 3de3894 + 18dfb1f commit fabc89c

File tree

10 files changed

+677
-484
lines changed

10 files changed

+677
-484
lines changed

.gitattributes

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
CHANGELOG.md export-ignore
88
codeception.yml export-ignore
99
composer.lock export-ignore
10+
ecs.php export-ignore
1011
gruntfile.js export-ignore
1112
gulpfile.js export-ignore
1213
package.json export-ignore
@@ -16,4 +17,4 @@ SECURITY.md export-ignore
1617
tests/ export-ignore
1718

1819
# Auto detect text files and perform LF normalization
19-
* text=auto
20+
* text=auto

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/config.yml

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

.github/workflows/ci.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: ci
2+
on:
3+
workflow_dispatch:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
jobs:
9+
call-workflow:
10+
uses: craftcms/.github/.github/workflows/ci.yml@v1
11+
with:
12+
run_ecs: true
13+
run_phpstan: true
14+
secrets:
15+
slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }}

composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"craftcms/cms": "^4.0.0-alpha.1"
3131
},
3232
"require-dev": {
33+
"craftcms/ecs": "dev-main",
3334
"craftcms/phpstan": "dev-main",
3435
"craftcms/rector": "dev-main"
3536
},
@@ -39,6 +40,8 @@
3940
}
4041
},
4142
"scripts": {
43+
"check-cs": "ecs check --ansi",
44+
"fix-cs": "ecs check --ansi --fix",
4245
"phpstan": "phpstan --memory-limit=1G"
4346
},
4447
"extra": {

0 commit comments

Comments
 (0)