Merge pull request #56 from mlocati/fix-installing-yaml-extension

Fix installing yaml extension on PHP < 7.2

Author: mlocati

PhpManager/private/PhpVersion.ps1

@@ -271,11 +271,19 @@ class PhpVersionInstalled : PhpVersion
         }
         $directoryPath = $directory.FullName.TrimEnd($directorySeparator) + $directorySeparator
         $actualDirectoryPath = $null
-        if ($directory.Target -and $directory.Target.Count -gt 0 -and $directory.Target[0]) {
-            try {
-                $actualDirectoryPath = (Get-Item -LiteralPath $directory.Target[0]).FullName.TrimEnd($directorySeparator) + $directorySeparator
-            } catch {
-                Write-Debug $_
+        if ($directory.Target) {
+            $target = $null
+            if ($directory.Target -is [string]) {
+                $target = $directory.Target
+            } elseif ($directory.Target.Count -gt 0) {
+                $target = $directory.Target[0]
+            }
+            if ($target) {
+                try {
+                    $actualDirectoryPath = (Get-Item -LiteralPath $directory.Target[0]).FullName.TrimEnd($directorySeparator) + $directorySeparator
+                } catch {
+                    Write-Debug $_
+                }
             }
         }
         if (-Not($actualDirectoryPath)) {

PhpManager/public/Install-PhpExtension.ps1

@@ -127,6 +127,7 @@
                 }
                 Write-Verbose ("Downloading PECL package {0} {1} from {2}" -f $peclPackageHandle, $availablePackageVersion.PackageVersion, $availablePackageVersion.PackageArchiveUrl)
                 $downloadedFile, $keepDownloadedFile = Get-FileFromUrlOrCache -Url $availablePackageVersion.PackageArchiveUrl
+                $additionalFiles = @()
                 try {
                     if ($remoteFileIsZip) {
                         $tempFolder = New-TempDirectory
@@ -142,6 +143,14 @@
                             throw ("Multiple PHP DLL found in archive downloaded from {0}" -f $availablePackageVersion.PackageArchiveUrl)
                         }
                         $dllPath = $phpDlls[0].FullName
+                        switch ($peclPackageHandle) {
+                            'yaml' {
+                                $yamlDll = Join-Path -Path $tempFolder -ChildPath 'yaml.dll'
+                                if (Test-Path -LiteralPath $yamlDll -PathType Leaf) {
+                                    $additionalFiles += $yamlDll
+                                }
+                            }
+                        }
                     }
                     else {
                         $keepDownloadedFile = $true
@@ -179,6 +188,15 @@
                 } catch {
                     Write-Debug -Message "Failed to reset the ACL for $($oldExtension.Filename): $($_.Exception.Message)"
                 }
+                foreach ($additionalFile in $additionalFiles) {
+                    $additionalFileDestination = Join-Path -Path $phpVersion.ActualFolder -ChildPath $(Split-Path -Path $additionalFile -Leaf)
+                    Copy-Item -LiteralPath $additionalFile -Destination $additionalFileDestination -Force
+                    try {
+                        Reset-Acl -Path $additionalFileDestination
+                    } catch {
+                        Write-Debug -Message "Failed to reset the ACL for $($additionalFileDestination): $($_.Exception.Message)"
+                    }
+                }
                 if ($oldExtension.State -eq $Script:EXTENSIONSTATE_DISABLED -and -Not($DontEnable)) {
                     Enable-PhpExtension -Extension $oldExtension.Name -Path $phpVersion.ExecutablePath
                 }
@@ -198,6 +216,15 @@
                 } catch {
                     Write-Debug -Message "Failed to reset the ACL for $($newExtensionFilename): $($_.Exception.Message)"
                 }
+                foreach ($additionalFile in $additionalFiles) {
+                    $additionalFileDestination = Join-Path -Path $phpVersion.ActualFolder -ChildPath $(Split-Path -Path $additionalFile -Leaf)
+                    Copy-Item -LiteralPath $additionalFile -Destination $additionalFileDestination -Force
+                    try {
+                        Reset-Acl -Path $additionalFileDestination
+                    } catch {
+                        Write-Debug -Message "Failed to reset the ACL for $($additionalFileDestination): $($_.Exception.Message)"
+                    }
+                }
                 if (-Not($DontEnable)) {
                     Write-Verbose "Enabling extension ""$($newExtension.Name)"" for ""$($phpVersion.ExecutablePath)"""
                     Enable-PhpExtension -Extension $newExtension.Name -Path $phpVersion.ExecutablePath

test/setup.ps1

@@ -4,6 +4,13 @@ Write-Host " - Windows installation type: $($pcInfo.WindowsInstallationType)"
 Write-Host " - Windows version name: $($pcInfo.WindowsProductName)"
 Write-Host " - PowerShell edition: $($PSVersionTable.PSEdition)"
 Write-Host " - PowerShell version: $($PSVersionTable.PSVersion.ToString())"
+try {
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+} catch {
+  Write-Host 'Failed to configure TLS1.2 for ServicePointManager'
+  Write-Host $_
+}
+
 $nuget = Get-PackageProvider -Name NuGet -ErrorAction SilentlyContinue
 if (-Not($nuget)) {
     Write-Host ' - installing NuGet'

test/tests/Install-Enable-Extensions.Tests.ps1

@@ -58,6 +58,15 @@
             $imagick.Type | Should -BeExactly 'Php'
             $imagick.State | Should -BeExactly 'Disabled'
         }
+        It -Name 'should download and install yaml on PHP <version>' -TestCases $testCases {
+            param ($path, $version)
+            Get-PhpExtension -Path $path | Where-Object { $_.Handle -eq 'yaml' } | Should -HaveCount 0
+            Install-PhpExtension -Extension yaml -Path $path
+            $yaml = Get-PhpExtension -Path $path | Where-Object { $_.Handle -eq 'yaml' }
+            $yaml | Should -HaveCount 1
+            $yaml.Type | Should -BeExactly 'Php'
+            $yaml.State | Should -BeExactly 'Enabled'
+        }
         It -Name 'should handle multiple extension versions' {
             $phpPath = Join-Path -Path $Global:PHPMANAGER_TESTINSTALLS -ChildPath (New-Guid).Guid
             Install-Php -Version 7.1 -Architecture x64 -ThreadSafe $true -Path $phpPath