setup-php 2.35.5 → 2.37.0

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
 }
@@ -39,10 +41,21 @@ get_extension_from_formula() {
   local formula=$1
   local extension
   extension=$(grep -E "^$formula=" "$src"/configs/brew_extensions | cut -d '=' -f 2)
-  [[ -z "$extension" ]] && extension="$(echo "$formula" | sed -E "s/pecl_|[0-9]//g")"
+  [[ -z "$extension" ]] && extension="$(echo "$formula" | sed -E "s/pecl_|php|[0-9]//g")"
   echo "$extension"
 }
 
+# Function to get renamed formula.
+get_renamed_formula() {
+  local formula=$1
+  formula_renames_json="$tap_dir/$ext_tap/formula_renames.json"
+  if [ -e "$formula_renames_json" ] && grep -q "$formula@$version\":" "$formula_renames_json"; then
+    grep "$formula@$version\":" "$formula_renames_json" | cut -d ':' -f 2 | tr -d ' ",' | cut -d '@' -f 1
+  else
+    echo "$formula"
+  fi
+}
+
 # Function to copy extension binaries to the extension directory.
 copy_brew_extensions() {
   local formula=$1
@@ -69,9 +82,14 @@ add_brew_extension() {
   else
     add_brew_tap "$php_tap"
     add_brew_tap "$ext_tap"
+    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
 }
@@ -148,9 +166,9 @@ get_brewed_php() {
   cellar="$brew_prefix"/Cellar
   php_cellar="$cellar"/php
   if [ -d "$cellar" ] && ! [[ "$(find "$cellar" -maxdepth 1 -name "php@$version*" | wc -l 2>/dev/null)" -eq 0 ]]; then
-    php_semver | cut -c 1-3
+    php_semver
   elif [ -d "$php_cellar" ] && ! [[ "$(find "$php_cellar" -maxdepth 1 -name "$version*" | wc -l 2>/dev/null)" -eq 0 ]]; then
-    php_semver | cut -c 1-3
+    php_semver
   else
     echo 'false';
   fi
@@ -160,17 +178,25 @@ get_brewed_php() {
 add_php() {
   action=$1
   existing_version=$2
-  add_brew_tap "$php_tap"
-  update_dependencies
   suffix="$(get_php_formula_suffix)"
-  php_formula="shivammathur/php/php@$version$suffix"
+  php_keg="php@$version$suffix"
+  php_formula="shivammathur/php/$php_keg"
+  if [[ "$existing_version" = "false" || -n "$suffix" || "$action" = "upgrade" ]]; then
+    update_dependencies
+    add_brew_tap "$php_tap"
+  fi
   if [[ "$existing_version" != "false" && -z "$suffix" ]]; then
-    ([ "$action" = "upgrade" ] && brew upgrade -f --overwrite "$php_formula") || brew unlink "$php_formula"
+    if [ "$action" = "upgrade" ]; then
+      safe_brew install --only-dependencies "$php_formula"
+      safe_brew upgrade -f --overwrite "$php_formula"
+    else
+      brew unlink "$php_keg"
+    fi
   else
-    brew install -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
-  sudo chown -R "$(id -un)":"$(id -gn)" "$brew_prefix"
-  brew link --force --overwrite "$php_formula"
+  brew link --force --overwrite "$php_keg" || (sudo chown -R "$(id -un)":"$(id -gn)" "$brew_prefix" && brew link --force --overwrite "$php_keg")
 }
 
 # Function to get formula suffix
@@ -222,18 +248,18 @@ setup_php() {
   update=true
   check_pre_installed
   existing_version=$(get_brewed_php)
+  status="Found"
   if [[ "$version" =~ ${old_versions:?} ]]; then
     run_script "php5-darwin" "${version/./}" >/dev/null 2>&1
     status="Installed"
-  elif [ "$existing_version" != "$version" ]; then
+  elif [ "${existing_version:0:3}" != "$version" ]; then
     add_php "install" "$existing_version" >/dev/null 2>&1
     status="Installed"
-  elif [ "$existing_version" = "$version" ]; then
-    if [ "${update:?}" = "true" ]; then
+  elif [[ "${existing_version:0:3}" = "$version" && "${update:?}" = "true" ]]; then
+    brew_php_version="$(brew info --json "php@$version" 2>/dev/null | jq -r '.[].versions.stable')"
+    if [ "$brew_php_version" != "$existing_version" ]; then
       add_php "upgrade" "$existing_version" >/dev/null 2>&1
-      status="Updated to"
-    else
-      status="Found"
+      status="Upgraded"
     fi
   fi
   php_config="$(command -v php-config)"
@@ -258,7 +284,7 @@ setup_php() {
 }
 
 # Variables
-version=${1:-'8.4'}
+version=${1:-'8.5'}
 ini=${2:-'production'}
 src=${0%/*}/..
 php_formula=shivammathur/php/php@"$version"

package/src/scripts/extensions/add_extensions.sh

@@ -1,8 +1,10 @@
 # Function to log result of installing extension.
 add_extension_log() {
-  (
-    check_extension "$(echo "$1" | cut -d '-' -f 1)" && add_log "${tick:?}" "$1" "$2"
-  ) || add_log "${cross:?}" "$1" "Could not install $1 on PHP ${semver:?}"
+  if check_extension ${1%%-*}; then
+    add_log "${tick:?}" "$1" "$2"
+  else
+    add_log "${cross:?}" "$1" "${3:-Could not install $1 on PHP ${semver:?}}"
+  fi
 }
 
 # Function to test if extension is loaded.

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

@@ -4,8 +4,10 @@ add_gearman_helper() {
   enable_extension gearman extension
   if ! check_extension gearman; then
     status="Installed and enabled"
-    if [[ "${version:?}" =~ 5.[3-5] ]]; then
+    if [[ "${version:?}" =~ 5.[3-6] ]]; then
       pecl_install gearman-1.1.2
+    elif [[ "${version:?}" =~ 7.0 ]]; then
+      pecl_install gearman-2.1.3
     else
       install_packages php"${version:?}"-gearman || pecl_install gearman
     fi

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/ibm.ps1

@@ -0,0 +1,56 @@
+# Function to log license information for ibm extensions.
+Function Add-LicenseLog() {
+  printf "$env:GROUP\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" $extension "Click to read the $extension related license information"
+  printf "IBM Db2 ODBC and CLI Driver is required for %s extension.\n" $extension
+  printf "It is provided under the IBM International Program License Agreement.\n"
+  printf "Refer to: \033[35;1m%s \033[0m\n" "https://www.ibm.com/support/pages/db2-odbc-cli-driver-download-and-installation-information"
+  $licensePath = "$php_dir\clidriver\license\odbc_notices.rtf"
+  if (Test-Path $licensePath) {
+    Add-Type -AssemblyName System.Windows.Forms
+    $rtBox = New-Object System.Windows.Forms.RichTextBox
+    $rtBox.Rtf = [System.IO.File]::ReadAllText($licensePath);
+    Write-Host $rtBox.Text;
+  }
+  Write-Output "$env:END_GROUP"
+}
+
+# Function to install IBM Db2 CLI driver.
+Function Add-IbmCli() {
+  $cliPath = "$php_dir\clidriver"
+  if (-not (Test-Path "$cliPath\bin")) {
+    $suffix = if ($arch -eq 'x86') { 'nt32' } else { 'ntx64' }
+    $archive = "$suffix`_odbc_cli.zip"
+    $destination = "$ENV:RUNNER_TOOL_CACHE\ibm_cli.zip"
+    Get-File -Url "https://public.dhe.ibm.com/ibmdl/export/pub/software/data/db2/drivers/odbc_cli/$archive" -OutFile $destination > $null 2>&1
+    Expand-Archive -Path $destination -DestinationPath $php_dir -Force > $null 2>&1
+  }
+  $env:IBM_DB_HOME = $cliPath
+  $env:LD_LIBRARY_PATH = "$cliPath\bin;$cliPath\lib;$env:LD_LIBRARY_PATH"
+  Add-Path "$cliPath\bin"
+  $env:PATH = "$cliPath\bin;$env:PATH"
+}
+
+# Function to install ibm_db2 and pdo_ibm.
+Function Add-Ibm() {
+  Param (
+    [Parameter(Position = 0, Mandatory = $true)]
+    [ValidateNotNull()]
+    [ValidateSet('ibm_db2', 'pdo_ibm')]
+    [string]
+    $extension
+  )
+  try {
+    $status = 'Enabled'
+    Add-IbmCli
+    if (Test-Path "$ext_dir\php_$extension.dll") {
+      Enable-PhpExtension -Extension $extension -Path $php_dir
+    } else {
+      Add-Extension $extension 
+      $status = 'Installed and enabled'
+    }
+    Add-ExtensionLog $extension $status
+    Add-LicenseLog
+  } catch {
+    Add-Log $cross $extension "Could not install $extension on PHP $( $installed.FullVersion )"
+  }
+}

package/src/scripts/extensions/ibm.sh

@@ -0,0 +1,106 @@
+# Function to log license details for ibm extensions.
+add_license_log() {
+  printf "$GROUP\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "$ext" "Click to read the $ext related license information"
+  printf "IBM Db2 ODBC and CLI Driver is required for %s extension.\n" "$ext"
+  printf "Refer to: \033[35;1m%s \033[0m\n" "https://www.ibm.com/support/pages/db2-odbc-cli-driver-download-and-installation-information"
+  local license_file="$ibm_cli/license/odbc_notices.txt"
+  if [ -f "$license_file" ]; then
+    cat "$license_file"
+  fi
+  echo "$END_GROUP"
+}
+
+# Function to determine the driver archive for the current platform.
+get_cli_archive() {
+  local os=$1
+  local arch=$2
+  case $os in
+    Linux)
+      case $arch in
+        x86_64|amd64) echo "linuxx64_odbc_cli.tar.gz";;
+        i?86) echo "linuxia32_odbc_cli.tar.gz";;
+        *) return 1;;
+      esac
+      ;;
+    Darwin)
+      case $arch in
+        x86_64) echo "macos64_odbc_cli.tar.gz";;
+        arm64|aarch64) echo "macarm64_odbc_cli.tar.gz";;
+        *) return 1;;
+      esac
+      ;;
+    *)
+      return 1
+      ;;
+  esac
+}
+
+# Function to install IBM Db2 CLI driver.
+add_cli_driver() {
+  local os arch archive url tmp libs
+  if [ -d "$ibm_cli" ]; then
+    return 0
+  fi
+  os=$(uname -s)
+  arch=$(uname -m)
+  archive=$(get_cli_archive "$os" "$arch") || return 1
+  url="https://public.dhe.ibm.com/ibmdl/export/pub/software/data/db2/drivers/odbc_cli/$archive"
+  tmp=/tmp/$archive
+  get -q -n "$tmp" "$url"
+  sudo mkdir -p "$ibm_home"
+  sudo tar -xzf "$tmp" -C "$ibm_home"
+  sudo rm -f "$tmp"
+  if [ ! -d "$ibm_cli" ]; then
+    local extracted
+    extracted=$(find "$ibm_home" -maxdepth 1 -type d -name 'clidriver*' | head -n 1)
+    [ -n "$extracted" ] && sudo mv "$extracted" "$ibm_cli"
+  fi
+  if [ "$os" = "Linux" ]; then
+    echo "$ibm_cli/lib" | sudo tee /etc/ld.so.conf.d/ibm_db2.conf >/dev/null
+    sudo ldconfig
+  else
+    libs='/usr/local/lib'
+    sudo mkdir -p "$libs"
+    sudo ln -sf "$ibm_cli"/lib/*.dylib "$libs" >/dev/null 2>&1 || true
+  fi
+}
+
+# Function to install ibm_db2 and pdo_ibm.
+add_ibm_helper() {
+  if ! shared_extension "$ext"; then
+    status='Installed and enabled'
+    export IBM_DB_HOME="$ibm_cli"
+    export LD_LIBRARY_PATH="$IBM_DB_HOME/lib"
+    add_env DYLD_LIBRARY_PATH "$IBM_DB_HOME/lib"
+    local configure_flag
+    if [ "$ext" = 'ibm_db2' ]; then
+      configure_flag="--with-IBM_DB2=$IBM_DB_HOME"
+    else
+      configure_flag="--with-pdo-ibm=$IBM_DB_HOME"
+    fi
+    read -r "${ext}_CONFIGURE_OPTS" <<< "--with-php-config=$(command -v php-config) $configure_flag"
+    patch_phpize
+    add_extension_from_source "$ext" https://github.com php "pecl-database-$ext" master extension get
+    restore_phpize
+  else
+    enable_extension "$ext" extension
+  fi
+}
+
+# Function to add ibm_db2 and pdo_ibm.
+add_ibm() {
+  ext=$1
+  status='Enabled'
+  ibm_home='/opt/ibm'
+  ibm_cli=$ibm_home/clidriver
+  if ! add_cli_driver >/dev/null 2>&1; then
+    add_log "${cross:?}" "$ext" "IBM Db2 CLI driver is not available on $(uname -s)/$(uname -m)"
+    return 1
+  fi
+  add_ibm_helper >/dev/null 2>&1
+  add_extension_log "$ext" "$status"
+  check_extension "$ext" && add_license_log
+}
+
+# shellcheck source=.
+. "${scripts:?}"/extensions/patches/phpize.sh

package/src/scripts/extensions/oci.sh

@@ -38,7 +38,7 @@ add_client() {
       sudo mv "$icdir"/* "$oracle_client"/
     done
     sudo mkdir -p "$libs"
-    sudo ln -sf /opt/oracle/instantclient/*.$lib_ext* $libs
+    sudo ln -sf /opt/oracle/instantclient/*."$lib_ext"* "$libs"
     if [ "$os" = "Linux" ]; then
       [ -e "$libs/$arch"-linux-gnu/libaio.so.1 ] || sudo ln -sf "$libs/$arch"-linux-gnu/libaio.so.1t64 "$libs/$arch"-linux-gnu/libaio.so.1
     fi
@@ -49,6 +49,7 @@ add_client() {
 add_oci_helper() {
   if ! shared_extension "$ext"; then
     status='Installed and enabled'
+    read -r "${ext}_CONFIGURE_PREFIX_OPTS" <<< "CFLAGS=-Wno-incompatible-function-pointer-types"
     read -r "${ext}_LINUX_LIBS" <<< "libaio-dev"
     read -r "${ext}_CONFIGURE_OPTS" <<< "--with-php-config=$(command -v php-config) --with-${ext/_/-}=instantclient,$oracle_client"
     patch_phpize

package/src/scripts/extensions/patches/amqp.sh

@@ -0,0 +1,5 @@
+patch_amqp() {
+  if [[ $(printf '%s\n%s\n' "${version:?}" "8.5" | sort -V | head -n1) == "8.5" ]]; then
+    get -q -n amqp_connection_resource.c https://raw.githubusercontent.com/remicollet/php-amqp/977449987412a3d5c59a036dbab8b6d67764bb3e/amqp_connection_resource.c
+  fi
+}

package/src/scripts/extensions/patches/common.sh

@@ -1,12 +1,35 @@
-process_file() {
-    local file=$1
-    sed -i'' -e '0,/#include.*\(php_lcg.h\|php_mt_rand.h\|php_rand.h\|standard\/php_random\.h\).*/s//\#include <ext\/random\/php_random.h>/' "$file"
-    sed -i'' -e '/#include.*\(php_lcg.h\|php_mt_rand.h\|php_rand.h\|standard\/php_random\.h\)/d' "$file"
+patch_84() {
+  sed -i.bak \
+    -e '0,/#include.*\(php_lcg.h\|php_mt_rand.h\|php_rand.h\|standard\/php_random\.h\).*/s//#include <ext\/random\/php_random.h>/' \
+    -e '/#include.*\(php_lcg.h\|php_mt_rand.h\|php_rand.h\|standard\/php_random\.h\)/d' \
+    "$1" && rm -rf *.bak
 }
 
-export -f process_file
+patch_85() {
+  sed -i.bak \
+    -e 's#ext/standard/php_smart_string.h#Zend/zend_smart_string.h#g' \
+    -e 's#ext/standard/php_smart_string_public.h#Zend/zend_smart_string.h#g' \
+    -e 's#zend_exception_get_default(TSRMLS_C)#zend_ce_exception#g' \
+    -e 's#zend_exception_get_default()#zend_ce_exception#g' \
+    "$1" && rm -rf *.bak
+}
+
+version_ge() {
+  ver=$1
+  min=$2
+  [[ $(printf '%s\n%s\n' "$ver" "$min" | sort -V | head -n1) == "$min" ]]
+}
+
+if version_ge "${version:?}" "8.4"; then
+  while IFS= read -r file; do
+    patch_84 "$file"
+  done < <(grep -rlE 'php_lcg\.h|php_mt_rand\.h|php_rand\.h|standard/php_random\.h' \
+           --include='*.c' --include='*.h' . || true)
+fi
 
-# Compare with 8.3 so it runs only on 8.4 and above
-if [[ $(printf "%s\n%s" "${version:?}" "8.3" | sort -V | head -n1) != "$version" ]]; then
-  find . -type f \( -name "*.c" -o -name "*.h" \) -exec bash -c 'process_file "$0"' {} \;
+if version_ge "${version:?}" "8.5"; then
+  while IFS= read -r file; do
+    patch_85 "$file"
+  done < <(grep -rlE 'ext/standard/php_smart_string(_public)?\.h|zend_exception_get_default' \
+           --include='*.c' --include='*.h' . || true)
 fi

package/src/scripts/extensions/patches/geos.sh

@@ -1,11 +1,7 @@
 patch_geos() {
-  php_version_id="$(php -r "echo PHP_VERSION_ID;")"
-  if [ "$php_version_id" -ge 70000 ]; then
+  if [[ $(printf '%s\n%s\n' "${version:?}" "7.0" | sort -V | head -n1) == "7.0" ]]; then
     sed -i~ -e "s/, ce->name/, ZSTR_VAL(ce->name)/; s/ulong /zend_ulong /" geos.c
   fi
-  if [ "$php_version_id" -ge 80500 ]; then
-    sed -i~ -e "s/zend_exception_get_default(TSRMLS_C)/zend_ce_exception/" geos.c
-  fi
   get -q -n /tmp/php8.patch https://git.remirepo.net/cgit/rpms/php/php-geos.git/plain/0003-add-all-arginfo-and-fix-build-with-PHP-8.patch
   get -q -n /tmp/toString.patch https://git.remirepo.net/cgit/rpms/php/php-geos.git/plain/0006-fix-__toString-with-8.2.patch
   patch -p1 < /tmp/php8.patch 2>/dev/null || true

package/src/scripts/extensions/patches/pdo_oci.sh

@@ -1,5 +1,8 @@
 patch_pdo_oci() {
   get -q -n config.m4 https://raw.githubusercontent.com/php/php-src/PHP-8.0/ext/pdo_oci/config.m4
+  if [[ $(printf '%s\n%s\n' "${version:?}" "8.5" | sort -V | head -n1) == "8.5" ]]; then
+    get -q -n pdo_oci.c https://raw.githubusercontent.com/shivammathur/pecl-database-pdo_oci/a9cf2c53b6de46f9e5f523bcd11fd344e3beeb85/pdo_oci.c
+  fi
   if [[ ${version:?} =~ 5.[3-6] ]]; then
     sudo sed -i '' "/PHP_CHECK_PDO_INCLUDES/d" config.m4 2>/dev/null || sudo sed -i "/PHP_CHECK_PDO_INCLUDES/d" config.m4
   fi

package/src/scripts/extensions/patches/pdo_sqlsrv.sh

@@ -0,0 +1,5 @@
+if [[ $(printf '%s\n%s\n' "${version:?}" "8.5" | sort -V | head -n1) == "8.5" ]]; then
+  sed -i.bak -e 's/zval_ptr_dtor( &dbh->query_stmt_zval );/OBJ_RELEASE(dbh->query_stmt_obj);dbh->query_stmt_obj = NULL;/' php_pdo_sqlsrv_int.h
+  sed -i.bak -e 's/pdo_error_mode prev_err_mode/uint8_t prev_err_mode/g' pdo_dbh.cpp
+  rm -rf *.bak
+fi

package/src/scripts/extensions/patches/phpize.sh

@@ -3,7 +3,8 @@ get_phpize() {
   if [[ "${version:?}" =~ 5.[3-5] ]]; then
     echo '/opt/local/bin/phpize'
   else
-    echo "/usr/local/bin/$(readlink /usr/local/bin/phpize)"
+    [ -n "$brew_prefix" ] && phpize_dir="$brew_prefix" || phpize_dir="/usr/local/bin"
+    echo "${phpize_dir}/bin/$(readlink ${phpize_dir}/bin/phpize)"
   fi
 }
 

package/src/scripts/extensions/relay.sh

@@ -2,11 +2,9 @@
 get_relay_version() {
  local ext=$1
   if [[ "$ext" =~ ^relay$ ]]; then
-    if [ "${version:?}" = "7.4" ]; then
-      echo 'v0.7.0'
-    else
-      get -s -n "" "${relay_releases:?}"/latest 2<&1 | grep -m 1 -Eo "tag/(v[0-9]+(\.[0-9]+)?(\.[0-9]+)?)" | head -n 1 | cut -d '/' -f 2
-    fi
+    get -s -n "" "${relay_release:?}"
+  elif [[ $ext =~ ^relay-nightly$ ]]; then
+    echo "dev"
   else
     relay_version="${ext##*-}"
     echo "v${relay_version/v//}"
@@ -38,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
@@ -48,19 +49,6 @@ change_library_paths() {
   fi
 }
 
-# Add hiredis library
-add_hiredis_1.1.0() {
-  hiredis_url=https://github.com/redis/hiredis/archive/v1.1.0.tar.gz
-  hiredis_sha=fe6d21741ec7f3fc9df409d921f47dfc73a4d8ff64f4ac6f1d95f951bf7f53d6
-  sed -Ei.bak -e "s#^  url.*#  url \"$hiredis_url\"#" -e "s#^  sha256.*#  sha256 \"$hiredis_sha\"#" ${core_repo:?}/Formula/h/hiredis.rb
-  brew install -s hiredis
-  lib_dir="${brew_prefix:?}"/opt/hiredis/lib
-  if [ -e "$lib_dir"/libhiredis_ssl.1.1.0.dylib ]; then
-    sudo ln -sf "$lib_dir"/libhiredis_ssl.1.1.0.dylib "$lib_dir"/libhiredis_ssl.dylib.1.1.0
-  fi
-  mv ${core_repo:?}/Formula/h/hiredis.rb.bak ${core_repo:?}/Formula/h/hiredis.rb
-}
-
 # Add relay dependencies
 add_relay_dependencies() {
   add_extension json
@@ -69,12 +57,7 @@ add_relay_dependencies() {
   if [ "$os" = "Darwin" ]; then
     . "${0%/*}"/tools/brew.sh
     configure_brew
-    if [ "$relay_version" = "v0.7.0" ]; then
-      brew install lz4 zstd concurrencykit
-      add_hiredis_1.1.0 >/dev/null 2>&1
-    else
-      brew install lz4 hiredis zstd concurrencykit
-    fi
+    safe_brew install lz4 hiredis zstd concurrencykit
   fi
 }
 
@@ -128,7 +111,7 @@ configure_relay() {
 
 # Helper function to add relay extension
 add_relay_helper() {
-  arch="$(uname -m | sed 's/_/-/')"
+  local arch=$1
   os_suffix="$(get_os_suffix)"
   openssl_suffix="$(get_openssl_suffix)"
   artifact_file_name="relay-$relay_version-php${version:?}-$os_suffix-$arch$openssl_suffix.tar.gz"
@@ -152,17 +135,24 @@ add_relay() {
   local ext=$1
   local arch
   local url
+  local message
+  local error
   os=$(uname -s)
-  relay_releases=https://github.com/cachewerk/relay/releases
+  arch="$(uname -m | sed 's/_/-/')"
+  relay_release=https://builds.r2.relay.so/meta/latest
   relay_trunk=https://builds.r2.relay.so
-  relay_version=$(get_relay_version "$ext")
-  add_relay_dependencies >/dev/null 2>&1
-  if shared_extension relay; then
-    message="Enabled"
+  if [[ "$arch" = "x86-64" && "$os" = "Darwin" ]]; then
+    error="Relay extension is not available for macOS x86_64 architecture"
   else
-    add_relay_helper >/dev/null 2>&1
-    message="Installed and enabled"
+    relay_version=$(get_relay_version "$ext")
+    add_relay_dependencies >/dev/null 2>&1
+    if shared_extension relay; then
+      message="Enabled"
+    else
+      add_relay_helper "$arch" >/dev/null 2>&1
+      message="Installed and enabled ${relay_version}"
+    fi
+    configure_relay >/dev/null 2>&1
   fi
-  configure_relay >/dev/null 2>&1
-  add_extension_log relay "$message"
+  add_extension_log relay "$message" "$error"
 }