Skip to content

Commit e9a22b6

Browse files
authored
Merge pull request #17 from php-etl/feature/cs-fixer-and-phpstan
Ran php-cs-fixer + fixed some phpstan errors
2 parents c7d8936 + 3695009 commit e9a22b6

25 files changed

+791
-157
lines changed

.github/workflows/actions.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
- uses: actions/checkout@v2
88
- name: Cs-Fixer
99
run: |
10-
wget -q https://cs.symfony.com/download/php-cs-fixer-v2.phar -O php-cs-fixer
10+
wget -q https://cs.symfony.com/download/php-cs-fixer-v3.phar -O php-cs-fixer
1111
chmod a+x php-cs-fixer
1212
PHP_CS_FIXER_IGNORE_ENV=true ./php-cs-fixer fix src --dry-run
1313
@@ -17,7 +17,7 @@ jobs:
1717
- uses: actions/checkout@v2
1818
- uses: shivammathur/setup-php@v2
1919
with:
20-
php-version: '8.0'
20+
php-version: '8.1'
2121
tools: composer:v2
2222
coverage: pcov
2323
- uses: actions/cache@v2
@@ -29,7 +29,7 @@ jobs:
2929
- uses: php-actions/composer@v5
3030
with:
3131
args: --prefer-dist --ignore-platform-reqs
32-
php_version: 8.0
32+
php_version: 8.1
3333

3434
- name: Run tests & generate Coverage
3535
run: bin/phpunit tests --coverage-html var/coverage --whitelist=src
@@ -55,7 +55,7 @@ jobs:
5555
- uses: php-actions/composer@v5
5656
with:
5757
args: --prefer-dist --ignore-platform-reqs
58-
php_version: 8.0
58+
php_version: 8.1
5959

6060
- name: PHPStan
6161
uses: php-actions/phpstan@v2
@@ -69,7 +69,7 @@ jobs:
6969
- uses: actions/checkout@v2
7070
- uses: shivammathur/setup-php@v2
7171
with:
72-
php-version: '8.0'
72+
php-version: '8.1'
7373
tools: composer:v2
7474
coverage: pcov
7575
- uses: actions/cache@v2
@@ -81,7 +81,7 @@ jobs:
8181
- uses: php-actions/composer@v5
8282
with:
8383
args: --prefer-dist --ignore-platform-reqs
84-
php_version: 8.0
84+
php_version: 8.1
8585

8686
- name: Infection
8787
run: |

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/vendor

.php-cs-fixer.dist.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
'error_suppression' => true,
3434
'ereg_to_preg' => true,
3535
'dir_constant' => true,
36+
'method_chaining_indentation' => false,
3637
])
3738
->setFinder($finder)
3839
->setCacheFile('.php-cs-fixer.cache') // forward compatibility with 3.x line

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
"friends-of-phpspec/phpspec-code-coverage": "*",
3131
"adlawson/vfs": "dev-develop",
3232
"php-etl/bucket": "0.2.x-dev",
33-
"php-etl/phpunit-extension": "^0.2.0"
33+
"php-etl/phpunit-extension": "^0.2.0",
34+
"friendsofphp/php-cs-fixer": "^3.0"
3435
},
3536
"autoload": {
3637
"psr-4": {

0 commit comments

Comments
 (0)