Skip to content

Commit 6782029

Browse files
authored
Merge pull request #13 from thecaliskan/master
Added PHP 8.5 Support
2 parents 36949b0 + cc89fd8 commit 6782029

File tree

6 files changed

+11
-3
lines changed

6 files changed

+11
-3
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ It will also check if a GitHub hosted Windows runner is available with the requi
138138
| 8.2 | 2019 (vs16) | windows-2022, github-hosted |
139139
| 8.3 | 2019 (vs16) | windows-2022, github-hosted |
140140
| 8.4 | 2022 (vs17) | windows-2022, github-hosted |
141+
| 8.5 | 2022 (vs17) | windows-2022, github-hosted |
141142
| master | 2022 (vs17) | windows-2022, github-hosted |
142143

143144
## Release

extension-matrix/config/vs.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@
4949
"os": "windows-2022",
5050
"type": "github-hosted"
5151
},
52+
"8.5": {
53+
"vs": "2022",
54+
"os": "windows-2022",
55+
"dev": true,
56+
"type": "github-hosted"
57+
},
5258
"master": {
5359
"vs": "2022",
5460
"os": "windows-2022",

extension/BuildPhpExtension/private/Get-PhpBuildDetails.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ function Get-PhpBuildDetails {
1313
begin {
1414
}
1515
process {
16-
if($Config.php_version -eq 'master') {
16+
if($Config.php_version -eq 'master' -or $Config.php_version -eq '8.5') {
1717
$baseUrl = $fallbackBaseUrl = "https://github.com/shivammathur/php-builder-windows/releases/download/master"
1818
$PhpSemver = $PhpVersion
1919
} else {

php/BuildPhp/config/tests.config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@
99
"8.2": {"runner": "run-tests.php", "workers": "-jNumWorkers", "progress": "--no-progress"},
1010
"8.3": {"runner": "run-tests.php", "workers": "-jNumWorkers", "progress": "--no-progress"},
1111
"8.4": {"runner": "run-tests.php", "workers": "-jNumWorkers", "progress": "--no-progress"},
12+
"8.5": {"runner": "run-tests.php", "workers": "-jNumWorkers", "progress": "--no-progress"},
1213
"default": {"runner": "run-tests.php", "workers": "jNumWorkers", "progress": ""}
1314
}

php/BuildPhp/private/Get-PhpBuild.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ function Get-PhpBuild {
4040
throw "PHP version $PhpVersion is not supported."
4141
}
4242
}
43-
if($PhpVersion -eq 'master') {
43+
if($PhpVersion -eq 'master' -or $PhpVersion -eq '8.5') {
4444
$fallbackBaseUrl = $baseUrl = "https://github.com/shivammathur/php-builder-windows/releases/download/master"
4545
} else {
4646
$releaseState = if ($PhpVersion -match "[a-z]") {"qa"} else {"releases"}

php/BuildPhp/private/Get-PhpTestPack.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function Get-PhpTestPack {
2222
process {
2323
Add-Type -Assembly "System.IO.Compression.Filesystem"
2424

25-
if($PhpVersion -eq 'master') {
25+
if($PhpVersion -eq 'master' -or $PhpVersion -eq '8.5') {
2626
$fallbackBaseUrl = $baseUrl = "https://github.com/shivammathur/php-builder-windows/releases/download/master"
2727
} else {
2828
$releaseState = if ($PhpVersion -match "[a-z]") {"qa"} else {"releases"}

0 commit comments

Comments
 (0)