Skip to content

Commit 8f1dab2

Browse files
committed
Next-gen coding standard workflow
1 parent 7332b90 commit 8f1dab2

File tree

9 files changed

+21
-467
lines changed

9 files changed

+21
-467
lines changed

.gitattributes

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ tmp export-ignore
77
.gitignore export-ignore
88
.travis.yml export-ignore
99
Makefile export-ignore
10-
phpcs.xml export-ignore
1110
phpstan.neon export-ignore
1211
phpstan-baseline.neon export-ignore
1312
phpunit.xml export-ignore

.github/renovate.json

-5
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@
1010
"enabled": true,
1111
"groupName": "root-composer"
1212
},
13-
{
14-
"matchPaths": ["build-cs/**"],
15-
"enabled": true,
16-
"groupName": "build-cs"
17-
},
1813
{
1914
"matchPaths": [".github/**"],
2015
"enabled": true,

.github/workflows/build.yml

+12-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- name: "Lint"
4343
run: "make lint"
4444

45-
coding-standards:
45+
coding-standard:
4646
name: "Coding Standard"
4747

4848
runs-on: "ubuntu-latest"
@@ -51,18 +51,28 @@ jobs:
5151
- name: "Checkout"
5252
uses: actions/checkout@v3
5353

54+
- name: "Checkout build-cs"
55+
uses: actions/checkout@v3
56+
with:
57+
repository: "phpstan/build-cs"
58+
path: "build-cs"
59+
5460
- name: "Install PHP"
5561
uses: "shivammathur/setup-php@v2"
5662
with:
5763
coverage: "none"
58-
php-version: "8.0"
64+
php-version: "8.2"
5965

6066
- name: "Validate Composer"
6167
run: "composer validate"
6268

6369
- name: "Install dependencies"
6470
run: "composer install --no-interaction --no-progress"
6571

72+
- name: "Install build-cs dependencies"
73+
working-directory: "build-cs"
74+
run: "composer install --no-interaction --no-progress"
75+
6676
- name: "Lint"
6777
run: "make lint"
6878

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/tests/tmp
2+
/build-cs
23
/vendor
34
/composer.lock
45
.phpunit.result.cache

Makefile

+8-2
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,19 @@ lint:
1010
php vendor/bin/parallel-lint --colors \
1111
src tests
1212

13+
.PHONY: cs-install
14+
cs-install:
15+
git clone https://github.com/phpstan/build-cs.git || true
16+
git -C build-cs fetch origin && git -C build-cs reset --hard origin/main
17+
composer install --working-dir build-cs
18+
1319
.PHONY: cs
1420
cs:
15-
composer install --working-dir build-cs && php build-cs/vendor/bin/phpcs
21+
php build-cs/vendor/bin/phpcs --standard=build-cs/phpcs.xml src tests
1622

1723
.PHONY: cs-fix
1824
cs-fix:
19-
php build-cs/vendor/bin/phpcbf
25+
php build-cs/vendor/bin/phpcbf --standard=build-cs/phpcs.xml src tests
2026

2127
.PHONY: phpstan
2228
phpstan:

build-cs/.gitignore

-1
This file was deleted.

build-cs/composer.json

-13
This file was deleted.

0 commit comments

Comments
 (0)