Skip to content

Commit cbda459

Browse files
committed
Fix parsing of PHP 7.4 beta URL
1 parent 28bc4c5 commit cbda459

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

PhpManager/private/Constants.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ New-Variable -Option Constant -Scope Script -Name 'UNSTABLEPHP_RELEASECANDIDATE'
1919
# PHP non-stable identifiers regex
2020
New-Variable -Option Constant -Scope Script -Name 'UNSTABLEPHP_RX' -Value "$UNSTABLEPHP_ALPHA|$UNSTABLEPHP_BETA|$UNSTABLEPHP_RELEASECANDIDATE"
2121

22-
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"
22+
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"
2323

2424
New-Variable -Option Constant -Scope Script -Name 'EXTENSIONSTATE_BUILTIN' -Value 'Builtin'
2525
New-Variable -Option Constant -Scope Script -Name 'EXTENSIONSTATE_UNKNOWN' -Value 'Unknown'

PhpManager/private/Get-PeclArchiveUrl.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
$rxMatch += '-' + [regex]::Escape($PackageVersion)
5050
$rxMatch += '-' + [regex]::Escape('' + $PhpVersion.ComparableVersion.Major + '.' + $PhpVersion.ComparableVersion.Minor)
5151
$rxMatch += '-' + $(if ($PhpVersion.ThreadSafe) { 'ts' } else { 'nts' } )
52-
$rxMatch += '-(vc|vs)' + $PhpVersion.VCVersion
52+
$rxMatch += '-(VC|vc|vs)' + $PhpVersion.VCVersion
5353
$rxMatch += '-' + [regex]::Escape($PhpVersion.Architecture)
5454
$rxMatch += '\.zip$'
5555
$urls = @("https://windows.php.net/downloads/pecl/releases/$handleLC/$PackageVersion")

PhpManager/private/Install-PhpExtensionPrerequisite.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
Write-Verbose ('Checking prerequisites for {0}' -f $Extension.Name)
2525
switch ($Extension.Handle) {
2626
imagick {
27-
$rxSearch = '/ImageMagick-[\d\.\-]+-(vc|vs)' + $PhpVersion.VCVersion + '-' + $PhpVersion.Architecture + '\.zip$'
27+
$rxSearch = '/ImageMagick-[\d\.\-]+-(VC|vc|vs)' + $PhpVersion.VCVersion + '-' + $PhpVersion.Architecture + '\.zip$'
2828
$pageUrl = 'https://windows.php.net/downloads/pecl/deps/'
2929
Set-NetSecurityProtocolType
3030
$webResponse = Invoke-WebRequest -UseBasicParsing -Uri $pageUrl

0 commit comments

Comments
 (0)