From 248e3ca37a3e439628c6c2b0c88808bd9632af5e Mon Sep 17 00:00:00 2001
From: Shivam Mathur <shivam_jpr@hotmail.com>
Date: Fri, 21 Nov 2025 02:36:26 +0530
Subject: [PATCH] Mark PHP 8.5 as stable

---
 README.md                     | 8 ++++----
 src/configs/php-versions.json | 8 ++++----
 src/scripts/darwin.sh         | 2 +-
 src/scripts/linux.sh          | 2 +-
 src/scripts/unix.sh           | 2 +-
 src/scripts/win32.ps1         | 7 +++++--
 6 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 58b6c67e..7d0b5ac2 100644
--- a/README.md
+++ b/README.md
@@ -126,12 +126,12 @@ On all supported OS/Platforms, the following PHP versions can be set up as per t
 | `8.2`       | `Stable`  | `Security fixes only` | `GitHub-hosted`, `self-hosted` |
 | `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.5`       | `Stable`  | `Active`              | `GitHub-hosted`, `self-hosted` |
 | `8.6`       | `Nightly` | `In development`      | `GitHub-hosted`, `self-hosted` |
 
 
 > [!Note]
-> - 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.
+> - Specifying `8.6` in `php-version` input installs a nightly build of `PHP 8.6.0-dev` 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
@@ -563,7 +563,7 @@ jobs:
 
 ### Nightly Build Setup
 
-> Set up a nightly build of `PHP 8.5` or `PHP 8.6`.
+> Set up a nightly build of `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 these versions currently.
@@ -573,7 +573,7 @@ steps:
 - name: Setup nightly PHP
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.5'
+    php-version: '8.6'
     extensions: mbstring
     ini-values: post_max_size=256M, max_execution_time=180
     coverage: xdebug
diff --git a/src/configs/php-versions.json b/src/configs/php-versions.json
index 39e19883..0ed946ce 100644
--- a/src/configs/php-versions.json
+++ b/src/configs/php-versions.json
@@ -1,10 +1,10 @@
 {
   "lowest": "8.1",
-  "highest": "8.4",
-  "latest": "8.4",
-  "nightly": "8.5",
+  "highest": "8.5",
+  "latest": "8.5",
+  "nightly": "8.6",
   "master": "8.6",
   "5.x": "5.6",
   "7.x": "7.4",
-  "8.x": "8.4"
+  "8.x": "8.5"
 }
diff --git a/src/scripts/darwin.sh b/src/scripts/darwin.sh
index 4effc4da..4e6a5f5e 100644
--- a/src/scripts/darwin.sh
+++ b/src/scripts/darwin.sh
@@ -277,7 +277,7 @@ setup_php() {
 }
 
 # Variables
-version=${1:-'8.4'}
+version=${1:-'8.5'}
 ini=${2:-'production'}
 src=${0%/*}/..
 php_formula=shivammathur/php/php@"$version"
diff --git a/src/scripts/linux.sh b/src/scripts/linux.sh
index 8a7bfc48..3a5ddf62 100644
--- a/src/scripts/linux.sh
+++ b/src/scripts/linux.sh
@@ -291,7 +291,7 @@ setup_php() {
 }
 
 # Variables
-version=${1:-'8.4'}
+version=${1:-'8.5'}
 ini=${2:-'production'}
 src=${0%/*}/..
 debconf_fix="DEBIAN_FRONTEND=noninteractive"
diff --git a/src/scripts/unix.sh b/src/scripts/unix.sh
index 0f32290d..e86ce282 100644
--- a/src/scripts/unix.sh
+++ b/src/scripts/unix.sh
@@ -4,7 +4,7 @@ export cross="✗"
 export curl_opts=(-sL)
 export old_versions="5.[3-5]"
 export jit_versions="8.[0-9]"
-export nightly_versions="8.[3-9]"
+export nightly_versions="8.[6-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 7951d75c..e4fe329f 100644
--- a/src/scripts/win32.ps1
+++ b/src/scripts/win32.ps1
@@ -323,7 +323,7 @@ $php_builder = "$github/shivammathur/php-builder-windows"
 $current_profile = "$env:TEMP\setup-php.ps1"
 $ProgressPreference = 'SilentlyContinue'
 $jit_versions = '8.[0-9]'
-$nightly_versions = '8.[2-9]'
+$nightly_versions = '8.[6-9]'
 $xdebug3_versions = "7.[2-4]|8.[0-9]"
 $enable_extensions = ('openssl', 'curl', 'mbstring')
 
@@ -444,9 +444,12 @@ if($installed.MajorMinorVersion -ne $version) {
 }
 if($version -lt "5.5") {
   ('libeay32.dll', 'ssleay32.dll') | ForEach-Object -Parallel { Invoke-WebRequest -Uri "$using:php_builder/releases/download/openssl-1.0.2u/$_" -OutFile $using:php_dir\$_ >$null 2>&1 }
-} else {
+} elseif($version -lt "8.5") {
   $enable_extensions += ('opcache')
 }
+if($version -ge "8.5" -and (Test-Path $ext_dir\php_opcache.dll)) {
+  Remove-Item $ext_dir\php_opcache.dll -Force
+}
 Enable-PhpExtension -Extension ($enable_extensions | Where-Object { Test-Path $ext_dir\php_$_.dll }) -Path $php_dir
 Add-PhpCAInfo
 Add-OpenSSLConf