Skip to content

Commit bcff203

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 992282c + 1b8a236 commit bcff203

File tree

9 files changed

+273
-190
lines changed

9 files changed

+273
-190
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ indent_style = space
88
indent_size = 4
99
trim_trailing_whitespace = true
1010

11-
[*.{yml, yaml, sh, conf, neon*}]
11+
[*.{yml,yaml,sh,conf,neon*}]
1212
indent_size = 2
1313

1414
[Makefile]

.gitattributes

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
* text=auto
22

3-
/.github export-ignore
3+
/.* export-ignore
44
/tests export-ignore
55
/[Dd]ocker* export-ignore
6-
/.* export-ignore
7-
/phpunit.xml* export-ignore
6+
/*.xml export-ignore
7+
/*.xml.dist export-ignore
88
/phpstan.* export-ignore
99
/Makefile export-ignore
10+
/rector.php export-ignore

.github/workflows/cs-fix.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
on:
2+
push:
3+
branches:
4+
- '*'
5+
6+
name: Fix Code Style
7+
8+
jobs:
9+
cs-fix:
10+
permissions:
11+
contents: write
12+
uses: spiral/gh-actions/.github/workflows/cs-fix.yml@master

.gitignore

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,14 @@ composer.lock
1515
/coverage
1616
.DS_Store
1717
*.cache
18-
/runtime
18+
/runtime
19+
20+
# Binaries
21+
/rr
22+
/rr.exe
23+
/protoc
24+
/protoc.exe
25+
/protoc-gen-php-grpc
26+
/protoc-gen-php-grpc.exe
27+
/temporal
28+
/temporal.exe

.php-cs-fixer.dist.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@
1010
->include(__DIR__ . '/config')
1111
->include(__DIR__ . '/tests')
1212
->include(__DIR__ . '/rector.php')
13+
->allowRisky(false)
1314
->build();

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ test: ## Execute php tests and linters
2929
docker-compose run $(RUN_APP_ARGS) app composer test
3030

3131
test-cover: ## Execute php tests with coverage
32-
docker-compose run --rm --user "0:0" -e 'XDEBUG_MODE=coverage' app sh -c 'docker-php-ext-enable xdebug && su $(shell whoami) -s /bin/sh -c "composer phpunit-cover"'
32+
docker-compose run --rm --user "0:0" -e 'XDEBUG_MODE=coverage' app sh -c 'docker-php-ext-enable xdebug && su $(shell whoami) -s /bin/sh -c "composer phpunit:cover"'
3333

3434
shell: ## Start shell into container with php
3535
docker-compose run $(RUN_APP_ARGS) app sh

0 commit comments

Comments
 (0)