diff --git a/.github/workflows/check-dependencies.yml b/.github/workflows/check-dependencies.yml index 6111b66488..08e294156c 100644 --- a/.github/workflows/check-dependencies.yml +++ b/.github/workflows/check-dependencies.yml @@ -26,7 +26,7 @@ jobs: - uses: shivammathur/setup-php@v2 with: - php-version: '8.4.14' + php-version: '8.5.0' tools: composer:2.9.0 coverage: xdebug diff --git a/.github/workflows/continuous-integration-optional.yml b/.github/workflows/continuous-integration-optional.yml index 850447586f..fb8ea32254 100644 --- a/.github/workflows/continuous-integration-optional.yml +++ b/.github/workflows/continuous-integration-optional.yml @@ -21,7 +21,7 @@ jobs: - uses: shivammathur/setup-php@v2 with: - php-version: '8.4.14' + php-version: '8.5.0' tools: composer:2.9.0 coverage: xdebug @@ -36,7 +36,7 @@ jobs: - uses: shivammathur/setup-php@v2 with: - php-version: '8.4.14' + php-version: '8.5.0' tools: composer:2.9.0 coverage: xdebug @@ -66,7 +66,7 @@ jobs: - uses: shivammathur/setup-php@v2 with: - php-version: '8.4.14' + php-version: '8.5.0' tools: composer:2.9.0 coverage: xdebug @@ -114,7 +114,7 @@ jobs: - uses: shivammathur/setup-php@v2 with: - php-version: '8.4.14' + php-version: '8.5.0' tools: composer:2.9.0 coverage: xdebug diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 76449a34f2..de19fe57c5 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -91,7 +91,7 @@ jobs: - uses: shivammathur/setup-php@v2 with: - php-version: '8.4.14' + php-version: '8.5.0' tools: composer:2.9.0 coverage: none @@ -264,7 +264,7 @@ jobs: - uses: shivammathur/setup-php@v2 with: - php-version: '8.4.14' + php-version: '8.5.0' extensions: intl-73.1 tools: composer:2.9.0 coverage: pcov diff --git a/api/Dockerfile b/api/Dockerfile index 24f15dbcf2..daa137d78d 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -3,7 +3,7 @@ # Adapted from https://github.com/api-platform/api-platform/blob/fa1c5808305d7cadbf7b8392e0fddb6e80fb2092/api/Dockerfile # Versions -FROM dunglas/frankenphp:1.9-php8.4.14 AS frankenphp_upstream +FROM dunglas/frankenphp:1.10-php8.5.0 AS frankenphp_upstream # the different stages of this Dockerfile are meant to be built into separate images # https://docs.docker.com/develop/develop-images/multistage-build/#stop-at-a-specific-build-stage diff --git a/renovate.json b/renovate.json index 7e81fc337e..395d31bc98 100644 --- a/renovate.json +++ b/renovate.json @@ -6,7 +6,7 @@ ], "constraints": { "node": "24.12.0", - "php": "8.4.14" + "php": "8.5.0" }, "automergeType": "branch", "rebaseWhen": "conflicted",