setup-php 2.36.0 → 2.37.1

package/src/extensions.ts

@@ -35,9 +35,9 @@ export async function addExtensionDarwin(
       // match 5.3blackfire...8.5blackfire
       // match 5.3blackfire-(semver)...8.5blackfire-(semver)
       // match couchbase, event, geos, ibm_db2, pdo_ibm, pdo_oci, oci8, http, pecl_http
-      // match 5.3ioncube...8.4ioncube
+      // match 5.3ioncube...8.5ioncube
       // match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, and 7.4phalcon5...8.4phalcon5
-      // match 7.0zephir_parser...8.4zephir_parser
+      // match 7.0zephir_parser...8.5zephir_parser
       case /^(7\.4|8\.[0-5])relay(-v?\d+\.\d+\.\d+|-nightly)?$/.test(
         version_extension
       ):
@@ -47,12 +47,12 @@ export async function addExtensionDarwin(
       case /^couchbase|^event|^gearman$|^geos$|^ibm_db2$|^pdo_ibm$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(
         extension
       ):
-      case /^(5\.[3-6]|7\.[0-4]|8\.[0-4])ioncube$/.test(version_extension):
+      case /^(5\.[3-6]|7\.[0-4]|8\.[0-5])ioncube$/.test(version_extension):
       case /(5\.6|7\.[0-3])phalcon3|7\.[2-4]phalcon4|(7\.4|8\.[0-4])phalcon5?/.test(
         version_extension
       ):
       case /(?<!5\.[3-6])(pdo_)?sqlsrv$/.test(version_extension):
-      case /^(7\.[0-4]|8\.[0-4])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
+      case /^(7\.[0-4]|8\.[0-5])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
         add_script += await utils.customPackage(
@@ -85,13 +85,14 @@ export async function addExtensionDarwin(
         add_script += await utils.getUnsupportedLog('pcov', version, 'darwin');
         return;
       // match brew extensions
-      case /(?<!5\.[3-5])(amqp|apcu|expect|gnupg|grpc|igbinary|imagick|imap|mailparse|mcrypt|memcache|memcached|mongodb|msgpack|protobuf|psr|raphf|rdkafka|redis|snmp|ssh2|swoole|uuid|vld|xdebug|xdebug2|yaml|zmq)/.test(
+      case /(?<!5\.[3-5])(amqp|apcu|brotli|excimer|expect|gmagick|gnupg|grpc|igbinary|imagick|imap|interbase|mailparse|maxminddb|mcrypt|memcache|memcached|mongodb|mongodb1|msgpack|newrelic|oauth|opentelemetry|pdo_firebird|pinba|protobuf|psr|raphf|rdkafka|redis|scalar_objects|seaslog|snmp|spx|ssh2|swoole|uopz|uploadprogress|uuid|vld|xdebug|xdebug2|xhprof|yaml|zmq|zstd)/.test(
         version_extension
       ):
       case /(?<!5\.[3-6])(ds|v8js)/.test(version_extension):
       case /(5\.6|7\.[0-4])(propro|lua)/.test(version_extension):
       case /(?<!5\.[3-6]|7\.0)pcov/.test(version_extension):
       case /(?<!5\.[3-6])(ast|vips|xlswriter)/.test(version_extension):
+      case /^(8\.[0-5])swow$/.test(version_extension):
         add_script += await utils.joins(
           '\nadd_brew_extension',
           ext_name,
@@ -139,23 +140,23 @@ export async function addExtensionWindows(
       // match 5.3blackfire...8.5blackfire
       // match 5.3blackfire-(semver)...8.5blackfire-(semver)
       // match ibm_db2, pdo_ibm, pdo_oci and oci8
-      // match 5.3ioncube...8.4ioncube
+      // match 5.3ioncube...8.5ioncube
       // match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, and 7.4phalcon5...8.4phalcon5
-      // match 7.1pecl_http...8.1pecl_http and 7.1http...8.1http
-      // match 7.0zephir_parser...8.4zephir_parser
+      // match 7.1pecl_http...8.5pecl_http and 7.1http...8.5http
+      // match 7.0zephir_parser...8.5zephir_parser
       case /^(5\.[3-6]|7\.[0-4]|8\.[0-5])blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
       case /^ibm_db2$|^pdo_ibm$|^pdo_oci$|^oci8$|^pdo_firebird$/.test(
         extension
       ):
-      case /^(5\.[3-6]|7\.[0-4]|8\.[0-4])ioncube$/.test(version_extension):
+      case /^(5\.[3-6]|7\.[0-4]|8\.[0-5])ioncube$/.test(version_extension):
       case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$|^(7\.4|8\.[0-4])phalcon5?$/.test(
         version_extension
       ):
-      case /^(7\.[1-4]|8\.1)(pecl_)?http/.test(version_extension):
+      case /^(7\.[1-4]|8\.[0-5])(pecl_)?http/.test(version_extension):
       case /(?<!5\.[3-6])(pdo_)?sqlsrv$/.test(version_extension):
-      case /^(7\.[0-4]|8\.[0-4])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
+      case /^(7\.[0-4]|8\.[0-5])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
         add_script += await utils.customPackage(
@@ -272,9 +273,9 @@ export async function addExtensionLinux(
       // match 5.3blackfire-(semver)...8.5blackfire-(semver)
       // match 5.3pdo_cubrid...7.2php_cubrid, 5.3cubrid...7.4cubrid
       // match couchbase, geos, ibm_db2, pdo_ibm, pdo_oci, oci8, http, pecl_http
-      // match 5.3ioncube...8.4ioncube
+      // match 5.3ioncube...8.5ioncube
       // match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, 7.4phalcon5...8.4phalcon5
-      // match 7.0zephir_parser...8.4zephir_parser
+      // match 7.0zephir_parser...8.5zephir_parser
       case /^(7\.4|8\.[0-5])relay(-v?\d+\.\d+\.\d+|-nightly)?$/.test(
         version_extension
       ):
@@ -288,12 +289,12 @@ export async function addExtensionLinux(
         extension
       ):
       case /(?<!5\.[3-5])intl-\d+\.\d+$/.test(version_extension):
-      case /^(5\.[3-6]|7\.[0-4]|8\.[0-4])ioncube$/.test(version_extension):
+      case /^(5\.[3-6]|7\.[0-4]|8\.[0-5])ioncube$/.test(version_extension):
       case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$|^(7\.4|8\.[0-4])phalcon5?$/.test(
         version_extension
       ):
       case /(?<!5\.[3-6])(pdo_)?sqlsrv$/.test(version_extension):
-      case /^(7\.[0-4]|8\.[0-4])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
+      case /^(7\.[0-4]|8\.[0-5])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
         add_script += await utils.customPackage(

package/src/fetch.ts

@@ -1,9 +1,10 @@
-import {IncomingMessage, OutgoingHttpHeaders} from 'http';
-import * as https from 'https';
-import * as url from 'url';
+/**
+ * Redirect status codes set for O(1) lookup
+ */
+const REDIRECT_CODES = new Set([301, 302, 303, 307, 308]);
 
 /**
- * Function to fetch a URL
+ * Function to fetch a URL using native fetch API (Node 24+)
  *
  * @param input_url
  * @param auth_token
@@ -14,43 +15,28 @@ export async function fetch(
   auth_token?: string,
   redirect_count = 5
 ): Promise<Record<string, string>> {
-  const fetch_promise: Promise<Record<string, string>> = new Promise(
-    resolve => {
-      const url_object: url.UrlObject = new url.URL(input_url);
-      const headers: OutgoingHttpHeaders = {
-        'User-Agent': `Mozilla/5.0 (${process.platform} ${process.arch}) setup-php`
-      };
-      if (auth_token) {
-        headers.authorization = 'Bearer ' + auth_token;
-      }
-      const options: https.RequestOptions = {
-        hostname: url_object.hostname,
-        path: url_object.pathname,
-        headers: headers,
-        agent: new https.Agent({keepAlive: false})
-      };
-      const req = https.get(options, (res: IncomingMessage) => {
-        if (res.statusCode === 200) {
-          let body = '';
-          res.setEncoding('utf8');
-          res.on('data', chunk => (body += chunk));
-          res.on('end', () => resolve({data: `${body}`}));
-        } else if (
-          [301, 302, 303, 307, 308].includes(res.statusCode as number)
-        ) {
-          if (redirect_count > 0 && res.headers.location) {
-            fetch(res.headers.location, auth_token, redirect_count--).then(
-              resolve
-            );
-          } else {
-            resolve({error: `${res.statusCode}: Redirect error`});
-          }
-        } else {
-          resolve({error: `${res.statusCode}: ${res.statusMessage}`});
-        }
-      });
-      req.end();
+  const headers: Record<string, string> = {
+    'User-Agent': `Mozilla/5.0 (${process.platform} ${process.arch}) setup-php`
+  };
+  if (auth_token) {
+    headers['Authorization'] = 'Bearer ' + auth_token;
+  }
+
+  try {
+    const response = await globalThis.fetch(input_url, {
+      headers,
+      redirect: redirect_count > 0 ? 'follow' : 'manual'
+    });
+
+    if (response.ok) {
+      const data = await response.text();
+      return {data};
+    } else if (REDIRECT_CODES.has(response.status) && redirect_count <= 0) {
+      return {error: `${response.status}: Redirect error`};
+    } else {
+      return {error: `${response.status}: ${response.statusText}`};
     }
-  );
-  return await fetch_promise;
+  } catch (error) {
+    return {error: `Fetch error: ${(error as Error).message}`};
+  }
 }

package/src/install.ts

@@ -1,8 +1,8 @@
 import path from 'path';
 import fs from 'fs';
 import {exec} from '@actions/exec';
-import * as core from '@actions/core';
 import * as config from './config';
+import * as core from './core';
 import * as coverage from './coverage';
 import * as extensions from './extensions';
 import * as tools from './tools';
@@ -18,7 +18,10 @@ export async function getScript(os: string): Promise<string> {
   const filename = os + (await utils.scriptExtension(os));
   const script_path = path.join(__dirname, '../src/scripts', filename);
   const run_path = script_path.replace(os, 'run');
-  const extension_csv: string = await utils.getInput('extensions', false);
+  const extension_csv: string = utils.sanitizeShellInput(
+    await utils.getInput('extensions', false),
+    true
+  );
   const ini_values_csv: string = await utils.getInput('ini-values', false);
   const coverage_driver: string = await utils.getInput('coverage', false);
   const tools_csv: string = await utils.getInput('tools', false);
@@ -28,7 +31,7 @@ export async function getScript(os: string): Promise<string> {
   const ini_file: string = await utils.parseIniFile(
     await utils.getInput('ini-file', false)
   );
-  let script = await utils.joins('.', script_path, version, ini_file);
+  let script = await utils.joins('.', script_path, `'${version}'`, ini_file);
   if (extension_csv) {
     script += await extensions.addExtension(extension_csv, version, os);
   }

package/src/scripts/darwin.sh

@@ -15,7 +15,9 @@ handle_dependency_extensions() {
     brew_opts=(-sf)
     patch_abstract_file >/dev/null 2>&1
     for dependency_extension in "${dependency_extensions[@]}"; do
-        brew install "${brew_opts[@]}" "$ext_tap/$dependency_extension@$version" >/dev/null 2>&1 && copy_brew_extensions "$dependency_extension"
+        safe_brew install --skip-link "${brew_opts[@]}" "$ext_tap/$dependency_extension@$version" >/dev/null 2>&1 &&
+        brew link --overwrite --force "$dependency_extension@$version" >/dev/null 2>&1 &&
+        copy_brew_extensions "$dependency_extension"
     done
   fi
 }
@@ -83,7 +85,11 @@ add_brew_extension() {
     formula="$(get_renamed_formula "$formula")"
     update_dependencies >/dev/null 2>&1
     handle_dependency_extensions "$formula" "$extension" >/dev/null 2>&1
-    (brew install "${brew_opts[@]}" "$ext_tap/$formula@$version" >/dev/null 2>&1 && copy_brew_extensions "$formula") || pecl_install "$extension" >/dev/null 2>&1
+    (
+      safe_brew install --skip-link "${brew_opts[@]}" "$ext_tap/$formula@$version" >/dev/null 2>&1 &&
+      brew link --overwrite --force "$formula@$version" >/dev/null 2>&1 &&
+      copy_brew_extensions "$formula"
+    ) || pecl_install "$extension" >/dev/null 2>&1
     add_extension_log "$extension" "Installed and enabled"
   fi
 }
@@ -181,14 +187,14 @@ add_php() {
   fi
   if [[ "$existing_version" != "false" && -z "$suffix" ]]; then
     if [ "$action" = "upgrade" ]; then
-      brew install --only-dependencies "$php_formula"
-      brew upgrade -f --overwrite "$php_formula"
+      safe_brew install --only-dependencies "$php_formula"
+      safe_brew upgrade -f --overwrite "$php_formula"
     else
       brew unlink "$php_keg"
     fi
   else
-    brew install --only-dependencies "$php_formula"
-    brew install -f --overwrite "$php_formula" 2>/dev/null || brew upgrade -f --overwrite "$php_formula"
+    safe_brew install --only-dependencies "$php_formula"
+    safe_brew install --skip-link -f --overwrite "$php_formula" 2>/dev/null || safe_brew upgrade -f --overwrite "$php_formula"
   fi
   brew link --force --overwrite "$php_keg" || (sudo chown -R "$(id -un)":"$(id -gn)" "$brew_prefix" && brew link --force --overwrite "$php_keg")
 }

package/src/scripts/extensions/couchbase.sh

@@ -79,9 +79,20 @@ add_couchbase() {
       add_extension_log "couchbase" "Installed and enabled"
     fi
   else
-    if [ -e "${ext_dir:?}"/libcouchbase_php_core.dylib ]; then
-      sudo cp "${ext_dir:?}"/libcouchbase_php_core.dylib "${brew_prefix:?}"/lib
+    if [ -e "${ext_dir:?}/couchbase.so" ]; then
+      couchbase_rpath="$(otool -l "${ext_dir:?}/couchbase.so" 2>/dev/null | awk '$1 == "path" && $2 ~ /\/couchbase@'"${version:?}"'\// {print $2; exit}')"
+      couchbase_rpath="${couchbase_rpath/@loader_path/${ext_dir:?}}"
+      otool -L "${ext_dir:?}/couchbase.so" 2>/dev/null |
+        awk -v rpath="$couchbase_rpath" '/libcouchbase_php.*\.dylib/ {if ($1 ~ /^@rpath\// && rpath != "") {sub(/^@rpath/, rpath, $1)}; print $1}' |
+        while read -r dylib; do
+          dylib="${dylib/@loader_path/${ext_dir:?}}"
+          [ -e "${ext_dir:?}/$(basename "$dylib")" ] || continue
+          sudo mkdir -p "$(dirname "$dylib")"
+          sudo cp "${ext_dir:?}/$(basename "$dylib")" "$dylib"
+        done
     fi
     add_brew_extension couchbase extension
+    find "${brew_prefix:?}/lib" "${brew_prefix:?}/opt/couchbase@${version:?}" "${brew_prefix:?}/Cellar/couchbase@${version:?}" \
+      -name 'libcouchbase_php*.dylib' -exec sudo cp {} "${ext_dir:?}" \; >/dev/null 2>&1
   fi
 }

package/src/scripts/extensions/firebird.sh

@@ -1,17 +1,3 @@
-add_firebird_client_darwin() {
-  firebird_tag='v5.0.0'
-  arch_name='x64'
-  arch="$(uname -m)"
-  [[ "$arch" = "arm64" || "$arch" = "aarch64" ]] && arch_name='arm64'
-  pkg_name=$(get -s -n "" https://api.github.com/repos/FirebirdSQL/firebird/releases/tags/"$firebird_tag" | grep -Eo "Firebird-.*.-$arch_name.pkg" | head -n 1)
-  [ -z "$pkg_name" ] && pkg_name=$(get -s -n "" https://github.com/FirebirdSQL/firebird/releases/expanded_assets/"$firebird_tag" | grep -Eo "Firebird-.*.-$arch_name.pkg" | head -n 1)
-  get -q -e "/tmp/firebird.pkg" https://github.com/FirebirdSQL/firebird/releases/download/"$firebird_tag"/"$pkg_name"
-  sudo installer -pkg /tmp/firebird.pkg -target /
-  sudo mkdir -p /opt/firebird/include /opt/firebird/lib
-  sudo cp -a /Library/Frameworks/Firebird.framework/Headers/* /opt/firebird/include/
-  sudo find /Library/Frameworks/Firebird.framework -name '*.dylib' -exec cp "{}" /opt/firebird/lib \;
-}
-
 add_firebird_helper() {
   firebird_dir=$1
   tag="$(php_src_tag)"
@@ -23,22 +9,19 @@ add_firebird_helper() {
 }
 
 add_firebird() {
-  if [ "$(uname -s )" = "Darwin" ]; then
-    add_firebird_client_darwin >/dev/null 2>&1
-  fi
   enable_extension pdo_firebird extension
-  status="Enabled"
-  if ! check_extension pdo_firebird; then
-    status="Installed and enabled"
+  if check_extension pdo_firebird; then
+    add_log "${tick:?}" pdo_firebird Enabled
+  else
     if [ "$(uname -s)" = "Linux" ]; then
-      if [[ "${version:?}" =~ 5.3|${nightly_versions:?} ]]; then
+      if [[ "${version:?}" =~ 5.3|${php_builder_versions:?} ]]; then
         add_firebird_helper /usr >/dev/null 2>&1
       else
         add_pdo_extension firebird >/dev/null 2>&1
       fi
     else
-      add_firebird_helper /opt/firebird >/dev/null 2>&1
+      add_brew_extension pdo_firebird extension >/dev/null 2>&1
     fi
+    add_extension_log pdo_firebird "Installed and enabled"
   fi
-  add_extension_log pdo_firebird "$status"
 }

package/src/scripts/extensions/gearman.sh

@@ -1,9 +1,9 @@
 # Helper function to add gearman extension.
 add_gearman_helper() {
-  install_packages libgearman-dev
   enable_extension gearman extension
   if ! check_extension gearman; then
     status="Installed and enabled"
+    install_packages libgearman-dev
     if [[ "${version:?}" =~ 5.[3-6] ]]; then
       pecl_install gearman-1.1.2
     elif [[ "${version:?}" =~ 7.0 ]]; then

package/src/scripts/extensions/http.ps1

@@ -10,13 +10,15 @@ Function Get-ICUUrl() {
     [ValidateNotNull()]
     $vs_version
   )
-  $trunk = "https://windows.php.net"
-  $urls=@("${trunk}/downloads/php-sdk/deps/${vs_version}/${arch}", "${trunk}/downloads/php-sdk/deps/archives/${vs_version}/${arch}")
+  $trunk = "https://downloads.php.net"
+  $urls=@("${trunk}/~windows/php-sdk/deps/${vs_version}/${arch}/", "${trunk}/~windows/php-sdk/deps/archives/${vs_version}/${arch}/")
   foreach ($url in $urls) {
-    $web_content = Get-File -Url $url
+    try {
+      $web_content = Get-File -Url $url 2>$null
+    } catch { continue }
     foreach ($link in $web_content.Links) {
-      if ($link -match "/.*ICU-${icu_version}.*/") {
-        return $trunk + $link.HREF
+      if ($link.href -match ".*ICU-${icu_version}.*") {
+        return $url + $link.HREF
       }
     }
   }

package/src/scripts/extensions/phalcon.ps1

@@ -19,26 +19,6 @@ Function Get-PhalconReleaseAssetUrl() {
         $match = (Get-File -Url "$github/$releases/expanded_assets/v$Semver").Links.href | Select-String -Pattern "(phalcon_${arch}_.*_php${version}_${extension_version}.*[0-9]${nts}.zip)"
       } catch { }
     }
-  } else {
-    $nts = if (!$installed.ThreadSafe) { "-nts" } else { "-ts" }
-    try {
-      $match = (Invoke-RestMethod -Uri "$domain/$releases/tags/v$Semver").assets | Select-String -Pattern "browser_download_url=.*(php_phalcon-php${version}${nts}-windows.*-x64.zip)"
-    } catch { }
-    if($null -eq $match) {
-      try {
-        $match = (Get-File -Url "$github/$releases/expanded_assets/v$Semver").Links.href | Select-String -Pattern "(php_phalcon-php${version}${nts}-windows.*-x64.zip)"
-      } catch { }
-    }
-    if($null -eq $match) {
-      try {
-        $match = (Invoke-RestMethod -Uri "$domain/$releases/tags/v$Semver").assets | Select-String -Pattern "browser_download_url=.*(phalcon-php${version}${nts}-windows.*-x64.zip)"
-      } catch { }
-    }
-    if($null -eq $match) {
-      try {
-        $match = (Get-File -Url "$github/$releases/expanded_assets/v$Semver").Links.href | Select-String -Pattern "(phalcon-php${version}${nts}-windows.*-x64.zip)"
-      } catch { }
-    }
   }
   if($NULL -ne $match) {
     return "$github/$releases/download/v$Semver/$($match.Matches[0].Groups[1].Value)"
@@ -73,6 +53,8 @@ Function Get-PhalconSemver() {
     return '4.1.0'
   } elseif (($extension_version -eq '5') -and ($version -eq '7.4')) {
     return '5.4.0'
+  } elseif (($extension_version -eq '5') -and ($version -eq '8.0')) {
+    return '5.10.0'
   }
   return Get-PeclPackageVersion phalcon $extension_version stable stable | Select-Object -First 1
 }
@@ -80,7 +62,7 @@ Function Get-PhalconSemver() {
 # Function to install phalcon
 Function Add-PhalconHelper() {
   $semver = Get-PhalconSemver
-  if ($extension_version -eq '3') {
+  if ($extension_version -match '[3-4]') {
     Add-PhalconFromGitHub $semver
   } else {
     Add-Extension -Extension phalcon -Stability stable -Extension_version $semver

package/src/scripts/extensions/phalcon.sh

@@ -3,6 +3,8 @@ get_phalcon_version() {
   if [ "$extension" = "phalcon5" ]; then
     if [ "${version:?}" = "7.4" ]; then
       echo '5.4.0'
+    elif [ "${version:?}" = "8.0" ]; then
+      echo '5.10.0'
     else
       get_pecl_version phalcon stable 5
     fi

package/src/scripts/extensions/relay.sh

@@ -36,7 +36,10 @@ get_openssl_suffix() {
 change_library_paths() {
   if [ "$os" = "Darwin" ]; then
     otool -L "${ext_dir:?}"/relay.so | grep -q 'ssl.1' && openssl_version='1.1' || openssl_version='3'
-    [ -e "${brew_prefix:?}"/opt/openssl@"$openssl_version" ] || brew install openssl@"$openssl_version"
+    [ -e "${brew_prefix:?}"/opt/openssl@"$openssl_version" ] || {
+      safe_brew install --skip-link openssl@"$openssl_version" &&
+      brew link --overwrite --force openssl@"$openssl_version"
+    }
     dylibs="$(otool -L "${ext_dir:?}"/relay.so | grep -Eo '.*\.dylib' | cut -f1 -d ' ')"
     install_name_tool -change "$(echo "${dylibs}" | grep -E "libzstd.*dylib" | xargs)" "$brew_prefix"/opt/zstd/lib/libzstd.dylib "$ext_dir"/relay.so
     install_name_tool -change "$(echo "${dylibs}" | grep -E "liblz4.*dylib" | xargs)" "$brew_prefix"/opt/lz4/lib/liblz4.dylib "$ext_dir"/relay.so
@@ -54,7 +57,7 @@ add_relay_dependencies() {
   if [ "$os" = "Darwin" ]; then
     . "${0%/*}"/tools/brew.sh
     configure_brew
-    brew install lz4 hiredis zstd concurrencykit
+    safe_brew install lz4 hiredis zstd concurrencykit
   fi
 }
 

package/src/scripts/extensions/source.sh

@@ -60,9 +60,11 @@ add_linux_libs() {
 add_darwin_libs() {
   local lib=$1
   if ! check_lib "$lib"; then
-    brew install "$lib" >/dev/null 2>&1 || true
     if [[ "$lib" = *@* ]]; then
+      safe_brew install --skip-link "$lib" >/dev/null 2>&1 || true
       brew link --overwrite --force "$lib" >/dev/null 2>&1 || true
+    else
+      safe_brew install "$lib" >/dev/null 2>&1 || true
     fi
   fi
   add_lib_log "$lib"

package/src/scripts/extensions/sqlsrv.ps1

@@ -9,6 +9,8 @@ Function Get-SqlsrvReleaseVersion() {
     return '5.10.1'
   } elseif ($version -eq '8.0') {
     return '5.11.1'
+  } elseif ($version -match '8.[1-2]') {
+    return '5.12.0'
   } else {
     return 'latest'
   }

package/src/scripts/extensions/sqlsrv.sh

@@ -6,6 +6,8 @@ get_sqlsrv_version() {
     echo '5.10.1'
   elif [[ "${version:?}" =~ 8.0 ]]; then
     echo '5.11.1'
+  elif [[ "${version:?}" =~ 8.[1-2] ]]; then
+    echo '5.12.0'
   else
     # Return an empty string so that pecl will install the latest version.
     echo ''

package/src/scripts/linux.sh

@@ -127,6 +127,51 @@ setup_cached_versions() {
   run_script "php-ubuntu" "$version" "${debug:?}" "${ts:?}"
 }
 
+# Function to get the link path for an alternative.
+alternative_link() {
+  case "$1" in
+  php-cgi-bin) echo "/usr/lib/cgi-bin/php" ;;
+  php-fpm) echo "/usr/sbin/php-fpm" ;;
+  php-fpm.sock) echo "/run/php/php-fpm.sock" ;;
+  *) echo "/usr/bin/$1" ;;
+  esac
+}
+
+# Function to get the target path for an alternative.
+alternative_target() {
+  case "$1" in
+  php-cgi-bin) echo "/usr/lib/cgi-bin/php$version" ;;
+  php-fpm) echo "/usr/sbin/php-fpm$version" ;;
+  php-fpm.sock) echo "/run/php/php$version-fpm.sock" ;;
+  *) echo "/usr/bin/$1$version" ;;
+  esac
+}
+
+# Function to register an alternative if the versioned binary exists but is missing.
+register_alternative() {
+  local tool=$1
+  local link target priority state_file
+  target="$(alternative_target "$tool")"
+  [ -e "$target" ] || return 0
+  state_file="/var/lib/dpkg/alternatives/$tool"
+  if sudo test -r "$state_file" && sudo grep -Fxq "$target" "$state_file"; then
+    return 0
+  fi
+  link="$(alternative_link "$tool")"
+  priority="${version//./}"
+  sudo update-alternatives --install "$link" "$tool" "$target" "$priority" >/dev/null 2>&1
+}
+
+# Function to register and switch an alternative.
+set_alternative() {
+  local tool=$1
+  local target
+  target="$(alternative_target "$tool")"
+  [ -e "$target" ] || return 0
+  register_alternative "$tool" || return 1
+  sudo update-alternatives --set "$tool" "$target" >/dev/null 2>&1
+}
+
 # Function to add PECL.
 add_pecl() {
   add_devtools phpize >/dev/null 2>&1
@@ -143,16 +188,11 @@ switch_version() {
   tools=("$@")
   to_wait=()
   if ! (( ${#tools[@]} )); then
-    tools+=(pear pecl php phar phar.phar php-cgi php-config phpize phpdbg)
-    [ -e /usr/lib/cgi-bin/php"$version" ] && sudo update-alternatives --set php-cgi-bin /usr/lib/cgi-bin/php"$version" & to_wait+=($!)
-    [ -e /usr/sbin/php-fpm"$version" ] && sudo update-alternatives --set php-fpm /usr/sbin/php-fpm"$version" & to_wait+=($!)
-    [ -e /run/php/php"$version"-fpm.sock ] && sudo update-alternatives --set php-fpm.sock /run/php/php"$version"-fpm.sock & to_wait+=($!)
+    tools+=(php-cgi-bin php-fpm php-fpm.sock pear pecl php phar phar.phar php-cgi php-config phpize phpdbg)
   fi
   for tool in "${tools[@]}"; do
-    if [ -e "/usr/bin/$tool$version" ]; then
-      sudo update-alternatives --set "$tool" /usr/bin/"$tool$version" &
-      to_wait+=($!)
-    fi
+    set_alternative "$tool" &
+    to_wait+=($!)
   done
   wait "${to_wait[@]}"
 }
@@ -187,7 +227,7 @@ update_php() {
 # Function to install PHP.
 add_php() {
   if [ "${runner:?}" = "self-hosted" ] || [ "${use_package_cache:-true}" = "false" ]; then
-    if [[ "$version" =~ ${nightly_versions:?} || "$ts" = "zts" ]]; then
+    if [[ "$version" =~ ${php_builder_versions:?} || "$ts" = "zts" ]]; then
         setup_php_builder
     else
       add_packaged_php