Merge branch 'stable' into next-minor

This commit is contained in:
Dylan K. Taylor 2023-01-20 15:40:32 +00:00
commit 6c52723d97
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
6 changed files with 22 additions and 21 deletions

View File

@ -13,11 +13,11 @@ jobs:
strategy: strategy:
matrix: matrix:
image: [ubuntu-20.04] image: [ubuntu-20.04]
php: [8.0.23, 8.1.10] php: [8.0.27, 8.1.14, 8.2.1]
steps: steps:
- name: Build and prepare PHP cache - name: Build and prepare PHP cache
uses: pmmp/setup-php-action@82a44d659bf5046612c69f036af3e14dc32e3fa8 uses: pmmp/setup-php-action@7e0f5f0a95e9d45d1d5fab0e1ee7555fa3b04339
with: with:
php-version: ${{ matrix.php }} php-version: ${{ matrix.php }}
install-path: "./bin" install-path: "./bin"
@ -31,13 +31,13 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
image: [ubuntu-20.04] image: [ubuntu-20.04]
php: [8.0.23, 8.1.10] php: [8.0.27, 8.1.14, 8.2.1]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Setup PHP - name: Setup PHP
uses: pmmp/setup-php-action@82a44d659bf5046612c69f036af3e14dc32e3fa8 uses: pmmp/setup-php-action@7e0f5f0a95e9d45d1d5fab0e1ee7555fa3b04339
with: with:
php-version: ${{ matrix.php }} php-version: ${{ matrix.php }}
install-path: "./bin" install-path: "./bin"
@ -69,13 +69,13 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
image: [ubuntu-20.04] image: [ubuntu-20.04]
php: [8.0.23, 8.1.10] php: [8.0.27, 8.1.14, 8.2.1]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Setup PHP - name: Setup PHP
uses: pmmp/setup-php-action@82a44d659bf5046612c69f036af3e14dc32e3fa8 uses: pmmp/setup-php-action@7e0f5f0a95e9d45d1d5fab0e1ee7555fa3b04339
with: with:
php-version: ${{ matrix.php }} php-version: ${{ matrix.php }}
install-path: "./bin" install-path: "./bin"
@ -107,7 +107,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
image: [ubuntu-20.04] image: [ubuntu-20.04]
php: [8.0.23, 8.1.10] php: [8.0.27, 8.1.14, 8.2.1]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -115,7 +115,7 @@ jobs:
submodules: true submodules: true
- name: Setup PHP - name: Setup PHP
uses: pmmp/setup-php-action@82a44d659bf5046612c69f036af3e14dc32e3fa8 uses: pmmp/setup-php-action@7e0f5f0a95e9d45d1d5fab0e1ee7555fa3b04339
with: with:
php-version: ${{ matrix.php }} php-version: ${{ matrix.php }}
install-path: "./bin" install-path: "./bin"
@ -147,13 +147,13 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
image: [ubuntu-20.04] image: [ubuntu-20.04]
php: [8.0.23, 8.1.10] php: [8.0.27, 8.1.14, 8.2.1]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Setup PHP - name: Setup PHP
uses: pmmp/setup-php-action@82a44d659bf5046612c69f036af3e14dc32e3fa8 uses: pmmp/setup-php-action@7e0f5f0a95e9d45d1d5fab0e1ee7555fa3b04339
with: with:
php-version: ${{ matrix.php }} php-version: ${{ matrix.php }}
install-path: "./bin" install-path: "./bin"

View File

@ -23,7 +23,8 @@ declare(strict_types=1);
const VERSIONS = [ const VERSIONS = [
"8.0", "8.0",
"8.1" "8.1",
"8.2"
]; ];
$workflowFile = file_get_contents(__DIR__ . '/main.yml'); $workflowFile = file_get_contents(__DIR__ . '/main.yml');

View File

@ -54,7 +54,7 @@
"webmozart/path-util": "^2.3" "webmozart/path-util": "^2.3"
}, },
"require-dev": { "require-dev": {
"phpstan/phpstan": "1.9.12", "phpstan/phpstan": "1.9.13",
"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": "480dceecbc8a6fac8c498dfcc0938a73", "content-hash": "1b14016d1d20b9f4c79c59bafabd1e73",
"packages": [ "packages": [
{ {
"name": "adhocore/json-comment", "name": "adhocore/json-comment",
@ -1832,16 +1832,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "1.9.12", "version": "1.9.13",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "44a338ff0d5572c13fd77dfd91addb96e48c29f8" "reference": "a0922426da3a7d0d9334e99a363f7f9f6e23e84f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/44a338ff0d5572c13fd77dfd91addb96e48c29f8", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a0922426da3a7d0d9334e99a363f7f9f6e23e84f",
"reference": "44a338ff0d5572c13fd77dfd91addb96e48c29f8", "reference": "a0922426da3a7d0d9334e99a363f7f9f6e23e84f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1871,7 +1871,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.9.12" "source": "https://github.com/phpstan/phpstan/tree/1.9.13"
}, },
"funding": [ "funding": [
{ {
@ -1887,7 +1887,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-01-17T10:44:04+00:00" "time": "2023-01-18T15:26:53+00:00"
}, },
{ {
"name": "phpstan/phpstan-phpunit", "name": "phpstan/phpstan-phpunit",

View File

@ -92,7 +92,7 @@ abstract class Terminal{
self::$FORMAT_RESET = "\x1b[m"; self::$FORMAT_RESET = "\x1b[m";
$color = fn(int $code) => "\x1b[38;5;${code}m"; $color = fn(int $code) => "\x1b[38;5;{$code}m";
self::$COLOR_BLACK = $color(16); self::$COLOR_BLACK = $color(16);
self::$COLOR_DARK_BLUE = $color(19); self::$COLOR_DARK_BLUE = $color(19);

@ -1 +1 @@
Subproject commit 95921c6d877cbe07921a20bcca436db76b0d8bda Subproject commit a67f9af8d6cff1615975c68a9b171a8f09aac0c4