From 30da14b51f1c1356b9b6a104432f6bbb202a83ca Mon Sep 17 00:00:00 2001 From: dpi Date: Tue, 5 Apr 2022 14:52:55 +0800 Subject: [PATCH] phpstan-phpunit update --- .github/workflows/workflows.yml | 4 ++-- composer.json | 2 +- composer.lock | 38 ++++++++++++++------------------- 3 files changed, 19 insertions(+), 25 deletions(-) diff --git a/.github/workflows/workflows.yml b/.github/workflows/workflows.yml index 3f4e23b..f6fba0e 100644 --- a/.github/workflows/workflows.yml +++ b/.github/workflows/workflows.yml @@ -26,7 +26,7 @@ jobs: env: COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: "Install dependencies" - uses: "ramsey/composer-install@v1" + uses: "ramsey/composer-install@v2" - name: "Run PHPStan" run: | ./vendor/bin/phpstan analyse --no-progress @@ -49,7 +49,7 @@ jobs: - name: Setup problem matchers for PHPUnit run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - name: "Install dependencies" - uses: "ramsey/composer-install@v1" + uses: "ramsey/composer-install@v2" with: dependency-versions: ${{ matrix.dependency-versions }} - name: "Prepare for tests" diff --git a/composer.json b/composer.json index 6d96417..cfcc2cb 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "mikey179/vfsstream": "^1.6.7", "phpstan/extension-installer": "^1.1", "phpstan/phpstan": "^1", - "phpstan/phpstan-phpunit": "1.0.x-dev", + "phpstan/phpstan-phpunit": "^1.1", "phpstan/phpstan-symfony": "^1", "phpunit/phpunit": "^9.5" }, diff --git a/composer.lock b/composer.lock index 73a8ee9..7545c3f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6bc64d0530a5cdbe79dba973d9508e11", + "content-hash": "92336b2f3a6d918931c807bd604f5b59", "packages": [], "packages-dev": [ { @@ -2630,16 +2630,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.5.0", + "version": "1.5.4", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "2be8dd6dfa09ab1a21c49956ff591979cd5ab29e" + "reference": "bbf68cae24f6dc023c607ea0f87da55dd9d55c2b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/2be8dd6dfa09ab1a21c49956ff591979cd5ab29e", - "reference": "2be8dd6dfa09ab1a21c49956ff591979cd5ab29e", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/bbf68cae24f6dc023c607ea0f87da55dd9d55c2b", + "reference": "bbf68cae24f6dc023c607ea0f87da55dd9d55c2b", "shasum": "" }, "require": { @@ -2665,7 +2665,7 @@ "description": "PHPStan - PHP Static Analysis Tool", "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.5.0" + "source": "https://github.com/phpstan/phpstan/tree/1.5.4" }, "funding": [ { @@ -2685,25 +2685,25 @@ "type": "tidelift" } ], - "time": "2022-03-24T18:18:00+00:00" + "time": "2022-04-03T12:39:00+00:00" }, { "name": "phpstan/phpstan-phpunit", - "version": "dev-master", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-phpunit.git", - "reference": "59253fc2d4fecb246cf0657d9031a1d1ff1652e0" + "reference": "09133ce914f1388a8bb8c7f8573aaa3723cff52a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/59253fc2d4fecb246cf0657d9031a1d1ff1652e0", - "reference": "59253fc2d4fecb246cf0657d9031a1d1ff1652e0", + "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/09133ce914f1388a8bb8c7f8573aaa3723cff52a", + "reference": "09133ce914f1388a8bb8c7f8573aaa3723cff52a", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0", - "phpstan/phpstan": "^1.0" + "php": "^7.2 || ^8.0", + "phpstan/phpstan": "^1.5.0" }, "conflict": { "phpunit/phpunit": "<7.0" @@ -2714,12 +2714,8 @@ "phpstan/phpstan-strict-rules": "^1.0", "phpunit/phpunit": "^9.5" }, - "default-branch": true, "type": "phpstan-extension", "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - }, "phpstan": { "includes": [ "extension.neon", @@ -2739,9 +2735,9 @@ "description": "PHPUnit extensions and rules for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-phpunit/issues", - "source": "https://github.com/phpstan/phpstan-phpunit/tree/master" + "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.1.0" }, - "time": "2022-01-16T10:53:50+00:00" + "time": "2022-03-28T09:20:49+00:00" }, { "name": "phpstan/phpstan-symfony", @@ -7626,9 +7622,7 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": { - "phpstan/phpstan-phpunit": 20 - }, + "stability-flags": [], "prefer-stable": true, "prefer-lowest": false, "platform": {