setup-php 2.36.0 → 2.37.1

package/src/scripts/tools/add_tools.ps1

@@ -3,6 +3,7 @@ $composer_home = "$env:APPDATA\Composer"
 $composer_bin = "$composer_home\vendor\bin"
 $composer_json = "$composer_home\composer.json"
 $composer_lock = "$composer_home\composer.lock"
+$skip_composer_github_auth = $false
 
 # Function to configure composer.
 Function Edit-ComposerConfig() {
@@ -23,6 +24,7 @@ Function Edit-ComposerConfig() {
   if (-not(Test-Path $composer_json)) {
     Set-Content -Path $composer_json -Value "{}"
   }
+  Get-ToolVersion "composer" $null | Out-Null
   Set-ComposerEnv
   Add-Path $composer_bin
   Set-ComposerAuth
@@ -74,8 +76,18 @@ function Test-GitHubPublicAccess {
   }
 }
 
+Function Write-ComposerGhAuthNoOpWarning() {
+  $message = (Get-Content (Join-Path $src 'configs\composer-gh-auth-warn') -Raw).Trim().Replace('%s', $composer_version)
+  if($env:fail_fast -eq 'true') {
+    Add-Log "$cross" "composer" $message
+  } else {
+    Write-Output "::warning::$message"
+  }
+}
+
 # Function to setup authentication in composer.
 Function Set-ComposerAuth() {
+  $token = if ($env:COMPOSER_TOKEN) { $env:COMPOSER_TOKEN } else { $env:GITHUB_TOKEN }
   if(Test-Path env:COMPOSER_AUTH_JSON) {
     if(Test-Json -JSON $env:COMPOSER_AUTH_JSON) {
       Set-Content -Path $composer_home\auth.json -Value $env:COMPOSER_AUTH_JSON
@@ -83,13 +95,18 @@ Function Set-ComposerAuth() {
       Add-Log "$cross" "composer" "Could not parse COMPOSER_AUTH_JSON as valid JSON"
     }
   }
+  if($skip_composer_github_auth) {
+    Write-ComposerGhAuthNoOpWarning
+  }
   $composer_auth = @()
   if(Test-Path env:PACKAGIST_TOKEN) {
     $composer_auth += '"http-basic": {"repo.packagist.com": { "username": "token", "password": "' + $env:PACKAGIST_TOKEN + '"}}'
   }
   $write_token = $true
-  $token = if ($env:COMPOSER_TOKEN) { $env:COMPOSER_TOKEN } else { $env:GITHUB_TOKEN }
   if ($token) {
+    if ($skip_composer_github_auth) {
+      $write_token = $false
+    }
     if ($env:GITHUB_SERVER_URL -ne "https://github.com" -and -not(Test-GitHubPublicAccess $token)) {
       $write_token = $false
     }
@@ -115,6 +132,18 @@ Function Set-ComposerEnv() {
   }
 }
 
+# Function to identify latest-like URLs that should bypass the persistent cache.
+Function Test-MutableToolUrl() {
+  Param(
+    [Parameter(Position = 0, Mandatory = $true)]
+    [string]
+    $Url
+  )
+  $mutableUrlRegex = '(^|[/?#._=-])(latest|stable|preview|snapshot|nightly|master)([/?#._=-]|$)|/releases/latest/download/'
+  $versionLikeRegex = '(^|[^0-9])[0-9]+\.[0-9]+([.-][0-9A-Za-z]+)*'
+  return ($Url -match $mutableUrlRegex) -or (($Url -match '\.phar([?#].*)?$') -and -not ($Url -match $versionLikeRegex))
+}
+
 # Function to extract tool version.
 Function Get-ToolVersion() {
   Param (
@@ -158,12 +187,7 @@ Function Add-ToolsHelper() {
   } elseif($tool -eq "cs2pr") {
     (Get-Content $bin_dir/cs2pr).replace('exit(9)', 'exit(0)') | Set-Content $bin_dir/cs2pr
   } elseif($tool -eq "deployer") {
-    if(Test-Path $composer_bin\deployer.phar.bat) {
-      Copy-Item $composer_bin\deployer.phar.bat -Destination $composer_bin\dep.bat
-    }
-    if(Test-Path $composer_bin\dep.bat) {
-      Copy-Item $composer_bin\dep.bat -Destination $composer_bin\deployer.bat
-    }
+    Copy-Item $bin_dir\deployer.bat -Destination $bin_dir\dep.bat
   } elseif($tool -eq "phan") {
     $extensions += @('fileinfo', 'ast')
   } elseif($tool -eq "phinx") {
@@ -203,32 +227,58 @@ Function Add-Tool() {
     [ValidateNotNull()]
     $tool,
     [Parameter(Position = 2, Mandatory = $false)]
-    $ver_param
+    $ver_param,
+    [Parameter(Position = 3, Mandatory = $false)]
+    $skip_composer_github_auth
   )
-  if (Test-Path $bin_dir\$tool) {
-    Copy-Item $bin_dir\$tool -Destination $bin_dir\$tool.old -Force
+  if($tool -eq "composer") {
+    $script:skip_composer_github_auth = $skip_composer_github_auth -eq 'true'
   }
+  $urls = $urls -split ','
   $tool_path = "$bin_dir\$tool"
-  foreach ($url in $urls){
-    if (($url | Split-Path -Extension) -eq ".exe") {
-      $tool_path = "$tool_path.exe"
-    }
-    try {
-      $status_code = (Invoke-WebRequest -Passthru -Uri $url -OutFile $tool_path).StatusCode
-    } catch {
-      if($url -match '.*github.com.*releases.*latest.*') {
-        try {
-          $url = $url.replace("releases/latest/download", "releases/download/" + ([regex]::match((Get-File -Url ($url.split('/release')[0] + "/releases")).Content, "([0-9]+\.[0-9]+\.[0-9]+)/" + ($url.Substring($url.LastIndexOf("/") + 1))).Groups[0].Value).split('/')[0])
-          $status_code = (Invoke-WebRequest -Passthru -Uri $url -OutFile $tool_path).StatusCode
-        } catch { }
+  $is_exe = ((($urls[0] | Split-Path -Extension).ToLowerInvariant()) -eq '.exe')
+  if ($is_exe) { $tool_path = "$tool_path.exe" }
+  $tool_ext = if ($is_exe) { '.exe' } else { '' }
+  $url_stream = [System.IO.MemoryStream]::New([System.Text.Encoding]::UTF8.GetBytes($urls[0]))
+  $cache_key = (Get-FileHash -InputStream $url_stream -Algorithm SHA256).Hash.Substring(0, 16)
+  $cache_path = "$env:TEMP\$tool-$cache_key$tool_ext"
+  $use_cache = -not (Test-MutableToolUrl $urls[0])
+  $status_code = 200
+  if ($use_cache -and (Test-Path $cache_path -PathType Leaf)) {
+    Copy-Item $cache_path -Destination $tool_path -Force
+  } else {
+    $backup_path = "$tool_path.bak"
+    if (Test-Path $tool_path) { Copy-Item $tool_path -Destination $backup_path -Force }
+    foreach ($url in $urls){
+      try {
+        $status_code = (Invoke-WebRequest -Passthru -Uri $url -OutFile $tool_path).StatusCode
+      } catch {
+        if($url -match '.*github.com.*releases.*latest.*') {
+          try {
+            $url = $url.replace("releases/latest/download", "releases/download/" + ([regex]::match((Get-File -Url ($url.split('/release')[0] + "/releases")).Content, "([0-9]+\.[0-9]+\.[0-9]+)/" + ($url.Substring($url.LastIndexOf("/") + 1))).Groups[0].Value).split('/')[0])
+            $status_code = (Invoke-WebRequest -Passthru -Uri $url -OutFile $tool_path).StatusCode
+          } catch {
+            $status_code = 0
+          }
+        } else {
+          $status_code = 0
+        }
+      }
+      if($status_code -eq 200 -and (Test-Path $tool_path)) {
+        if ($use_cache) {
+          Copy-Item $tool_path -Destination $cache_path -Force
+        }
+        break
       }
     }
-    if($status_code -eq 200 -and (Test-Path $tool_path)) {
-      break
+    if ($status_code -ne 200 -and (Test-Path $backup_path)) {
+      Copy-Item $backup_path -Destination $tool_path -Force
     }
+    Remove-Item $backup_path -Force -ErrorAction SilentlyContinue
   }
 
-  if (((Get-ChildItem -Path $bin_dir/* | Where-Object Name -Match "^$tool(.exe|.phar)*$").Count -gt 0)) {
+  $escaped_tool = [regex]::Escape($tool)
+  if (((Get-ChildItem -Path $bin_dir/* | Where-Object Name -Match "^$escaped_tool(\.exe|\.phar)?$").Count -gt 0)) {
     $bat_content = @()
     $bat_content += "@ECHO off"
     $bat_content += "setlocal DISABLEDELAYEDEXPANSION"
@@ -242,8 +292,6 @@ Function Add-Tool() {
   } else {
     if($tool -eq "composer") {
       $env:fail_fast = 'true'
-    } elseif (Test-Path $bin_dir\$tool.old) {
-      Copy-Item $bin_dir\$tool.old -Destination $bin_dir\$tool -Force
     }
     Add-Log $cross $tool "Could not add $tool"
   }

package/src/scripts/tools/add_tools.sh

@@ -3,6 +3,7 @@ export composer_home="$HOME/.composer"
 export composer_bin="$composer_home/vendor/bin"
 export composer_json="$composer_home/composer.json"
 export composer_lock="$composer_home/composer.lock"
+skip_composer_github_auth=false
 
 # Function to extract tool version.
 get_tool_version() {
@@ -41,6 +42,7 @@ configure_composer() {
     echo '{}' | tee "$composer_json" >/dev/null
     chmod 644 "$composer_json"
   fi
+  get_tool_version composer >/dev/null
   set_composer_env
   add_path "$composer_bin"
   set_composer_auth
@@ -70,22 +72,39 @@ can_access_public_github() {
   curl --fail -s -H "Authorization: token $1" 'https://api.github.com/' >/dev/null 2>&1
 }
 
+composer_gh_auth_no_op() {
+  local message
+  message="$(<"${src:?}"/configs/composer-gh-auth-warn)"
+  message="${message//%s/$composer_version}"
+  if [ "${fail_fast:-false}" = "true" ]; then
+    add_log "${cross:?}" "composer" "$message"
+  else
+    echo "::warning::$message"
+  fi
+}
+
 # Function to setup authentication in composer.
 set_composer_auth() {
-  if [ -n "$COMPOSER_AUTH_JSON" ]; then
-    if php -r "json_decode('$COMPOSER_AUTH_JSON'); if(json_last_error() !== JSON_ERROR_NONE) { throw new Exception('invalid json'); }"; then
-      echo "$COMPOSER_AUTH_JSON" | tee "$composer_home/auth.json" >/dev/null
+  token="${COMPOSER_TOKEN:-$GITHUB_TOKEN}"
+  if [ -n "${COMPOSER_AUTH_JSON:-}" ]; then
+    if printf '%s' "$COMPOSER_AUTH_JSON" | jq -e . >/dev/null; then
+      printf '%s' "$COMPOSER_AUTH_JSON" | tee "$composer_home/auth.json" >/dev/null
     else
       add_log "${cross:?}" "composer" "Could not parse COMPOSER_AUTH_JSON as valid JSON"
     fi
   fi
+  if [ "$skip_composer_github_auth" = "true" ]; then
+    composer_gh_auth_no_op
+  fi
   composer_auth=()
   if [ -n "$PACKAGIST_TOKEN" ]; then
     composer_auth+=( '"http-basic": {"repo.packagist.com": { "username": "token", "password": "'"$PACKAGIST_TOKEN"'"}}' )
   fi
-  token="${COMPOSER_TOKEN:-$GITHUB_TOKEN}"
   if [ -n "$token" ]; then
     write_token=true
+    if [ "$skip_composer_github_auth" = "true" ]; then
+      write_token=false
+    fi
     if [ "$GITHUB_SERVER_URL" != "https://github.com" ]; then
       can_access_public_github "$token" || write_token=false
     fi
@@ -113,6 +132,16 @@ set_composer_env() {
   fi
 }
 
+# Function to identify latest-like URLs that should bypass the persistent cache.
+is_mutable_tool_url() {
+  local tool_url=$1
+  local mutable_url_regex='(^|[/?#._=-])(latest|stable|preview|snapshot|nightly|master)([/?#._=-]|$)|/releases/latest/download/'
+  local version_like_regex='(^|[^0-9])[0-9]+\.[0-9]+([.-][0-9A-Za-z]+)*'
+  [[ "$tool_url" =~ $mutable_url_regex ]] && return 0
+  [[ "$tool_url" =~ \.phar([?#].*)?$ && ! "$tool_url" =~ $version_like_regex ]] && return 0
+  return 1
+}
+
 # Helper function to configure tools.
 add_tools_helper() {
   tool=$1
@@ -123,19 +152,15 @@ add_tools_helper() {
     extensions+=(iconv mbstring phar sodium)
   elif [ "$tool" = "codeception" ]; then
     extensions+=(json mbstring)
-    sudo ln -s "$scoped_dir"/vendor/bin/codecept "$scoped_dir"/vendor/bin/codeception
+    sudo ln -s "$scoped_dir"/vendor/bin/codecept "$scoped_dir"/vendor/bin/codeception 2>/dev/null || true
   elif [ "$tool" = "composer" ]; then
     configure_composer "$tool_path"
   elif [ "$tool" = "cs2pr" ]; then
     sudo sed -i 's/\r$//; s/exit(9)/exit(0)/' "$tool_path" 2>/dev/null ||
     sudo sed -i '' 's/\r$//; s/exit(9)/exit(0)/' "$tool_path"
   elif [ "$tool" = "deployer" ]; then
-    if [ -e "$composer_bin"/deployer.phar ]; then
-      sudo ln -s "$composer_bin"/deployer.phar "$composer_bin"/dep
-    fi
-    if [ -e "$composer_bin"/dep ]; then
-      sudo ln -s "$composer_bin"/dep "$composer_bin"/deployer
-    fi
+    sudo ln -s "$tool_path" "$tool_path_dir"/deployer 2>/dev/null || true
+    sudo ln -s "$tool_path" "$tool_path_dir"/dep 2>/dev/null || true
   elif [ "$tool" = "phan" ]; then
     extensions+=(fileinfo ast)
   elif [ "$tool" = "phinx" ]; then
@@ -151,7 +176,7 @@ add_tools_helper() {
   elif [ "$tool" = "phpDocumentor" ]; then
     extensions+=(ctype hash json fileinfo iconv mbstring simplexml xml)
     sudo ln -s "$tool_path" "$tool_path_dir"/phpdocumentor 2>/dev/null || true
-    sudo ln -s "$tool_path" "$tool_path_dir"/phpdoc
+    sudo ln -s "$tool_path" "$tool_path_dir"/phpdoc 2>/dev/null || true
   elif [ "$tool" = "phpunit" ]; then
     extensions+=(dom json libxml mbstring xml xmlwriter)
   elif [ "$tool" = "phpunit-bridge" ]; then
@@ -162,9 +187,9 @@ add_tools_helper() {
     fi
   elif [ "$tool" = "vapor-cli" ]; then
     extensions+=(fileinfo json mbstring zip simplexml)
-    sudo ln -s "$scoped_dir"/vendor/bin/vapor "$scoped_dir"/vendor/bin/vapor-cli
+    sudo ln -s "$scoped_dir"/vendor/bin/vapor "$scoped_dir"/vendor/bin/vapor-cli 2>/dev/null || true
   elif [ "$tool" = wp-cli ]; then
-    sudo ln -s "$tool_path" "$tool_path_dir"/"${tool%-*}"
+    sudo ln -s "$tool_path" "$tool_path_dir"/"${tool%-*}" 2>/dev/null || true
   fi
   for extension in "${extensions[@]}"; do
     add_extension "$extension" extension >/dev/null 2>&1
@@ -176,29 +201,48 @@ add_tool() {
   url=$1
   tool=$2
   ver_param=$3
+  if [ "$tool" = "composer" ]; then
+    skip_composer_github_auth="${4:-false}"
+  fi
   tool_path="$tool_path_dir/$tool"
   if ! [ -d "$tool_path_dir" ]; then
     sudo mkdir -p "$tool_path_dir"
   fi
-  add_path "$tool_path_dir"
-  if [ -e "$tool_path" ]; then
-    sudo cp -aL "$tool_path" /tmp/"$tool"
+  if ! [ -d "$tool_cache_path_dir" ]; then
+    sudo mkdir -p "$tool_cache_path_dir"
   fi
+  add_path "$tool_path_dir" verify
+  add_path "$tool_cache_path_dir"
   IFS="," read -r -a url <<<"$url"
-  status_code=$(get -v -e "$tool_path" "${url[@]}")
-  if [ "$status_code" != "200" ] && [[ "${url[0]}" =~ .*github.com.*releases.*latest.* ]]; then
-    url[0]="${url[0]//releases\/latest\/download/releases/download/$(get -s -n "" "$(echo "${url[0]}" | cut -d '/' -f '1-5')/releases" | grep -Eo -m 1 "([0-9]+\.[0-9]+\.[0-9]+)/$(echo "${url[0]}" | sed -e "s/.*\///")" | cut -d '/' -f 1)}"
-    status_code=$(get -v -e "$tool_path" "${url[0]}")
+  cache_key=$(get_sha256 "${url[0]}" | head -c 16)
+  cache_path="$tool_cache_path_dir/${tool}-${cache_key}"
+  use_cache=true
+  is_mutable_tool_url "${url[0]}" && use_cache=false
+  status_code="200"
+  if [ "$use_cache" = "true" ] && [ -f "$cache_path" ]; then
+    sudo cp -a "$cache_path" "$tool_path"
+  else
+    [ -f "$tool_path" ] && sudo cp -a "$tool_path" "$tool_path.bak"
+    status_code=$(get -v -e "$tool_path" "${url[@]}")
+    if [ "$status_code" != "200" ] && [[ "${url[0]}" =~ .*github.com.*releases.*latest.* ]]; then
+      url[0]="${url[0]//releases\/latest\/download/releases/download/$(get -s -n "" "$(echo "${url[0]}" | cut -d '/' -f '1-5')/releases" | grep -Eo -m 1 "([0-9]+\.[0-9]+\.[0-9]+)/$(echo "${url[0]}" | sed -e "s/.*\///")" | cut -d '/' -f 1)}"
+      status_code=$(get -v -e "$tool_path" "${url[0]}")
+    fi
+    if [ "$status_code" = "200" ]; then
+      [ "$use_cache" = "true" ] && sudo cp -a "$tool_path" "$cache_path"
+    elif [ -f "$tool_path.bak" ]; then
+      sudo mv "$tool_path.bak" "$tool_path"
+    fi
+    sudo rm -f "$tool_path.bak"
   fi
   if [ "$status_code" = "200" ]; then
     add_tools_helper "$tool"
     tool_version=$(get_tool_version "$tool" "$ver_param")
+    sudo ln -sfn "$tool_path" "$tool_cache_path_dir/$tool" 2>/dev/null || true
     add_log "${tick:?}" "$tool" "Added $tool $tool_version"
   else
     if [ "$tool" = "composer" ]; then
       export fail_fast=true
-    elif [ -e /tmp/"$tool" ]; then
-      sudo cp -a /tmp/"$tool" "$tool_path"
     fi
     if [ "$status_code" = "404" ]; then
       add_log "$cross" "$tool" "Failed to download $tool from ${url[*]}"

package/src/scripts/tools/blackfire.sh

@@ -8,7 +8,7 @@ add_blackfire_linux() {
 add_blackfire_darwin() {
   sudo mkdir -p /usr/local/var/run
   add_brew_tap blackfireio/homebrew-blackfire
-  brew install blackfire
+  safe_brew install blackfire
 }
 
 blackfire_config() {

package/src/scripts/tools/brew.sh

@@ -44,6 +44,135 @@ add_brew_bins_to_path() {
   add_path "$brew_prefix"/sbin
 }
 
+# Function to get file modification time.
+get_file_mtime() {
+  local file=$1
+  if [ "$(uname -s)" = "Darwin" ]; then
+    stat -f "%m" "$file" 2>/dev/null || echo 0
+  else
+    stat -c "%Y" "$file" 2>/dev/null || echo 0
+  fi
+}
+
+# Function to terminate a process and its direct children.
+terminate_process_tree() {
+  local pid=$1
+  local children child
+  children=$(pgrep -P "$pid" 2>/dev/null || true)
+  kill -TERM "$pid" >/dev/null 2>&1 || true
+  for child in $children; do
+    terminate_process_tree "$child"
+  done
+  sleep 2
+  kill -KILL "$pid" >/dev/null 2>&1 || true
+  for child in $children; do
+    terminate_process_tree "$child"
+  done
+}
+
+# Function to run a command with an inactivity watchdog.
+run_with_inactivity_watchdog() {
+  local timeout_secs="${SETUP_PHP_BREW_INACTIVITY_TIMEOUT:-180}"
+  local poll_secs="${SETUP_PHP_BREW_WATCHDOG_POLL:-5}"
+  local tmp_dir stdout_fifo stderr_fifo stdout_log stderr_log timeout_file
+  local command_pid stdout_reader_pid stderr_reader_pid monitor_pid exit_code
+  tmp_dir="$(mktemp -d "${TMPDIR:-/tmp}/setup-php-brew.XXXXXX")" || return 1
+  stdout_fifo="$tmp_dir/stdout.fifo"
+  stderr_fifo="$tmp_dir/stderr.fifo"
+  stdout_log="$tmp_dir/stdout.log"
+  stderr_log="$tmp_dir/stderr.log"
+  timeout_file="$tmp_dir/timed_out"
+  mkfifo "$stdout_fifo" "$stderr_fifo" || {
+    rm -rf "$tmp_dir"
+    return 1
+  }
+  : >"$stdout_log"
+  : >"$stderr_log"
+
+  ("$@" >"$stdout_fifo" 2>"$stderr_fifo") &
+  command_pid=$!
+
+  (
+    while IFS= read -r line || [ -n "$line" ]; do
+      printf '%s\n' "$line"
+      printf '%s\n' "$line" >>"$stdout_log"
+    done <"$stdout_fifo"
+  ) &
+  stdout_reader_pid=$!
+
+  (
+    while IFS= read -r line || [ -n "$line" ]; do
+      printf '%s\n' "$line" >&2
+      printf '%s\n' "$line" >>"$stderr_log"
+    done <"$stderr_fifo"
+  ) &
+  stderr_reader_pid=$!
+
+  (
+    local last_activity current_activity current_err_activity now
+    last_activity=$(get_file_mtime "$stdout_log")
+    current_err_activity=$(get_file_mtime "$stderr_log")
+    [ "$current_err_activity" -gt "$last_activity" ] && last_activity="$current_err_activity"
+    while kill -0 "$command_pid" >/dev/null 2>&1; do
+      sleep "$poll_secs"
+      current_activity=$(get_file_mtime "$stdout_log")
+      [ "$current_activity" -gt "$last_activity" ] && last_activity="$current_activity"
+      current_err_activity=$(get_file_mtime "$stderr_log")
+      [ "$current_err_activity" -gt "$last_activity" ] && last_activity="$current_err_activity"
+      now=$(date +%s)
+      if [ $((now - last_activity)) -ge "$timeout_secs" ]; then
+        printf "\nsetup-php: brew produced no output for %ss; terminating and retrying...\n" "$timeout_secs" >&2
+        : >"$timeout_file"
+        terminate_process_tree "$command_pid"
+        break
+      fi
+    done
+  ) &
+  monitor_pid=$!
+
+  wait "$command_pid"
+  exit_code=$?
+  wait "$stdout_reader_pid" 2>/dev/null || true
+  wait "$stderr_reader_pid" 2>/dev/null || true
+  kill "$monitor_pid" >/dev/null 2>&1 || true
+  wait "$monitor_pid" 2>/dev/null || true
+
+  if [ -e "$timeout_file" ]; then
+    rm -rf "$tmp_dir"
+    return 124
+  fi
+
+  rm -rf "$tmp_dir"
+  return "$exit_code"
+}
+
+# Function to run brew with retries and an inactivity watchdog.
+safe_brew() {
+  local max_attempts="${SETUP_PHP_BREW_RETRY_ATTEMPTS:-3}"
+  local attempt=1
+  local exit_code=0
+
+  if [ "${SETUP_PHP_BREW_WATCHDOG:-true}" = "false" ]; then
+    brew "$@"
+    return $?
+  fi
+
+  while [ "$attempt" -le "$max_attempts" ]; do
+    run_with_inactivity_watchdog brew "$@" && return 0
+    exit_code=$?
+
+    if [ "$attempt" -ge "$max_attempts" ]; then
+      return "$exit_code"
+    fi
+
+    printf "setup-php: retrying brew command (attempt %s/%s, exit %s)\n" "$((attempt + 1))" "$max_attempts" "$exit_code" >&2
+    sleep "$((attempt * 5))"
+    attempt=$((attempt + 1))
+  done
+
+  return "$exit_code"
+}
+
 # Function to add brew.
 add_brew() {
   brew_prefix="$(get_brew_prefix)"
@@ -74,6 +203,7 @@ configure_brew() {
   export HOMEBREW_NO_ENV_HINTS=1
   export HOMEBREW_NO_INSTALL_CLEANUP=1
   export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
+  export HOMEBREW_DOWNLOAD_CONCURRENCY="${HOMEBREW_DOWNLOAD_CONCURRENCY:-6}"
   export brew_opts
   export brew_path
   export brew_path_dir

package/src/scripts/tools/grpc_php_plugin.sh

@@ -4,7 +4,7 @@ add_bazel() {
       add_list bazel/apt https://storage.googleapis.com/bazel-apt https://bazel.build/bazel-release.pub.gpg stable jdk1.8
       install_packages bazel
     else
-      brew install bazel
+      safe_brew install bazel
     fi
   fi
 }
@@ -25,7 +25,7 @@ add_grpc_php_plugin_brew() {
   . "${0%/*}"/tools/brew.sh
   configure_brew
   [ -e /usr/local/bin/protoc ] && sudo mv /usr/local/bin/protoc /tmp/protoc && sudo mv /usr/local/include/google /tmp
-  brew install grpc
+  safe_brew install grpc
   brew link --force --overwrite grpc >/dev/null 2>&1
   [ -e /tmp/protoc ] && sudo mv /tmp/protoc /usr/local/bin/protoc && sudo mv /tmp/google /usr/local/include/
   grpc_tag="v$(brew info grpc | grep "grpc:" | grep -Eo "[0-9]+\.[0-9]+\.[0-9]+")"

package/src/scripts/tools/ppa.sh

@@ -246,7 +246,11 @@ check_lists() {
     match_file=$(grep -Elr "$primary" "$list_dir" 2>/dev/null | head -n 1)
   fi
   if [ -z "$match_file" ] && [ -n "$secondary" ]; then
-    match_file=$(grep -Elr "$secondary" "$list_dir" 2>/dev/null | head -n 1)
+    local candidate
+    candidate=$(grep -Elr "$secondary" "$list_dir" 2>/dev/null | head -n 1)
+    if [ -n "$candidate" ] && { [ -z "$primary" ] || grep -Eq "$primary" "$candidate"; }; then
+      match_file="$candidate"
+    fi
   fi
   if [ -n "$match_file" ]; then
     local list_count

package/src/scripts/unix.sh

@@ -4,6 +4,7 @@ export cross="✗"
 export curl_opts=(-sL)
 export old_versions="5.[3-5]"
 export jit_versions="8.[0-9]"
+export php_builder_versions="8.[3-9]"
 export nightly_versions="8.[6-9]"
 export xdebug3_versions="7.[2-4]|8.[0-9]"
 export latest="releases/latest/download"
@@ -58,6 +59,7 @@ read_env() {
      -n "$ACT" || -n "$CONTAINER" ]] && _runner=self-hosted || _runner=github
   runner="${runner:-${RUNNER:-$_runner}}"
   tool_path_dir="${setup_php_tools_dir:-${SETUP_PHP_TOOLS_DIR:-/usr/local/bin}}"
+  tool_cache_path_dir="${setup_php_tool_cache_dir:-${SETUP_PHP_TOOL_CACHE_DIR:-${RUNNER_TOOL_CACHE:-/opt/hostedtoolcache}/setup-php/tools}}"  
 
   if [[ "$runner" = "github" && $_runner = "self-hosted" ]]; then
     fail_fast=true
@@ -79,6 +81,7 @@ read_env() {
   export update
   export ts
   export tool_path_dir
+  export tool_cache_path_dir
 }
 
 # Function to create a lock.
@@ -169,14 +172,15 @@ get_shell_profile() {
 # Function to add a path to the PATH variable.
 add_path() {
   path_to_add=$1
-  [[ ":$PATH:" == *":$path_to_add:"* ]] && return
+  action=$2
+  [[ "$action" == "verify" && ":$PATH:" == *":$path_to_add:"* ]] && return
   if [[ -n "$GITHUB_PATH" ]]; then
-    echo "$path_to_add" | tee -a "$GITHUB_PATH" >/dev/null 2>&1
+    printf '%s\n%s' "$path_to_add" "$(grep -v "^${path_to_add}$" "$GITHUB_PATH" 2>/dev/null)" > "$GITHUB_PATH"
   else
     profile=$(get_shell_profile)
     ([ -e "$profile" ] && grep -q ":$path_to_add\"" "$profile" 2>/dev/null) || echo "export PATH=\"\${PATH:+\${PATH}:}\"$path_to_add" | sudo tee -a "$profile" >/dev/null 2>&1
   fi
-  export PATH="${PATH:+${PATH}:}$path_to_add"
+  [[ ":$PATH:" == *":$path_to_add:"* ]] || export PATH="${PATH:+${PATH}:}$path_to_add"
 }
 
 # Function to add environment variables using a PATH.

package/src/scripts/win32.ps1

@@ -81,9 +81,10 @@ Function Get-PathFromRegistry {
 # Function to add a location to PATH.
 Function Add-Path {
   param(
-    [string]$PathItem
+    [string]$PathItem,
+    [switch]$Force
   )
-  if("$env:PATH;".contains("$PathItem;")) {
+  if(-not($Force) -and "$env:PATH;".contains("$PathItem;")) {
     return
   }
   if ($env:GITHUB_PATH) {
@@ -202,16 +203,20 @@ Function Install-PSPackage() {
     $cmdlet
   )
   $module_path = "$bin_dir\$psm1_path.psm1"
-  if(-not (Test-Path $module_path -PathType Leaf)) {
-    $zip_file = "$bin_dir\$package.zip"
-    Get-File -Url $url -OutFile $zip_file
-    Expand-Archive -Path $zip_file -DestinationPath $bin_dir -Force
-  }
-  Import-Module $module_path
-  if($null -eq (Get-Command $cmdlet -ErrorAction SilentlyContinue)) {
-    Install-Module -Name $package -Force
-  } else {
+  $imported = $false
+  try {
+    if(-not (Test-Path $module_path -PathType Leaf)) {
+      $zip_file = "$bin_dir\$package.zip"
+      Get-File -Url $url -OutFile $zip_file
+      Expand-Archive -Path $zip_file -DestinationPath $bin_dir -Force -ErrorAction Stop
+    }
+    Import-Module $module_path -ErrorAction Stop
+    $imported = $null -ne (Get-Command $cmdlet -ErrorAction SilentlyContinue)
+  } catch { }
+  if($imported) {
     Add-ToProfile $current_profile "$package-search" "Import-Module $module_path"
+  } else {
+    Install-Module -Name $package -Force
   }
 }
 
@@ -375,6 +380,7 @@ if(-not($env:ImageOS) -and -not($env:ImageVersion)) {
   if(-not(Test-Path -LiteralPath $current_profile)) {
     New-Item -Path $current_profile -ItemType "file" -Force >$null 2>&1
   }
+  Add-Path -PathItem $bin_dir -Force
 }
 
 $src = Join-Path -Path $PSScriptRoot -ChildPath \..