diff --git a/.github/SECURITY.md b/.github/SECURITY.md index b7c98ad9..c9571d85 100644 --- a/.github/SECURITY.md +++ b/.github/SECURITY.md @@ -14,6 +14,7 @@ This security policy only applies to the latest patch releases of the following | 8.3 | :white_check_mark: | | 8.4 | :white_check_mark: | | 8.5 | :white_check_mark: | +| 8.6 | :white_check_mark: | ## Reporting a Vulnerability diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index b3ce8067..d56944f6 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -23,7 +23,7 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true env: - default-php-version: '8.5' + default-php-version: '8.6' jobs: run: name: Run diff --git a/README.md b/README.md index b171a668..f3900edd 100644 --- a/README.md +++ b/README.md @@ -134,12 +134,12 @@ On all supported OS/Platforms, the following PHP versions can be set up as per t | `8.3` | `Stable` | `Security fixes only` | `GitHub-hosted`, `self-hosted` | | `8.4` | `Stable` | `Active` | `GitHub-hosted`, `self-hosted` | | `8.5` | `Stable` | `Active` | `GitHub-hosted`, `self-hosted` | -| `8.6` | `Nightly` | `In development` | `GitHub-hosted`, `self-hosted` | +| `8.6` | `Stable` | `Active` | `GitHub-hosted`, `self-hosted` | | `8.7` | `Nightly` | `In development` | `GitHub-hosted`, `self-hosted` | > [!Note] -> - Specifying `8.7` or `master` in `php-version` input installs a nightly build of `PHP 8.7.0-dev` from the master branch of PHP. Specifying `8.6` or `nightly` installs a nightly build of `PHP 8.6.0-dev` from the PHP-8.6 branch. See [nightly build setup](#nightly-build-setup) for more information. +> - Specifying `8.6` in the `php-version` input selects the PHP 8.6 stable series. Specifying `8.7`, `nightly`, or `master` installs a nightly build of PHP 8.7 from the master branch of PHP. See [nightly build setup](#nightly-build-setup) for more information. > - To use JIT on `PHP 8.0` and above, refer to the [JIT configuration](#jit-configuration) section. ## :heavy_plus_sign: PHP Extension Support @@ -435,7 +435,7 @@ Disable coverage for these reasons: - Accepts a `string`. For example `'8.5'`. - Accepts `lowest` to set up the lowest supported PHP version. - Accepts `highest` or `latest` to set up the latest stable PHP version. -- Accepts `nightly` to set up a nightly build of the next PHP release (`8.6`). +- Accepts `nightly` to set up a nightly build of the next PHP release (`8.7`). - Accepts `master` to set up a nightly build from the master branch of PHP (`8.7`). - Accepts `pre-installed` to set up the highest pre-installed PHP version. You can combine this with `update: true` to update the pre-installed PHP version. - Accepts the format `d.x`, where `d` is the major version. For example `5.x`, `7.x` and `8.x`. @@ -593,10 +593,10 @@ jobs: ### Nightly Build Setup -> Set up a nightly build of `PHP 8.6` or `PHP 8.7`. +> Set up a nightly build of `PHP 8.7`. -- These PHP versions are currently in active development and might contain bugs and breaking changes. -- Some user space extensions might not support these versions currently. +- PHP 8.7 is in active development and might contain bugs and breaking changes. +- Some extensions might not support PHP 8.7 yet. ```yaml steps: @@ -692,7 +692,7 @@ jobs: > Set up PHP on multiple architectures on Ubuntu GitHub Runners. -- `PHP 5.6` to `PHP 8.5` are supported by `setup-php` on multiple architecture on `Ubuntu` and `Debian`. +- `PHP 5.6` to `PHP 8.6` are supported by `setup-php` on multiple architectures on `Ubuntu` and `Debian`. - For this, you can use `shivammathur/node` images as containers. These have compatible `Nodejs` and `PHP` installed for `setup-php`. ```yaml diff --git a/__tests__/utils.test.ts b/__tests__/utils.test.ts index c2b07bbb..d76cc9d2 100644 --- a/__tests__/utils.test.ts +++ b/__tests__/utils.test.ts @@ -51,8 +51,10 @@ describe('Utils tests', () => { 'utf8' ) }); - expect(await utils.parseVersion('latest')).toBe('8.5'); - expect(await utils.parseVersion('nightly')).toBe('8.6'); + expect(await utils.parseVersion('latest')).toBe('8.6'); + expect(await utils.parseVersion('highest')).toBe('8.6'); + expect(await utils.parseVersion('8.x')).toBe('8.6'); + expect(await utils.parseVersion('nightly')).toBe('8.7'); expect(await utils.parseVersion('master')).toBe('8.7'); expect(await utils.parseVersion('8.7')).toBe('8.7'); expect(await utils.parseVersion('8.7.0')).toBe('8.7'); diff --git a/src/configs/php-versions.json b/src/configs/php-versions.json index c8f7480f..38f6e812 100644 --- a/src/configs/php-versions.json +++ b/src/configs/php-versions.json @@ -1,10 +1,10 @@ { "lowest": "8.1", - "highest": "8.5", - "latest": "8.5", - "nightly": "8.6", + "highest": "8.6", + "latest": "8.6", + "nightly": "8.7", "master": "8.7", "5.x": "5.6", "7.x": "7.4", - "8.x": "8.5" + "8.x": "8.6" } diff --git a/src/scripts/darwin.sh b/src/scripts/darwin.sh index 0f3e3527..0aed1f3c 100644 --- a/src/scripts/darwin.sh +++ b/src/scripts/darwin.sh @@ -333,7 +333,7 @@ setup_php() { } # Variables -version=${1:-'8.5'} +version=${1:-'8.6'} ini=${2:-'production'} src=${0%/*}/.. php_formula=shivammathur/php/php@"$version" diff --git a/src/scripts/linux.sh b/src/scripts/linux.sh index ad8e6d95..6f9803d0 100644 --- a/src/scripts/linux.sh +++ b/src/scripts/linux.sh @@ -344,7 +344,7 @@ setup_php() { } # Variables -version=${1:-'8.5'} +version=${1:-'8.6'} ini=${2:-'production'} src=${0%/*}/.. debconf_fix="DEBIAN_FRONTEND=noninteractive" diff --git a/src/scripts/unix.sh b/src/scripts/unix.sh index eb9951bf..691c36a2 100644 --- a/src/scripts/unix.sh +++ b/src/scripts/unix.sh @@ -5,7 +5,7 @@ export curl_opts=(-sL) export old_versions="5.[3-5]" export jit_versions="8.[0-9]" export php_builder_versions="8.[3-9]" -export nightly_versions="8.[6-9]" +export nightly_versions="8.[7-9]" export xdebug3_versions="7.[2-4]|8.[0-9]" export latest="releases/latest/download" export github="https://github.com/shivammathur" diff --git a/src/scripts/win32.ps1 b/src/scripts/win32.ps1 index 976f64f5..d5118196 100644 --- a/src/scripts/win32.ps1 +++ b/src/scripts/win32.ps1 @@ -3,7 +3,7 @@ param ( [ValidateNotNull()] [ValidateLength(1, [int]::MaxValue)] [string] - $version = '8.4', + $version = '8.6', [Parameter(Position = 1, Mandatory = $true)] [ValidateNotNull()] [ValidateLength(1, [int]::MaxValue)] @@ -343,7 +343,7 @@ $php_manifest = $null $current_profile = "$env:TEMP\setup-php.ps1" $ProgressPreference = 'SilentlyContinue' $jit_versions = '8.[0-9]' -$nightly_versions = '8.[6-9]' +$nightly_versions = '8.[7-9]' $xdebug3_versions = "7.[2-4]|8.[0-9]" $enable_extensions = ('openssl', 'curl', 'mbstring')