Add patch to build extensions with PHP 8.5

Author: shivammathur

extension/BuildPhpExtension/patches/php/8.5.ps1

@@ -0,0 +1,21 @@
+$replacements = @{
+  'ext/standard/php_smart_string.h'        = 'Zend/zend_smart_string.h'
+  'ext/standard/php_smart_string_public.h' = 'Zend/zend_smart_string.h'
+  'zend_exception_get_default()'           = 'zend_ce_exception'
+  'zend_exception_get_default(TSRMLS_C)'   = 'zend_ce_exception'
+}
+
+$extensions = @('*.c', '*.h', '*.cpp', '*.hpp')
+
+Get-ChildItem -Path . -Recurse -File -Include $extensions | ForEach-Object {
+  $file = $_.FullName
+  $content = Get-Content -Path $file -Raw
+  $original = $content
+  foreach ($old in $replacements.Keys) {
+    $new = $replacements[$old]
+    $content = $content.Replace($old, $new)
+  }
+  if ($content -ne $original) {
+    Set-Content -Path $file -Value $content
+  }
+}

extension/BuildPhpExtension/private/Add-Patches.ps1

@@ -1,25 +1,25 @@
 Function Add-Patches {
     <#
     .SYNOPSIS
-        Add patches to the extension.
-    .PARAMETER Extension
-        The extension name.
+        Add patches to the extension source
+    .PARAMETER PatchPath
+        Path to the patch script
     #>
     [OutputType()]
     param(
-        [Parameter(Mandatory = $true, Position=0, HelpMessage='Extension')]
+        [Parameter(Mandatory = $true, Position=0, HelpMessage='Path to the patch script')]
         [ValidateNotNull()]
         [ValidateLength(1, [int]::MaxValue)]
-        [string] $Extension
+        [string] $PatchPath
     )
     begin {
     }
     process {
         # Apply patches only for php/php-windows-builder and shivammathur/php-windows-builder
         if($null -ne $env:GITHUB_REPOSITORY) {
             if($env:GITHUB_REPOSITORY -eq 'php/php-windows-builder' -or $env:GITHUB_REPOSITORY -eq 'shivammathur/php-windows-builder') {
-                if(Test-Path -PATH $PSScriptRoot\..\patches\$Extension.ps1) {
-                    . $PSScriptRoot\..\patches\$Extension.ps1
+                if(Test-Path -PATH $PSScriptRoot\..\patches\$PatchPath) {
+                    . $PSScriptRoot\..\patches\$PatchPath
                 }
             }
         }

extension/BuildPhpExtension/private/Get-Extension.ps1

@@ -6,6 +6,8 @@ function Get-Extension {
         Extension URL
     .PARAMETER ExtensionRef
         Extension Reference
+    .PARAMETER PhpVersion
+        PHP Version
     .PARAMETER BuildDirectory
         Build directory
     .PARAMETER LocalSrc
@@ -17,11 +19,15 @@ function Get-Extension {
         [string] $ExtensionUrl = '',
         [Parameter(Mandatory = $false, Position=1, HelpMessage='Extension Reference')]
         [string] $ExtensionRef = '',
-        [Parameter(Mandatory = $true, Position=2, HelpMessage='Build directory')]
+        [Parameter(Mandatory = $true, Position=2, HelpMessage='PHP Version')]
+        [ValidateNotNull()]
+        [ValidateLength(1, [int]::MaxValue)]
+        [string] $PhpVersion,
+        [Parameter(Mandatory = $true, Position=3, HelpMessage='Build directory')]
         [ValidateNotNull()]
         [ValidateLength(1, [int]::MaxValue)]
         [string] $BuildDirectory,
-        [Parameter(Mandatory = $true, Position=3, HelpMessage='Is source local')]
+        [Parameter(Mandatory = $true, Position=4, HelpMessage='Is source local')]
         [ValidateNotNull()]
         [bool] $LocalSrc = $false
     )
@@ -67,9 +73,15 @@ function Get-Extension {
 
         $patches = $False
         if($null -ne $extension) {
-            if(Test-Path -PATH $PSScriptRoot\..\patches\$extension.ps1) {
-                if((Get-Content $PSScriptRoot\..\patches\$extension.ps1).Contains('config.w32')) {
-                    Add-Patches $extension
+            if(Test-Path -PATH "$PSScriptRoot\..\patches\${extension}.ps1") {
+                if((Get-Content "$PSScriptRoot\..\patches\${extension}.ps1").Contains('config.w32')) {
+                    Add-Patches "${extension}.ps1"
+                    $patches = $True
+                }
+            }
+            if(Test-Path -PATH "$PSScriptRoot\..\patches\php\${PhpVersion}.ps1") {
+                if((Get-Content "$PSScriptRoot\..\patches\php\${PhpVersion}.ps1").Contains('config.w32')) {
+                    Add-Patches "php\${PhpVersion}.ps1"
                     $patches = $True
                 }
             }
@@ -103,7 +115,8 @@ function Get-Extension {
         }
 
         if(!$patches) {
-            Add-Patches $name
+            Add-Patches "${name}.ps1"
+            Add-Patches "php\${PhpVersion}.ps1"
         }
         if(-not($LocalSrc)) {
             Add-BuildLog tick $name "Fetched $name extension"

extension/BuildPhpExtension/public/Invoke-PhpBuildExtension.ps1

@@ -64,7 +64,7 @@ function Invoke-PhpBuildExtension {
 
         $source = Get-ExtensionSource -ExtensionUrl $ExtensionUrl -ExtensionRef $ExtensionRef
 
-        $extension = Get-Extension -ExtensionUrl $source.url -ExtensionRef $source.ref -BuildDirectory $buildDirectory -LocalSrc $source.local
+        $extension = Get-Extension -ExtensionUrl $source.url -ExtensionRef $source.ref -PhpVersion $PhpVersion -BuildDirectory $buildDirectory -LocalSrc $source.local
 
         Set-Location "$buildDirectory"