Skip to content

Commit 753499b

Browse files
authored
Switch from windows.php.net to downloads.php.net/~windows (#138)
* Switch from windows.php.net to downloads.php.net/~windows * Accept HTML pages with relative HTML links
1 parent 0f469e7 commit 753499b

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

PhpManager/private/Constants.ps1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
New-Variable -Option Constant -Scope Script -Name 'URL_LIST_QA' -Value 'https://windows.php.net/downloads/qa/'
2-
New-Variable -Option Constant -Scope Script -Name 'URL_LIST_RELEASE' -Value 'https://windows.php.net/downloads/releases/'
3-
New-Variable -Option Constant -Scope Script -Name 'URL_LIST_ARCHIVE' -Value 'https://windows.php.net/downloads/releases/archives/'
1+
New-Variable -Option Constant -Scope Script -Name 'URL_LIST_QA' -Value 'https://downloads.php.net/~windows/qa/'
2+
New-Variable -Option Constant -Scope Script -Name 'URL_LIST_RELEASE' -Value 'https://downloads.php.net/~windows/releases/'
3+
New-Variable -Option Constant -Scope Script -Name 'URL_LIST_ARCHIVE' -Value 'https://downloads.php.net/~windows/releases/archives/'
44
New-Variable -Option Constant -Scope Script -Name 'URL_LIST_SNAPSHOT' -Value 'https://windows.php.net/downloads/snaps/'
55

66
New-Variable -Option Constant -Scope Script -Name 'RELEASESTATE_UNKNOWN' -Value ''
@@ -26,8 +26,8 @@ New-Variable -Option Constant -Scope Script -Name 'UNSTABLEPHP_RELEASECANDIDATE_
2626
New-Variable -Option Constant -Scope Script -Name 'UNSTABLEPHP_RX' -Value "$UNSTABLEPHP_ALPHA|$UNSTABLEPHP_BETA|$UNSTABLEPHP_RELEASECANDIDATE_LC|$UNSTABLEPHP_RELEASECANDIDATE_UC"
2727

2828
New-Variable -Option Constant -Scope Script -Name 'RX_ZIPARCHIVE' -Value "php-(?<version>\d+\.\d+\.\d+)(?:(?<unstabilityLevel>$UNSTABLEPHP_RX)(?<unstabilityVersion>[1-9]\d*))?(?<threadSafe>-nts)?-Win32-(?:VC|vc|vs)(?<vcVersion>\d{1,2})-(?<architecture>x86|x64)\.zip"
29-
New-Variable -Option Constant -Scope Script -Name 'RX_ZIPARCHIVE_SNAPSHOT' -Value "/(?:master|(?:php-(?<version>\d+\.\d+)))/r[0-9a-f]{7,}/php-(?:master|\d+\.\d+)-(?<threadSafe>nts|ts)-windows-(?:VC|vc|vs)(?<vcVersion>\d{1,2})-(?<architecture>x86|x64)-r[0-9a-f]{7,}\.zip$"
30-
New-Variable -Option Constant -Scope Script -Name 'RX_ZIPARCHIVE_SNAPSHOT_SHIVAMMATHUR' -Value "/php-(?:master|\d+\.\d+)-(?<threadSafe>nts|ts)-windows-(?:VC|vc|vs)(?<vcVersion>\d{1,2})-(?<architecture>x86|x64).zip$"
29+
New-Variable -Option Constant -Scope Script -Name 'RX_ZIPARCHIVE_SNAPSHOT' -Value "(?:master|(?:php-(?<version>\d+\.\d+)))/r[0-9a-f]{7,}/php-(?:master|\d+\.\d+)-(?<threadSafe>nts|ts)-windows-(?:VC|vc|vs)(?<vcVersion>\d{1,2})-(?<architecture>x86|x64)-r[0-9a-f]{7,}\.zip"
30+
New-Variable -Option Constant -Scope Script -Name 'RX_ZIPARCHIVE_SNAPSHOT_SHIVAMMATHUR' -Value "php-(?:master|\d+\.\d+)-(?<threadSafe>nts|ts)-windows-(?:VC|vc|vs)(?<vcVersion>\d{1,2})-(?<architecture>x86|x64).zip"
3131

3232
New-Variable -Option Constant -Scope Script -Name 'EXTENSIONSTATE_BUILTIN' -Value 'Builtin'
3333
New-Variable -Option Constant -Scope Script -Name 'EXTENSIONSTATE_UNKNOWN' -Value 'Unknown'

PhpManager/private/Get-PhpVersionFromUrl.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
}
3535
process {
3636
$data = @{}
37-
$match = $Url | Select-String -CaseSensitive -Pattern ('/' + $Script:RX_ZIPARCHIVE + '$')
37+
$match = $Url | Select-String -CaseSensitive -Pattern ('(^|/)' + $Script:RX_ZIPARCHIVE + '$')
3838
if ($null -ne $match) {
3939
$groups = $match.Matches[0].Groups
4040
$data.Version = $groups['version'].Value
@@ -44,9 +44,9 @@
4444
$data.VCVersion = $groups['vcVersion'].Value
4545
$data.Architecture = $groups['architecture'].Value
4646
} else {
47-
$match = $Url | Select-String -CaseSensitive -Pattern ($Script:RX_ZIPARCHIVE_SNAPSHOT)
47+
$match = $Url | Select-String -CaseSensitive -Pattern ('(^|/)' + $Script:RX_ZIPARCHIVE_SNAPSHOT + '$')
4848
if ($null -eq $match) {
49-
$match = $Url | Select-String -CaseSensitive -Pattern ($Script:RX_ZIPARCHIVE_SNAPSHOT_SHIVAMMATHUR)
49+
$match = $Url | Select-String -CaseSensitive -Pattern ('(^|/)' + $Script:RX_ZIPARCHIVE_SNAPSHOT_SHIVAMMATHUR + '$')
5050
}
5151
if ($null -ne $match) {
5252
$groups = $match.Matches[0].Groups

PhpManager/public/Get-PhpAvailableVersion.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
continue
8989
}
9090
$artifactUrl = [Uri]::new([Uri]"$artifactsUrl/", $artifactsLink.HREF).AbsoluteUri
91-
if (-not($artifactUrl -match $Script:RX_ZIPARCHIVE_SNAPSHOT)) {
91+
if (-not($artifactUrl -match ('(^|/)' + $Script:RX_ZIPARCHIVE_SNAPSHOT + '$'))) {
9292
continue
9393
}
9494
$artifactVersion = Get-PhpVersionFromUrl -Url $artifactUrl -ReleaseState $State
@@ -110,7 +110,7 @@
110110
}
111111
default {
112112
$webResponse = Get-WebResource -Uri $urlList
113-
foreach ($link in $webResponse.Links | Where-Object -Property 'Href' -Match ('/' + $Script:RX_ZIPARCHIVE + '$')) {
113+
foreach ($link in $webResponse.Links | Where-Object -Property 'Href' -Match ('(^|/)' + $Script:RX_ZIPARCHIVE + '$')) {
114114
$result += Get-PhpVersionFromUrl -Url $link.Href -ReleaseState $State -PageUrl $urlList
115115
}
116116
}

0 commit comments

Comments
 (0)