Add support to build extensions on PHP 8.4

shivammathur · shivammathur · commit 9c3bf94ae3d2 · 2024-10-08T17:19:55.000+05:30
diff --git a/extension-matrix/config/vs.json b/extension-matrix/config/vs.json
@@ -43,5 +43,11 @@
     "vs": "2019",
     "os": "windows-2019",
     "type": "github-hosted"
+  },
+  "8.4": {
+    "vs": "2022",
+    "os": "windows-2022",
+    "type": "github-hosted",
+    "dev": true
   }
 }
diff --git a/extension-matrix/src/php-versions.sh b/extension-matrix/src/php-versions.sh
@@ -66,7 +66,7 @@ function compare_versions_using_composer() {
   local composer_json=$2
   SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
   vs_json="$SCRIPT_DIR"/../config/vs.json
-  php_versions=$(jq -r 'keys | join(",")' "$vs_json")
+  php_versions=$(jq -r 'to_entries | map(select(.value.dev != true)) | map(.key) | join(",")' "$vs_json")
   constraint=$(jq -r .require.php "$composer_json")
   php "$SCRIPT_DIR"/semver/semver.phar composer.json "$constraint" "$php_versions"
 }
@@ -76,7 +76,7 @@ function compare_versions_using_package_xml() {
   local package_xml=$2
   SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
   vs_json="$SCRIPT_DIR"/../config/vs.json
-  php_versions=$(jq -r 'keys | join(",")' "$vs_json")
+  php_versions=$(jq -r 'to_entries | map(select(.value.dev != true)) | map(.key) | join(",")' "$vs_json")
   php "$SCRIPT_DIR"/semver/semver.phar package.xml "$package_xml" "$php_versions"
 }
 
diff --git a/extension/BuildPhpExtension/BuildPhpExtension.psd1 b/extension/BuildPhpExtension/BuildPhpExtension.psd1
@@ -60,7 +60,7 @@
     # NestedModules = @()
 
     # Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
-    FunctionsToExport = 'Invoke-PhpBuildExtension', 'Add-BuildRequirements', 'Add-Path', 'Get-PhpSdk', 'Add-Dependencies', 'Add-PhpDependencies', 'Get-VsVersion', 'Add-Extension', 'Get-Extension', 'Get-BuildDirectory', 'Get-ExtensionSource', 'Add-ExtensionDependencies', 'Add-BuildTools', 'Add-OciSdk', 'Add-OdbcCli', 'Get-ExtensionConfig', 'Add-Extensions', 'Get-PhpBuild', 'Invoke-Build', 'Invoke-Tests', 'Add-Package', 'Get-PhpDevelBuild', 'Get-OlderVsVersion', 'Get-PeclLibraryZip'
+    FunctionsToExport = 'Invoke-PhpBuildExtension', 'Add-BuildRequirements', 'Add-Path', 'Get-PhpSdk', 'Add-Dependencies', 'Add-PhpDependencies', 'Get-VsVersion', 'Add-Extension', 'Get-Extension', 'Get-BuildDirectory', 'Get-ExtensionSource', 'Add-ExtensionDependencies', 'Add-BuildTools', 'Add-OciSdk', 'Add-OdbcCli', 'Get-ExtensionConfig', 'Add-Extensions', 'Get-PhpBuild', 'Get-PhpBuildDetails', 'Invoke-Build', 'Invoke-Tests', 'Add-Package', 'Get-PhpDevelBuild', 'Get-OlderVsVersion', 'Get-PeclLibraryZip'
 
     # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
     CmdletsToExport = '*'
diff --git a/extension/BuildPhpExtension/config/vs.json b/extension/BuildPhpExtension/config/vs.json
@@ -7,7 +7,8 @@
     "8.0": "vs16",
     "8.1": "vs16",
     "8.2": "vs16",
