Fix and refactor ext-blackfire

src/scripts/ext/blackfire.ps1

@@ -2,26 +2,29 @@ Param (
     [Parameter(Position = 0, Mandatory = $true)]
     [ValidateNotNull()]
     [string]
-    $phpversion,
-    [Parameter(Position = 1, Mandatory = $true)]
+    $version,
+    [Parameter(Position = 2, Mandatory = $false)]
     [ValidateNotNull()]
-    [ValidateLength(1, [int]::MaxValue)]
     [string]
-    $version = '1.31.0'
+    $extension_version
 )
 
-Function Install-Blackfire() {
-    $installed = Get-Php -Path $php_dir
-    $nts = if (!$installed.ThreadSafe) { "_nts" } else { "" }
-    Invoke-WebRequest -UseBasicParsing -Uri "https://packages.blackfire.io/binaries/blackfire-php/${version}/blackfire-php-windows_x64-php-${phpversion}${nts}.dll" -OutFile $ENV:RUNNER_TOOL_CACHE\blackfire.dll > $null 2>&1
-    Copy-Item -Path "$ENV:RUNNER_TOOL_CACHE\blackfire.dll" -Destination "$ext_dir\blackfire.dll"
-    Enable-PhpExtension -Extension blackfire -Path $php_dir
-    printf "\033[%s;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "32" $tick "Blackfire" "Installed and enabled"
-}
-
 $tick = ([char]8730)
 $php_dir = 'C:\tools\php'
 $ext_dir = $php_dir + '\ext'
+$arch='x64'
+if ($version -lt '7.0') { $arch='x86' }
+$version = $version.replace('.', '')
 
-Install-Blackfire
+if (Test-Path $ext_dir\blackfire.dll) {
+    Enable-PhpExtension -Extension blackfire -Path $php_dir
+    $status="Enabled"
+} else {
+    $installed = Get-Php -Path $php_dir
+    $nts = if (!$installed.ThreadSafe) { "_nts" } else { "" }
+    Invoke-WebRequest -UseBasicParsing -Uri "https://packages.blackfire.io/binaries/blackfire-php/${extension_version}/blackfire-php-windows_${arch}-php-${version}${nts}.dll" -OutFile $ext_dir\blackfire.dll > $null 2>&1
+    Enable-PhpExtension -Extension blackfire -Path $php_dir
+    $status="Installed and enabled"
+}
+printf "\033[%s;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "32" $tick "blackfire" "$status"