Add retry logic for downloading files

shivammathur · shivammathur · commit eb7b52272387 · 2025-07-29T21:28:03.000+05:30
diff --git a/extension/BuildPhpExtension/BuildPhpExtension.psd1 b/extension/BuildPhpExtension/BuildPhpExtension.psd1
@@ -83,7 +83,8 @@
         'Get-BuildDirectory',
         'Get-Extension',
         'Get-ExtensionConfig',
-        'Get-ExtensionSource',
+        'Get-ExtensionSource'
+        'Get-File',
         'Get-LibrariesFromConfig',
         'Get-OlderVsVersion',
         'Get-PeclLibraryZip',
diff --git a/extension/BuildPhpExtension/private/Add-Boost.ps1 b/extension/BuildPhpExtension/private/Add-Boost.ps1
@@ -10,7 +10,7 @@ Function Add-Boost {
     }
     process {
         $url = "https://archives.boost.io/release/1.72.0/source/boost_1_72_0.zip"
-        Invoke-WebRequest $url -OutFile "boost.zip"
+        Get-File -Url -OutFile "boost.zip"
         Expand-Archive -Path "boost.zip" -DestinationPath "../deps"
     }
     end {
diff --git a/extension/BuildPhpExtension/private/Add-Extension.ps1 b/extension/BuildPhpExtension/private/Add-Extension.ps1
@@ -22,7 +22,7 @@ Function Add-Extension {
     }
     process {
         Set-GAGroup start
-        Invoke-WebRequest -Uri "https://pecl.php.net/get/$Extension" -OutFile "$Extension.tgz"
+        Get-File -Url "https://pecl.php.net/get/$Extension" -OutFile "$Extension.tgz"
         $currentDirectory = (Get-Location).Path
         & tar -xzf "$Extension.tgz" -C $currentDirectory
         Set-Location "$Extension-*"
diff --git a/extension/BuildPhpExtension/private/Add-ExtensionDependencies.ps1 b/extension/BuildPhpExtension/private/Add-ExtensionDependencies.ps1
@@ -32,7 +32,7 @@ Function Add-ExtensionDependencies {
                     }
                     Default {
                         $url = "https://downloads.php.net/~windows/pecl/deps/$_"
-                        Invoke-WebRequest -Uri $url -OutFile $_ -UseBasicParsing
+                        Get-File -Url $url -OutFile $_
                         Expand-Archive -Path $_ -DestinationPath "..\deps" -Force
                         if(Test-Path "..\deps\LICENSE") {
                             Rename-Item -Path "..\deps\LICENSE" -NewName "LICENSE.$library"
diff --git a/extension/BuildPhpExtension/private/Add-OciDB.ps1 b/extension/BuildPhpExtension/private/Add-OciDB.ps1
@@ -11,7 +11,7 @@ Function Add-OciDB {
     process {
         $dbUrl = 'https://download.oracle.com/otn-pub/otn_software/db-express/OracleXE213_Win64.zip'
         $dbZipFile = 'OracleXE213_Win64.zip'
-        Invoke-WebRequest $dbUrl -OutFile $dbZipFile -UseBasicParsing -Verbose
+        Get-File -Url $dbUrl -OutFile $dbZipFile
         New-Item -ItemType Directory -Path C:\tools\oracle-setup -Force | Out-Null
         New-Item -ItemType Directory -Path C:\tools\oracle -Force | Out-Null
         Expand-Archive -Path $dbZipFile -DestinationPath C:\tools\oracle-setup -Force
diff --git a/extension/BuildPhpExtension/private/Add-OciSdk.ps1 b/extension/BuildPhpExtension/private/Add-OciSdk.ps1
@@ -16,7 +16,7 @@ Function Add-OciSdk {
         $suffix = if ($Config.arch -eq "x64") {"windows"} else {"nt"}
         @('sdk', 'basic') | ForEach-Object {
             $url = "https://download.oracle.com/otn_software/nt/instantclient/instantclient-$_-$suffix.zip"
-            Invoke-WebRequest $url -OutFile "instantclient-$_.zip"
+            Get-File -Url -OutFile "instantclient-$_.zip"
             Expand-Archive -Path "instantclient-$_.zip" -DestinationPath "../deps" -Force
         }
         Copy-Item ../deps/instantclient_*/sdk/* -Destination "../deps" -Recurse -Force
diff --git a/extension/BuildPhpExtension/private/Add-OdbcCli.ps1 b/extension/BuildPhpExtension/private/Add-OdbcCli.ps1
@@ -15,7 +15,7 @@ Function Add-OdbcCli {
     process {
         $prefix = if ($Config.arch -eq "x64") {"ntx64"} else {"nt32"}
         $url = "https://public.dhe.ibm.com/ibmdl/export/pub/software/data/db2/drivers/odbc_cli/${prefix}_odbc_cli.zip"
-        Invoke-WebRequest $url -OutFile "odbc_cli.zip"
+        Get-File -Url $url -OutFile "odbc_cli.zip"
         Expand-Archive -Path "odbc_cli.zip" -DestinationPath "../deps"
         Copy-Item ../deps/clidriver/* -Destination "../deps" -Recurse -Force
     }
diff --git a/extension/BuildPhpExtension/private/Add-Package.ps1 b/extension/BuildPhpExtension/private/Add-Package.ps1
@@ -50,7 +50,7 @@ function Add-Package {
             }
 
             if(Test-Path ..\deps\bin) {
-                $dllMap = Invoke-WebRequest -Uri "https://downloads.php.net/~windows/pecl/deps/dllmapping.json"
+                $dllMap = Get-File -Url "https://downloads.php.net/~windows/pecl/deps/dllmapping.json"
                 Get-ChildItem -Path ..\deps\bin -Recurse -Include "*.dll" | ForEach-Object {
                     if($dllMap.content.Contains($_.Name)) {
                         if(-not(Test-Path "php-bin\$($_.Name)")) {
diff --git a/extension/BuildPhpExtension/private/Add-PhpDependencies.ps1 b/extension/BuildPhpExtension/private/Add-PhpDependencies.ps1
@@ -18,8 +18,8 @@ Function Add-PhpDependencies {
         }
         $phpBaseUrl = 'https://downloads.php.net/~windows/php-sdk/deps'
         $phpTrunkBaseUrl = "https://downloads.php.net/~windows/php-sdk/deps/$($Config.vs_version)/$($Config.arch)"
-        $phpSeries = Invoke-WebRequest -Uri "$phpBaseUrl/series/packages-$($Config.php_version)-$($Config.vs_version)-$($Config.arch)-staging.txt" -UseBasicParsing
-        $phpTrunk = Invoke-WebRequest -Uri $phpTrunkBaseUrl -UseBasicParsing
+        $phpSeries = Get-File -Url "$phpBaseUrl/series/packages-$($Config.php_version)-$($Config.vs_version)-$($Config.arch)-staging.txt"
+        $phpTrunk = Get-File -Url $phpTrunkBaseUrl
         foreach ($library in $Config.php_libraries) {
             try {
                 $matchesFound = $phpSeries.Content | Select-String -Pattern "(^|\n)$library.*"
@@ -35,7 +35,7 @@ Function Add-PhpDependencies {
                     throw "Failed to find $library"
                 }
                 $file = $matchesFound.Matches[0].Value.Trim()
-                Invoke-WebRequest "$phpBaseUrl/$($Config.vs_version)/$($Config.arch)/$file" -OutFile $library
+                Get-File -Url "$phpBaseUrl/$($Config.vs_version)/$($Config.arch)/$file" -OutFile $library
                 Expand-Archive $library "../deps"
                 Add-BuildLog tick "$library" "Added $($file -replace '\.zip$')"
             } catch {
diff --git a/extension/BuildPhpExtension/private/Add-VS.ps1 b/extension/BuildPhpExtension/private/Add-VS.ps1
@@ -32,7 +32,7 @@ function Add-Vs {
                 if (-not (Test-Path $installerDir)) {
                     New-Item -Path $installerDir -ItemType Directory -Force | Out-Null
                 }
-                Invoke-WebRequest -Uri $vsWhereUrl -OutFile $vswherePath -UseBasicParsing
+                Get-File -Url $vsWhereUrl -OutFile $vswherePath
             }
 
             $instances = & $vswherePath -products '*' -format json 2> $null | ConvertFrom-Json
@@ -57,7 +57,7 @@ function Add-Vs {
                 $installerUrl = "https://aka.ms/vs/$channel/release/$exe"
                 $installerPath = Join-Path $env:TEMP $exe
 
-                Invoke-WebRequest -Uri $installerUrl -OutFile $installerPath -UseBasicParsing
+                Get-File -Url $installerUrl -OutFile $installerPath
 
                 & $installerPath modify `
                     --installPath $vsInst.installationPath `
@@ -69,7 +69,7 @@ function Add-Vs {
                 $installerUrl = "https://aka.ms/vs/$channel/release/$exe"
                 $installerPath = Join-Path $env:TEMP $exe
 
-                Invoke-WebRequest -Uri $installerUrl -OutFile $installerPath -UseBasicParsing
+                Get-File -Url $installerUrl -OutFile $installerPath
                 & $installerPath `
                     --quiet --wait --norestart --nocache `
                     @componentArgs 2>&1 | ForEach-Object { Write-Host $_ }
diff --git a/extension/BuildPhpExtension/private/Get-Extension.ps1 b/extension/BuildPhpExtension/private/Get-Extension.ps1
@@ -30,11 +30,11 @@ function Get-Extension {
                 if ($ExtensionUrl -like "*pecl.php.net*") {
                     $extension = Split-Path -Path $ExtensionUrl -Leaf
                     try {
-                        Invoke-WebRequest -Uri "https://pecl.php.net/get/$extension-$ExtensionRef.tgz" -OutFile "$extension-$ExtensionRef.tgz" -UseBasicParsing
+                        Get-File -Url "https://pecl.php.net/get/$extension-$ExtensionRef.tgz" -OutFile "$extension-$ExtensionRef.tgz"
                     } catch {}
                     if(-not(Test-Path "$extension-$ExtensionRef.tgz")) {
                         try {
-                            Invoke-WebRequest -Uri "https://pecl.php.net/get/$($extension.ToUpper())-$ExtensionRef.tgz" -OutFile "$extension-$ExtensionRef.tgz" -UseBasicParsing
+                            Get-File -Url "https://pecl.php.net/get/$($extension.ToUpper())-$ExtensionRef.tgz" -OutFile "$extension-$ExtensionRef.tgz"
                         } catch {}
                     }
                     & tar -xzf "$extension-$ExtensionRef.tgz" -C $currentDirectory
diff --git a/extension/BuildPhpExtension/private/Get-ExtensionConfig.ps1 b/extension/BuildPhpExtension/private/Get-ExtensionConfig.ps1
@@ -169,9 +169,9 @@ Function Get-ExtensionConfig {
             }
 
             if($Libraries.Count -gt 0) {
-                $phpSeries = Invoke-WebRequest -Uri "https://downloads.php.net/~windows/php-sdk/deps/$VsVersion/$Arch"
-                $extensionSeries = Invoke-WebRequest -Uri "https://downloads.php.net/~windows/pecl/deps"
-                $extensionArchivesSeries = Invoke-WebRequest -Uri "https://downloads.php.net/~windows/pecl/deps/archives"
+                $phpSeries = Get-File -Url "https://downloads.php.net/~windows/php-sdk/deps/$VsVersion/$Arch"
+                $extensionSeries = Get-File -Url "https://downloads.php.net/~windows/pecl/deps"
+                $extensionArchivesSeries = Get-File -Url "https://downloads.php.net/~windows/pecl/deps/archives"
             }
             $thirdPartyLibraries = @("boost", "instantclient", "odbc_cli")
             $Libraries | Select-Object -Unique | ForEach-Object {
diff --git a/extension/BuildPhpExtension/private/Get-File.ps1 b/extension/BuildPhpExtension/private/Get-File.ps1
@@ -0,0 +1,61 @@
+Function Get-File {
+    <#
+    .SYNOPSIS
+        Downloads a file from a URL with retries and an optional fallback URL.
+    .PARAMETER Url
+        The primary URL to download the file from.
+    .PARAMETER FallbackUrl
+        An optional fallback URL to use if the primary URL fails.
+    .PARAMETER OutFile
+        The output file path where the downloaded content will be saved.
+    .PARAMETER Retries
+        The number of times to retry the download if it fails. Default is 3.
+    .PARAMETER TimeoutSec
+        The timeout in seconds for each download attempt. Default is 0 (no timeout).
+    #>
+    [OutputType()]
+    param (
+        [Parameter(Mandatory = $true, Position=0, HelpMessage='Primary URL to download the file from')]
+        [ValidateNotNullOrEmpty()]
+        [string] $Url,
+
+        [Parameter(Mandatory = $false, Position=1, HelpMessage='Fallback URL to use if the primary URL fails')]
+        [string] $FallbackUrl,
+
+        [Parameter(Mandatory = $false, Position=2, HelpMessage='Output file path for the downloaded content')]
+        [string] $OutFile = '',
+
+        [Parameter(Mandatory = $false, Position=3, HelpMessage='Number of retries for download attempts')]
+        [int] $Retries = 3,
+
+        [Parameter(Mandatory = $false, Position=4, HelpMessage='Timeout in seconds for each download attempt')]
+        [int] $TimeoutSec = 0
+    )
+
+    for ($i = 0; $i -lt $Retries; $i++) {
+        try {
+            if($OutFile -ne '') {
+                Invoke-WebRequest -Uri $Url -OutFile $OutFile -TimeoutSec $TimeoutSec
+            } else {
+                Invoke-WebRequest -Uri $Url -TimeoutSec $TimeoutSec
+            }
+            break;
+        } catch {
+            if ($i -eq ($Retries - 1)) {
+                if($FallbackUrl) {
+                    try {
+                        if($OutFile -ne '') {
+                            Invoke-WebRequest -Uri $FallbackUrl -OutFile $OutFile -TimeoutSec $TimeoutSec
+                        } else {
+                            Invoke-WebRequest -Uri $FallbackUrl -TimeoutSec $TimeoutSec
+                        }
+                    } catch {
+                        throw "Failed to download the file from $Url and $FallbackUrl"
+                    }
+                } else {
+                    throw "Failed to download the file from $Url"
+                }
+            }
+        }
+    }
+}
diff --git a/extension/BuildPhpExtension/private/Get-LibrariesFromConfig.ps1 b/extension/BuildPhpExtension/private/Get-LibrariesFromConfig.ps1
@@ -27,10 +27,10 @@ Function Get-LibrariesFromConfig {
     }
     process {
         $jsonData = (
-        Invoke-WebRequest -Uri "https://downloads.php.net/~windows/pecl/deps/libmapping.json"
+        Get-File -Url "https://downloads.php.net/~windows/pecl/deps/libmapping.json"
         ).Content | ConvertFrom-Json
 
-        $phpSeries = (Invoke-WebRequest -Uri "https://downloads.php.net/~windows/php-sdk/deps/$VsVersion/$Arch").Content.ToLower()
+        $phpSeries = (Get-File -Url "https://downloads.php.net/~windows/php-sdk/deps/$VsVersion/$Arch").Content.ToLower()
 
         Function Find-Library {
             param (
diff --git a/extension/BuildPhpExtension/private/Get-PhpBuild.ps1 b/extension/BuildPhpExtension/private/Get-PhpBuild.ps1
@@ -31,10 +31,10 @@ function Get-PhpBuild {
             }
 
             try {
-                Invoke-WebRequest $binUrl -OutFile $binZipFile
+                Get-File -Url $binUrl -OutFile $binZipFile
             } catch {
                 try {
-                    Invoke-WebRequest $fallBackUrl -OutFile $binZipFile
+                    Get-File -Url $fallBackUrl -OutFile $binZipFile
                 } catch {
                     throw "Failed to download the build for PHP version $( $Config.php_version )."
                 }
diff --git a/extension/BuildPhpExtension/private/Get-PhpBuildDetails.ps1 b/extension/BuildPhpExtension/private/Get-PhpBuildDetails.ps1
@@ -20,10 +20,10 @@ function Get-PhpBuildDetails {
             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
+                $releases = Get-File -Url "$baseUrl/releases.json" | ConvertFrom-Json
                 $phpSemver = $releases.$($Config.php_version).version
                 if($null -eq $phpSemver) {
-                    $phpSemver = (Invoke-WebRequest $fallbackBaseUrl).Links |
+                    $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 |
diff --git a/extension/BuildPhpExtension/private/Get-PhpDevelBuild.ps1 b/extension/BuildPhpExtension/private/Get-PhpDevelBuild.ps1
@@ -31,10 +31,10 @@ function Get-PhpDevelBuild {
             }
 
             try {
-                Invoke-WebRequest $binUrl -OutFile $binZipFile
+                Get-File -Url $binUrl -OutFile $binZipFile
             } catch {
                 try {
-                    Invoke-WebRequest $fallBackUrl -OutFile $binZipFile
+                    Get-File -Url $fallBackUrl -OutFile $binZipFile
                 } catch {
                     throw "Failed to download the build for PHP version $($Config.php_version)."
                 }
diff --git a/extension/BuildPhpExtension/private/Get-PhpSdk.ps1 b/extension/BuildPhpExtension/private/Get-PhpSdk.ps1
@@ -16,7 +16,7 @@ function Get-PhpSdk {
         {
             Add-Type -Assembly "System.IO.Compression.Filesystem"
 
-            Invoke-WebRequest $url -OutFile php-sdk.zip
+            Get-File -Url $url -OutFile php-sdk.zip
             $currentDirectory = (Get-Location).Path
             $sdkZipFilePath = Join-Path $currentDirectory php-sdk.zip
             [System.IO.Compression.ZipFile]::ExtractToDirectory($sdkZipFilePath, $currentDirectory)
diff --git a/extension/BuildPhpExtension/private/Get-PhpSrc.ps1 b/extension/BuildPhpExtension/private/Get-PhpSrc.ps1
@@ -34,7 +34,7 @@ function Get-PhpSrc {
         $directoryPath = Join-Path $currentDirectory $directory
         $srcZipFilePath = Join-Path $currentDirectory "php-$PhpVersion-src.zip"
 
-        Invoke-WebRequest $url -Outfile $zipFile
+        Get-File -Url $url -Outfile $zipFile
         [System.IO.Compression.ZipFile]::ExtractToDirectory($zipFilePath, $currentDirectory)
         Rename-Item -Path "php-src-$ref" -NewName $directory
         [System.IO.Compression.ZipFile]::CreateFromDirectory($directoryPath,  $srcZipFilePath)
diff --git a/php/BuildPhp/BuildPhp.psd1 b/php/BuildPhp/BuildPhp.psd1
@@ -65,6 +65,7 @@
         'Add-BuildRequirements',
         'Add-TestRequirements',
         'Add-Vs',
+        'Get-File',
         'Get-OciSdk',
         'Get-PhpBuild',
         'Get-PhpSdk',
diff --git a/php/BuildPhp/private/Add-VS.ps1 b/php/BuildPhp/private/Add-VS.ps1
@@ -28,7 +28,7 @@ function Add-Vs {
             if (-not (Test-Path $installerDir)) {
                 New-Item -Path $installerDir -ItemType Directory -Force | Out-Null
             }
-            Invoke-WebRequest -Uri $vsWhereUrl -OutFile $vswherePath -UseBasicParsing
+            Get-File -Url $vsWhereUrl -OutFile $vswherePath
         }
 
         $instances = & $vswherePath -products '*' -format json 2> $null | ConvertFrom-Json
@@ -53,7 +53,7 @@ function Add-Vs {
             $installerUrl = "https://aka.ms/vs/$channel/release/$exe"
             $installerPath = Join-Path $env:TEMP $exe
 
-            Invoke-WebRequest -Uri $installerUrl -OutFile $installerPath -UseBasicParsing
+            Get-File -Url $installerUrl -OutFile $installerPath
 
             & $installerPath modify `
                 --installPath $vsInst.installationPath `
@@ -65,7 +65,7 @@ function Add-Vs {
             $installerUrl = "https://aka.ms/vs/$channel/release/$exe"
             $installerPath = Join-Path $env:TEMP $exe
 
-            Invoke-WebRequest -Uri $installerUrl -OutFile $installerPath -UseBasicParsing
+            Get-File -Url $installerUrl -OutFile $installerPath
             & $installerPath `
                 --quiet --wait --norestart --nocache `
                 @componentArgs 2>&1 | ForEach-Object { Write-Host $_ }
diff --git a/php/BuildPhp/private/Get-File.ps1 b/php/BuildPhp/private/Get-File.ps1
@@ -0,0 +1,61 @@
+Function Get-File {
+    <#
+    .SYNOPSIS
+        Downloads a file from a URL with retries and an optional fallback URL.
+    .PARAMETER Url
+        The primary URL to download the file from.
+    .PARAMETER FallbackUrl
+        An optional fallback URL to use if the primary URL fails.
+    .PARAMETER OutFile
+        The output file path where the downloaded content will be saved.
+    .PARAMETER Retries
+        The number of times to retry the download if it fails. Default is 3.
+    .PARAMETER TimeoutSec
+        The timeout in seconds for each download attempt. Default is 0 (no timeout).
+    #>
+    [OutputType()]
+    param (
+        [Parameter(Mandatory = $true, Position=0, HelpMessage='Primary URL to download the file from')]
+        [ValidateNotNullOrEmpty()]
+        [string] $Url,
+
+        [Parameter(Mandatory = $false, Position=1, HelpMessage='Fallback URL to use if the primary URL fails')]
+        [string] $FallbackUrl,
+
+        [Parameter(Mandatory = $false, Position=2, HelpMessage='Output file path for the downloaded content')]
+        [string] $OutFile = '',
+
+        [Parameter(Mandatory = $false, Position=3, HelpMessage='Number of retries for download attempts')]
+        [int] $Retries = 3,
+
+        [Parameter(Mandatory = $false, Position=4, HelpMessage='Timeout in seconds for each download attempt')]
+        [int] $TimeoutSec = 0
+    )
+
+    for ($i = 0; $i -lt $Retries; $i++) {
+        try {
+            if($OutFile -ne '') {
+                Invoke-WebRequest -Uri $Url -OutFile $OutFile -TimeoutSec $TimeoutSec
+            } else {
+                Invoke-WebRequest -Uri $Url -TimeoutSec $TimeoutSec
+            }
+            break;
+        } catch {
+            if ($i -eq ($Retries - 1)) {
+                if($FallbackUrl) {
+                    try {
+                        if($OutFile -ne '') {
+                            Invoke-WebRequest -Uri $FallbackUrl -OutFile $OutFile -TimeoutSec $TimeoutSec
+                        } else {
+                            Invoke-WebRequest -Uri $FallbackUrl -TimeoutSec $TimeoutSec
+                        }
+                    } catch {
+                        throw "Failed to download the file from $Url and $FallbackUrl"
+                    }
+                } else {
+                    throw "Failed to download the file from $Url"
+                }
+            }
+        }
+    }
+}
diff --git a/php/BuildPhp/private/Get-OciSdk.ps1 b/php/BuildPhp/private/Get-OciSdk.ps1
@@ -16,7 +16,7 @@ function Get-OciSdk {
         $url = "https://download.oracle.com/otn_software/nt/instantclient/instantclient-sdk-$suffix.zip"
     }
     process {
-        Invoke-WebRequest $url -OutFile "instantclient-sdk.zip"
+        Get-File -Url $url -OutFile "instantclient-sdk.zip"
         Expand-Archive -Path "instantclient-sdk.zip" -DestinationPath "."
         Move-Item "instantclient_*" "instantclient"
     }
diff --git a/php/BuildPhp/private/Get-PhpBuild.ps1 b/php/BuildPhp/private/Get-PhpBuild.ps1
@@ -55,10 +55,10 @@ function Get-PhpBuild {
         $fallBackUrl = "$fallbackBaseUrl/$binZipFile"
 
         try {
-            Invoke-WebRequest $binUrl -OutFile $binZipFile
+            Get-File -Url $binUrl -OutFile $binZipFile
         } catch {
             try {
-                Invoke-WebRequest $fallBackUrl -OutFile $binZipFile
+                Get-File -Url $fallBackUrl -OutFile $binZipFile
             } catch {
                 throw "Failed to download the build for PHP version $PhpVersion."
             }
diff --git a/php/BuildPhp/private/Get-PhpSdk.ps1 b/php/BuildPhp/private/Get-PhpSdk.ps1
diff --git a/php/BuildPhp/private/Get-PhpSrc.ps1 b/php/BuildPhp/private/Get-PhpSrc.ps1
diff --git a/php/BuildPhp/private/Get-PhpTestPack.ps1 b/php/BuildPhp/private/Get-PhpTestPack.ps1

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ Function Add-Boost {`
`10`	`10`	`}`
`11`	`11`	`process {`
`12`	`12`	`$url = "https://archives.boost.io/release/1.72.0/source/boost_1_72_0.zip"`
`13`		`- Invoke-WebRequest $url -OutFile "boost.zip"`
	`13`	`+ Get-File -Url -OutFile "boost.zip"`
`14`	`14`	`Expand-Archive -Path "boost.zip" -DestinationPath "../deps"`
`15`	`15`	`}`
`16`	`16`	`end {`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ Function Add-Extension {`
`22`	`22`	`}`
`23`	`23`	`process {`
`24`	`24`	`Set-GAGroup start`
`25`		`- Invoke-WebRequest -Uri "https://pecl.php.net/get/$Extension" -OutFile "$Extension.tgz"`
	`25`	`+ Get-File -Url "https://pecl.php.net/get/$Extension" -OutFile "$Extension.tgz"`
`26`	`26`	`$currentDirectory = (Get-Location).Path`
`27`	`27`	`& tar -xzf "$Extension.tgz" -C $currentDirectory`
`28`	`28`	`Set-Location "$Extension-*"`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ Function Add-ExtensionDependencies {`
`32`	`32`	`}`
`33`	`33`	`Default {`
`34`	`34`	`$url = "https://downloads.php.net/~windows/pecl/deps/$_"`
`35`		`- Invoke-WebRequest -Uri $url -OutFile $_ -UseBasicParsing`
	`35`	`+ Get-File -Url $url -OutFile $_`
`36`	`36`	`Expand-Archive -Path $_ -DestinationPath "..\deps" -Force`
`37`	`37`	`if(Test-Path "..\deps\LICENSE") {`
`38`	`38`	`Rename-Item -Path "..\deps\LICENSE" -NewName "LICENSE.$library"`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ Function Add-OciSdk {`
`16`	`16`	`$suffix = if ($Config.arch -eq "x64") {"windows"} else {"nt"}`
`17`	`17`	`@('sdk', 'basic') \| ForEach-Object {`
`18`	`18`	`$url = "https://download.oracle.com/otn_software/nt/instantclient/instantclient-$_-$suffix.zip"`
`19`		`- Invoke-WebRequest $url -OutFile "instantclient-$_.zip"`
	`19`	`+ Get-File -Url -OutFile "instantclient-$_.zip"`
`20`	`20`	`Expand-Archive -Path "instantclient-$_.zip" -DestinationPath "../deps" -Force`
`21`	`21`	`}`
`22`	`22`	`Copy-Item ../deps/instantclient_/sdk/ -Destination "../deps" -Recurse -Force`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ Function Add-OdbcCli {`
`15`	`15`	`process {`
`16`	`16`	`$prefix = if ($Config.arch -eq "x64") {"ntx64"} else {"nt32"}`
`17`	`17`	`$url = "https://public.dhe.ibm.com/ibmdl/export/pub/software/data/db2/drivers/odbc_cli/${prefix}_odbc_cli.zip"`
`18`		`- Invoke-WebRequest $url -OutFile "odbc_cli.zip"`
	`18`	`+ Get-File -Url $url -OutFile "odbc_cli.zip"`
`19`	`19`	`Expand-Archive -Path "odbc_cli.zip" -DestinationPath "../deps"`
`20`	`20`	`Copy-Item ../deps/clidriver/* -Destination "../deps" -Recurse -Force`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ function Add-Package {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`if(Test-Path ..\deps\bin) {`
`53`		`- $dllMap = Invoke-WebRequest -Uri "https://downloads.php.net/~windows/pecl/deps/dllmapping.json"`
	`53`	`+ $dllMap = Get-File -Url "https://downloads.php.net/~windows/pecl/deps/dllmapping.json"`
`54`	`54`	`Get-ChildItem -Path ..\deps\bin -Recurse -Include "*.dll" \| ForEach-Object {`
`55`	`55`	`if($dllMap.content.Contains($_.Name)) {`
`56`	`56`	`if(-not(Test-Path "php-bin\$($_.Name)")) {`