From 8368463e65f1f16cdaac2ec5f2ea9bcab308f6b9 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Sun, 31 Jul 2022 15:51:44 +0200 Subject: [PATCH] Bump tools and CI workflows --- .github/workflows/coding-standards.yml | 4 +++- .github/workflows/continuous-integration.yml | 4 +++- .../workflows/release-on-milestone-closed.yml | 3 +-- .github/workflows/static-analysis.yml | 4 +++- composer.json | 17 +++++++++++------ phpcs.xml.dist | 2 ++ phpstan.neon.dist | 2 +- .../Tests/Inflector/InflectorFactoryTest.php | 1 + 8 files changed, 25 insertions(+), 12 deletions(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 352847e3..aadb00d2 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -12,4 +12,6 @@ on: jobs: coding-standards: name: "Coding Standards" - uses: "doctrine/.github/.github/workflows/coding-standards.yml@1.1.1" + uses: "doctrine/.github/.github/workflows/coding-standards.yml@1.5.1" + with: + php-version: '8.1' diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 40de2f39..671a3d18 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -22,4 +22,6 @@ jobs: phpunit: name: "PHPUnit" - uses: "doctrine/.github/.github/workflows/continuous-integration.yml@1.1.1" + uses: "doctrine/.github/.github/workflows/continuous-integration.yml@1.5.1" + with: + php-versions: '["7.2", "7.3", "7.4", "8.0", "8.1"]' diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml index 563333bb..d32d76ef 100644 --- a/.github/workflows/release-on-milestone-closed.yml +++ b/.github/workflows/release-on-milestone-closed.yml @@ -8,9 +8,8 @@ on: jobs: release: name: "Git tag, release & create merge-up PR" - uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@1.1.1" + uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@1.5.1" secrets: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }} GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }} ORGANIZATION_ADMIN_TOKEN: ${{ secrets.ORGANIZATION_ADMIN_TOKEN }} diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 15546419..d1d1d937 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -12,4 +12,6 @@ on: jobs: static-analysis-phpstan: name: "Static Analysis" - uses: "doctrine/.github/.github/workflows/static-analysis.yml@1.1.1" + uses: "doctrine/.github/.github/workflows/static-analysis.yml@1.5.1" + with: + php-version: "8.1" diff --git a/composer.json b/composer.json index f08fdc3b..87da3e23 100644 --- a/composer.json +++ b/composer.json @@ -16,12 +16,12 @@ "php": "^7.2 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^8.2", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", - "phpstan/phpstan-strict-rules": "^0.12", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", - "vimeo/psalm": "^4.10" + "doctrine/coding-standard": "^9", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.1", + "phpstan/phpstan-strict-rules": "^1.3", + "phpunit/phpunit": "^8.5 || ^9.5", + "vimeo/psalm": "^4.25" }, "autoload": { "psr-4": { @@ -32,5 +32,10 @@ "psr-4": { "Doctrine\\Tests\\Inflector\\": "tests/Doctrine/Tests/Inflector" } + }, + "config": { + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true + } } } diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 49d4cdeb..ea961a05 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -9,6 +9,8 @@ + + lib tests diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 5f3f16b2..5c091267 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -9,5 +9,5 @@ parameters: - lib - tests - excludes_analyse: + excludePaths: - %rootDir%/../../../tests/Doctrine/Tests/Common/* diff --git a/tests/Doctrine/Tests/Inflector/InflectorFactoryTest.php b/tests/Doctrine/Tests/Inflector/InflectorFactoryTest.php index abb91792..bf023497 100644 --- a/tests/Doctrine/Tests/Inflector/InflectorFactoryTest.php +++ b/tests/Doctrine/Tests/Inflector/InflectorFactoryTest.php @@ -26,6 +26,7 @@ public function testCreateUsesEnglishByDefault(): void /** * @phpstan-param class-string $expectedClass + * * @dataProvider provideLanguages */ public function testCreateForLanguageWithCustomLanguage(string $expectedClass, string $language): void