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/6] 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/6] 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/6] 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/6] 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 d9027a9c71d2b62f0ab061733d0b8986c30ab4fa Mon Sep 17 00:00:00 2001 From: Jorg Sowa Date: Wed, 10 Dec 2025 17:49:49 +0100 Subject: [PATCH 5/6] ci: updated symfony dependencies --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index b5d9dd4f..a43b6948 100644 --- a/composer.json +++ b/composer.json @@ -17,16 +17,16 @@ "php-http/discovery": "^1.19", "php-http/socket-client": "^2.3", "psr/http-message": "^2.0", - "symfony/filesystem": "^6.3 || ^7.0", - "symfony/process": "^6.3 || ^7.0", - "symfony/serializer": "^6.3 || ^7.0" + "symfony/filesystem": "^6.3 || ^7.0 || ^8.0", + "symfony/process": "^6.3 || ^7.0 || ^8.0", + "symfony/serializer": "^6.3 || ^7.0 || ^8.0" }, "require-dev": { "ergebnis/composer-normalize": "^2.42", "friendsofphp/php-cs-fixer": "^3.8", "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/phpstan": "^1.10", - "phpunit/phpunit": "^10.5.46", + "phpunit/phpunit": "^10.5.46 || ^11.0 || ^12.0", "psy/psysh": "^0.12.8", "roave/security-advisories": "dev-latest" }, From 18eeb548f082b0db70d1018aaee9aab72a003887 Mon Sep 17 00:00:00 2001 From: Jorg Sowa Date: Tue, 16 Dec 2025 02:09:02 +0100 Subject: [PATCH 6/6] revert PHPUnit update --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a43b6948..eca91be7 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "friendsofphp/php-cs-fixer": "^3.8", "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/phpstan": "^1.10", - "phpunit/phpunit": "^10.5.46 || ^11.0 || ^12.0", + "phpunit/phpunit": "^10.5.46", "psy/psysh": "^0.12.8", "roave/security-advisories": "dev-latest" },