Add fallback to 7zip for extracting

Author: shivammathur

php/BuildPhp/private/Add-TestRequirements.ps1

@@ -60,14 +60,22 @@ function Add-TestRequirements {
             Write-Host "Downloading PHP build $binZipFile..."
             Get-PhpBuild -PhpVersion $PhpVersion -Arch $Arch -Ts $Ts -VsVersion $VsVersion
         } else {
-            [System.IO.Compression.ZipFile]::ExtractToDirectory($binZipFilePath, $binDirectoryPath)
+            try {
+                [System.IO.Compression.ZipFile]::ExtractToDirectory($binZipFilePath, $binDirectoryPath)
+            } catch {
+                7z x $binZipFilePath "-o$binDirectoryPath" -y | Out-Null
+            }
         }
 
         if(-not(Test-Path $testZipFilePath)) {
             Write-Host "Downloading PHP test pack $testZipFile..."
             Get-PhpTestPack -PhpVersion $PhpVersion -TestsDirectory $TestsDirectory
         } else {
-            [System.IO.Compression.ZipFile]::ExtractToDirectory($testZipFilePath, $testsDirectoryPath)
+            try {
+                [System.IO.Compression.ZipFile]::ExtractToDirectory($testZipFilePath, $testsDirectoryPath)
+            } catch {
+                7z x $testZipFilePath "-o$testsDirectoryPath" -y | Out-Null
+            }
         }
 
         $FetchDeps = $False

php/BuildPhp/private/Get-PhpBuild.ps1

@@ -68,7 +68,11 @@ function Get-PhpBuild {
         $binZipFilePath = Join-Path $currentDirectory $binZipFile
         $binDirectoryPath = Join-Path $currentDirectory phpbin
 
-        [System.IO.Compression.ZipFile]::ExtractToDirectory($binZipFilePath, $binDirectoryPath)
+        try {
+            [System.IO.Compression.ZipFile]::ExtractToDirectory($binZipFilePath, $binDirectoryPath)
+        } catch {
+            7z x $binZipFilePath "-o$binDirectoryPath" -y | Out-Null
+        }
     }
     end {
     }

php/BuildPhp/private/Get-PhpTestPack.ps1

@@ -49,7 +49,11 @@ function Get-PhpTestPack {
         $testZipFilePath = Join-Path $currentDirectory $testZipFile
         $testsDirectoryPath = Join-Path $currentDirectory $TestsDirectory
 
-        [System.IO.Compression.ZipFile]::ExtractToDirectory($testZipFilePath, $testsDirectoryPath)
+        try {
+            [System.IO.Compression.ZipFile]::ExtractToDirectory($testZipFilePath, $testsDirectoryPath)
+        } catch {
+            7z x $testZipFilePath "-o$testsDirectoryPath" -y | Out-Null
+        }
     }
     end {
     }