Skip to content

Commit c970437

Browse files
committed
Update php styling for 7.4
Signed-off-by: John Molakvoæ <[email protected]>
1 parent 4525bc2 commit c970437

File tree

8 files changed

+1276
-351
lines changed

8 files changed

+1276
-351
lines changed

.github/workflows/psalm.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Static analysis
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- master
8+
- stable*
9+
10+
jobs:
11+
static-psalm-analysis:
12+
runs-on: ubuntu-latest
13+
14+
strategy:
15+
matrix:
16+
ocp-version: [ 'dev-master' ]
17+
18+
name: Nextcloud ${{ matrix.ocp-version }}
19+
steps:
20+
- name: Checkout
21+
uses: actions/checkout@master
22+
23+
- name: Set up php
24+
uses: shivammathur/setup-php@v2
25+
with:
26+
php-version: 7.4
27+
coverage: none
28+
29+
- name: Install dependencies
30+
run: composer i
31+
32+
- name: Install dependencies
33+
run: composer require --dev christophwurst/nextcloud:${{ matrix.ocp-version }}
34+
35+
- name: Run coding standards check
36+
run: composer run psalm

.github/workflows/static-analysis.yml

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

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111
"cs:fix": "php-cs-fixer fix",
1212
"cs:check": "php-cs-fixer fix --dry-run --diff",
1313
"lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",
14-
"psalm": "psalm.phar"
14+
"psalm": "psalm",
15+
"psalm:update-baseline": "psalm --update-baseline"
1516
},
1617
"require-dev": {
1718
"nextcloud/coding-standard": "^0.5.0",
1819
"phpunit/phpunit": "^9",
19-
"psalm/phar": "^4.3"
20+
"vimeo/psalm": "^4.22"
2021
}
2122
}

0 commit comments

Comments
 (0)