setup-php 2.35.5 → 2.36.0

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//}"
@@ -48,19 +46,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 +54,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
+    brew install lz4 hiredis zstd concurrencykit
   fi
 }
 
@@ -128,7 +108,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 +132,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"
 }

package/src/scripts/extensions/source.sh

@@ -1,3 +1,7 @@
+os="$(uname -s)"
+os_lower=$(echo "$os" | tr '[:upper:]' '[:lower:]')
+os_capital=$(echo "$os" | tr '[:lower:]' '[:upper:]')
+
 # Function to parse extension environment variables
 parse_args() {
   local extension=${1%-*}
@@ -36,7 +40,7 @@ add_lib_log() {
 # Function to check if a library is installed
 check_lib() {
   local lib=$1
-  if [ "$(uname -s)" = "Linux" ]; then
+  if [ "$os" = "Linux" ]; then
     [ "x$(dpkg -s "$lib" 2>/dev/null | grep Status)" != "x" ]
   else
     [ "x$(find "${brew_prefix:?}"/Cellar -maxdepth 1 -name "$lib")" != "x" ]
@@ -68,7 +72,7 @@ add_darwin_libs() {
 add_libs() {
   local all_libs=("$@")
   for lib in "${all_libs[@]}"; do
-    if [ "$(uname -s)" = "Linux" ]; then
+    if [ "$os" = "Linux" ]; then
       add_linux_libs "$lib"
     else
       add_darwin_libs "$lib"
@@ -76,6 +80,19 @@ add_libs() {
   done
 }
 
+# Function to get required libraries for an extension
+get_libraries() {
+  local extension=$1
+  {
+    parse_args "$extension" LIBS
+    parse_args "$extension" "$os_capital"_LIBS
+    [ -r "${src:?}/configs/${os_lower}_libs" ] && \
+      grep -E "^[[:space:]]*${extension}[[:space:]]*=" "${src:?}/configs/${os_lower}_libs" | \
+      head -n1 | \
+      sed -E "s/^[[:space:]]*${extension}[[:space:]]*=[[:space:]]*//"
+  } | xargs -n 1 2>/dev/null | sort -u | xargs 2>/dev/null
+}
+
 # Function to run command in a group
 run_group() {
   local command=$1
@@ -119,9 +136,10 @@ fetch_extension() {
   elif [ "$fetch" = "pecl" ]; then
     source="pecl"
     pecl_name=${extension/http/pecl_http}
-    get -q -n /tmp/"$pecl_name".tgz https://pecl.php.net/get/"$pecl_name"-"$release".tgz
+    capital_pecl_name=$(echo "$pecl_name" | tr '[:lower:]' '[:upper:]')
+    get -q -n /tmp/"$pecl_name".tgz https://pecl.php.net/get/"$pecl_name"-"$release".tgz https://pecl.php.net/get/"$capital_pecl_name"-"$release".tgz
     tar -xzf /tmp/"$pecl_name".tgz -C /tmp
-    cd /tmp/"$pecl_name"-"$release" || exit
+    cd /tmp/"$pecl_name"-"$release" 2>/dev/null || cd /tmp/"$capital_pecl_name"-"$release" 2>/dev/null || exit
   fi
 }
 
@@ -136,7 +154,7 @@ add_extension_from_source() {
   local fetch=${7:-clone}
   slug="$extension-$release"
   source="$url/$org/$repo"
-  libraries="$(parse_args "$extension" LIBS) $(parse_args "$extension" "$(uname -s)"_LIBS)"
+  libraries="$(get_libraries "$extension")"
   opts="$(parse_args "$extension" CONFIGURE_OPTS)"
   prefix_opts="$(parse_args "$extension" CONFIGURE_PREFIX_OPTS)"
   suffix_opts="$(parse_args "$extension" CONFIGURE_SUFFIX_OPTS)"

package/src/scripts/linux.sh

@@ -291,7 +291,7 @@ setup_php() {
 }
 
 # Variables
-version=${1:-'8.4'}
+version=${1:-'8.5'}
 ini=${2:-'production'}
 src=${0%/*}/..
 debconf_fix="DEBIAN_FRONTEND=noninteractive"