diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f13f908..4e1be43 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ on: jobs: testsuite-linux: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 strategy: fail-fast: false matrix: @@ -62,7 +62,7 @@ jobs: cs-stan: name: Coding Standard & Static Analysis - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 @@ -73,7 +73,7 @@ jobs: php-version: '7.4' extensions: mbstring, intl coverage: none - tools: psalm:~4.1.0, cs2pr + tools: phive, cs2pr - name: Composer Install run: composer install @@ -81,5 +81,9 @@ jobs: - name: Run phpcs run: vendor/bin/phpcs --report=checkstyle src/ tests/ | cs2pr + - name: Install PHP tools with phive. + run: phive install --trust-gpg-keys 'CF1A108D0E7AE720,51C67305FFC2E5C0,12CE0F1D262429A5' + - name: Run psalm - run: psalm --output-format=github + if: always() + run: tools/psalm --output-format=github diff --git a/.phive/phars.xml b/.phive/phars.xml new file mode 100644 index 0000000..cdacf95 --- /dev/null +++ b/.phive/phars.xml @@ -0,0 +1,4 @@ + + + + diff --git a/composer.json b/composer.json index 3a14a04..6619295 100644 --- a/composer.json +++ b/composer.json @@ -35,5 +35,13 @@ "config": { "sort-packages": true }, - "prefer-stable": true + "prefer-stable": true, + "scripts": { + "cs-check": "phpcs --colors --parallel=16 -p src/ tests/", + "cs-fix": "phpcbf --colors --parallel=16 -p src/ tests/", + "psalm": "tools/psalm --show-info=false", + "stan-setup": "phive install", + "test": "phpunit", + "test-coverage": "phpunit --coverage-clover=clover.xml" + } } diff --git a/psalm-baseline.xml b/psalm-baseline.xml new file mode 100644 index 0000000..b5cd20f --- /dev/null +++ b/psalm-baseline.xml @@ -0,0 +1,8 @@ + + + + + $pathMap + + + diff --git a/psalm.xml b/psalm.xml index 8dc065a..dcc61e7 100644 --- a/psalm.xml +++ b/psalm.xml @@ -1,10 +1,10 @@