From e030852d0e63c6ad8d5f7004f7e99bf071b472d1 Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Thu, 9 Sep 2021 02:53:01 +0530 Subject: [PATCH] Use PhpManager for all PHP versions on v1 --- src/scripts/win32.ps1 | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/scripts/win32.ps1 b/src/scripts/win32.ps1 index 1f90b402..8fe0620c 100644 --- a/src/scripts/win32.ps1 +++ b/src/scripts/win32.ps1 @@ -277,7 +277,6 @@ $github = 'https://github.com' $composer_bin = "$env:APPDATA\Composer\vendor\bin" $composer_json = "$env:APPDATA\Composer\composer.json" $composer_lock = "$env:APPDATA\Composer\composer.lock" -$master_version = '8.0' $arch = 'x64' if(-not([Environment]::Is64BitOperatingSystem) -or $version -lt '7.0') { $arch = 'x86' @@ -308,13 +307,7 @@ if ($null -eq $installed -or -not("$($installed.Version).".StartsWith(($version Install-PSPackage VcRedist VcRedist-main\VcRedist\VcRedist "$github/aaronparker/VcRedist/archive/main.zip" Get-VcList >$null 2>&1 } try { - if ($version -eq $master_version) { - $version = 'master' - Invoke-WebRequest -UseBasicParsing -Uri https://github.com/shivammathur/php-builder-windows/releases/latest/download/Get-Php.ps1 -OutFile $php_dir\Get-Php.ps1 > $null 2>&1 - & $php_dir\Get-Php.ps1 -Architecture $arch -ThreadSafe $ts -Path $php_dir - } else { - Install-Php -Version $version -Architecture $arch -ThreadSafe $ts -InstallVC -Path $php_dir -TimeZone UTC -InitialPhpIni Production -Force > $null 2>&1 - } + Install-Php -Version $version -Architecture $arch -ThreadSafe $ts -InstallVC -Path $php_dir -TimeZone UTC -InitialPhpIni Production -Force > $null 2>&1 } catch { } } else { $status = "Found"