Merge pull request #89 from mlocati/php8.1rc-take2

Detect RC<n>-dev snapshot versions

Author: mlocati

PhpManager/private/Constants.ps1

@@ -25,7 +25,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_LC|$UNSTABLEPHP_RELEASECANDIDATE_UC"
 
-New-Variable -Option Constant -Scope Script -Name 'RX_ZIPARCHIVE' -Value "php-(?<version>\d+\.\d+\.\d+)(?:(?<unstabilityLevel>$UNSTABLEPHP_RX)(?<unstabilityVersion>[1-9]\d*)(?:-dev)?)?(?<threadSafe>-nts)?-Win32-(?:VC|vc|vs)(?<vcVersion>\d{1,2})-(?<architecture>x86|x64)\.zip"
+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"
 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$"
 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$"
 

PhpManager/private/PhpVersion.ps1

@@ -307,13 +307,13 @@ echo PHP_VERSION, chr(9), PHP_INT_SIZE * 8, chr(9), $matches[1];
         if ($LASTEXITCODE -ne 0 -or -Not($executableResult)) {
             throw "Failed to execute php.exe: $LASTEXITCODE"
         }
-        $match = $executableResult | Select-String -Pattern "(?<version>\d+\.\d+\.\d+)(?<stabilityLevel>-dev|(?:$Script:UNSTABLEPHP_RX))?(?<stabilityVersion>\d+)?(-dev)?\t(?<bits>\d+)\t(?<apiVersion>\d+)$"
+        $match = $executableResult | Select-String -Pattern "(?<version>\d+\.\d+\.\d+)(?<stabilityLevel>([Rr][Cc]\d+)?-dev|(?:$Script:UNSTABLEPHP_RX))?(?<stabilityVersion>\d+)?\t(?<bits>\d+)\t(?<apiVersion>\d+)$"
         if (-not($match)) {
             throw "Unsupported PHP version: $executableResult"
         }
         $groups = $match.Matches[0].Groups
         $data.Version = $groups['version'].Value
-        if ($groups['stabilityLevel'].Value -eq '-dev') {
+        if ($groups['stabilityLevel'].Value -match '-dev$') {
             $data.UnstabilityLevel = $Script:UNSTABLEPHP_SNAPSHOT
         } else {
             $data.UnstabilityLevel = $groups['stabilityLevel'].Value

PhpManager/public/Install-Php.ps1

@@ -97,7 +97,7 @@
                 $searchReleaseStates = @($Script:RELEASESTATE_SNAPSHOT)
                 $rxSearchVersion = "^$($match.Matches[0].Groups[1].Value -replace '\.', '\.')-dev$"
             } else {
-                $match = $Version | Select-String -Pattern "^([1-9]\d*)(?:\.(\d+))?(?:\.(\d+))?(?:($Script:UNSTABLEPHP_RX)(\d*)(?:-dev)?)?$"
+                $match = $Version | Select-String -Pattern "^([1-9]\d*)(?:\.(\d+))?(?:\.(\d+))?(?:($Script:UNSTABLEPHP_RX)(\d*))?$"
                 if ($null -eq $match) {
                     throw "The specified PHP version ($Version) is malformed"
                 }