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"
 

src/scripts/ext/blackfire.sh

@@ -1,23 +1,7 @@
-add_log() {
-  mark=$1
-  subject=$2
-  message=$3
-  if [ "$mark" = "$tick" ]; then
-    printf "\033[32;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
-  else
-    printf "\033[31;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
-  fi
-}
-
-phpversion=$2
-blackfireVersion=${3:-1.31.0}
-ini_file="/etc/php/$1/cli/conf.d/50-blackfire.ini"
-tick="✓"
-cross="✗"
-
-(curl -A "Github action" -o /tmp/blackfire.so -L -s https://packages.blackfire.io/binaries/blackfire-php/$blackfireVersion/blackfire-php-linux_amd64-php-$phpversion.so >/dev/null 2>&1 && \
-sudo mv /tmp/blackfire.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so >/dev/null 2>&1 && \
-echo "extension=blackfire.so" | sudo tee -a "$ini_file" >/dev/null 2>&1 && \
-add_log "$tick" "blackfire" "Installed and enabled") || \
-add_log "$cross" "blackfire" "Could not install blackfire"
-
+version=${1/./}
+extension_version=$2
+ext_dir=$(php -i | grep "extension_dir => /" | sed -e "s|.*=> s*||")
+scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
+ini_file="$scan_dir/50-blackfire.ini"
+sudo curl -o $ext_dir/blackfire.so -SL https://packages.blackfire.io/binaries/blackfire-php/$extension_version/blackfire-php-linux_amd64-php-$version.so
+echo "extension=blackfire.so" | sudo tee -a "$ini_file"

src/scripts/ext/blackfire_darwin.sh

@@ -1,23 +1,7 @@
-# Function to log result of a operation
-add_log() {
-  mark=$1
-  subject=$2
-  message=$3
-  if [ "$mark" = "$tick" ]; then
-    printf "\033[32;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
-  else
-    printf "\033[31;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
-  fi
-}
-
-tick="✓"
-cross="✗"
-phpversion=$2
-blackfireVersion=${3:-1.31.0}
-ini_file=$(php -d "date.timezone=UTC" --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
-
-(curl -A "Github action" -o /tmp/blackfire.so -L -s https://packages.blackfire.io/binaries/blackfire-php/$blackfireVersion/blackfire-php-darwin_amd64-php-$phpversion.so && \
-sudo mv /tmp/blackfire.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so && \
-echo "extension=blackfire.so" >>"$ini_file" && \
-add_log "$tick" "blackfire" "Installed and enabled") || \
-add_log "$cross" "blackfire" "Could not install blackfire"
+version=${1/./}
+extension_version=$2
+ext_dir=$(php -i | grep -Ei "extension_dir => /usr" | sed -e "s|.*=> s*||")
+scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
+ini_file="$scan_dir/50-blackfire.ini"
+sudo curl -o $ext_dir/blackfire.so -SL https://packages.blackfire.io/binaries/blackfire-php/$extension_version/blackfire-php-darwin_amd64-php-$version.so
+echo "extension=blackfire.so" | sudo tee -a "$ini_file"