Merge pull request #59 from mlocati/fix-installing-couchbase-extension

Fix installing couchbase extension

Author: mlocati

PhpManager/public/Install-Composer.ps1

@@ -71,13 +71,13 @@
                 $installer = Get-FileFromUrlOrCache -Url $installerUrl -CachedFileName 'composer-installer.php'
             }
             $tempPhar  = [System.IO.Path]::GetTempFileName();
-            $args = @()
-            $args += $installer
-            $args += '--install-dir=' + (Split-Path -Path $tempPhar -Parent)
-            $args += '--filename=' + (Split-Path -Path $tempPhar -Leaf)
-            $args += '2>&1'
+            $arguments = @()
+            $arguments += $installer
+            $arguments += '--install-dir=' + (Split-Path -Path $tempPhar -Parent)
+            $arguments += '--filename=' + (Split-Path -Path $tempPhar -Leaf)
+            $arguments += '2>&1'
             Write-Verbose "Launching Composer installer"
-            $installerResult = & $phpVersion.ExecutablePath $args
+            $installerResult = & $phpVersion.ExecutablePath $arguments
             if ($LASTEXITCODE -ne 0) {
                 throw $installerResult
             }

PhpManager/public/Install-Php.ps1

@@ -47,6 +47,7 @@
     Use this switch to enable installing PHP even if the destination directory already exists and it's not empty.
     #>
     [OutputType()]
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSReviewUnusedParameter', 'ThreadSafe', Justification = 'False positive as rule does not know that Where-Object operates within the same scope')] # See https://github.com/PowerShell/PSScriptAnalyzer/issues/1472
     param (
         [Parameter(Mandatory = $true, Position = 0, HelpMessage = 'The PHP version to be installed')]
         [ValidatePattern('^(master|(\d+\.\d+snapshot)|(\d+(\.\d+)?(\.\d+)?((alpha|beta|RC)\d*)?))$')]

PhpManager/public/Install-PhpExtension.ps1

@@ -144,6 +144,12 @@
                         }
                         $dllPath = $phpDlls[0].FullName
                         switch ($peclPackageHandle) {
+                            'couchbase' {
+                                $libcouchbaseDll = Join-Path -Path $tempFolder -ChildPath 'libcouchbase.dll'
+                                if (Test-Path -LiteralPath $libcouchbaseDll -PathType Leaf) {
+                                    $additionalFiles += $libcouchbaseDll
+                                }
+                            }
                             'yaml' {
                                 $yamlDll = Join-Path -Path $tempFolder -ChildPath 'yaml.dll'
                                 if (Test-Path -LiteralPath $yamlDll -PathType Leaf) {

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

@@ -67,6 +67,20 @@
             $yaml.Type | Should -BeExactly 'Php'
             $yaml.State | Should -BeExactly 'Enabled'
         }
+        It -Name 'should download and install couchbase on PHP <version>' -TestCases $testCases {
+            param ($path, $version)
+            if (-not(Join-Path -Path $Env:windir -ChildPath System32\msvcp140.dll | Test-Path -PathType Leaf)) {
+                if (-not(Join-Path -Path $Env:windir -ChildPath System32\msvcp160.dll | Test-Path -PathType Leaf)) {
+                    Set-ItResult -Skipped -Because 'Missing some required system DLLs'
+                }
+            }
+            Get-PhpExtension -Path $path | Where-Object { $_.Handle -eq 'couchbase' } | Should -HaveCount 0
+            Install-PhpExtension -Extension couchbase -Path $path
+            $couchbase = Get-PhpExtension -Path $path | Where-Object { $_.Handle -eq 'couchbase' }
+            $couchbase | Should -HaveCount 1
+            $couchbase.Type | Should -BeExactly 'Php'
+            $couchbase.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