Skip to content

Commit ab66218

Browse files
authored
Merge pull request #119 from mlocati/php8.4
Add support for PHP 8.4 (alpha)
2 parents 6d8ee5e + d502a60 commit ab66218

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

PhpManager/private/Get-PhpVersionFromApiVersion.ps1

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,22 @@ function Get-PhpVersionFromApiVersion {
1616
return ''
1717
}
1818
switch ($ApiVersion) {
19+
# https://github.com/php/php-src/blob/php-8.4.0alpha1/Zend/zend_modules.h#L34
20+
20230901 {
21+
return '8.4'
22+
}
1923
# https://github.com/php/php-src/blob/php-8.3.0RC1/Zend/zend_modules.h#L34
20-
# https://github.com/php/php-src/blob/php-8.3.7/Zend/zend_modules.h#L34
24+
# https://github.com/php/php-src/blob/php-8.3.9/Zend/zend_modules.h#L34
2125
20230831 {
2226
return '8.3'
2327
}
2428
# https://github.com/php/php-src/blob/php-8.2.0RC1/Zend/zend_modules.h#L34
25-
# https://github.com/php/php-src/blob/php-8.2.19/Zend/zend_modules.h#L34
29+
# https://github.com/php/php-src/blob/php-8.2.21/Zend/zend_modules.h#L34
2630
20220829 {
2731
return '8.2'
2832
}
2933
# https://github.com/php/php-src/blob/php-8.1.0RC1/Zend/zend_modules.h#L34
30-
# https://github.com/php/php-src/blob/php-8.1.28/Zend/zend_modules.h#L34
34+
# https://github.com/php/php-src/blob/php-8.1.29/Zend/zend_modules.h#L34
3135
20210902 {
3236
return '8.1'
3337
}

PhpManager/private/PhpVersion.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ echo PHP_VERSION, chr(9), PHP_INT_SIZE * 8, chr(9), $matches[1];
324324
$executableResult = & $data.ExecutablePath @('-i')
325325
$match = $executableResult | Select-String -CaseSensitive -Pattern '^[ \t]*Thread Safety\s*=>\s*(\w+)'
326326
$data.ThreadSafe = $match.Matches.Groups[1].Value -eq 'enabled'
327-
$match = $executableResult | Select-String -CaseSensitive -Pattern '^[ \t]*Compiler\s*=>\s*MSVC([\d]{1,2})'
327+
$match = $executableResult | Select-String -CaseSensitive -Pattern '^[ \t]*Compiler\s*=>\s*MSVC ?([\d]{1,2})'
328328
if ($null -ne $match) {
329329
$data.VCVersion = $match.Matches.Groups[1].Value
330330
} elseif ([System.Version]$data.Version -le [System.Version]'5.2.9999') {

0 commit comments

Comments
 (0)