From 4f72d61ac26480cacfe6b59cd2caaea9abc091de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=A1vio=20Heleno?= Date: Wed, 11 Jun 2025 22:50:47 -0300 Subject: [PATCH 1/5] Drop CodeClimate integration from CI Workflow --- .github/workflows/continuous-integration.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index d0586282..4e6431d7 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -8,7 +8,6 @@ on: paths-ignore: - "doc/**" - jobs: phpunit: name: PHP ${{ matrix.php-version }} (${{ matrix.dependency-versions }}) @@ -52,14 +51,3 @@ jobs: - name: Run PHPUnit test suite run: composer run-script test-ci - - - name: Publish code coverage - if: github.repository == 'beluga-php/docker-php' && github.event_name != 'pull_request' - uses: paambaati/codeclimate-action@a1831d7162ea1fbc612ffe5fb3b90278b7999d59 # v5.0.0 - env: - CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }} - with: - coverageCommand: composer run-script test-coverage - coverageLocations: | - ${{github.workspace}}/clover.xml:clover - From 40dcaac47f33c4aabc868ebdadbb224d2d907834 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 15 Nov 2025 00:43:35 +0000 Subject: [PATCH 2/5] Bump shivammathur/setup-php from 2.33.0 to 2.35.5 Bumps [shivammathur/setup-php](https://github.com/shivammathur/setup-php) from 2.33.0 to 2.35.5. - [Release notes](https://github.com/shivammathur/setup-php/releases) - [Commits](https://github.com/shivammathur/setup-php/compare/cf4cade2721270509d5b1c766ab3549210a39a2a...bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f) --- updated-dependencies: - dependency-name: shivammathur/setup-php dependency-version: 2.35.5 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/continuous-integration.yml | 2 +- .github/workflows/static-analysis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 4e6431d7..abc3cc54 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -31,7 +31,7 @@ jobs: uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 - name: Setup PHP with PECL extension - uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2.33.0 + uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5 with: php-version: ${{ matrix.php-version }} tools: composer:v2 diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 44a1d56d..875822ce 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -21,7 +21,7 @@ jobs: uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 - name: Setup PHP with PECL extension - uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2.33.0 + uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5 with: php-version: 8.1 tools: composer:v2 From f77e92bac763cbbe770f4710170d195d2e077b79 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 15 Nov 2025 00:45:31 +0000 Subject: [PATCH 3/5] Bump actions/checkout from 4.1.3 to 5.0.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.3 to 5.0.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/1d96c772d19495a3b5c517cd2bc0cb401ea0529f...08c6903cd8c0fde910a37f88322edcfb5dd907a8) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: 5.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/continuous-integration.yml | 2 +- .github/workflows/static-analysis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index abc3cc54..4c69d1f5 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -28,7 +28,7 @@ jobs: steps: - name: Repository checkout - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: Setup PHP with PECL extension uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5 diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 875822ce..c5fcdba9 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -18,7 +18,7 @@ jobs: steps: - name: Repository checkout - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: Setup PHP with PECL extension uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5 From c2d1af1a8be7818f8ea300cb021b9c4ba8701b30 Mon Sep 17 00:00:00 2001 From: Adam Spychala Date: Wed, 4 Jun 2025 19:01:30 +0200 Subject: [PATCH 4/5] set explicit nullable parameters for PHP 8.4 --- src/Endpoint/ContainerAttachWebsocket.php | 3 ++- src/Endpoint/ContainerLogs.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Endpoint/ContainerAttachWebsocket.php b/src/Endpoint/ContainerAttachWebsocket.php index 6009f415..ee6fe023 100644 --- a/src/Endpoint/ContainerAttachWebsocket.php +++ b/src/Endpoint/ContainerAttachWebsocket.php @@ -27,7 +27,8 @@ public function getExtraHeaders(): array ); } - protected function transformResponseBody(ResponseInterface $response, SerializerInterface $serializer, string $contentType = null) + protected function transformResponseBody(ResponseInterface $response, SerializerInterface $serializer, ?string + $contentType = null) { if (200 === $response->getStatusCode() && DockerRawStream::HEADER === $contentType) { return new AttachWebsocketStream($response->getBody()); diff --git a/src/Endpoint/ContainerLogs.php b/src/Endpoint/ContainerLogs.php index 573ae648..996b09c3 100644 --- a/src/Endpoint/ContainerLogs.php +++ b/src/Endpoint/ContainerLogs.php @@ -11,7 +11,7 @@ class ContainerLogs extends BaseEndpoint { - protected function transformResponseBody(ResponseInterface $response, SerializerInterface $serializer, string $contentType = null) + protected function transformResponseBody(ResponseInterface $response, SerializerInterface $serializer, ?string $contentType = null) { if (200 === $response->getStatusCode() && DockerRawStream::HEADER === $contentType) { return new DockerRawStream($response->getBody()); From 4419ebd073a47c646ed7d64e42cb8761ea713f57 Mon Sep 17 00:00:00 2001 From: Jorg Sowa Date: Wed, 10 Dec 2025 17:51:05 +0100 Subject: [PATCH 5/5] ci: support PHP 8.5 in CI --- .github/workflows/continuous-integration.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 4c69d1f5..89f832c3 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -23,6 +23,7 @@ jobs: - "8.2" - "8.3" - "8.4" + - "8.5" dependency-versions: [lowest, highest] experimental: [false]