Switch away from php-sdk in tests

Author: shivammathur

php/BuildPhp/BuildPhp.psd1

@@ -69,6 +69,7 @@
         'Get-File',
         'Get-OciSdk',
         'Get-PhpBuild',
+        'Get-PhpDeps',
         'Get-PhpSdk',
         'Get-PhpSrc',
         'Get-PhpTestPack',
@@ -77,6 +78,7 @@
         'Get-TestsList',
         'Get-VsVersion',
         'Get-VsVersionHelper',
+        'Invoke-EditBin',
         'Set-EnchantTestEnvironment',
         'Set-FirebirdTestEnvironment',
         'Set-MsSqlTestEnvironment',

php/BuildPhp/private/Add-TestRequirements.ps1

@@ -70,29 +70,19 @@ function Add-TestRequirements {
             [System.IO.Compression.ZipFile]::ExtractToDirectory($testZipFilePath, $testsDirectoryPath)
         }
 
-        Get-PhpSdk
         $FetchDeps = $False
+        $majorMinorVersion = ($PhpVersion -split '\.')[0..1] -join '.'
         if($null -eq $env:DEPS_DIR) {
-            $majorMinorVersion = ($PhpVersion -split '\.')[0..1] -join '.'
             $env:DEPS_DIR = "C:\deps-$majorMinorVersion-$Arch"
             $FetchDeps = $True
         }
-        if(-not(Test-Path $env:DEPS_DIR)) {
-            New-Item "$env:DEPS_DIR" -ItemType "directory" -Force > $null 2>&1
-        }
-        $branch = if ($PhpVersion -eq 'master') {'master'} else {($PhpVersion -split '\.')[0..1] -join '.'}
-        $env:PHP_SDK_VS = $VsVersion
-        $env:PHP_SDK_ARCH = $Arch
-        $bat_content = @()
         if($FetchDeps -eq $True -or $null -eq $Env:DEPS_CACHE_HIT -or $Env:DEPS_CACHE_HIT -ne 'true') {
-            $bat_content += "cmd /c phpsdk_deps --update --force --no-backup --branch $branch --stability staging --deps $env:DEPS_DIR"
+            Get-PhpDeps -PhpVersion $majorMinorVersion -VsVersion $VsVersion -Arch $Arch -Destination $env:DEPS_DIR
         }
-        $bat_content += "editbin /stack:8388608 $binDirectoryPath\php.exe"
-        $bat_content += "editbin /stack:8388608 $binDirectoryPath\php-cgi.exe"
-        Set-Content -Encoding "ASCII" -Path vs.bat -Value $bat_content
-        & "$currentDirectory\php-sdk\phpsdk-starter.bat" -c $VsVersion -a $Arch -t vs.bat
+        Invoke-EditBin -Exe "$binDirectoryPath\php.exe" -StackSize 8388608 -Arch $Arch
+        Invoke-EditBin -Exe "$binDirectoryPath\php-cgi.exe" -StackSize 8388608 -Arch $Arch
         Add-Path "$env:DEPS_DIR\bin"
     }
     end {
     }
-}
+}

php/BuildPhp/private/Get-PhpDeps.ps1

