setup-php 1.11.4 → 1.11.7

package/src/configs/phpunit.json

@@ -1,24 +1,24 @@
-{
-  "problemMatcher": [
-    {
-      "owner": "phpunit",
-      "pattern": [
-        {
-          "regexp": "^\\d+\\)\\s.*$"
-        },
-        {
-          "regexp": "^(.*Failed\\sasserting\\sthat.*)$",
-          "message": 1
-        },
-        {
-          "regexp": "^\\s*$"
-        },
-        {
-          "regexp": "^(.*):(\\d+)$",
-          "file": 1,
-          "line": 2
-        }
-      ]
-    }
-  ]
-}
+{
+  "problemMatcher": [
+    {
+      "owner": "phpunit",
+      "pattern": [
+        {
+          "regexp": "^\\d+\\)\\s.*$"
+        },
+        {
+          "regexp": "^(.*Failed\\sasserting\\sthat.*)$",
+          "message": 1
+        },
+        {
+          "regexp": "^\\s*$"
+        },
+        {
+          "regexp": "^(.*):(\\d+)$",
+          "file": 1,
+          "line": 2
+        }
+      ]
+    }
+  ]
+}

package/src/extensions.ts

@@ -30,10 +30,10 @@ export async function addExtensionDarwin(
           ' ' +
           ext_prefix;
         return;
-      // match 5.6 to 8.0 amqp, grpc, igbinary, imagick, imap, mongodb, msgpack, pecl_http, propro, protobuf, raphf, rdkafka, redis, swoole, xdebug, xdebug2, yaml, zmq
+      // match 5.6 to 8.0 amqp, expect, grpc, igbinary, imagick, imap, mongodb, msgpack, pecl_http, propro, protobuf, raphf, rdkafka, redis, ssh2, swoole, xdebug, xdebug2, yaml, zmq
       // match 7.1pcov to 8.0pcov
       // match 7.0vips to 8.0vips
-      case /(5\.6|7\.[0-4]|8.0)(amqp|grpc|igbinary|imagick|imap|mongodb|msgpack|^(pecl_)?http$|propro|protobuf|psr|raphf|rdkafka|redis|swoole|xdebug|xdebug2|yaml|zmq)/.test(
+      case /(5\.6|7\.[0-4]|8.0)(amqp|expect|grpc|igbinary|imagick|imap|mcrypt|mongodb|msgpack|^(pecl_)?http$|propro|protobuf|psr|raphf|rdkafka|redis|ssh2|swoole|xdebug|xdebug2|yaml|zmq)/.test(
         version_extension
       ):
       case /(7\.[1-4]|8\.0])pcov/.test(version_extension):

package/src/scripts/darwin.sh

@@ -18,7 +18,7 @@ add_log() {
 
 # Function to remove extensions
 remove_extension() {
-  extension=$1
+  local extension=$1
   sudo sed -Ei '' "/=(.*\/)?\"?$extension/d" "$ini_file"
   sudo rm -rf "$scan_dir"/*"$extension"* >/dev/null 2>&1
   sudo rm -rf "$ext_dir"/"$extension".so >/dev/null 2>&1
@@ -26,7 +26,7 @@ remove_extension() {
 
 # Function to test if extension is loaded
 check_extension() {
-  extension=$1
+  local extension=$1
   if [ "$extension" != "mysql" ]; then
     php -m | grep -i -q -w "$extension"
   else
@@ -42,7 +42,7 @@ pecl_install() {
 
 # Function to get the PECL version
 get_pecl_version() {
-  extension=$1
+  local extension=$1
   stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot|preview)")"
   pecl_rest='https://pecl.php.net/rest/r/'
   response=$(curl "${curl_opts[@]}" "$pecl_rest$extension"/allreleases.xml)
@@ -55,7 +55,7 @@ get_pecl_version() {
 
 # Function to install a PECL version
 add_pecl_extension() {
-  extension=$1
+  local extension=$1
   pecl_version=$2
   prefix=$3
   if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot|preview).* ]]; then
@@ -103,7 +103,8 @@ add_brew_tap() {
 # Function to install a php extension from shivammathur/extensions tap.
 add_brew_extension() {
   formula=$1
-  extension=${formula//[0-9]/}
+  extension=$(grep "$formula=" "$dist"/../src/configs/brew_extensions | cut -d '=' -f 2)
+  [[ -z "$extension" ]] && extension="$(echo "$formula" | sed -E "s/pecl_|[0-9]//g")"
   add_brew_tap shivammathur/homebrew-php
   add_brew_tap shivammathur/homebrew-extensions
   sudo mv "$tap_dir"/shivammathur/homebrew-extensions/.github/deps/"$formula"/* "$tap_dir/homebrew/homebrew-core/Formula/" 2>/dev/null || true
@@ -113,7 +114,7 @@ add_brew_extension() {
 
 # Function to setup extensions
 add_extension() {
-  extension=$1
+  local extension=$1
   install_command=$2
   prefix=$3
   if ! check_extension "$extension" && [ -e "$ext_dir/$extension.so" ]; then
@@ -131,7 +132,7 @@ add_extension() {
 
 # Function to pre-release extensions using PECL
 add_unstable_extension() {
-  extension=$1
+  local extension=$1
   stability=$2
   prefix=$3
   pecl_version=$(get_pecl_version "$extension" "$stability")
@@ -241,30 +242,38 @@ link_libraries() {
   formula_prefix="$(brew --prefix "$formula")"
   sudo mkdir -p "$formula_prefix"/lib
   for lib in "$formula_prefix"/lib/*.dylib; do
-    [ -f "$lib" ] || break
     lib_name=$(basename "$lib")
     sudo cp -a "$lib" "$brew_prefix/lib/$lib_name" 2>/dev/null || true
   done
 }
 
 patch_brew() {
-  sudo sed -i '' "s/ keg.link(verbose: verbose?)/ keg.link(verbose: verbose?, overwrite: true)/" "$brew_repo"/Library/Homebrew/formula_installer.rb
+  formula_installer="$brew_repo"/Library/Homebrew/formula_installer.rb
+  code=" keg.link\(verbose: verbose\?"
+  sudo sed -Ei '' "s/$code.*/$code, overwrite: true\)/" "$formula_installer"
   # shellcheck disable=SC2064
-  trap "git -C $brew_repo stash >/dev/null 2>&1" exit
+  trap "sudo sed -Ei '' 's/$code.*/$code, overwrite: overwrite?\)/' $formula_installer" exit
+}
+
+# Helper function to update the dependencies.
+update_dependencies_helper() {
+  dependency=$1
+  curl -o "$tap_dir/homebrew/homebrew-core/Formula/$formula.rb" "${curl_opts[@]}" "https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/$formula.rb"
+  link_libraries "$dependency"
 }
 
 # Function to update dependencies
 update_dependencies() {
-  if [ "${ImageOS:-}" != "" ] && [ "${ImageVersion:-}" != "" ]; then
-    patch_brew
-    while read -r formula; do
-      (
-        curl -o "$tap_dir/homebrew/homebrew-core/Formula/$formula.rb" "${curl_opts[@]}" "https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/$formula.rb"
-        link_libraries "$formula"
-      ) &
-      to_wait+=( $! )
-    done < "$tap_dir/shivammathur/homebrew-php/.github/deps/${ImageOS:?}_${ImageVersion:?}"
-    wait "${to_wait[@]}"
+  if ! [ -e /tmp/update_dependencies ]; then
+    if [ "${ImageOS:-}" != "" ] && [ "${ImageVersion:-}" != "" ]; then
+      patch_brew
+      while read -r dependency; do
+        update_dependencies_helper "$dependency" &
+        to_wait+=($!)
+      done <"$tap_dir/shivammathur/homebrew-php/.github/deps/${ImageOS:?}_${ImageVersion:?}"
+      wait "${to_wait[@]}"
+    fi
+    echo '' | sudo tee /tmp/update_dependencies >/dev/null 2>&1
   fi
 }
 

package/src/scripts/ext/phalcon.sh

@@ -20,7 +20,7 @@ update_ppa() {
 
 # Function to install phalcon
 install_phalcon() {
-  extension=$1
+  local extension=$1
   version=$2
   (update_ppa && sudo DEBIAN_FRONTEND=noninteractive apt-get install -y "php$version-psr" "php$version-$extension" >/dev/null 2>&1 && add_log "$tick" "$extension" "Installed and enabled") ||
   add_log "$cross" "$extension" "Could not install $extension on PHP $semver"

package/src/scripts/linux.sh

@@ -62,7 +62,7 @@ configure_pecl() {
 
 # Function to get the PECL version
 get_pecl_version() {
-  extension=$1
+  local extension=$1
   stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot|preview)")"
   pecl_rest='https://pecl.php.net/rest/r/'
   response=$(curl "${curl_opts[@]}" "$pecl_rest$extension"/allreleases.xml)
@@ -89,7 +89,7 @@ enable_extension() {
 
 # Function to test if extension is loaded
 check_extension() {
-  extension=$1
+  local extension=$1
   if [ "$extension" != "mysql" ]; then
     php -m | grep -i -q -w "$extension"
   else
@@ -99,7 +99,7 @@ check_extension() {
 
 # Function to delete extensions
 delete_extension() {
-  extension=$1
+  local extension=$1
   sudo sed -Ei "/=(.*\/)?\"?$extension/d" "$ini_file"
   sudo sed -Ei "/=(.*\/)?\"?$extension/d" "$pecl_file"
   sudo rm -rf "$scan_dir"/*"$extension"* >/dev/null 2>&1
@@ -109,7 +109,7 @@ delete_extension() {
 
 # Function to disable and delete extensions
 remove_extension() {
-  extension=$1
+  local extension=$1
   if [ -e /etc/php/"$version"/mods-available/"$extension".ini ]; then
     sudo phpdismod -v "$version" "$extension"
   fi
@@ -118,7 +118,7 @@ remove_extension() {
 
 # Function to setup extensions
 add_extension() {
-  extension=$1
+  local extension=$1
   install_command=$2
   prefix=$3
   enable_extension "$extension" "$prefix"
@@ -135,7 +135,7 @@ add_extension() {
 
 # Function to install a PECL version
 add_pecl_extension() {
-  extension=$1
+  local extension=$1
   pecl_version=$2
   prefix=$3
   configure_pecl
@@ -158,7 +158,7 @@ add_pecl_extension() {
 
 # Function to pre-release extensions using PECL
 add_unstable_extension() {
-  extension=$1
+  local extension=$1
   stability=$2
   prefix=$3
   pecl_version=$(get_pecl_version "$extension" "$stability")

package/src/scripts/win32.ps1

@@ -77,7 +77,7 @@ Function Install-PSPackage() {
   Add-ToProfile $current_profile "$package-search" "Import-Module $module_path"
 
   if($null -eq (Get-Command $cmdlet -ErrorAction SilentlyContinue)) {
-    Install-Module -Name $cmdlet -Force
+    Install-Module -Name $package -Force
   }
 }
 
@@ -303,7 +303,7 @@ if (Test-Path -LiteralPath $php_dir -PathType Container) {
 }
 $status = "Installed"
 if ($null -eq $installed -or -not("$($installed.Version).".StartsWith(($version -replace '^(\d+(\.\d+)*).*', '$1.'))) -or $ts -ne $installed.ThreadSafe) {
-  if ($version -lt '7.0' -and (Get-InstalledModule).Name -notcontains 'VcRedist') {
+  if ($version -lt '7.0' -and ($null -eq (Get-Module -ListAvailable -Name VcRedist))) {
     Install-PSPackage VcRedist VcRedist-main\VcRedist\VcRedist "$github/aaronparker/VcRedist/archive/main.zip" Get-VcList >$null 2>&1
   }
   try {

package/src/tools.ts

@@ -245,8 +245,11 @@ export async function addComposer(tools_list: string[]): Promise<string[]> {
  *
  * @param version
  */
-export async function getComposerUrl(version: string): Promise<string> {
-  let cache_url = `https://github.com/shivammathur/composer-cache/releases/latest/download/composer-${version.replace(
+export async function getComposerUrl(
+  version: string,
+  php_version: string
+): Promise<string> {
+  let cache_url = `https://github.com/shivammathur/composer-cache/releases/latest/download/composer-${php_version}-${version.replace(
     'latest',
     'stable'
   )}.phar`;
@@ -415,7 +418,7 @@ export async function addTools(
         script += await addArchive(tool, url, os_version);
         break;
       case 'composer':
-        url = await getComposerUrl(version);
+        url = await getComposerUrl(version, php_version);
         script += await addArchive('composer', url, os_version);
         break;
       case 'codeception':

package/src/utils.ts

@@ -71,7 +71,7 @@ export async function fetch(url: string): Promise<string> {
  */
 export async function parseVersion(version: string): Promise<string> {
   const manifest =
-    'https://raw.githubusercontent.com/shivammathur/setup-php/develop/src/configs/php-versions.json';
+    'https://raw.githubusercontent.com/shivammathur/setup-php/releases/v1/src/configs/php-versions.json';
   switch (true) {
     case /^(latest|\d+\.x)$/.test(version):
       return JSON.parse(await fetch(manifest))[version];

package/lib/sapi.js

@@ -1,64 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addSAPI = exports.getSapiList = void 0;
-const utils = __importStar(require("./utils"));
-async function getSapiList(sapi_csv) {
-    const sapi_list = await utils.packageArray(sapi_csv);
-    const servers = sapi_list.filter(sapi => /.*:.*/.test(sapi));
-    return [servers[servers.length - 1]].concat(sapi_list.filter(sapi => /.*[^:].*/.test(sapi)));
-}
-exports.getSapiList = getSapiList;
-/**
- * Function to set sapi
- *
- * @param sapi_csv
- * @param os_version
- */
-async function addSAPI(sapi_csv, os_version) {
-    let script = '\n' + (await utils.stepLog('Setup SAPI', os_version));
-    let sapi_list;
-    switch (true) {
-        case sapi_csv.split(':').length - 1 > 1:
-            sapi_list = await getSapiList(sapi_csv);
-            script +=
-                '\n' +
-                    utils.log('Multiple SAPI with web servers specified, choosing the last one ' +
-                        sapi_list[0], os_version, 'warning');
-            break;
-        default:
-            sapi_list = await utils.packageArray(sapi_csv);
-    }
-    await utils.asyncForEach(sapi_list, async function (sapi) {
-        sapi = sapi.toLowerCase();
-        switch (os_version) {
-            case 'linux':
-            case 'darwin':
-                script += '\nadd_sapi ' + sapi;
-                break;
-            case 'win32':
-                script += '\nAdd-Sapi ' + sapi;
-                break;
-        }
-    });
-    return script;
-}
-exports.addSAPI = addSAPI;