Fix parsing of PHP 7.4 beta URL

mlocati · Sep 3, 2019 · cbda459 · cbda459
1 parent 28bc4c5
commit cbda459
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/PhpManager/private/Constants.ps1 b/PhpManager/private/Constants.ps1
@@ -19,7 +19,7 @@ New-Variable -Option Constant -Scope Script -Name 'UNSTABLEPHP_RELEASECANDIDATE'
 # PHP non-stable identifiers regex
 New-Variable -Option Constant -Scope Script -Name 'UNSTABLEPHP_RX' -Value "$UNSTABLEPHP_ALPHA|$UNSTABLEPHP_BETA|$UNSTABLEPHP_RELEASECANDIDATE"
 
-New-Variable -Option Constant -Scope Script -Name 'RX_ZIPARCHIVE' -Value "php-(\d+\.\d+\.\d+)(?:($UNSTABLEPHP_RX)([1-9]\d*))?(-nts)?-Win32-(?:VC|vs)(\d{1,2})-(x86|x64)\.zip"
+New-Variable -Option Constant -Scope Script -Name 'RX_ZIPARCHIVE' -Value "php-(\d+\.\d+\.\d+)(?:($UNSTABLEPHP_RX)([1-9]\d*))?(-nts)?-Win32-(?:VC|vc|vs)(\d{1,2})-(x86|x64)\.zip"
 
 New-Variable -Option Constant -Scope Script -Name 'EXTENSIONSTATE_BUILTIN' -Value 'Builtin'
 New-Variable -Option Constant -Scope Script -Name 'EXTENSIONSTATE_UNKNOWN' -Value 'Unknown'

diff --git a/PhpManager/private/Get-PeclArchiveUrl.ps1 b/PhpManager/private/Get-PeclArchiveUrl.ps1
@@ -49,7 +49,7 @@
         $rxMatch += '-' + [regex]::Escape($PackageVersion)
         $rxMatch += '-' + [regex]::Escape('' + $PhpVersion.ComparableVersion.Major + '.' + $PhpVersion.ComparableVersion.Minor)
         $rxMatch += '-' + $(if ($PhpVersion.ThreadSafe) { 'ts' } else { 'nts' } )
-        $rxMatch += '-(vc|vs)' + $PhpVersion.VCVersion
+        $rxMatch += '-(VC|vc|vs)' + $PhpVersion.VCVersion
         $rxMatch += '-' + [regex]::Escape($PhpVersion.Architecture)
         $rxMatch += '\.zip$'
         $urls = @("https://windows.php.net/downloads/pecl/releases/$handleLC/$PackageVersion")

diff --git a/PhpManager/private/Install-PhpExtensionPrerequisite.ps1 b/PhpManager/private/Install-PhpExtensionPrerequisite.ps1
@@ -24,7 +24,7 @@
         Write-Verbose ('Checking prerequisites for {0}' -f $Extension.Name)
         switch ($Extension.Handle) {
             imagick {
-                $rxSearch = '/ImageMagick-[\d\.\-]+-(vc|vs)' + $PhpVersion.VCVersion + '-' + $PhpVersion.Architecture + '\.zip$'
+                $rxSearch = '/ImageMagick-[\d\.\-]+-(VC|vc|vs)' + $PhpVersion.VCVersion + '-' + $PhpVersion.Architecture + '\.zip$'
                 $pageUrl = 'https://windows.php.net/downloads/pecl/deps/'
                 Set-NetSecurityProtocolType
                 $webResponse = Invoke-WebRequest -UseBasicParsing -Uri $pageUrl