Fix build URLs for 8.5

Author: shivammathur

extension/BuildPhpExtension/private/Get-PhpBuildDetails.ps1

@@ -15,7 +15,7 @@ function Get-PhpBuildDetails {
     process {
         if($Config.php_version -eq 'master' -or $Config.php_version -eq '8.5') {
             $baseUrl = $fallbackBaseUrl = "https://github.com/shivammathur/php-builder-windows/releases/download/master"
-            $PhpSemver = $PhpVersion
+            $PhpSemver = 'master'
         } else {
             foreach($releaseState in @("releases", "qa")) {
                 $baseUrl = "https://downloads.php.net/~windows/$releaseState"

php/BuildPhp/private/Get-PhpBuild.ps1

@@ -40,15 +40,17 @@ function Get-PhpBuild {
                 throw "PHP version $PhpVersion is not supported."
             }
         }
+        $versionInUrl = $PhpVersion
         if($PhpVersion -eq 'master' -or $PhpVersion -eq '8.5') {
             $fallbackBaseUrl = $baseUrl = "https://github.com/shivammathur/php-builder-windows/releases/download/master"
+            $versionInUrl = "master"
         } else {
             $releaseState = if ($PhpVersion -match "[a-z]") {"qa"} else {"releases"}
             $baseUrl = "https://downloads.php.net/~windows/$releaseState"
             $fallbackBaseUrl = "https://downloads.php.net/~windows/$releaseState/archives"
         }
         $tsPart = if ($Ts -eq "nts") {"nts-Win32"} else {"Win32"}
-        $binZipFile = "php-$PhpVersion-$tsPart-$VsVersion-$Arch.zip"
+        $binZipFile = "php-$versionInUrl-$tsPart-$VsVersion-$Arch.zip"
         $binUrl = "$baseUrl/$binZipFile"
         $fallBackUrl = "$fallbackBaseUrl/$binZipFile"
 

php/BuildPhp/private/Get-PhpTestPack.ps1

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