Skip to content

Commit 1000991

Browse files
authored
Merge pull request #95 from mlocati/fix-imagick-dependencies
Use the ImageMagick DLLs that comes the imagick zip archive
2 parents b6029fc + df20d6b commit 1000991

File tree

3 files changed

+3
-91
lines changed

3 files changed

+3
-91
lines changed

PhpManager/private/Install-ImagickPrerequisite.ps1

Lines changed: 0 additions & 83 deletions
This file was deleted.

PhpManager/public/Install-PhpExtension.ps1

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,9 @@
177177
}
178178
}
179179
'imagick' {
180-
if ($phpVersion.FullVersion -ge [System.Version]'8.0.0') {
181-
$additionalFiles += @(Get-ChildItem -Path $tempFolder\CORE_RL_*.dll -File -Depth 1)
182-
$additionalFiles += @(Get-ChildItem -Path $tempFolder\IM_MOD_RL_*.dll -File -Depth 1)
183-
$additionalFiles += @(Get-ChildItem -Path $tempFolder\FILTER_*.dll -File -Depth 1)
184-
}
180+
$additionalFiles += @(Get-ChildItem -Path $tempFolder\CORE_*.dll -File -Depth 1)
181+
$additionalFiles += @(Get-ChildItem -Path $tempFolder\IM_*.dll -File -Depth 1)
182+
$additionalFiles += @(Get-ChildItem -Path $tempFolder\FILTER_*.dll -File -Depth 1)
185183
}
186184
'yaml' {
187185
$yamlDll = Join-Path -Path $tempFolder -ChildPath 'yaml.dll'

PhpManager/public/Install-PhpExtensionPrerequisite.ps1

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@
5050
$wantedExtensionHandle = Get-PhpExtensionHandle -Name $wantedExtension
5151
Write-Verbose "Checking prerequisites for $wantedExtensionHandle"
5252
switch ($wantedExtensionHandle) {
53-
imagick {
54-
Install-ImagickPrerequisite -PhpVersion $phpVersion -InstallPath $InstallPath
55-
}
5653
default {
5754
Write-Verbose "No prerequisites needed for $wantedExtensionHandle"
5855
}

0 commit comments

Comments
 (0)