-    "8.3": "vs16"
+    "8.3": "vs16",
+    "8.4": "vs17"
   },
   "vs" : {
     "vc14": {
diff --git a/extension/BuildPhpExtension/private/Add-BuildRequirements.ps1 b/extension/BuildPhpExtension/private/Add-BuildRequirements.ps1
@@ -59,8 +59,9 @@ function Add-BuildRequirements {
                                       -Ts $Ts `
                                       -VsVersion $VsVersion `
                                       -VsToolset $VsToolset
-        $prefix = Get-PhpBuild -Config $config
-        Get-PhpDevelBuild -Config $config
+        $buildDetails = Get-PhpBuildDetails -Config $Config
+        $prefix = Get-PhpBuild -Config $config -BuildDetails $buildDetails
+        Get-PhpDevelBuild -Config $config -BuildDetails $buildDetails
         Add-Dependencies -Config $config -Prefix $prefix
         return $config
     }
diff --git a/extension/BuildPhpExtension/private/Get-PhpBuild.ps1 b/extension/BuildPhpExtension/private/Get-PhpBuild.ps1
@@ -4,34 +4,26 @@ function Get-PhpBuild {
         Get the PHP build.
     .PARAMETER Config
         Extension Configuration
+    .PARAMETER BuildDetails
+        PHP Build Details
     #>
     [OutputType()]
     param (
         [Parameter(Mandatory = $true, Position=0, HelpMessage='Configuration for the extension')]
-        [PSCustomObject] $Config
+        [PSCustomObject] $Config,
+        [Parameter(Mandatory = $true, Position=1, HelpMessage='Php Build Details')]
+        [PSCustomObject] $BuildDetails
     )
     begin {
     }
     process {
         Add-Type -Assembly "System.IO.Compression.Filesystem"
-
-        $releaseState = if ($Config.php_version -match "[a-z]") {"qa"} else {"releases"}
-        $baseUrl = "https://downloads.php.net/~windows/$releaseState"
-        $fallbackBaseUrl = "https://downloads.php.net/~windows/$releaseState/archives"
+        $phpSemver, $baseUrl = $BuildDetails.phpSemver, $BuildDetails.baseUrl
         $tsPart = if ($Config.ts -eq "nts") {"nts-Win32"} else {"Win32"}
-        $releases = Invoke-WebRequest "$baseUrl/releases.json" | ConvertFrom-Json
-        $phpSemver = $releases.$($Config.php_version).version
-        if($null -eq $phpSemver) {
-            $phpSemver = (Invoke-WebRequest $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
-        }
         $binZipFile = "php-$phpSemver-$tsPart-$($Config.vs_version)-$($Config.arch).zip"
         $binUrl = "$baseUrl/$binZipFile"
 
-        $fallBackUrl = "$fallbackBaseUrl/$binZipFile"
+        $fallBackUrl = "$baseUrl/archives/$binZipFile"
 
         if($Config.php_version -lt '7.4') {
             $fallBackUrl = $fallBackUrl.replace("vc", "VC")
diff --git a/extension/BuildPhpExtension/private/Get-PhpBuildDetails.ps1 b/extension/BuildPhpExtension/private/Get-PhpBuildDetails.ps1
@@ -0,0 +1,39 @@
+function Get-PhpBuildDetails {
+    <#
+    .SYNOPSIS
+        Get the PHP build Details.
+    .PARAMETER Config
+        Extension Configuration
+    #>
+    [OutputType()]
+    param (
+        [Parameter(Mandatory = $true, Position=0, HelpMessage='Configuration for the extension')]
+        [PSCustomObject] $Config
+    )
+    begin {
+    }
+    process {
+        foreach($releaseState in @("releases", "qa")) {
+            $baseUrl = "https://downloads.php.net/~windows/$releaseState"
+            $fallbackBaseUrl = "https://downloads.php.net/~windows/$releaseState/archives"
+            $releases = Invoke-WebRequest "$baseUrl/releases.json" | ConvertFrom-Json
+            $phpSemver = $releases.$($Config.php_version).version
+            if($null -eq $phpSemver) {
+                $phpSemver = (Invoke-WebRequest $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
+            }
+        }
+        return [PSCustomObject]@{
+            phpSemver = $phpSemver
+            baseUrl = $baseUrl
+        }
+    }
+    end {
+    }
+}
diff --git a/extension/BuildPhpExtension/private/Get-PhpDevelBuild.ps1 b/extension/BuildPhpExtension/private/Get-PhpDevelBuild.ps1
@@ -4,33 +4,25 @@ function Get-PhpDevelBuild {
         Get the PHP build.
     .PARAMETER Config
         Extension Configuration
+    .PARAMETER BuildDetails
+        PHP Build Details
     #>
     [OutputType()]
     param (
         [Parameter(Mandatory = $true, Position=0, HelpMessage='Configuration for the extension')]
-        [PSCustomObject] $Config
+        [PSCustomObject] $Config,
+        [Parameter(Mandatory = $true, Position=1, HelpMessage='Php Build Details')]
+        [PSCustomObject] $BuildDetails
     )
     begin {
     }
     process {
         Add-Type -Assembly "System.IO.Compression.Filesystem"
-
-        $releaseState = if ($Config.php_version -match "[a-z]") {"qa"} else {"releases"}
-        $baseUrl = "https://downloads.php.net/~windows/$releaseState"
-        $fallbackBaseUrl = "https://downloads.php.net/~windows/$releaseState/archives"
+        $phpSemver, $baseUrl = $BuildDetails.phpSemver, $BuildDetails.baseUrl
         $tsPart = if ($Config.ts -eq "nts") {"nts-Win32"} else {"Win32"}
-        $releases = Invoke-WebRequest "$baseUrl/releases.json" | ConvertFrom-Json
-        $phpSemver = $releases.$($Config.php_version).version
-        if($null -eq $phpSemver) {
-            $phpSemver = (Invoke-WebRequest $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
-        }
         $binZipFile = "php-devel-pack-$phpSemver-$tsPart-$($Config.vs_version)-$($Config.arch).zip"
         $binUrl = "$baseUrl/$binZipFile"
-        $fallBackUrl = "$fallbackBaseUrl/$binZipFile"
+        $fallBackUrl = "$baseUrl/archives/$binZipFile"
 
         if($Config.php_version -lt '7.4') {
             $fallBackUrl = $fallBackUrl.replace("vc", "VC")

Original file line number	Diff line number	Diff line change
`@@ -43,5 +43,11 @@`
`43`	`43`	`"vs": "2019",`
`44`	`44`	`"os": "windows-2019",`
`45`	`45`	`"type": "github-hosted"`
	`46`	`+ },`
	`47`	`+ "8.4": {`
	`48`	`+ "vs": "2022",`
	`49`	`+ "os": "windows-2022",`
	`50`	`+ "type": "github-hosted",`
	`51`	`+ "dev": true`
`46`	`52`	`}`
`47`	`53`	`}`