@@ -0,0 +1,67 @@
+function Get-PhpDeps {
+    <#
+    .SYNOPSIS
+        Fetch specified PHP SDK deps zip packages and extract them to a destination directory.
+    .PARAMETER Version
+        PHP version series (e.g., 8.3 or master).
+    .PARAMETER VsVersion
+        Visual Studio toolset version (e.g., vs16, vs17).
+    .PARAMETER Arch
+        Target architecture: x86 or x64.
+    .PARAMETER Destination
+        Destination directory to extract the downloaded deps into.
+    #>
+    [CmdletBinding()]
+    param(
+        [Parameter(Mandatory=$true)]
+        [ValidateNotNullOrEmpty()]
+        [string] $PhpVersion,
+        [Parameter(Mandatory=$true)]
+        [ValidateNotNullOrEmpty()]
+        [string] $VsVersion,
+        [Parameter(Mandatory=$true)]
+        [ValidateSet('x86','x64')]
+        [string] $Arch,
+        [Parameter(Mandatory=$true)]
+        [ValidateNotNullOrEmpty()]
+        [string] $Destination
+    )
+
+    begin {
+        $baseurl = 'https://downloads.php.net/~windows/php-sdk/deps'
+    }
+    process {
+        if (-not (Test-Path -LiteralPath $Destination)) {
+            New-Item -ItemType Directory -Force -Path $Destination | Out-Null
+        }
+
+        $seriesUrl = "$baseurl/series/packages-$PhpVersion-$VsVersion-$Arch-staging.txt"
+        Write-Verbose "Fetching series listing: $seriesUrl"
+        $series = Invoke-WebRequest -Uri $seriesUrl -UseBasicParsing -ErrorAction Stop
+        $lines = @()
+        if ($series -and $series.Content) {
+            $lines = $series.Content -split "[\r\n]+" | Where-Object { $_ -and $_.Trim().Length -gt 0 }
+        }
+        foreach ($line in $lines) {
+            Write-Host "Processing package $line"
+            $temp = New-TemporaryFile | Rename-Item -NewName { $_.Name + '.zip' } -PassThru
+            $url = "$baseurl/$VsVersion/$Arch/$line"
+            Invoke-WebRequest -Uri $url -UseBasicParsing -OutFile $temp.FullName -ErrorAction Stop
+            try {
+                Expand-Archive -LiteralPath $temp.FullName -DestinationPath $Destination -Force
+            } catch {
+                Add-Type -AssemblyName System.IO.Compression.FileSystem -ErrorAction SilentlyContinue
+                [System.IO.Compression.ZipFile]::ExtractToDirectory($temp.FullName, $Destination)
+            } finally {
+                Remove-Item -LiteralPath $temp.FullName -Force -ErrorAction SilentlyContinue
+            }
+        }
+
+        $extra = Join-Path $Destination 'openssl.cnf'
+        if (Test-Path -LiteralPath $extra) {
+            $tdir = Join-Path $Destination 'template\ssl'
+            New-Item -ItemType Directory -Force -Path $tdir | Out-Null
+            Move-Item -LiteralPath $extra -Destination (Join-Path $tdir 'openssl.cnf') -Force
+        }
+    }
+}

php/BuildPhp/private/Invoke-EditBin.ps1

@@ -0,0 +1,43 @@
+function Invoke-EditBin {
+    <#
+    .SYNOPSIS
+        Run editbin.exe to set the stack size on an executable.
+    .PARAMETER Exe
+        Path to the target executable.
+    .PARAMETER StackSize
+        Stack size in bytes.
+    .PARAMETER Target
+        Target architecture subfolder under Hostx64 (x64 or x86)
+    #>
+    [CmdletBinding()]
+    param(
+        [Parameter(Mandatory=$true, Position=0, HelpMessage='Path to target executable')]
+        [ValidateNotNullOrEmpty()]
+        [string] $Exe,
+        [Parameter(Mandatory=$true, Position=1, HelpMessage='Stack reserve size in bytes')]
+        [int] $StackSize,
+        [Parameter(Mandatory=$true, Position=2, HelpMessage='Architecture')]
+        [ValidateSet('x64','x86')]
+        [string] $Arch
+    )
+
+    process {
+        if (-not (Test-Path -LiteralPath $Exe)) {
+            throw "Target executable not found: $Exe"
+        }
+
+        $pattern = "C:\\Program Files\\Microsoft Visual Studio\\2022\\*\\VC\\Tools\\MSVC\\*\\bin\\Hostx64\\$Arch\\editbin.exe"
+        $editbin = Get-ChildItem -Path $pattern -File -ErrorAction SilentlyContinue |
+                   Sort-Object { Split-Path $_.DirectoryName -Leaf } -Descending |
+                   Select-Object -First 1
+
+        if (-not $editbin) {
+            throw "editbin.exe not found under VS2022 paths."
+        }
+
+        & $editbin.FullName "/STACK:$StackSize" $Exe
+        if ($LASTEXITCODE) {
+            throw "editbin failed with exit code $LASTEXITCODE"
+        }
+    }
+}