actions/setup-php
1
0
Fork 0
mirror of https://github.com/shivammathur/setup-php.git synced 2025-09-15 09:14:19 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix extension logs

Browse Source 
Refactor utils.addCommand
This commit is contained in:
Shivam Mathur
2023-01-18 09:00:28 +05:30
parent 6db1a06425
commit bbc65d999a
10 changed files with 94 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/scripts/extensions/add_extensions.ps1
View File

@ -1,3 +1,20 @@
Function Add-ExtensionLog() {
Param (
[Parameter(Position = 0, Mandatory = $true)]
[ValidateNotNull()]
$extension,
[Parameter(Position = 1, Mandatory = $true)]
[ValidateNotNull()]
$message
)
$extension_info = Get-PhpExtension -Path $php_dir | Where-Object { $_.Name -eq $extension -or $_.Handle -eq $extension }
if ($null -ne $extension_info -and ($extension_info.State -eq 'Enabled' -or $extension_info.State -eq 'Builtin')) {
Add-Log $tick $extension $message
} else {
Add-Log $cross $extension "Could not install $extension on PHP $( $installed.FullVersion )"
}
}
# Function to link dependencies to PHP directory.
Function Set-ExtensionPrerequisites
{

7
src/scripts/extensions/http.ps1
View File

@ -47,10 +47,5 @@ Function Add-Http() {
}
Add-Extension pecl_http >$null 2>&1
Repair-ICU
try {
php --ri "http" 2> $null | Out-Null
Add-Log $tick "http" "Installed and enabled"
} catch {
Add-Log $cross "http" "Could not install http on PHP $( $installed.FullVersion )"
}
Add-ExtensionLog http "Installed and enabled"
}

6
src/scripts/tools/add_tools.ps1
View File

@ -183,7 +183,7 @@ Function Add-Tool() {
}
}
Function Add-ComposertoolHelper() {
Function Add-ComposerToolHelper() {
Param (
[Parameter(Position = 0, Mandatory = $true)]
[string]
@ -234,7 +234,7 @@ Function Add-ComposertoolHelper() {
}
# Function to setup a tool using composer.
Function Add-Composertool() {
Function Add-ComposerTool() {
Param (
[Parameter(Position = 0, Mandatory = $true)]
[ValidateNotNull()]
@ -267,7 +267,7 @@ Function Add-Composertool() {
}
}
Enable-PhpExtension -Extension curl, mbstring, openssl -Path $php_dir
$log = Add-ComposertoolHelper $tool $release $prefix $scope $composer_args
$log = Add-ComposerToolHelper $tool $release $prefix $scope $composer_args
if(Test-Path $composer_bin\composer) {
Copy-Item -Path "$bin_dir\composer" -Destination "$composer_bin\composer" -Force
}

6
src/scripts/tools/add_tools.sh
View File

@ -153,7 +153,7 @@ add_tool() {
}
# Function to setup a tool using composer in a different scope.
add_composertool_helper() {
add_composer_tool_helper() {
tool=$1
release=$2
prefix=$3
@ -184,7 +184,7 @@ add_composertool_helper() {
}
# Function to setup a tool using composer.
add_composertool() {
add_composer_tool() {
tool=$1
release=$2
prefix=$3
@ -199,7 +199,7 @@ add_composertool() {
return
fi
fi
add_composertool_helper "$tool" "$release" "$prefix" "$scope" "$composer_args"
add_composer_tool_helper "$tool" "$release" "$prefix" "$scope" "$composer_args"
tool_version=$(get_tool_version cat /tmp/composer.log)
([ -s /tmp/composer.log ] && add_log "$tick" "$tool" "Added $tool $tool_version"
) || add_log "$cross" "$tool" "Could not setup $tool"