setup-php 2.16.0 → 2.18.0

package/src/scripts/{ext → extensions}/oci.ps1

@@ -1,10 +1,10 @@
 # Function to log license information.
 Function Add-LicenseLog() {
-    printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" $extension "Click to read the $extension related license information"
+    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 "Oracle Instant Client package is required for %s extension.\n" $extension
     printf "It is provided under the Oracle Technology Network Development and Distribution License.\n"
     printf "Refer to: \033[35;1m%s \033[0m\n" "https://www.oracle.com/downloads/licenses/instant-client-lic.html"
-    Write-Output "::endgroup::"
+    Write-Output "$env:END_GROUP"
 }
 
 # Function to get instantclinet.
@@ -20,6 +20,36 @@ Function Add-InstantClient() {
   }
 }
 
+# Function to oci8 extension URL.
+Function Get-Oci8Url() {
+  if($version -lt '8.0') {
+    $ociVersion = '2.2.0'
+    if ($version -eq '7.0') {
+      $ociVersion = '2.1.8'
+    } elseif ($version -lt '7.0') {
+      $ociVersion = '2.0.12'
+    }
+    return Get-PeclArchiveUrl oci8 $ociVersion $installed
+  } else {
+    $ociUrl = '';
+    Get-PeclPackageVersion oci8 -MinimumStability stable -MaximumStability stable | ForEach-Object {
+      $ociUrl = Get-PeclArchiveUrl oci8 $_ $installed
+      if($ociUrl) {
+        return $ociUrl
+      }
+    }
+  }
+}
+
+# Function to get OCI8 DLL.
+Function Get-Oci8DLL() {
+  Get-ChildItem $ext_dir\php_oci8*.dll | ForEach-Object {
+    if((Get-PhpExtension -Path $_).PhpVersion -eq $version) {
+      return $_
+    }
+  }
+}
+
 # Function to install oci8 and pdo_oci.
 Function Add-Oci() {
   Param (
@@ -36,19 +66,14 @@ Function Add-Oci() {
       Enable-PhpExtension pdo_oci -Path $php_dir
     } else {
       if(-not(Test-Path $ext_dir\php_oci8.dll)) {
-        $status = 'Installed and enabled'
-        $ociVersion = Get-PeclPackageVersion oci8 -MinimumStability stable -MaximumStability stable | Select-Object -First 1
-        if ($version -eq '7.0') {
-          $ociVersion = '2.1.8'
-        } elseif ($version -lt '7.0') {
-          $ociVersion = '2.0.12'
-        } elseif ($version -lt '8.0') {
-          $ociVersion = '2.2.0'
+        $oci8DLL = Get-Oci8DLL
+        if($oci8DLL) {
+          Copy-Item -Path $oci8DLL -Destination $ext_dir\php_oci8.dll
+        } else {
+          $status = 'Installed and enabled'
+          Invoke-WebRequest -Uri (Get-Oci8Url) -OutFile $php_dir\oci8.zip
+          Expand-Archive -Path $php_dir\oci8.zip -DestinationPath $ext_dir -Force
         }
-        $ociUrl = Get-PeclArchiveUrl oci8 $ociVersion $installed
-        Invoke-WebRequest -Uri $ociUrl -OutFile $php_dir\oci8.zip
-        Expand-Archive -Path $php_dir\oci8.zip -DestinationPath $ext_dir -Force
-
       }
       Add-Content -Value "`r`nextension=php_oci8.dll" -Path $php_dir\php.ini
     }

package/src/scripts/{ext → extensions}/oci.sh

@@ -1,10 +1,10 @@
 # Function to log result of a operation.
 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 "$GROUP\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "$ext" "Click to read the $ext related license information"
   printf "Oracle Instant Client package is required for %s extension.\n" "$ext"
   printf "It is provided under the Oracle Technology Network Development and Distribution License.\n"
   printf "Refer to: \033[35;1m%s \033[0m\n" "https://www.oracle.com/downloads/licenses/instant-client-lic.html"
-  echo "::endgroup::"
+  echo "$END_GROUP"
 }
 
 # Function to install instantclient and SDK.
@@ -62,4 +62,4 @@ add_oci() {
 }
 
 # shellcheck source=.
-. "${scripts:?}"/ext/patches/phpize.sh
+. "${scripts:?}"/extensions/patches/phpize.sh

package/src/scripts/{ext → extensions}/phalcon.sh

@@ -4,11 +4,10 @@ add_phalcon_helper() {
   if [ "$(uname -s)" = "Darwin" ]; then
     add_brew_extension "$extension" extension
   else
-    if [ "$extension" = "phalcon4" ]; then
-      install_packages "php${version:?}-psr" "php${version:?}-$extension"
-    else
-      install_packages "php${version:?}-$extension"
-    fi
+    packages=("php${version:?}-$extension")
+    [ "$extension" = "phalcon4" ] && packages+=("php${version:?}-psr")
+    add_ppa ondrej/php >/dev/null 2>&1 || update_ppa ondrej/php
+    check_package "${packages[0]}" && install_packages "${packages[@]}"
   fi
 }
 

package/src/scripts/{ext → extensions}/source.sh

@@ -1,6 +1,6 @@
 # Function to parse extension environment variables
 parse_args() {
-  extension=$1
+  local extension=${1%-*}
   suffix=$(echo "$2" | tr '[:lower:]' '[:upper:]')
   up_ext_name=$(echo "$extension" | tr '[:lower:]' '[:upper:]')
   var="${extension}_${suffix}"
@@ -10,9 +10,22 @@ parse_args() {
   echo "$output" | xargs -n 1 | sort | uniq | xargs
 }
 
+# Function to parse configure options for pecl
+# Make sure we have all options in name="value" form i.e XML properties.
+parse_pecl_configure_options() {
+  configure_opts=$(echo "$1" | sed -r -e "s#['\"]|--##g")
+  IFS=' ' read -r -a opts_array <<< "$configure_opts"
+  output_opts=()
+  for opt in "${opts_array[@]}"; do
+    [ "${opt##*=}" != "${opt%=*}" ] && value="${opt##*=}" || value=yes
+    output_opts+=("${opt%=*}=\"$value\"")
+  done
+  echo "${output_opts[@]}"
+}
+
 # Function to log if a library is installed
 add_lib_log() {
-  lib=$1
+  local lib=$1
   if check_lib "$lib"; then
     add_log "${tick:?}" "$lib" "Installed"
   else
@@ -22,7 +35,7 @@ add_lib_log() {
 
 # Function to check if a library is installed
 check_lib() {
-  lib=$1
+  local lib=$1
   if [ "$(uname -s)" = "Linux" ]; then
     [ "x$(dpkg -s "$lib" 2>/dev/null | grep Status)" != "x" ]
   else
@@ -32,7 +45,7 @@ check_lib() {
 
 # Function to add a library on linux
 add_linux_libs() {
-  lib=$1
+  local lib=$1
   if ! check_lib "$lib"; then
     install_packages "$lib" >/dev/null 2>&1 || true
   fi
@@ -41,7 +54,7 @@ add_linux_libs() {
 
 # Function to add a library on macOS
 add_darwin_libs() {
-  lib=$1
+  local lib=$1
   if ! check_lib "$lib"; then
     brew install "$lib" >/dev/null 2>&1 || true
     if [[ "$lib" = *@* ]]; then
@@ -53,7 +66,7 @@ add_darwin_libs() {
 
 # Function to add required libraries
 add_libs() {
-  all_libs=("$@")
+  local all_libs=("$@")
   for lib in "${all_libs[@]}"; do
     if [ "$(uname -s)" = "Linux" ]; then
       add_linux_libs "$lib"
@@ -65,26 +78,27 @@ add_libs() {
 
 # Function to run command in a group
 run_group() {
-  command=$1
-  log=$2
+  local command=$1
+  local log=$2
   echo "$command" | sudo tee ./run_group.sh >/dev/null 2>&1
-  echo "::group::$log"
+  echo "$GROUP$log"
   . ./run_group.sh
   rm ./run_group.sh
-  echo "::endgroup::"
+  echo "$END_GROUP"
 }
 
 patch_extension() {
-  extension=$1
-  if [ -e "${scripts:?}"/ext/patches/"$extension".sh ]; then
+  local extension=$1
+  if [ -e "${scripts:?}"/extensions/patches/"$extension".sh ]; then
     # shellcheck source=.
-    . "${scripts:?}"/ext/patches/"$extension".sh
+    . "${scripts:?}"/extensions/patches/"$extension".sh
     patch_"${extension}"
   fi
 }
 
 fetch_extension() {
-  fetch=$1
+  local extension=$1
+  local fetch=$2
   if [ "$fetch" = "clone" ]; then
     run_group "git clone -nv $url/$org/$repo /tmp/$repo-$release" "git clone"
     cd /tmp/"$repo-$release" || exit 1
@@ -109,13 +123,13 @@ fetch_extension() {
 
 # Function to install extension from a git repository
 add_extension_from_source() {
-  extension="${1/pecl_/}"
-  url=$2
-  org=$3
-  repo=$4
-  release=$5
-  prefix=$6
-  fetch=${7:-clone}
+  local extension="${1/pecl_/}"
+  local url=$2
+  local org=$3
+  local repo=$4
+  local release=$5
+  local prefix=$6
+  local fetch=${7:-clone}
   slug="$extension-$release"
   source="$url/$org/$repo"
   libraries="$(parse_args "$extension" LIBS) $(parse_args "$extension" "$(uname -s)"_LIBS)"
@@ -127,7 +141,7 @@ add_extension_from_source() {
   (
     add_devtools phpize >/dev/null 2>&1
     disable_extension_helper "$extension"
-    fetch_extension "$fetch"
+    fetch_extension "$extension" "$fetch"
     if ! [ "$(find . -maxdepth 1 -name '*.m4' -exec grep -H 'PHP_NEW_EXTENSION' {} \; | wc -l)" != "0" ]; then
       add_log "${cross:?}" "$source" "$source does not have a PHP extension"
     else

package/src/scripts/extensions/sqlsrv.sh

@@ -0,0 +1,15 @@
+# Function to get sqlsrv and pdo_sqlsrv version.
+get_sqlsrv_version() {
+  if [[ "${version:?}" =~ 7.[0-3] ]]; then
+    echo '5.9.0'
+  else
+    echo '5.10.0'
+  fi
+}
+
+# Function to install sqlsrv and pdo_sqlsrv.
+add_sqlsrv() {
+  ext=$1
+  ext_version=$(get_sqlsrv_version)
+  add_pecl_extension "$ext" "$ext_version" extension
+}

package/src/scripts/linux.sh

@@ -1,9 +1,13 @@
-# Function to setup environment for self-hosted runners.
-self_hosted_helper() {
+# Function to add sudo
+add_sudo() {
   if ! command -v sudo >/dev/null; then
-    apt-get update
-    apt-get install -y sudo || add_log "${cross:?}" "sudo" "Could not install sudo"
+    check_package sudo || apt-get update
+    apt-get install -y sudo
   fi
+}
+
+# Function to setup environment for self-hosted runners.
+self_hosted_helper() {
   if ! command -v apt-fast >/dev/null; then
     sudo ln -sf /usr/bin/apt-get /usr/bin/apt-fast
     trap "sudo rm -f /usr/bin/apt-fast 2>/dev/null" exit
@@ -21,11 +25,15 @@ install_packages() {
 disable_extension_helper() {
   local extension=$1
   local disable_dependents=${2:-false}
+  get_extension_map
   if [ "$disable_dependents" = "true" ]; then
     disable_extension_dependents "$extension"
   fi
   sudo sed -Ei "/=(.*\/)?\"?$extension(.so)?$/d" "${ini_file[@]}" "$pecl_file"
-  sudo find "$ini_dir"/.. -name "*$extension.ini" -not -path "*mods-available*" -delete >/dev/null 2>&1 || true
+  sudo find "$ini_dir"/.. -name "*$extension.ini" -not -path "*phar.ini" -not -path "*pecl.ini" -not -path "*mods-available*" -delete >/dev/null 2>&1 || true
+  sudo rm -f /tmp/php"$version"_extensions
+  mkdir -p /tmp/extdisabled/"$version"
+  echo '' | sudo tee /tmp/extdisabled/"$version"/"$extension" >/dev/null 2>&1
 }
 
 # Function to add PDO extension.
@@ -61,22 +69,16 @@ add_pdo_extension() {
 
 # Function to check if a package exists
 check_package() {
-  sudo apt-cache policy "$1" 2>/dev/null | grep -q 'Candidate'
+  apt-cache policy "$1" 2>/dev/null | grep -q 'Candidate'
 }
 
-# Function to add extensions.
-add_extension() {
+# Helper function to add an extension.
+add_extension_helper() {
   local extension=$1
-  prefix=$2
   package=php"$version"-"$extension"
-  enable_extension "$extension" "$prefix"
-  if check_extension "$extension"; then
-    add_log "${tick:?}" "$extension" "Enabled"
-  else
-    add_ppa ondrej/php >/dev/null 2>&1 || update_ppa ondrej/php
-    (check_package "$package" && install_packages "$package") || pecl_install "$extension"
-    add_extension_log "$extension" "Installed and enabled"
-  fi
+  add_ppa ondrej/php >/dev/null 2>&1 || update_ppa ondrej/php
+  (check_package "$package" && install_packages "$package") || pecl_install "$extension"
+  add_extension_log "$extension" "Installed and enabled"
   sudo chmod 777 "${ini_file[@]}"
 }
 
@@ -84,8 +86,9 @@ add_extension() {
 add_devtools() {
   tool=$1
   if ! command -v "$tool$version" >/dev/null; then
-    install_packages "php$version-dev" "php$version-xml"
+    install_packages "php$version-dev"
   fi
+  add_extension xml extension >/dev/null 2>&1
   switch_version "phpize" "php-config"
   add_log "${tick:?}" "$tool" "Added $tool $semver"
 }
@@ -113,8 +116,14 @@ add_pecl() {
 
 # Function to switch versions of PHP binaries.
 switch_version() {
-  tools=("$@") && ! (( ${#tools[@]} )) && tools+=(pear pecl php phar phar.phar php-cgi php-config phpize phpdbg)
+  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+=($!)
+  fi
   for tool in "${tools[@]}"; do
     if [ -e "/usr/bin/$tool$version" ]; then
       sudo update-alternatives --set "$tool" /usr/bin/"$tool$version" &
@@ -128,8 +137,9 @@ switch_version() {
 add_packaged_php() {
   if [ "$runner" = "self-hosted" ] || [ "${use_package_cache:-true}" = "false" ]; then
     add_ppa ondrej/php >/dev/null 2>&1 || update_ppa ondrej/php
-    IFS=' ' read -r -a packages <<<"$(echo "cli curl dev mbstring xml intl" | sed "s/[^ ]*/php$version-&/g")"
+    IFS=' ' read -r -a packages <<<"$(sed "s/[^ ]*/php$version-&/g" "$src"/configs/php_packages | tr '\n' ' ')"
     install_packages "${packages[@]}"
+    add_pecl
   else
     run_script "php-ubuntu" "$version"
   fi
@@ -165,7 +175,10 @@ link_pecl_file() {
   echo '' | sudo tee "$pecl_file" >/dev/null 2>&1
   for file in "${ini_file[@]}"; do
     sapi_scan_dir="$(realpath -m "$(dirname "$file")")/conf.d"
-    [ "$sapi_scan_dir" != "$scan_dir" ] && ! [ -h "$sapi_scan_dir" ] && sudo ln -sf "$pecl_file" "$sapi_scan_dir/99-pecl.ini"
+    if [ "$sapi_scan_dir" != "$scan_dir" ] && ! [ -h "$sapi_scan_dir" ]; then
+      sudo mkdir -p "$sapi_scan_dir"
+      sudo ln -sf "$pecl_file" "$sapi_scan_dir/99-pecl.ini"
+    fi
   done
 }
 
@@ -176,12 +189,34 @@ php_extra_version() {
   fi
 }
 
+# Function to set php.ini
+add_php_config() {
+  php_lib_dir=/usr/lib/php/"$version"
+  current_ini="$php_lib_dir"/php.ini-current
+  current=$(cat "$current_ini" 2>/dev/null)
+  if [ "$current" = "$ini" ]; then
+    return;
+  fi
+  if [[ "$ini" = "production" && "x$current" != "xproduction" ]]; then
+    echo "${ini_file[@]}" | xargs -n 1 -P 6 sudo cp "$php_lib_dir"/php.ini-production
+    if [ -e "$php_lib_dir"/php.ini-production.cli ]; then
+      sudo cp "$php_lib_dir"/php.ini-production.cli "$ini_dir"/php.ini
+    fi
+  elif [ "$ini" = "development" ]; then
+    echo "${ini_file[@]}" | xargs -n 1 -P 6 sudo cp "$php_lib_dir"/php.ini-development
+  elif [ "$ini" = "none" ]; then
+    echo '' | sudo tee "${ini_file[@]}" >/dev/null 2>&1
+  fi
+  echo "$ini" | sudo tee "$current_ini" >/dev/null 2>&1
+}
+
 # Function to Setup PHP
 setup_php() {
   step_log "Setup PHP"
   sudo mkdir -m 777 -p /var/run /run/php
-  if [ "$(php-config --version 2>/dev/null | cut -c 1-3)" != "$version" ]; then
-    if [ ! -e "/usr/bin/php$version" ]; then
+  php_config="$(command -v php-config)"
+  if [[ -z "$php_config" ]] || [ "$(php_semver | cut -c 1-3)" != "$version" ]; then
+    if [ ! -e "/usr/bin/php$version" ] || [ ! -e "/usr/bin/php-config$version" ]; then
       add_php >/dev/null 2>&1
     else
       if ! [[ "$version" =~ ${old_versions:?} ]]; then
@@ -193,6 +228,7 @@ setup_php() {
         status="Switched to"
       fi
     fi
+    php_config="$(command -v php-config)"
   else
     if [ "$update" = "true" ]; then
       update_php >/dev/null 2>&1
@@ -201,39 +237,43 @@ setup_php() {
     fi
   fi
   if ! command -v php"$version" >/dev/null; then
-    add_log "$cross" "PHP" "Could not setup PHP $version"
+    add_log "${cross:?}" "PHP" "Could not setup PHP $version"
     exit 1
   fi
-  semver=$(php_semver)
-  extra_version=$(php_extra_version)
-  ext_dir=$(php -i | grep "extension_dir => /" | sed -e "s|.*=> s*||")
-  scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
-  ini_dir=$(php --ini | grep "(php.ini)" | sed -e "s|.*: s*||")
+  ext_dir="/usr/$(grep -Po "extension_dir=..[^/]*/\K[^'\"]*" "$php_config")"
+  ini_dir="$(php_ini_path)"
+  scan_dir="$ini_dir"/conf.d
   pecl_file="$scan_dir"/99-pecl.ini
+  semver="$(php_semver)"
+  extra_version="$(php_extra_version)"
   export ext_dir
   mapfile -t ini_file < <(sudo find "$ini_dir/.." -name "php.ini" -exec readlink -m {} +)
   link_pecl_file
   configure_php
+  set_output "php-version" "$semver"
   sudo rm -rf /usr/local/bin/phpunit >/dev/null 2>&1
   sudo chmod 777 "${ini_file[@]}" "$pecl_file" "${tool_path_dir:?}"
-  sudo cp "$dist"/../src/configs/pm/*.json "$RUNNER_TOOL_CACHE/"
-  echo "::set-output name=php-version::$semver"
+  sudo cp "$src"/configs/pm/*.json "$RUNNER_TOOL_CACHE/"
   add_log "${tick:?}" "PHP" "$status PHP $semver$extra_version"
 }
 
 # Variables
-version=$1
-dist=$2
+version=${1:-'8.1'}
+ini=${2:-'production'}
+src=${0%/*}/..
 debconf_fix="DEBIAN_FRONTEND=noninteractive"
 apt_install="sudo $debconf_fix apt-fast install -y --no-install-recommends"
-scripts="${dist}"/../src/scripts
+scripts="$src"/scripts
+
+add_sudo >/dev/null 2>&1
 
 . /etc/os-release
 # shellcheck source=.
-. "${scripts:?}"/ext/source.sh
+. "${scripts:?}"/unix.sh
 . "${scripts:?}"/tools/ppa.sh
 . "${scripts:?}"/tools/add_tools.sh
-. "${scripts:?}"/common.sh
+. "${scripts:?}"/extensions/source.sh
+. "${scripts:?}"/extensions/add_extensions.sh
 read_env
 self_hosted_setup
 setup_php