Skip to content

Commit e59c1a9

Browse files
authored
Merge pull request #2 from php-etl/feature/qualityflow-improvments
Add a phpstan lvl 6, update php 8.2 with rector, validate cs-fixer, v…
2 parents 465db39 + eac3382 commit e59c1a9

17 files changed

+4174
-345
lines changed

.github/workflows/infection.yaml

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

.github/workflows/phpstan-5.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
name: PHPStan level 5
1+
name: PHPStan level 6
22
on: push
33
jobs:
44
phpstan:
55
runs-on: ubuntu-latest
66
steps:
7-
- uses: actions/checkout@v2
8-
- uses: actions/cache@v2
7+
- uses: actions/checkout@v3
8+
- uses: actions/cache@v3
99
with:
1010
path: '**/vendor'
1111
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
1212
restore-keys: |
1313
${{ runner.os }}-composer-
14-
- uses: php-actions/composer@v5
14+
- uses: php-actions/composer@v6
1515
with:
1616
args: --prefer-dist
17-
php_version: 8.0
18-
17+
php_version: '8.2'
1918
- name: PHPStan
20-
uses: php-actions/phpstan@v2
19+
uses: php-actions/phpstan@v3
2120
with:
2221
path: src/
23-
args: --level=5
22+
level: 5
23+
php_version: '8.2'

.github/workflows/phpstan-6.yaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: PHPStan level 6
2+
on: push
3+
jobs:
4+
phpstan:
5+
runs-on: ubuntu-latest
6+
steps:
7+
- uses: actions/checkout@v3
8+
- uses: actions/cache@v3
9+
with:
10+
path: '**/vendor'
11+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
12+
restore-keys: |
13+
${{ runner.os }}-composer-
14+
- uses: php-actions/composer@v6
15+
with:
16+
args: --prefer-dist
17+
php_version: '8.2'
18+
19+
- name: PHPStan
20+
uses: php-actions/phpstan@v3
21+
with:
22+
path: src/
23+
level: 6

.github/workflows/phpstan-7.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ jobs:
44
phpstan:
55
runs-on: ubuntu-latest
66
steps:
7-
- uses: actions/checkout@v2
8-
- uses: actions/cache@v2
7+
- uses: actions/checkout@v3
8+
- uses: actions/cache@v3
99
with:
1010
path: '**/vendor'
1111
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
1212
restore-keys: |
1313
${{ runner.os }}-composer-
14-
- uses: php-actions/composer@v5
14+
- uses: php-actions/composer@v6
1515
with:
1616
args: --prefer-dist
17-
php_version: 8.0
17+
php_version: '8.2'
1818

1919
- name: PHPStan
20-
uses: php-actions/phpstan@v2
20+
uses: php-actions/phpstan@v3
2121
with:
2222
path: src/
23-
args: --level=5
23+
level: 7

.github/workflows/phpstan-8.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ jobs:
44
phpstan:
55
runs-on: ubuntu-latest
66
steps:
7-
- uses: actions/checkout@v2
8-
- uses: actions/cache@v2
7+
- uses: actions/checkout@v3
8+
- uses: actions/cache@v3
99
with:
1010
path: '**/vendor'
1111
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
1212
restore-keys: |
1313
${{ runner.os }}-composer-
14-
- uses: php-actions/composer@v5
14+
- uses: php-actions/composer@v6
1515
with:
1616
args: --prefer-dist
17-
php_version: 8.0
17+
php_version: '8.2'
1818

1919
- name: PHPStan
20-
uses: php-actions/phpstan@v2
20+
uses: php-actions/phpstan@v3
2121
with:
2222
path: src/
23-
args: --level=5
23+
level: 8

.github/workflows/quality.yaml

