Merge pull request #83 from mlocati/imagick-php8

Fix installation of imagick with PHP 8+

Author: mlocati

PhpManager/private/Install-ImagickPrerequisite.ps1

@@ -22,6 +22,9 @@
     begin {
     }
     process {
+        if ($phpVersion.FullVersion -ge [System.Version]'8.0.0') {
+            return
+        }
         $rxSearch = '/ImageMagick-[\d\.\-]+-(VC|vc|vs)' + $PhpVersion.VCVersion + '-' + $PhpVersion.Architecture + '\.zip$'
         $pageUrl = 'https://windows.php.net/downloads/pecl/deps/'
         Set-NetSecurityProtocolType

PhpManager/public/Install-PhpExtension.ps1

@@ -167,6 +167,12 @@
                                     $additionalFiles += $libcouchbaseDll
                                 }
                             }
+                            'imagick' {
+                                if ($phpVersion.FullVersion -ge [System.Version]'8.0.0') {
+                                    $additionalFiles += @(Get-ChildItem -Path $tempFolder\CORE_RL_*.dll -File -Depth 1)
+                                    $additionalFiles += @(Get-ChildItem -Path $tempFolder\IM_MOD_RL_*.dll -File -Depth 1)
+                                }
+                            }
                             'yaml' {
                                 $yamlDll = Join-Path -Path $tempFolder -ChildPath 'yaml.dll'
                                 if (Test-Path -LiteralPath $yamlDll -PathType Leaf) {

test/tests/Install-Get-Update-Uninstall-Php.Tests.ps1

@@ -59,25 +59,25 @@
             }
         }
     }
-    It 'should install/get/update/remove PHP 7.3-dev' {
+    It 'should install/get/update/remove PHP 7.4-dev' {
         if ($isNanoServer) {
             Set-ItResult -Skipped -Because 'it does not seems possible to install the Visual C++ 2019 Redistributables on Windows Nano Server'
         }
         if (Test-Path -LiteralPath $phpPath) {
             Remove-Item -LiteralPath $phpPath -Recurse -Force
         }
         try {
-            Install-Php -Version 7.3snapshot -Architecture x64 -ThreadSafe $true -Path $phpPath -InstallVC
+            Install-Php -Version 7.4snapshot -Architecture x64 -ThreadSafe $true -Path $phpPath -InstallVC
             $initialPhpVersion = Get-Php -Path $phpPath
             $initialPhpVersion | Should -Not -BeNullOrEmpty
             $initialPhpVersion.GetType().FullName | Should -BeExactly 'PhpVersionInstalled'
             $initialPhpVersion.Version | Should -BeOfType [string]
-            $initialPhpVersion.Version | Should -MatchExactly '^7\.3\.\d+$'
-            $initialPhpVersion.MajorMinorVersion | Should -BeExactly '7.3'
+            $initialPhpVersion.Version | Should -MatchExactly '^7\.4\.\d+$'
+            $initialPhpVersion.MajorMinorVersion | Should -BeExactly '7.4'
             $initialPhpVersion.ComparableVersion | Should -BeOfType [version]
             $initialPhpVersion.UnstabilityLevel | Should -BeExactly 'snapshot'
             $initialPhpVersion.UnstabilityVersion | Should -BeNullOrEmpty
-            $initialPhpVersion.FullVersion | Should -MatchExactly '^7\.3\.\d+-dev$'
+            $initialPhpVersion.FullVersion | Should -MatchExactly '^7\.4\.\d+-dev$'
             $initialPhpVersion.Architecture | Should -BeExactly 'x64'
             $initialPhpVersion.ThreadSafe | Should -BeExactly $true
             $initialPhpVersion.VCVersion | Should -BeOfType [int]
@@ -91,11 +91,11 @@
             $updatedPhpVersion | Should -Not -BeNullOrEmpty
             $updatedPhpVersion.GetType().FullName | Should -BeExactly 'PhpVersionInstalled'
             $updatedPhpVersion.Version | Should -BeOfType [string]
-            $initialPhpVersion.Version | Should -MatchExactly '^7\.3\.\d+$'
+            $initialPhpVersion.Version | Should -MatchExactly '^7\.4\.\d+$'
             $updatedPhpVersion.ComparableVersion | Should -BeOfType [version]
             $initialPhpVersion.UnstabilityLevel | Should -BeExactly 'snapshot'
             $updatedPhpVersion.UnstabilityVersion | Should -BeNullOrEmpty
-            $initialPhpVersion.FullVersion | Should -MatchExactly '^7\.3\.\d+-dev$'
+            $initialPhpVersion.FullVersion | Should -MatchExactly '^7\.4\.\d+-dev$'
             $updatedPhpVersion.Architecture | Should -BeExactly $initialPhpVersion.Architecture
             $updatedPhpVersion.ThreadSafe | Should -BeExactly $initialPhpVersion.ThreadSafe
             $updatedPhpVersion.VCVersion | Should -BeExactly $initialPhpVersion.VCVersion