Fix building with PHP 8.5

Author: shivammathur

extension/BuildPhpExtension/private/Get-PhpBuildDetails.ps1

@@ -13,25 +13,21 @@ function Get-PhpBuildDetails {
     begin {
     }
     process {
-        if($Config.php_version -eq 'master' -or $Config.php_version -eq '8.5') {
+        if($Config.php_version -eq 'master') {
             $baseUrl = $fallbackBaseUrl = "https://github.com/shivammathur/php-builder-windows/releases/download/master"
             $PhpSemver = 'master'
         } else {
-            foreach($releaseState in @("releases", "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
-                if($null -eq $phpSemver) {
-                    $phpSemver = (Get-File -Url $fallbackBaseUrl).Links |
-                            Where-Object { $_.href -match "php-($($Config.php_version).[0-9]+).*" } |
-                            ForEach-Object { $matches[1] } |
-                            Sort-Object { [System.Version]$_ } -Descending |
-                            Select-Object -First 1
-                }
-                if($null -ne $phpSemver) {
-                    break
-                }
+            $releaseState = if ($Config.php_version -match "[a-z]" -or $Config.php_version -eq '8.5') {"qa"} else {"releases"}
+            $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
+            if($null -eq $phpSemver) {
+                $phpSemver = (Get-File -Url $fallbackBaseUrl).Links |
+                        Where-Object { $_.href -match "php-($($Config.php_version).[0-9]+).*" } |
+                        ForEach-Object { $matches[1] } |
+                        Sort-Object { [System.Version]$_ } -Descending |
+                        Select-Object -First 1
             }
         }
         return [PSCustomObject]@{

php/BuildPhp/private/Get-PhpBuild.ps1

@@ -41,11 +41,11 @@ function Get-PhpBuild {
             }
         }
         $versionInUrl = $PhpVersion
-        if($PhpVersion -eq 'master' -or $PhpVersion -eq '8.5') {
+        if($PhpVersion -eq 'master') {
             $fallbackBaseUrl = $baseUrl = "https://github.com/shivammathur/php-builder-windows/releases/download/master"
             $versionInUrl = "master"
         } else {
-            $releaseState = if ($PhpVersion -match "[a-z]") {"qa"} else {"releases"}
+            $releaseState = if ($PhpVersion -match "[a-z]" -or $PhpVersion -eq '8.5') {"qa"} else {"releases"}
             $baseUrl = "https://downloads.php.net/~windows/$releaseState"
             $fallbackBaseUrl = "https://downloads.php.net/~windows/$releaseState/archives"
         }

php/BuildPhp/private/Get-PhpTestPack.ps1

@@ -23,11 +23,11 @@ function Get-PhpTestPack {
         Add-Type -Assembly "System.IO.Compression.Filesystem"
 
         $versionInUrl = $PhpVersion
-        if($PhpVersion -eq 'master' -or $PhpVersion -eq '8.5') {
+        if($PhpVersion -eq 'master') {
             $fallbackBaseUrl = $baseUrl = "https://github.com/shivammathur/php-builder-windows/releases/download/master"
             $versionInUrl = "master"
         } else {
-            $releaseState = if ($PhpVersion -match "[a-z]") {"qa"} else {"releases"}
+            $releaseState = if ($PhpVersion -match "[a-z]" -or $PhpVersion -eq '8.5') {"qa"} else {"releases"}
             $baseUrl = "https://downloads.php.net/~windows/$releaseState"
             $fallbackBaseUrl = "https://downloads.php.net/~windows/$releaseState/archives"
         }