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

Merge pull request #528 from shivammathur/develop

Browse Source 
Stop using Install-PhpExtensionPrerequisite for imagick
This commit is contained in:
Shivam Mathur 2021-11-11 19:29:43 +05:30 committed by GitHub
commit ac7d3d7f84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/scripts/win32.ps1
View File

@ -141,26 +141,6 @@ Function Set-ExtensionPrerequisites
} }
} }
# Function to get extension pre-requisites.
# https://windows.php.net/downloads/pecl/deps
# Currently only imagick is supported using this Cmdlet.
Function Get-ExtensionPrerequisites{
Param (
[Parameter(Position = 0, Mandatory = $true)]
[ValidateNotNull()]
[ValidateLength(1, [int]::MaxValue)]
[string]
$extension
)
$deps_dir = "$ext_dir\$extension-vc$($installed.VCVersion)-$arch"
$extensions_with_dependencies = ('imagick')
New-Item $deps_dir -Type Directory -Force > $null 2>&1
if($extensions_with_dependencies.Contains($extension)) {
Install-PhpExtensionPrerequisite -Extension $extension -InstallPath $deps_dir -PhpPath $php_dir
}
return $deps_dir
}
# Function to add CA certificates to PHP. # Function to add CA certificates to PHP.
Function Add-PhpCAInfo { Function Add-PhpCAInfo {
try { try {
@ -192,6 +172,8 @@ Function Add-Extension {
) )
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 }
$deps_dir = "$ext_dir\$extension-vc$($installed.VCVersion)-$arch"
New-Item $deps_dir -Type Directory -Force > $null 2>&1
if ($null -ne $extension_info) { if ($null -ne $extension_info) {
switch ($extension_info.State) { switch ($extension_info.State) {
'Builtin' { 'Builtin' {
@ -201,7 +183,6 @@ Function Add-Extension {
Add-Log $tick $extension "Enabled" Add-Log $tick $extension "Enabled"
} }
default { default {
$deps_dir = Get-ExtensionPrerequisites $extension
Enable-ExtensionDependencies $extension Enable-ExtensionDependencies $extension
Enable-PhpExtension -Extension $extension_info.Handle -Path $php_dir Enable-PhpExtension -Extension $extension_info.Handle -Path $php_dir
Set-ExtensionPrerequisites $deps_dir Set-ExtensionPrerequisites $deps_dir
@ -210,7 +191,6 @@ Function Add-Extension {
} }
} }
else { else {
$deps_dir = Get-ExtensionPrerequisites $extension
$params = @{ Extension = $extension; MinimumStability = $stability; MaximumStability = $stability; Path = $php_dir; AdditionalFilesPath = $deps_dir; NoDependencies = $true } $params = @{ Extension = $extension; MinimumStability = $stability; MaximumStability = $stability; Path = $php_dir; AdditionalFilesPath = $deps_dir; NoDependencies = $true }
if($extension_version -ne '') { if($extension_version -ne '') {
$params["Version"] = $extension_version $params["Version"] = $extension_version