From 273bdd703387864b235d5cde21b43a78761e2709 Mon Sep 17 00:00:00 2001
From: James Titcumb <james@asgrim.com>
Date: Thu, 23 Jul 2026 20:26:29 +0100
Subject: [PATCH 1/3] Add PHP 8.6 to extension-matrix action

---
 extension-matrix/config/vs.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/extension-matrix/config/vs.json b/extension-matrix/config/vs.json
index 798cdaa3..34f04022 100644
--- a/extension-matrix/config/vs.json
+++ b/extension-matrix/config/vs.json
@@ -54,6 +54,12 @@
     "os": "windows-2022",
     "type": "github-hosted"
   },
+  "8.6": {
+    "vs": "2026",
+    "os": "windows-2025-vs2026",
+    "dev": true,
+    "type": "github-hosted"
+  },
   "master": {
     "vs": "2026",
     "os": "windows-2025-vs2026",

From 4556b142c17131b0af831dc90a999de5d3cab6c7 Mon Sep 17 00:00:00 2001
From: James Titcumb <james@asgrim.com>
Date: Thu, 23 Jul 2026 20:39:09 +0100
Subject: [PATCH 2/3] Add PHP8.6 to extension action

---
 extension/BuildPhpExtension/config/vs.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extension/BuildPhpExtension/config/vs.json b/extension/BuildPhpExtension/config/vs.json
index 5af01dd9..4b4d4224 100644
--- a/extension/BuildPhpExtension/config/vs.json
+++ b/extension/BuildPhpExtension/config/vs.json
@@ -10,6 +10,7 @@
     "8.3": "vs16",
     "8.4": "vs17",
     "8.5": "vs17",
+    "8.6": "vs18",
     "master": "vs18"
   },
   "vs" : {

From 3abce7a2ae3511628424452edcc24b7014bbba7f Mon Sep 17 00:00:00 2001
From: James Titcumb <james@asgrim.com>
Date: Thu, 23 Jul 2026 20:59:25 +0100
Subject: [PATCH 3/3] Add fall back to QA builds for pre-releases

---
 .../BuildPhpExtension/private/Get-PhpBuildDetails.ps1  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/extension/BuildPhpExtension/private/Get-PhpBuildDetails.ps1 b/extension/BuildPhpExtension/private/Get-PhpBuildDetails.ps1
index ff877a41..2930baf5 100644
--- a/extension/BuildPhpExtension/private/Get-PhpBuildDetails.ps1
+++ b/extension/BuildPhpExtension/private/Get-PhpBuildDetails.ps1
@@ -29,6 +29,14 @@ function Get-PhpBuildDetails {
                         Sort-Object { [System.Version]$_ } -Descending |
                         Select-Object -First 1
             }
+            # Fall back attempt to QA builds (e.g. 8.6 doesn't match above because it's not an exact version)
+            if($null -eq $phpSemver -and $releaseState -eq 'releases') {
+                $releaseState = 'qa'
+                $baseUrl = "https://downloads.php.net/~windows/$releaseState"
+                $fallbackBaseUrl = "https://downloads.php.net/~windows/$releaseState/archives"
+                $releases = Get-File -Url "$baseUrl/releases.json" | ConvertFrom-Json
+                $phpSemver = $releases.$($Config.php_version).version
+            }
         }
         return [PSCustomObject]@{
             phpSemver = $phpSemver
@@ -38,4 +46,4 @@ function Get-PhpBuildDetails {
     }
     end {
     }
-}
\ No newline at end of file
+}