actions/setup-php
1
0
Fork 0
mirror of https://github.com/shivammathur/setup-php.git synced 2024-11-22 20:01:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix installing xdebug with PHP 7.4 on Windows

Browse Source
This commit is contained in:
Michele Locati 2019-11-25 14:03:28 +01:00
parent 47387dd6e9
commit 71c631cffb
No known key found for this signature in database
GPG Key ID: 98B7CE2E7234E28B
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
__tests__/extensions.test.ts
View File

@ -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 pcov'); expect(win32).toContain('Add-Extension xdebug beta');
win32 = await extensions.addExtension( win32 = await extensions.addExtension(
'does_not_exist', 'does_not_exist',

9
src/extensions.ts
View File

@ -50,7 +50,14 @@ 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
script += '\nAdd-Extension ' + extension; let minimum_stability = 'stable';
switch (version + extension.toLowerCase()) {
case '7.4xdebug':
minimum_stability = 'beta';
break;
}
script += `
Add-Extension ${extension} ${minimum_stability}`;
}); });
return script; return script;
} }

4
src/scripts/win32.ps1
View File

@ -59,7 +59,7 @@ 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) { Function Add-Extension($extension, $mininum_stability) {
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) {
@ -77,7 +77,7 @@ Function Add-Extension($extension) {
} }
} }
else { else {
Install-PhpExtension -Extension $extension -Path $php_dir Install-PhpExtension -Extension $extension -MinimumStability $mininum_stability -Path $php_dir
Add-Log $tick $extension "Downloaded and enabled" Add-Log $tick $extension "Downloaded and enabled"
} }
} }