Lines changed: 11 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,36 @@
1-
name: Quality
1+
name: Quality (PHPStan lvl 4)
22
on: push
33
jobs:
44
cs-fixer:
55
runs-on: ubuntu-latest
66
steps:
77
- uses: actions/checkout@v2
8+
- uses: shivammathur/setup-php@v2
9+
with:
10+
php-version: '8.2'
811
- name: Cs-Fixer
912
run: |
10-
wget -q https://cs.symfony.com/download/php-cs-fixer-v2.phar -O php-cs-fixer
13+
wget -q https://cs.symfony.com/download/php-cs-fixer-v3.phar -O php-cs-fixer
1114
chmod a+x php-cs-fixer
1215
PHP_CS_FIXER_IGNORE_ENV=true ./php-cs-fixer fix src --dry-run
1316
14-
phpunit:
15-
runs-on: ubuntu-latest
16-
steps:
17-
- uses: actions/checkout@v2
18-
- uses: shivammathur/setup-php@v2
19-
with:
20-
php-version: '8.0'
21-
tools: composer:v2
22-
coverage: pcov
23-
- uses: actions/cache@v2
24-
with:
25-
path: '**/vendor'
26-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
27-
restore-keys: |
28-
${{ runner.os }}-composer-
29-
- uses: php-actions/composer@v5
30-
with:
31-
args: --prefer-dist
32-
php_version: 8.0
33-
34-
- name: Run tests & generate Coverage
35-
run: bin/phpunit --configuration=phpunit.xml tests --coverage-html var/coverage --whitelist=src
36-
37-
- name: Store coverage files
38-
uses: actions/upload-artifact@v2
39-
with:
40-
path: var/coverage
41-
4217
phpstan:
4318
runs-on: ubuntu-latest
4419
steps:
45-
- uses: actions/checkout@v2
46-
- uses: actions/cache@v2
20+
- uses: actions/checkout@v3
21+
- uses: actions/cache@v3
4722
with:
4823
path: '**/vendor'
4924
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
5025
restore-keys: |
5126
${{ runner.os }}-composer-
52-
- uses: php-actions/composer@v5
27+
- uses: php-actions/composer@v6
5328
with:
5429
args: --prefer-dist
55-
php_version: 8.0
30+
php_version: '8.2'
5631

5732
- name: PHPStan
58-
uses: php-actions/phpstan@v2
33+
uses: php-actions/phpstan@v3
5934
with:
6035
path: src/
61-
args: --level=4
36+
level: 4

.github/workflows/rector.yaml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# github action that checks code with Rector
2+
name: Rector
3+
4+
on:
5+
pull_request: null
6+
7+
jobs:
8+
rector:
9+
runs-on: ubuntu-latest
10+
if: github.event.pull_request.head.repo.full_name == 'php-etl/console-state'
11+
steps:
12+
- uses: actions/checkout@v3
13+
14+
- uses: shivammathur/setup-php@v2
15+
with:
16+
php-version: '8.2'
17+
coverage: none
18+
19+
- uses: "ramsey/composer-install@v2"
20+
21+
- run: bin/rector --ansi
22+
23+
- # commit only to core contributors who have repository access
24+
if: github.event.pull_request.head.repo.full_name == github.repository
25+
uses: stefanzweifel/git-auto-commit-action@v4
26+
with:
27+
commit_message: '[rector] Rector fixes'
28+
commit_author: 'GitHub Action <[email protected]>'
29+
commit_user_email: '[email protected]'

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
/vendor/
2+
/.php-cs-fixer.cache
3+
/bin/

.php-cs-fixer.dist.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
return (new PhpCsFixer\Config())
88
->setRiskyAllowed(true)
99
->setRules([
10+
'@PHP82Migration' => true,
1011
'@PHP81Migration' => true,
1112
'@PHP80Migration:risky' => true,
1213
'@PHPUnit84Migration:risky' => true,

README.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
Console state
2+
===
3+
4+
5+
[![Quality (PHPStan lvl 5)](https://github.com/php-etl/console-state/actions/workflows/quality.yaml/badge.svg)](https://github.com/php-etl/console-state/actions/workflows/quality.yaml)
6+
[![Rector](https://github.com/php-etl/console-state/actions/workflows/rector.yaml/badge.svg)](https://github.com/php-etl/console-state/actions/workflows/rector.yaml)
7+
[![PHPStan level 5](https://github.com/php-etl/console-state/actions/workflows/phpstan-5.yaml/badge.svg)](https://github.com/php-etl/console-state/actions/workflows/phpstan-5.yaml)
8+
[![PHPStan level 6](https://github.com/php-etl/console-state/actions/workflows/phpstan-6.yaml/badge.svg)](https://github.com/php-etl/console-state/actions/workflows/phpstan-6.yaml)
9+
[![PHPStan level 7](https://github.com/php-etl/console-state/actions/workflows/phpstan-7.yaml/badge.svg)](https://github.com/php-etl/console-state/actions/workflows/phpstan-7.yaml)
10+
[![PHPStan level 8](https://github.com/php-etl/console-state/actions/workflows/phpstan-8.yaml/badge.svg)](https://github.com/php-etl/console-state/actions/workflows/phpstan-8.yaml)
11+
![PHP](https://img.shields.io/packagist/php-v/php-etl/console-state)
12+
13+
Documentation
14+
---
15+
16+
[See full Documentation](https://php-etl.github.io/documentation)
17+

0 commit comments

Comments
 (0)