From 448aeec78067c2c671344f276de410af8501ab18 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Jan 2023 13:04:28 +0000 Subject: [PATCH 1/5] Bump phpstan/phpstan from 1.9.12 to 1.9.13 (#5520) Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.9.12 to 1.9.13. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/1.10.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.9.12...1.9.13) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index c9d3908d5..50593ee5b 100644 --- a/composer.json +++ b/composer.json @@ -54,7 +54,7 @@ "webmozart/path-util": "^2.3" }, "require-dev": { - "phpstan/phpstan": "1.9.12", + "phpstan/phpstan": "1.9.13", "phpstan/phpstan-phpunit": "^1.1.0", "phpstan/phpstan-strict-rules": "^1.2.0", "phpunit/phpunit": "^9.2" diff --git a/composer.lock b/composer.lock index b2bbb472c..b23e4916d 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": "1c5a3de092db3cda702d3f39d3da246c", + "content-hash": "15ba4659fe5eb8a99345c917325e90fd", "packages": [ { "name": "adhocore/json-comment", @@ -1832,16 +1832,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.9.12", + "version": "1.9.13", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "44a338ff0d5572c13fd77dfd91addb96e48c29f8" + "reference": "a0922426da3a7d0d9334e99a363f7f9f6e23e84f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/44a338ff0d5572c13fd77dfd91addb96e48c29f8", - "reference": "44a338ff0d5572c13fd77dfd91addb96e48c29f8", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a0922426da3a7d0d9334e99a363f7f9f6e23e84f", + "reference": "a0922426da3a7d0d9334e99a363f7f9f6e23e84f", "shasum": "" }, "require": { @@ -1871,7 +1871,7 @@ ], "support": { "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": [ { @@ -1887,7 +1887,7 @@ "type": "tidelift" } ], - "time": "2023-01-17T10:44:04+00:00" + "time": "2023-01-18T15:26:53+00:00" }, { "name": "phpstan/phpstan-phpunit", From 441919c5e3770f08c69563977268231737c80ac5 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 20 Jan 2023 01:12:35 +0000 Subject: [PATCH 2/5] Begin testing on PHP 8.2 --- .github/workflows/main.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a24e3db20..597cdfc13 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,11 +13,11 @@ jobs: strategy: matrix: image: [ubuntu-20.04] - php: [8.0.23, 8.1.10] + php: [8.0.23, 8.1.10, 8.2.1] steps: - name: Build and prepare PHP cache - uses: pmmp/setup-php-action@82a44d659bf5046612c69f036af3e14dc32e3fa8 + uses: pmmp/setup-php-action@7e0f5f0a95e9d45d1d5fab0e1ee7555fa3b04339 with: php-version: ${{ matrix.php }} install-path: "./bin" @@ -31,13 +31,13 @@ jobs: fail-fast: false matrix: image: [ubuntu-20.04] - php: [8.0.23, 8.1.10] + php: [8.0.23, 8.1.10, 8.2.1] steps: - uses: actions/checkout@v3 - name: Setup PHP - uses: pmmp/setup-php-action@82a44d659bf5046612c69f036af3e14dc32e3fa8 + uses: pmmp/setup-php-action@7e0f5f0a95e9d45d1d5fab0e1ee7555fa3b04339 with: php-version: ${{ matrix.php }} install-path: "./bin" @@ -69,13 +69,13 @@ jobs: fail-fast: false matrix: image: [ubuntu-20.04] - php: [8.0.23, 8.1.10] + php: [8.0.23, 8.1.10, 8.2.1] steps: - uses: actions/checkout@v3 - name: Setup PHP - uses: pmmp/setup-php-action@82a44d659bf5046612c69f036af3e14dc32e3fa8 + uses: pmmp/setup-php-action@7e0f5f0a95e9d45d1d5fab0e1ee7555fa3b04339 with: php-version: ${{ matrix.php }} install-path: "./bin" @@ -107,7 +107,7 @@ jobs: fail-fast: false matrix: image: [ubuntu-20.04] - php: [8.0.23, 8.1.10] + php: [8.0.23, 8.1.10, 8.2.1] steps: - uses: actions/checkout@v3 @@ -115,7 +115,7 @@ jobs: submodules: true - name: Setup PHP - uses: pmmp/setup-php-action@82a44d659bf5046612c69f036af3e14dc32e3fa8 + uses: pmmp/setup-php-action@7e0f5f0a95e9d45d1d5fab0e1ee7555fa3b04339 with: php-version: ${{ matrix.php }} install-path: "./bin" @@ -147,13 +147,13 @@ jobs: fail-fast: false matrix: image: [ubuntu-20.04] - php: [8.0.23, 8.1.10] + php: [8.0.23, 8.1.10, 8.2.1] steps: - uses: actions/checkout@v3 - name: Setup PHP - uses: pmmp/setup-php-action@82a44d659bf5046612c69f036af3e14dc32e3fa8 + uses: pmmp/setup-php-action@7e0f5f0a95e9d45d1d5fab0e1ee7555fa3b04339 with: php-version: ${{ matrix.php }} install-path: "./bin" From 65ef929d229ce51546f5f9795fbd8bc6d9d1e3ba Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 20 Jan 2023 01:13:15 +0000 Subject: [PATCH 3/5] Update Actions PHP versions --- .github/workflows/main.yml | 10 +++++----- .github/workflows/update-php-versions.php | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 597cdfc13..2aca2934e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: image: [ubuntu-20.04] - php: [8.0.23, 8.1.10, 8.2.1] + php: [8.0.27, 8.1.14, 8.2.1] steps: - name: Build and prepare PHP cache @@ -31,7 +31,7 @@ jobs: fail-fast: false matrix: image: [ubuntu-20.04] - php: [8.0.23, 8.1.10, 8.2.1] + php: [8.0.27, 8.1.14, 8.2.1] steps: - uses: actions/checkout@v3 @@ -69,7 +69,7 @@ jobs: fail-fast: false matrix: image: [ubuntu-20.04] - php: [8.0.23, 8.1.10, 8.2.1] + php: [8.0.27, 8.1.14, 8.2.1] steps: - uses: actions/checkout@v3 @@ -107,7 +107,7 @@ jobs: fail-fast: false matrix: image: [ubuntu-20.04] - php: [8.0.23, 8.1.10, 8.2.1] + php: [8.0.27, 8.1.14, 8.2.1] steps: - uses: actions/checkout@v3 @@ -147,7 +147,7 @@ jobs: fail-fast: false matrix: image: [ubuntu-20.04] - php: [8.0.23, 8.1.10, 8.2.1] + php: [8.0.27, 8.1.14, 8.2.1] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/update-php-versions.php b/.github/workflows/update-php-versions.php index 7ff798566..92e79a6de 100644 --- a/.github/workflows/update-php-versions.php +++ b/.github/workflows/update-php-versions.php @@ -23,7 +23,8 @@ declare(strict_types=1); const VERSIONS = [ "8.0", - "8.1" + "8.1", + "8.2" ]; $workflowFile = file_get_contents(__DIR__ . '/main.yml'); From 74e052de51424d0e919c5c76fb7708651762adb4 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 20 Jan 2023 01:30:39 +0000 Subject: [PATCH 4/5] Terminal: fix deprecation error on PHP 8.2 --- src/utils/Terminal.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/Terminal.php b/src/utils/Terminal.php index 7144b8a9b..49b4224ec 100644 --- a/src/utils/Terminal.php +++ b/src/utils/Terminal.php @@ -92,7 +92,7 @@ abstract class Terminal{ 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_DARK_BLUE = $color(19); From b1a5b02d3ab2c192ea15a100530a535b97f876d1 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 20 Jan 2023 01:55:52 +0000 Subject: [PATCH 5/5] Updated DevTools to 1.16.1 --- tests/plugins/DevTools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/plugins/DevTools b/tests/plugins/DevTools index bd0fa048d..a67f9af8d 160000 --- a/tests/plugins/DevTools +++ b/tests/plugins/DevTools @@ -1 +1 @@ -Subproject commit bd0fa048dae29bebe25ba76d8c58788e92418b67 +Subproject commit a67f9af8d6cff1615975c68a9b171a8f09aac0c4