mirror of
https://github.com/shivammathur/setup-php.git
synced 2024-11-26 05:23:03 +07:00
Install the stable release of xdebug even on PHP 7.4RC
This commit is contained in:
parent
981c662f5d
commit
0be846de83
@ -10,7 +10,7 @@ describe('Extension tests', () => {
|
|||||||
expect(win32).toContain('Add-Extension xdebug');
|
expect(win32).toContain('Add-Extension xdebug');
|
||||||
expect(win32).toContain('Add-Extension pcov');
|
expect(win32).toContain('Add-Extension pcov');
|
||||||
win32 = await extensions.addExtension('xdebug, pcov', '7.4', 'win32');
|
win32 = await extensions.addExtension('xdebug, pcov', '7.4', 'win32');
|
||||||
expect(win32).toContain('Add-Extension xdebug beta');
|
expect(win32).toContain('Add-Extension xdebug');
|
||||||
|
|
||||||
win32 = await extensions.addExtension(
|
win32 = await extensions.addExtension(
|
||||||
'does_not_exist',
|
'does_not_exist',
|
||||||
|
@ -50,13 +50,7 @@ export async function addExtensionWindows(
|
|||||||
let script = '\n';
|
let script = '\n';
|
||||||
await utils.asyncForEach(extensions, async function(extension: string) {
|
await utils.asyncForEach(extensions, async function(extension: string) {
|
||||||
// add script to enable extension is already installed along with php
|
// add script to enable extension is already installed along with php
|
||||||
let minimum_stability = 'stable';
|
script += '\nAdd-Extension ' + extension;
|
||||||
switch (version + extension.toLowerCase()) {
|
|
||||||
case '7.4xdebug':
|
|
||||||
minimum_stability = 'beta';
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
script += '\nAdd-Extension ' + extension + ' ' + minimum_stability;
|
|
||||||
});
|
});
|
||||||
return script;
|
return script;
|
||||||
}
|
}
|
||||||
|
@ -48,7 +48,8 @@ Set-PhpIniKey -Key 'date.timezone' -Value 'UTC' -Path $php_dir
|
|||||||
Enable-PhpExtension -Extension openssl, curl -Path $php_dir
|
Enable-PhpExtension -Extension openssl, curl -Path $php_dir
|
||||||
try {
|
try {
|
||||||
Update-PhpCAInfo -Path $php_dir -Source CurrentUser
|
Update-PhpCAInfo -Path $php_dir -Source CurrentUser
|
||||||
} catch {
|
}
|
||||||
|
catch {
|
||||||
Update-PhpCAInfo -Path $php_dir -Source Curl
|
Update-PhpCAInfo -Path $php_dir -Source Curl
|
||||||
}
|
}
|
||||||
if ([Version]$installed.Version -ge '7.4') {
|
if ([Version]$installed.Version -ge '7.4') {
|
||||||
@ -59,7 +60,19 @@ Add-Log $tick "PHP" $status
|
|||||||
Install-Composer -Scope System -Path $php_dir -PhpPath $php_dir
|
Install-Composer -Scope System -Path $php_dir -PhpPath $php_dir
|
||||||
Add-Log $tick "Composer" "Installed"
|
Add-Log $tick "Composer" "Installed"
|
||||||
|
|
||||||
Function Add-Extension($extension, $mininum_stability) {
|
Function Add-Extension {
|
||||||
|
Param (
|
||||||
|
[Parameter(Position = 0, Mandatory = $true)]
|
||||||
|
[ValidateNotNull()]
|
||||||
|
[ValidateLength(1, [int]::MaxValue)]
|
||||||
|
[string]
|
||||||
|
$extension,
|
||||||
|
[Parameter(Position = 1, Mandatory = $false)]
|
||||||
|
[ValidateNotNull()]
|
||||||
|
[ValidateSet('stable', 'beta', 'alpha', 'devel', 'snapshot')]
|
||||||
|
[string]
|
||||||
|
$mininum_stability = 'stable'
|
||||||
|
)
|
||||||
try {
|
try {
|
||||||
$extension_info = Get-PhpExtension -Path $php_dir | Where-Object { $_.Name -eq $extension -or $_.Handle -eq $extension }
|
$extension_info = Get-PhpExtension -Path $php_dir | Where-Object { $_.Name -eq $extension -or $_.Handle -eq $extension }
|
||||||
if ($null -ne $extension_info) {
|
if ($null -ne $extension_info) {
|
||||||
|
Loading…
Reference in New Issue
Block a user