diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 22876035..e4f6f6b0 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -118,7 +118,7 @@ jobs:
run: |
for os in ubuntu-24.04 ubuntu-22.04 windows-2022 windows-2019 macos-13 macos-14 macos-15; do
echo "These are extensions which are loaded by default on the following PHP versions. More extensions which are available as packages and available on pecl are supported by setup-php. Refer to [php extension support](https://github.com/shivammathur/setup-php#heavy_plus_sign-php-extension-support) for more details." > Php-extensions-loaded-on-"$os".md
- for version in 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5; do
+ for version in 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 8.6; do
if [[ "${os%-*}" = "macos" ]]; then
cat lists/php"$version"-macos-13.md >> Php-extensions-loaded-on-"$os".md
elif [ "${os%-*}" = "windows" ]; then
diff --git a/README.md b/README.md
index c2a4533b..1ce3276b 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
-
+
@@ -68,19 +68,20 @@ Both `GitHub-hosted` and `self-hosted` runners are supported by `setup-php` on t
### GitHub-Hosted Runners
-| Virtual environment | Arch | YAML workflow label | Pre-installed PHP |
-|---------------------|---------|------------------------------------|------------------------|
-| Ubuntu 24.04 | x86_64 | `ubuntu-latest` or `ubuntu-24.04` | `PHP 8.3` |
-| Ubuntu 22.04 | x86_64 | `ubuntu-22.04` | `PHP 8.1` |
-| Ubuntu 24.04 | aarch64 | `ubuntu-24.04-arm` | `PHP 8.3` |
-| Ubuntu 22.04 | aarch64 | `ubuntu-22.04-arm` | `PHP 8.1` |
-| Windows Server 2025 | x64 | `windows-2025` | `PHP 8.3` |
-| Windows Server 2022 | x64 | `windows-latest` or `windows-2022` | `PHP 8.3` |
-| Windows Server 2019 | x64 | `windows-2019` | `PHP 8.3` |
-| macOS Tahoe 26.x | arm64 | `macos-26` | - |
-| macOS Sequoia 15.x | arm64 | `macos-latest` or `macos-15` | - |
-| macOS Sonoma 14.x | arm64 | `macos-14` | - |
-| macOS Ventura 13.x | x86_64 | `macos-13` | `PHP 8.3` |
+| Virtual environment | Arch | YAML workflow label | Pre-installed PHP |
+|---------------------|---------|------------------------------------|-------------------|
+| Ubuntu 24.04 | x86_64 | `ubuntu-latest` or `ubuntu-24.04` | `PHP 8.3` |
+| Ubuntu 22.04 | x86_64 | `ubuntu-22.04` | `PHP 8.1` |
+| Ubuntu 24.04 | aarch64 | `ubuntu-24.04-arm` | `PHP 8.3` |
+| Ubuntu 22.04 | aarch64 | `ubuntu-22.04-arm` | `PHP 8.1` |
+| Windows Server 2025 | x64 | `windows-2025` | `PHP 8.3` |
+| Windows Server 2022 | x64 | `windows-latest` or `windows-2022` | `PHP 8.3` |
+| Windows Server 2019 | x64 | `windows-2019` | `PHP 8.3` |
+| macOS Tahoe 26.x | arm64 | `macos-26` | - |
+| macOS Sequoia 15.x | arm64 | `macos-latest` or `macos-15` | - |
+| macOS Sonoma 14.x | arm64 | `macos-14` | - |
+| macOS Sequoia 15.x | x86_64 | `macos-15-intel` | `PHP 8.3` |
+| macOS Ventura 13.x | x86_64 | `macos-13` | `PHP 8.3` |
### Self-Hosted Runners
@@ -103,11 +104,11 @@ Both `GitHub-hosted` and `self-hosted` runners are supported by `setup-php` on t
## :tada: PHP Support
-On all supported OS/Platforms the following PHP versions can be set up as per the runner.
+On all supported OS/Platforms, the following PHP versions can be set up as per the runner.
-- PHP 5.3 to PHP 8.5 on GitHub-hosted runners, except for macOS ARM64 runners (macos-14).
-- PHP 5.6 to PHP 8.5 on GitHub-hosted macOS ARM64 runners (macos-14).
-- PHP 5.6 to PHP 8.5 on self-hosted runners.
+- PHP 5.3 to PHP 8.6 on GitHub-hosted runners, except for macOS ARM64 runners (macos-14).
+- PHP 5.6 to PHP 8.6 on GitHub-hosted macOS ARM64 runners (macos-14).
+- PHP 5.6 to PHP 8.6 on self-hosted runners.
| PHP Version | Stability | Release Support | Runner Support |
|-------------|-----------|-----------------------|--------------------------------|
@@ -126,10 +127,11 @@ On all supported OS/Platforms the following PHP versions can be set up as per th
| `8.3` | `Stable` | `Active` | `GitHub-hosted`, `self-hosted` |
| `8.4` | `Stable` | `Active` | `GitHub-hosted`, `self-hosted` |
| `8.5` | `Nightly` | `In development` | `GitHub-hosted`, `self-hosted` |
+| `8.6` | `Nightly` | `In development` | `GitHub-hosted`, `self-hosted` |
> [!Note]
-> - Specifying `8.5` in `php-version` input installs a nightly build of `PHP 8.5.0-dev`. See [nightly build setup](#nightly-build-setup) for more information.
+> - Specifying `8.6` in `php-version` input installs a nightly build of `PHP 8.6.0-dev` from the master branch of PHP. Specifying `8.5` in `php-version` input installs a nightly build of `PHP 8.5.0-dev` from the PHP-8.5 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
@@ -561,10 +563,10 @@ jobs:
### Nightly Build Setup
-> Set up a nightly build of `PHP 8.5`.
+> Set up a nightly build of `PHP 8.5` or `PHP 8.6`.
- These PHP versions are currently in active development and might contain bugs and breaking changes.
-- Some user space extensions might not support this version currently.
+- Some user space extensions might not support these versions currently.
```yaml
steps:
diff --git a/src/configs/php-versions.json b/src/configs/php-versions.json
index 382131eb..39e19883 100644
--- a/src/configs/php-versions.json
+++ b/src/configs/php-versions.json
@@ -3,6 +3,7 @@
"highest": "8.4",
"latest": "8.4",
"nightly": "8.5",
+ "master": "8.6",
"5.x": "5.6",
"7.x": "7.4",
"8.x": "8.4"