From cdf75451dd899f0dde26af27531c6041a33a42ec Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Thu, 29 Dec 2022 11:41:26 +0100 Subject: [PATCH] Bump dev tools and CI workflows --- .github/workflows/coding-standards.yml | 3 +-- .github/workflows/continuous-integration.yml | 4 ++-- .github/workflows/phpbench.yml | 4 ++-- .github/workflows/release-on-milestone-closed.yml | 2 +- .github/workflows/static-analysis.yml | 3 +-- composer.json | 4 ++-- phpstan.neon.dist | 2 +- psalm.xml | 2 +- 8 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 545cd86..665d101 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -12,7 +12,6 @@ on: jobs: coding-standards: name: "Coding Standards" - uses: "doctrine/.github/.github/workflows/coding-standards.yml@1.4.1" + uses: "doctrine/.github/.github/workflows/coding-standards.yml@3.0.0" with: composer-root-version: "1.4" - php-version: "8.1" diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 9317474..8e50868 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -12,7 +12,7 @@ on: jobs: phpunit: name: "PHPUnit" - uses: "doctrine/.github/.github/workflows/continuous-integration.yml@1.4.1" + uses: "doctrine/.github/.github/workflows/continuous-integration.yml@3.0.0" with: - php-versions: '["7.1", "7.2", "7.3", "7.4", "8.0", "8.1"]' + php-versions: '["7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2"]' composer-root-version: "1.4" diff --git a/.github/workflows/phpbench.yml b/.github/workflows/phpbench.yml index d1abf24..9557b3e 100644 --- a/.github/workflows/phpbench.yml +++ b/.github/workflows/phpbench.yml @@ -16,7 +16,7 @@ env: jobs: phpbench: name: "PHPBench" - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-22.04" strategy: matrix: @@ -37,7 +37,7 @@ jobs: ini-values: "zend.assertions=1" - name: "Cache dependencies installed with composer" - uses: "actions/cache@v2" + uses: "actions/cache@v3" with: path: "~/.composer/cache" key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}" diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml index e7e127f..44c68ff 100644 --- a/.github/workflows/release-on-milestone-closed.yml +++ b/.github/workflows/release-on-milestone-closed.yml @@ -8,7 +8,7 @@ on: jobs: release: name: "Git tag, release & create merge-up PR" - uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@1.4.1" + uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@3.0.0" secrets: GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }} GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }} diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index dd70c4e..86bd6e8 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -12,7 +12,6 @@ on: jobs: static-analysis: name: "Static Analysis" - uses: "doctrine/.github/.github/workflows/static-analysis.yml@1.4.1" + uses: "doctrine/.github/.github/workflows/static-analysis.yml@3.0.0" with: composer-root-version: "1.4" - php-version: "8.1" diff --git a/composer.json b/composer.json index 4fba95c..fab8172 100644 --- a/composer.json +++ b/composer.json @@ -21,12 +21,12 @@ "require-dev": { "ext-phar": "*", "ext-pdo": "*", - "doctrine/coding-standard": "^9", + "doctrine/coding-standard": "^9 || ^11", "phpbench/phpbench": "^0.16 || ^1", "phpstan/phpstan": "^1.4", "phpstan/phpstan-phpunit": "^1", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.22" + "vimeo/psalm": "^4.30 || ^5.4" }, "autoload": { "psr-4": { diff --git a/phpstan.neon.dist b/phpstan.neon.dist index c9cb6fb..99ea416 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -4,7 +4,7 @@ includes: parameters: level: max - phpVersion: 80103 + phpVersion: 80200 paths: - src - tests diff --git a/psalm.xml b/psalm.xml index e6270c1..e9b622b 100644 --- a/psalm.xml +++ b/psalm.xml @@ -1,7 +1,7 @@