Skip to content

Commit 5e59d36

Browse files
authored
Merge pull request #10 from php-etl/feature/cs-fixer-and-phpstan
Updated github actions + ran php-cs-fixer + fixed phpstan errors
2 parents c323d37 + 8bfc825 commit 5e59d36

31 files changed

+2675
-1402
lines changed

.github/workflows/actions.yml

Lines changed: 7 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
32-
php_version: 8.0
32+
php_version: 8.1
3333
php_extensions: xdebug zip
3434

3535
- name: Run tests & generate Coverage
@@ -56,22 +56,23 @@ jobs:
5656
- uses: php-actions/composer@v5
5757
with:
5858
args: --prefer-dist
59-
php_version: 8.0
59+
php_version: 8.1
6060
php_extensions: xdebug zip
6161

6262
- name: PHPStan
6363
uses: php-actions/phpstan@v2
6464
with:
6565
path: src/
6666
args: --level=${{ matrix.phpstan-level }}
67+
php_version: 8.1
6768

6869
infection:
6970
runs-on: ubuntu-latest
7071
steps:
7172
- uses: actions/checkout@v2
7273
- uses: shivammathur/setup-php@v2
7374
with:
74-
php-version: '8.0'
75+
php-version: '8.1'
7576
tools: composer:v2
7677
coverage: pcov
7778
- uses: actions/cache@v2
@@ -83,7 +84,7 @@ jobs:
8384
- uses: php-actions/composer@v5
8485
with:
8586
args: --prefer-dist
86-
php_version: 8.0
87+
php_version: 8.1
8788

8889
- name: Infection
8990
run: |

.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: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"minimum-stability": "dev",
1313
"prefer-stable": true,
1414
"require": {
15-
"php": "^8.0",
15+
"php": "^8.1",
1616
"ext-json": "*",
1717
"nikic/php-parser": "^4.10",
1818
"symfony/config": "^5.2",
@@ -24,10 +24,11 @@
2424
"symfony/yaml": "^5.2",
2525
"adlawson/vfs": "dev-develop",
2626
"phpunit/phpunit": "^9.0",
27-
"php-etl/phpunit-extension": "^0.2.0",
27+
"php-etl/phpunit-extension": "^0.4.0",
2828
"php-etl/spreadsheet-flow": "^0.1.0",
2929
"php-etl/bucket-contracts": "^0.1.0",
30-
"php-etl/pipeline-contracts": "^0.3.0"
30+
"php-etl/pipeline-contracts": "^0.3.0",
31+
"friendsofphp/php-cs-fixer": "^3.0"
3132
},
3233
"autoload": {
3334
"psr-4": {

0 commit comments

Comments
 (0)