Merge branch 'next-minor' into next-major

This commit is contained in:
Dylan K. Taylor 2023-03-07 15:25:44 +00:00
commit dedd1d7fb3
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
3 changed files with 8 additions and 9 deletions

View File

@ -9,7 +9,6 @@ jobs:
build-php: build-php:
name: Prepare PHP name: Prepare PHP
runs-on: ${{ matrix.image }} runs-on: ${{ matrix.image }}
concurrency: php-build-${{ matrix.php }}
strategy: strategy:
matrix: matrix:

View File

@ -55,7 +55,7 @@
"symfony/filesystem": "^5.4" "symfony/filesystem": "^5.4"
}, },
"require-dev": { "require-dev": {
"phpstan/phpstan": "1.10.3", "phpstan/phpstan": "1.10.4",
"phpstan/phpstan-phpunit": "^1.1.0", "phpstan/phpstan-phpunit": "^1.1.0",
"phpstan/phpstan-strict-rules": "^1.2.0", "phpstan/phpstan-strict-rules": "^1.2.0",
"phpunit/phpunit": "^9.2" "phpunit/phpunit": "^9.2"

14
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "c17a304e431f339ea8fda7d7976bdfdf", "content-hash": "9751c90077792bd5d12ebb53a0214ec1",
"packages": [ "packages": [
{ {
"name": "adhocore/json-comment", "name": "adhocore/json-comment",
@ -1775,16 +1775,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "1.10.3", "version": "1.10.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "5419375b5891add97dc74be71e6c1c34baaddf64" "reference": "8d39218664b45a4a42d5be66d2b63dcf8c149982"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/5419375b5891add97dc74be71e6c1c34baaddf64", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8d39218664b45a4a42d5be66d2b63dcf8c149982",
"reference": "5419375b5891add97dc74be71e6c1c34baaddf64", "reference": "8d39218664b45a4a42d5be66d2b63dcf8c149982",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1814,7 +1814,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/phpstan/phpstan/issues", "issues": "https://github.com/phpstan/phpstan/issues",
"source": "https://github.com/phpstan/phpstan/tree/1.10.3" "source": "https://github.com/phpstan/phpstan/tree/1.10.4"
}, },
"funding": [ "funding": [
{ {
@ -1830,7 +1830,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-02-25T14:47:13+00:00" "time": "2023-03-06T13:39:20+00:00"
}, },
{ {
"name": "phpstan/phpstan-phpunit", "name": "phpstan/phpstan-phpunit",