Merge pull request #114 from mlocati/fix-installing-local-dll

Fix installing PHP extensions from local files
mlocati · Jul 6, 2023 · 019c319 · 019c319
2 parents a1e7232 + fceee4d
commit 019c319
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/PhpManager/private/Get-FileFromUrlOrCache.ps1 b/PhpManager/private/Get-FileFromUrlOrCache.ps1
@@ -20,6 +20,7 @@
     [System.Array]
     #>
     [OutputType([string], [bool])]
+    [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidUsingBrokenHashAlgorithms','')]
     param (
         [Parameter(Mandatory = $true, Position = 0)]
         [ValidateNotNull()]

diff --git a/PhpManager/public/Install-PhpExtension.ps1 b/PhpManager/public/Install-PhpExtension.ps1
@@ -81,6 +81,8 @@
             $Version = ''
         }
         $tempFolder = $null
+        $finalDllName = $null
+        $additionalFiles = @()
         try {
             if (Test-Path -Path $Extension -PathType Leaf) {
                 if ($Version -ne '') {
@@ -93,6 +95,8 @@
                     throw 'You can''t specify the -MaximumStability argument if you specify an existing file with the -Extension argument'
                 }
                 $dllPath = [System.IO.Path]::GetFullPath($Extension)
+                $newExtension = Get-PhpExtensionDetail -PhpVersion $phpVersion -Path $dllPath
+                $moveDll = $false
             }
             else {
                 if ($null -eq $MinimumStability -or $MinimumStability -eq '') {
@@ -119,13 +123,10 @@
                         if ($null -ne $availablePackageVersion) {
                             $remoteFileIsZip = $false
                             $finalDllName = 'php_xdebug.dll'
-                        } else {
-                            $finalDllName = $null
                         }
                     }
                     default {
                         $availablePackageVersion = $null
-                        $finalDllName = $null
                     }
                 }
                 if ($null -eq $availablePackageVersion) {
@@ -153,7 +154,6 @@
                 }
                 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
@@ -210,6 +210,7 @@
                         $dllPath = $downloadedFile
                     }
                     $newExtension = Get-PhpExtensionDetail -PhpVersion $phpVersion -Path $dllPath
+                    $moveDll = $true
                 }
                 catch {
                     $keepDownloadedFile = $false
@@ -235,7 +236,11 @@
                 if (-Not(Test-IsFileWritable($oldExtension.Filename))) {
                     throw "Unable to write to the file $($oldExtension.Filename)"
                 }
-                Move-Item -Path $dllPath -Destination $oldExtension.Filename -Force
+                if ($moveDll) {
+                    Move-Item -Path $dllPath -Destination $oldExtension.Filename -Force
+                } else {
+                    Copy-Item -Path $dllPath -Destination $oldExtension.Filename -Force
+                }
                 try {
                     Reset-Acl -Path $oldExtension.Filename
                 } catch {
@@ -264,8 +269,13 @@
                 } else {
                     $newExtensionFilename = [System.IO.Path]::Combine($phpVersion.ExtensionsPath, [System.IO.Path]::GetFileName($finalDllName))
                 }
-                Write-Verbose "Moving ""$dllPath"" to ""$newExtensionFilename"""
-                Move-Item -Path $dllPath -Destination $newExtensionFilename
+                if ($moveDll) {
+                    Write-Verbose "Moving ""$dllPath"" to ""$newExtensionFilename"""
+                    Move-Item -Path $dllPath -Destination $newExtensionFilename
+                } else {
+                    Write-Verbose "Copying ""$dllPath"" to ""$newExtensionFilename"""
+                    Copy-Item -Path $dllPath -Destination $newExtensionFilename
+                }
                 try {
                     Reset-Acl -Path $newExtensionFilename
                 } catch {

diff --git a/test/tests/Install-Get-Update-Uninstall-Php.Tests.ps1 b/test/tests/Install-Get-Update-Uninstall-Php.Tests.ps1
@@ -63,6 +63,7 @@
         if ($isNanoServer) {
             Set-ItResult -Skipped -Because 'it does not seems possible to install the Visual C++ 2019 Redistributables on Windows Nano Server'
         }
+        Set-ItResult -Skipped -Because '@todo we need to switch to a newer "snapshot" version'
         if (Test-Path -LiteralPath $phpPath) {
             Remove-Item -LiteralPath $phpPath -Recurse -Force
         }