Skip to content

Commit cc89d81

Browse files
committed
Fixed
1 parent 8b474a2 commit cc89d81

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
docker run --rm --name=postgres -e POSTGRES_PASSWORD=postgres -e POSTGRES_DB=test -p 5432:5432 -d postgres:9.6
5353
fi
5454
55-
- uses: actions/checkout@v2
55+
- uses: actions/checkout@v3
5656

5757
- name: Validate composer.json and composer.lock
5858
run: composer validate --strict
@@ -112,7 +112,7 @@ jobs:
112112
runs-on: ubuntu-latest
113113

114114
steps:
115-
- uses: actions/checkout@v2
115+
- uses: actions/checkout@v3
116116

117117
- name: Setup PHP
118118
uses: shivammathur/setup-php@v2
@@ -121,17 +121,11 @@ jobs:
121121
coverage: none
122122
tools: cs2pr
123123

124-
- name: Cache Composer packages
125-
id: composer-cache
126-
uses: actions/cache@v2
127-
with:
128-
path: vendor
129-
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
130-
restore-keys: |
131-
${{ runner.os }}-php-
132-
133124
- name: Composer install
134-
run: composer stan-setup
125+
run: composer update
126+
127+
- name: Composer show
128+
run: composer show
135129

136130
- name: Run PHP CodeSniffer
137131
continue-on-error: true
@@ -142,7 +136,7 @@ jobs:
142136

143137
- name: Run psalm
144138
if: success() || failure()
145-
run: vendor/bin/psalm.phar --output-format=github
139+
run: vendor/bin/psalm.phar --output-format=github --php-version=8.0
146140

147141
- name: Run phpstan
148142
if: success() || failure()
@@ -158,7 +152,7 @@ jobs:
158152
PHP_VERSION: '7.4'
159153

160154
steps:
161-
- uses: actions/checkout@v2
155+
- uses: actions/checkout@v3
162156

163157
- name: Setup PHP
164158
uses: shivammathur/setup-php@v2

composer.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
"require-dev": {
1919
"cakephp/cakephp-codesniffer": "^4.4",
2020
"mirko-pagliai/me-tools": "^2.19.8",
21-
"phpunit/phpunit": "^8.5.14|^9.1|^9.5"
21+
"phpunit/phpunit": "^9.1|^9.5",
22+
"phpstan/phpstan": "^1.7",
23+
"psalm/phar": "^4.24"
2224
},
2325
"autoload": {
2426
"psr-4": {
@@ -48,11 +50,14 @@
4850
"phpstan": "phpstan.phar analyse",
4951
"psalm": "psalm.phar --php-version=8.0",
5052
"stan": [
51-
"@stan-setup",
5253
"@phpstan",
5354
"@psalm"
5455
],
55-
"stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^0.12 psalm/phar:\"^3.18|^4\" && mv composer.backup composer.json",
5656
"update-lowest": "@composer update --prefer-lowest"
57+
},
58+
"config": {
59+
"allow-plugins": {
60+
"dealerdirect/phpcodesniffer-composer-installer": true
61+
}
5762
}
5863
}

0 commit comments

Comments
 (0)