setup-php 2.15.0 → 2.17.1

package/src/extensions.ts

@@ -31,12 +31,12 @@ export async function addExtensionDarwin(
       case /.+-.+\/.+@.+/.test(extension):
         add_script += await utils.parseExtensionSource(extension, ext_prefix);
         return;
-      // match 5.3blackfire...8.0blackfire
-      // match 5.3blackfire-(semver)...8.0blackfire-(semver)
+      // match 5.3blackfire...8.1blackfire
+      // match 5.3blackfire-(semver)...8.1blackfire-(semver)
       // match couchbase, geos, pdo_oci, oci8, http, pecl_http
       // match 5.3ioncube...7.4ioncube
       // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
-      case /^(5\.[3-6]|7\.[0-4]|8\.0)blackfire(-\d+\.\d+\.\d+)?$/.test(
+      case /^(5\.[3-6]|7\.[0-4]|8\.[0-1])blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
       case /^couchbase$|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(
@@ -44,9 +44,10 @@ export async function addExtensionDarwin(
       ):
       case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
       case /(5\.6|7\.[0-3])phalcon3|7\.[2-4]phalcon4/.test(version_extension):
+      case /(?<!5\.[3-6])(pdo_)?sqlsrv$/.test(version_extension):
         add_script += await utils.customPackage(
           ext_name,
-          'ext',
+          'extensions',
           extension,
           'darwin'
         );
@@ -73,11 +74,11 @@ export async function addExtensionDarwin(
       case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
         add_script += await utils.getUnsupportedLog('pcov', version, 'darwin');
         return;
-      // match 5.6 and newer - amqp, apcu, expect, grpc, igbinary, imagick, imap, memcache, memcached, mongodb, msgpack, protobuf, raphf, rdkafka, redis, ssh2, swoole, xdebug, xdebug2, yaml, zmq
+      // match 5.6 and newer - amqp, apcu, expect, gnupg, grpc, igbinary, imagick, imap, memcache, memcached, mongodb, msgpack, protobuf, raphf, rdkafka, redis, ssh2, swoole, xdebug, xdebug2, yaml, zmq
       // match 7.1 and newer - pcov
       // match 5.6 to 7.4 - propro
       // match 7.0 and newer - vips, xlswriter
-      case /(?<!5\.[3-5])(amqp|apcu|expect|grpc|igbinary|imagick|imap|memcache|memcached|mongodb|msgpack|protobuf|psr|raphf|rdkafka|redis|ssh2|swoole|xdebug|xdebug2|yaml|zmq)/.test(
+      case /(?<!5\.[3-5])(amqp|apcu|expect|gnupg|grpc|igbinary|imagick|imap|mailparse|memcache|memcached|mongodb|msgpack|protobuf|psr|raphf|rdkafka|redis|ssh2|swoole|xdebug|xdebug2|yaml|zmq)/.test(
         version_extension
       ):
       case /(5\.6|7\.[0-4])propro/.test(version_extension):
@@ -142,7 +143,7 @@ export async function addExtensionWindows(
       case /^(7\.[1-4]|8\.0)(pecl_)?http/.test(version_extension):
         add_script += await utils.customPackage(
           ext_name,
-          'ext',
+          'extensions',
           extension,
           'win32'
         );
@@ -231,7 +232,9 @@ export async function addExtensionLinux(
   let remove_script = '';
   await utils.asyncForEach(extensions, async function (extension: string) {
     const version_extension: string = version + extension;
-    const [ext_name, ext_version]: string[] = extension.split('-');
+    const [ext_name, ext_version]: string[] = extension
+      .split(/-(.+)/)
+      .filter(Boolean);
     const ext_prefix = await utils.getExtensionPrefix(ext_name);
 
     switch (true) {
@@ -247,13 +250,13 @@ export async function addExtensionLinux(
       case /.+-.+\/.+@.+/.test(extension):
         add_script += await utils.parseExtensionSource(extension, ext_prefix);
         return;
-      // match 5.3blackfire...8.0blackfire
-      // match 5.3blackfire-(semver)...8.0blackfire-(semver)
+      // match 5.3blackfire...8.1blackfire
+      // match 5.3blackfire-(semver)...8.1blackfire-(semver)
       // match 5.3pdo_cubrid...7.2php_cubrid, 5.3cubrid...7.4cubrid
       // match couchbase, geos, pdo_oci, oci8, http, pecl_http
       // match 5.3ioncube...7.4ioncube
       // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
-      case /^(5\.[3-6]|7\.[0-4]|8\.0)blackfire(-\d+\.\d+\.\d+)?$/.test(
+      case /^(5\.[3-6]|7\.[0-4]|8\.[0-1])blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
       case /^((5\.[3-6])|(7\.[0-2]))pdo_cubrid$|^((5\.[3-6])|(7\.[0-4]))cubrid$/.test(
@@ -265,9 +268,10 @@ export async function addExtensionLinux(
       case /(?<!5\.[3-5])intl-[\d]+\.[\d]+$/.test(version_extension):
       case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
       case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
+      case /(?<!5\.[3-6])(pdo_)?sqlsrv$/.test(version_extension):
         add_script += await utils.customPackage(
           ext_name,
-          'ext',
+          'extensions',
           extension,
           'linux'
         );
@@ -325,20 +329,20 @@ export async function addExtensionLinux(
  *
  * @param extension_csv
  * @param version
- * @param os_version
+ * @param os
  * @param no_step
  */
 export async function addExtension(
   extension_csv: string,
   version: string,
-  os_version: string,
+  os: string,
   no_step = false
 ): Promise<string> {
-  const log: string = await utils.stepLog('Setup Extensions', os_version);
+  const log: string = await utils.stepLog('Setup Extensions', os);
   let script = '\n';
   switch (no_step) {
     case true:
-      script += log + (await utils.suppressOutput(os_version));
+      script += log + (await utils.suppressOutput(os));
       break;
     case false:
     default:
@@ -346,7 +350,7 @@ export async function addExtension(
       break;
   }
 
-  switch (os_version) {
+  switch (os) {
     case 'win32':
       return script + (await addExtensionWindows(extension_csv, version));
     case 'darwin':
@@ -355,8 +359,8 @@ export async function addExtension(
       return script + (await addExtensionLinux(extension_csv, version));
     default:
       return await utils.log(
-        'Platform ' + os_version + ' is not supported',
-        os_version,
+        'Platform ' + os + ' is not supported',
+        os,
         'error'
       );
   }

package/src/fetch.ts

@@ -0,0 +1,54 @@
+import {IncomingMessage, OutgoingHttpHeaders} from 'http';
+import * as https from 'https';
+import * as url from 'url';
+
+/**
+ * Function to fetch an URL
+ *
+ * @param input_url
+ * @param auth_token
+ */
+export async function fetch(
+  input_url: string,
+  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
+      };
+      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();
+    }
+  );
+  return await fetch_promise;
+}

package/src/install.ts

@@ -1,3 +1,5 @@
+import path from 'path';
+import fs from 'fs';
 import {exec} from '@actions/exec';
 import * as core from '@actions/core';
 import * as config from './config';
@@ -9,66 +11,51 @@ import * as utils from './utils';
 /**
  * Build the script
  *
- * @param filename
- * @param version
- * @param os_version
+ * @param os
  */
-export async function getScript(
-  filename: string,
-  version: string,
-  os_version: string
-): Promise<string> {
+export async function getScript(os: string): Promise<string> {
   const url = 'https://setup-php.com/sponsor';
-  // taking inputs
+  const filename = os + (await utils.scriptExtension(os));
+  const script_path = path.join(__dirname, '../src/scripts', filename);
+  const run_path = script_path.replace(os, 'run');
   process.env['fail_fast'] = await utils.getInput('fail-fast', false);
   const extension_csv: string = await utils.getInput('extensions', false);
   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);
-
-  let script: string = await utils.readFile(filename, 'src/scripts');
-  script += await tools.addTools(tools_csv, version, os_version);
+  const version: string = await utils.parseVersion(
+    await utils.getInput('php-version', true)
+  );
+  const ini_file: string = await utils.parseIniFile(
+    await utils.getInput('ini-file', false)
+  );
+  let script = await utils.joins('.', script_path, version, ini_file);
   if (extension_csv) {
-    script += await extensions.addExtension(extension_csv, version, os_version);
+    script += await extensions.addExtension(extension_csv, version, os);
   }
+  script += await tools.addTools(tools_csv, version, os);
   if (coverage_driver) {
-    script += await coverage.addCoverage(coverage_driver, version, os_version);
+    script += await coverage.addCoverage(coverage_driver, version, os);
   }
   if (ini_values_csv) {
-    script += await config.addINIValues(ini_values_csv, os_version);
+    script += await config.addINIValues(ini_values_csv, os);
   }
-  script += '\n' + (await utils.stepLog(`Sponsor setup-php`, os_version));
-  script += '\n' + (await utils.addLog('$tick', 'setup-php', url, os_version));
+  script += '\n' + (await utils.stepLog(`Sponsor setup-php`, os));
+  script += '\n' + (await utils.addLog('$tick', 'setup-php', url, os));
+
+  fs.writeFileSync(run_path, script, {mode: 0o755});
 
-  return await utils.writeScript(filename, script);
+  return run_path;
 }
 
 /**
  * Run the script
  */
 export async function run(): Promise<void> {
-  try {
-    if ((await utils.readEnv('ImageOS')) == 'ubuntu16') {
-      core.setFailed(
-        'setup-php is not supported on Ubuntu 16.04. Please upgrade to Ubuntu 18.04 or Ubuntu 20.04 - https://setup-php.com/i/452'
-      );
-      return;
-    }
-    const version: string = await utils.parseVersion(
-      await utils.getInput('php-version', true)
-    );
-    if (version) {
-      const os_version: string = process.platform;
-      const tool = await utils.scriptTool(os_version);
-      const script = os_version + (await utils.scriptExtension(os_version));
-      const location = await getScript(script, version, os_version);
-      await exec(await utils.joins(tool, location, version, __dirname));
-    } else {
-      core.setFailed('Unable to get the PHP version');
-    }
-  } catch (error) {
-    core.setFailed((error as Error).message);
-  }
+  const os: string = process.platform;
+  const tool = await utils.scriptTool(os);
+  const run_path = await getScript(os);
+  await exec(tool + run_path);
 }
 
 // call the run function

package/src/scripts/darwin.sh

@@ -23,11 +23,14 @@ disable_dependency_extensions() {
 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:?}"
   sudo rm -rf "$scan_dir"/*"$extension"*
+  mkdir -p /tmp/extdisabled/"$version"
+  echo '' | sudo tee /tmp/extdisabled/"$version"/"$extension" >/dev/null 2>&1
 }
 
 # Function to fetch a brew tap.
@@ -61,7 +64,7 @@ add_brew_tap() {
 add_brew_extension() {
   formula=$1
   prefix=$2
-  extension=$(grep "$formula=" "$dist"/../src/configs/brew_extensions | cut -d '=' -f 2)
+  extension=$(grep "$formula=" "$src"/configs/brew_extensions | cut -d '=' -f 2)
   [[ -z "$extension" ]] && extension="$(echo "$formula" | sed -E "s/pecl_|[0-9]//g")"
   enable_extension "$extension" "$prefix"
   if check_extension "$extension"; then
@@ -69,7 +72,7 @@ add_brew_extension() {
   else
     add_brew_tap "$php_tap"
     add_brew_tap "$ext_tap"
-    sudo mv "$tap_dir"/"$ext_tap"/.github/deps/"$formula"/* "$tap_dir/homebrew/homebrew-core/Formula/" 2>/dev/null || true
+    sudo mv "$tap_dir"/"$ext_tap"/.github/deps/"$formula"/* "$core_repo/Formula/" 2>/dev/null || true
     update_dependencies >/dev/null 2>&1
     disable_dependency_extensions "$extension" >/dev/null 2>&1
     brew install -f "$formula@$version" >/dev/null 2>&1
@@ -78,22 +81,17 @@ add_brew_extension() {
   fi
 }
 
-# Function to setup extensions.
-add_extension() {
+# Helper function to add an extension.
+add_extension_helper() {
   local extension=$1
   prefix=$2
-  enable_extension "$extension" "$prefix"
-  if check_extension "$extension"; then
-    add_log "${tick:?}" "$extension" "Enabled"
+  if [[ "$version" =~ ${old_versions:?} ]] && [ "$extension" = "imagick" ]; then
+    run_script "php5-darwin" "${version/./}" "$extension" >/dev/null 2>&1
   else
-    if [[ "$version" =~ ${old_versions:?} ]] && [ "$extension" = "imagick" ]; then
-      run_script "php5-darwin" "${version/./}" "$extension" >/dev/null 2>&1
-    else
-      pecl_install "$extension" >/dev/null 2>&1 &&
-      if [[ "$version" =~ ${old_versions:?} ]]; then echo "$prefix=$ext_dir/$extension.so" >>"$ini_file"; fi
-    fi
-    add_extension_log "$extension" "Installed and enabled"
+    pecl_install "$extension" >/dev/null 2>&1 &&
+    if [[ "$version" =~ ${old_versions:?} ]]; then echo "$prefix=$ext_dir/$extension.so" >>"$ini_file"; fi
   fi
+  add_extension_log "$extension" "Installed and enabled"
 }
 
 # Function to handle request to add phpize and php-config.
@@ -104,6 +102,7 @@ add_devtools() {
 
 # Function to handle request to add PECL.
 add_pecl() {
+  enable_extension xml extension >/dev/null 2>&1
   configure_pecl >/dev/null 2>&1
   pear_version=$(get_tool_version "pecl" "version")
   add_log "${tick:?}" "PECL" "Found PECL $pear_version"
@@ -132,19 +131,23 @@ patch_brew() {
 # Helper function to update the dependencies.
 update_dependencies_helper() {
   dependency=$1
-  get -q -n "$tap_dir/homebrew/homebrew-core/Formula/$dependency.rb" "https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/$dependency.rb"
+  get -q -n "$core_repo/Formula/$dependency.rb" "https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/$dependency.rb"
   link_libraries "$dependency"
 }
 
 # Function to update dependencies.
 update_dependencies() {
-  if ! [ -e /tmp/update_dependencies ] && [ "${runner:?}" != "self-hosted" ] && [ "${ImageOS:-}" != "" ] && [ "${ImageVersion:-}" != "" ]; then
-    patch_brew
-    while read -r dependency; do
-      update_dependencies_helper "$dependency" &
-      to_wait+=($!)
-    done <"$tap_dir/$php_tap/.github/deps/${ImageOS:?}_${ImageVersion:?}"
-    wait "${to_wait[@]}"
+  if ! [ -e /tmp/update_dependencies ]; then
+    if [ "${runner:?}" != "self-hosted" ] && [ "${ImageOS:-}" != "" ] && [ "${ImageVersion:-}" != "" ]; then
+      patch_brew
+      while read -r dependency; do
+        update_dependencies_helper "$dependency" &
+        to_wait+=($!)
+      done <"$tap_dir/$php_tap/.github/deps/${ImageOS:?}_${ImageVersion:?}"
+      wait "${to_wait[@]}"
+    else
+      git -C "$core_repo" fetch origin master && git -C "$core_repo" reset --hard origin/master
+    fi
     echo '' | sudo tee /tmp/update_dependencies >/dev/null 2>&1
   fi
 }
@@ -164,7 +167,7 @@ fix_dependencies() {
 get_brewed_php() {
   php_cellar="$brew_prefix"/Cellar/php
   if [ -d "$php_cellar" ] && ! [[ "$(find "$php_cellar" -maxdepth 1 -name "$version*" | wc -l 2>/dev/null)" -eq 0 ]]; then
-    php-config --version 2>/dev/null | cut -c 1-3
+    php_semver | cut -c 1-3
   else
     echo 'false';
   fi
@@ -192,9 +195,31 @@ php_extra_version() {
   fi
 }
 
+# Function to set php.ini
+add_php_config() {
+  if ! [ -e "$ini_dir"/php.ini-development ]; then
+    sudo cp "$ini_dir"/php.ini "$ini_dir"/php.ini-development
+  fi
+  if [[ "$ini" = "production" || "$ini" = "development" ]]; then
+    sudo cp "$ini_dir"/php.ini-"$ini" "$ini_dir"/php.ini
+  elif [ "$ini" = "none" ]; then
+    echo '' | sudo tee "${ini_file[@]}" >/dev/null 2>&1
+  fi
+}
+
+# Function to get scan directory.
+get_scan_dir() {
+  if [[ "$version" =~ ${old_versions:?} ]]; then
+    php --ini | grep additional | sed -e "s|.*: s*||"
+  else
+    echo "$ini_dir"/conf.d
+  fi
+}
+
 # Function to Setup PHP.
 setup_php() {
   step_log "Setup PHP"
+  php_config="$(command -v php-config 2>/dev/null)"
   existing_version=$(get_brewed_php)
   if [[ "$version" =~ ${old_versions:?} ]]; then
     run_script "php5-darwin" "${version/./}" >/dev/null 2>&1
@@ -209,44 +234,52 @@ setup_php() {
     status="Found"
     fix_dependencies >/dev/null 2>&1
   fi
-  ini_file=$(php -d "date.timezone=UTC" --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
+  php_config="$(command -v php-config)"
+  ext_dir="$(grep 'extension_dir=' "$php_config" | cut -d "'" -f 2)"
+  ini_dir="$(php_ini_path)"
+  scan_dir="$(get_scan_dir)"
+  ini_file="$ini_dir"/php.ini
+  sudo mkdir -m 777 -p "$ext_dir" "$HOME/.composer"
   sudo chmod 777 "$ini_file" "${tool_path_dir:?}"
+  semver="$(php_semver)"
+  extra_version="$(php_extra_version)"
   configure_php
-  ext_dir=$(php -i | grep -Ei "extension_dir => /" | sed -e "s|.*=> s*||")
-  scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
-  sudo mkdir -m 777 -p "$ext_dir" "$HOME/.composer"
-  semver=$(php_semver)
-  extra_version=$(php_extra_version)
+  set_output "php-version" "$semver"
   if [ "${semver%.*}" != "$version" ]; then
     add_log "${cross:?}" "PHP" "Could not setup PHP $version"
     exit 1
   fi
 
-  sudo cp "$dist"/../src/configs/*.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%/*}/..
 php_formula=shivammathur/php/php@"$version"
-brew_prefix="$(brew --prefix)"
-brew_repo="$(brew --repository)"
+brew_path="$(command -v brew)"
+brew_path_dir="$(dirname "$brew_path")"
+brew_prefix="$brew_path_dir"/..
+brew_repo="$brew_path_dir/$(dirname "$(readlink "$brew_path")")"/..
 tap_dir="$brew_repo"/Library/Taps
-scripts="${dist}"/../src/scripts
+core_repo="$tap_dir"/homebrew/homebrew-core
+scripts="$src"/scripts
 ext_tap=shivammathur/homebrew-extensions
 php_tap=shivammathur/homebrew-php
 export HOMEBREW_CHANGE_ARCH_TO_ARM=1
 export HOMEBREW_DEVELOPER=1
-export HOMEBREW_NO_INSTALL_CLEANUP=1
 export HOMEBREW_NO_AUTO_UPDATE=1
+export HOMEBREW_NO_ENV_HINTS=1
+export HOMEBREW_NO_INSTALL_CLEANUP=1
 export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
 
 # shellcheck source=.
-. "${scripts:?}"/ext/source.sh
+. "${scripts:?}"/unix.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