Bump version 2.31.1

Update Node.js dependencies

.github/workflows/docs.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-22.04, ubuntu-20.04, windows-2022, macos-12]
+        operating-system: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, windows-2022, macos-12]
         php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
     steps:
       - name: Setup PHP
@@ -72,7 +72,7 @@ jobs:
           git config --local user.name "${{ github.repository_owner }}"
       - name: Combine
         run: |
-          for os in ubuntu-22.04 ubuntu-20.04 windows-2022 windows-2019 macos-11 macos-12 macos-13; do
+          for os in ubuntu-24.04 ubuntu-22.04 ubuntu-20.04 windows-2022 windows-2019 macos-11 macos-12 macos-13; do
             echo "These are extensions which are loaded by default on the following PHP versions. More extensions which are available as packages and available on pecl are supported by setup-php. Refer to [php extension support](https://github.com/shivammathur/setup-php#heavy_plus_sign-php-extension-support) for more details." > Php-extensions-loaded-on-"$os".md
             for version in 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4; do
               if [[ "$os" = "macos-11" || "$os" = "macos-13" ]]; then

.github/workflows/php.yml

@@ -28,10 +28,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-22.04, ubuntu-20.04, windows-2019, macos-13]
+        operating-system: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, windows-2019, macos-13]
         php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
         include:
-          - operating-system: ubuntu-22.04
+          - operating-system: ubuntu-24.04
             php-versions: ''
             php-version-file: 'php-version-file'
     env:

README.md

@@ -70,6 +70,7 @@ Both `GitHub-hosted` and `self-hosted` runners are supported by `setup-php` on t
 
 | Virtual environment | YAML workflow label                | Pre-installed PHP      |
 |---------------------|------------------------------------|------------------------|
+| Ubuntu 24.04        | `ubuntu-24.04`                     | `PHP 8.3`              |
 | Ubuntu 22.04        | `ubuntu-latest` or `ubuntu-22.04`  | `PHP 8.1`              |
 | Ubuntu 20.04        | `ubuntu-20.04`                     | `PHP 7.4` to `PHP 8.3` |
 | Windows Server 2022 | `windows-latest` or `windows-2022` | `PHP 8.3`              |
@@ -82,6 +83,7 @@ Both `GitHub-hosted` and `self-hosted` runners are supported by `setup-php` on t
 
 | Host OS/Virtual environment      | YAML workflow label        |
 |----------------------------------|----------------------------|
+| Ubuntu 24.04                     | `self-hosted` or `Linux`   |
 | Ubuntu 22.04                     | `self-hosted` or `Linux`   |
 | Ubuntu 20.04                     | `self-hosted` or `Linux`   |
 | Debian 11                        | `self-hosted` or `Linux`   |
@@ -224,7 +226,7 @@ PHP extensions can be set up using the `extensions` input. It accepts a `string`
 
 These tools can be set up globally using the `tools` input. It accepts a string in csv-format.
 
-[`behat`], [`blackfire`], [`blackfire-player`], [`box`], [`castor`], [`churn`], [`codeception`], [`composer`], [`composer-normalize`], [`composer-prefetcher`], [`composer-require-checker`], [`composer-unused`], [`cs2pr`], [`deployer`], [`flex`], [`grpc_php_plugin`], [`infection`], [`parallel-lint`], [`pecl`], [`phan`], [`phing`], [`phinx`], [`phive`], [`php-config`], [`php-cs-fixer`], [`php-scoper`], [`phpcbf`], [`phpcpd`], [`phpcs`], [`phpdoc`] or [`phpDocumentor`], [`phpize`], [`phplint`], [`phpmd`], [`phpspec`], [`phpstan`], [`phpunit`], [`phpunit-bridge`], [`phpunit-polyfills`], [`pint`], [`prestissimo`], [`protoc`], [`psalm`], [`rector`], [`symfony`] or [`symfony-cli`], [`vapor`] or [`vapor-cli`], [`wp`] or [`wp-cli`]
+[`behat`], [`blackfire`], [`blackfire-player`], [`box`], [`castor`], [`churn`], [`codeception`], [`composer`], [`composer-normalize`], [`composer-prefetcher`], [`composer-require-checker`], [`composer-unused`], [`cs2pr`], [`deployer`], [`ecs`], [`flex`], [`grpc_php_plugin`], [`infection`], [`parallel-lint`], [`pecl`], [`phan`], [`phing`], [`phinx`], [`phive`], [`php-config`], [`php-cs-fixer`], [`php-scoper`], [`phpcbf`], [`phpcpd`], [`phpcs`], [`phpdoc`] or [`phpDocumentor`], [`phpize`], [`phplint`], [`phpmd`], [`phpspec`], [`phpstan`], [`phpunit`], [`phpunit-bridge`], [`phpunit-polyfills`], [`pint`], [`prestissimo`], [`protoc`], [`psalm`], [`rector`], [`symfony`] or [`symfony-cli`], [`vapor`] or [`vapor-cli`], [`wp`] or [`wp-cli`]
 
 ```yaml
 - name: Setup PHP with tools
@@ -717,6 +719,9 @@ Choose the image tag which matches the `runs-on` property in your workflow. For
 # For runs-on: ubuntu-latest
 act -P ubuntu-latest=shivammathur/node:latest
 
+# For runs-on: ubuntu-24.04
+act -P ubuntu-24.04=shivammathur/node:2404
+
 # For runs-on: ubuntu-22.04
 act -P ubuntu-22.04=shivammathur/node:2204
 
@@ -1050,6 +1055,7 @@ These companies generously provide setup-php their products and services to aid
 [`composer-unused`]:          https://github.com/composer-unused/composer-unused
 [`cs2pr`]:                    https://github.com/staabm/annotate-pull-request-from-checkstyle
 [`deployer`]:                 https://deployer.org/
+[`ecs`]:                      https://github.com/easy-coding-standard/easy-coding-standard
 [`flex`]:                     https://flex.symfony.com/
 [`grpc_php_plugin`]:          https://grpc.io/
 [`infection`]:                https://infection.github.io/

__tests__/tools.test.ts

@@ -434,7 +434,7 @@ describe('Tools tests', () => {
 
   it.each([
     [
-      'behat, blackfire, blackfire-player, churn, composer-normalize, composer-require-checker, composer-unused, cs2pr:1.2.3, flex, grpc_php_plugin:1.2.3, infection, phan, phan:1.2.3, phing:1.2.3, phinx, phive:1.2.3, php-config, phpcbf, phpcpd, phpcs, phpdoc, phpize, phpmd, phpspec, phpunit-bridge:5.6, phpunit-polyfills:1.0.1, protoc:v1.2.3, psalm, rector, symfony-cli, vapor-cli, wp-cli',
+      'behat, blackfire, blackfire-player, churn, composer-normalize, composer-require-checker, composer-unused, cs2pr:1.2.3, ecs, flex, grpc_php_plugin:1.2.3, infection, phan, phan:1.2.3, phing:1.2.3, phinx, phive:1.2.3, php-config, phpcbf, phpcpd, phpcs, phpdoc, phpize, phpmd, phpspec, phpunit-bridge:5.6, phpunit-polyfills:1.0.1, protoc:v1.2.3, psalm, rector, symfony-cli, vapor-cli, wp-cli',
       [
         'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.4-stable.phar,https://dl.cloudsmith.io/public/shivammathur/composer-cache/raw/files/composer-7.4-stable.phar,https://getcomposer.org/composer-stable.phar composer',
         'add_composer_tool behat behat behat/ scoped',
@@ -468,7 +468,8 @@ describe('Tools tests', () => {
         'add_composer_tool rector rector rector/ scoped',
         'add_symfony latest',
         'add_composer_tool vapor-cli vapor-cli laravel/ scoped',
-        'add_tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli "--version"'
+        'add_tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli "--version"',
+        'add_composer_tool easy-coding-standard easy-coding-standard symplify/ scoped'
       ]
     ]
   ])('checking addTools on darwin', async (tools_csv, scripts) => {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-php",
-  "version": "2.30.4",
+  "version": "2.31.1",
   "private": false,
   "description": "Setup PHP for use with GitHub Actions",
   "main": "lib/install.js",
@@ -41,22 +41,22 @@
   },
   "devDependencies": {
     "@types/jest": "^29.5.12",
-    "@types/node": "^20.12.2",
-    "@typescript-eslint/eslint-plugin": "^7.4.0",
-    "@typescript-eslint/parser": "^7.4.0",
+    "@types/node": "^20.14.10",
+    "@typescript-eslint/eslint-plugin": "^7.15.0",
+    "@typescript-eslint/parser": "^7.15.0",
     "@vercel/ncc": "^0.38.1",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jest": "^27.9.0",
+    "eslint-plugin-jest": "^28.6.0",
     "eslint-plugin-prettier": "^5.1.3",
     "jest": "^29.7.0",
     "jest-circus": "^29.7.0",
     "nock": "^13.5.4",
-    "prettier": "^3.2.5",
+    "prettier": "^3.3.2",
     "simple-git-hooks": "^2.11.1",
-    "ts-jest": "^29.1.2",
-    "typescript": "^5.4.3"
+    "ts-jest": "^29.1.5",
+    "typescript": "^5.5.3"
   },
   "bugs": {
     "url": "https://github.com/shivammathur/setup-php/issues"

src/configs/mod_priority

@@ -6,6 +6,7 @@ couchbase=30
 decimal=30
 ds=30
 event=30
+ev=30
 grpc=30
 http=25
 pecl_http=25

src/configs/tools.json

@@ -318,5 +318,11 @@
     "extension": ".phar",
     "version_parameter": "--version",
     "version_prefix": "v"
+  },
+  "easy-coding-standard": {
+    "type": "composer",
+    "alias": "ecs",
+    "repository": "symplify/easy-coding-standard",
+    "scope": "scoped"
   }
-}
+}

src/extensions.ts

@@ -35,9 +35,9 @@ export async function addExtensionDarwin(
       // match 5.3blackfire...8.3blackfire
       // match 5.3blackfire-(semver)...8.3blackfire-(semver)
       // match couchbase, event, geos, pdo_oci, oci8, http, pecl_http
-      // match 5.3ioncube...7.4ioncube
+      // match 5.3ioncube...8.2ioncube
       // match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, and 7.4phalcon5...8.3phalcon5
-      // match 7.0zephir_parser...8.2zephir_parser
+      // match 7.0zephir_parser...8.3zephir_parser
       case /^(7\.4|8\.[0-3])relay(-v?\d+\.\d+\.\d+)?$/.test(version_extension):
       case /^(5\.[3-6]|7\.[0-4]|8\.[0-3])blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
@@ -45,12 +45,12 @@ export async function addExtensionDarwin(
       case /^couchbase|^event|^gearman$|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(
         extension
       ):
-      case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
+      case /^(5\.[3-6]|7\.[0-4]|8\.[0-2])ioncube$/.test(version_extension):
       case /(5\.6|7\.[0-3])phalcon3|7\.[2-4]phalcon4|(7\.4|8\.[0-3])phalcon5?/.test(
         version_extension
       ):
       case /(?<!5\.[3-6])(pdo_)?sqlsrv$/.test(version_extension):
-      case /^(7\.[0-4]|8\.[0-2])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
+      case /^(7\.[0-4]|8\.[0-3])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
         add_script += await utils.customPackage(
@@ -137,21 +137,21 @@ export async function addExtensionWindows(
       // match 5.3blackfire...8.3blackfire
       // match 5.3blackfire-(semver)...8.3blackfire-(semver)
       // match pdo_oci and oci8
-      // match 5.3ioncube...7.4ioncube
+      // match 5.3ioncube...8.2ioncube
       // match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, and 7.4phalcon5...8.3phalcon5
       // match 7.1pecl_http...8.1pecl_http and 7.1http...8.1http
-      // match 7.0zephir_parser...8.2zephir_parser
+      // match 7.0zephir_parser...8.3zephir_parser
       case /^(5\.[3-6]|7\.[0-4]|8\.[0-3])blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
       case /^pdo_oci$|^oci8$|^pdo_firebird$/.test(extension):
-      case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
+      case /^(5\.[3-6]|7\.[0-4]|8\.[0-2])ioncube$/.test(version_extension):
       case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$|^(7\.4|8\.[0-3])phalcon5?$/.test(
         version_extension
       ):
       case /^(7\.[1-4]|8\.1)(pecl_)?http/.test(version_extension):
       case /(?<!5\.[3-6])(pdo_)?sqlsrv$/.test(version_extension):
-      case /^(7\.[0-4]|8\.[0-2])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
+      case /^(7\.[0-4]|8\.[0-3])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
         add_script += await utils.customPackage(
@@ -268,9 +268,9 @@ export async function addExtensionLinux(
       // match 5.3blackfire-(semver)...8.3blackfire-(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 5.3ioncube...8.2ioncube
       // match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, 7.4phalcon5...8.3phalcon5
-      // match 7.0zephir_parser...8.2zephir_parser
+      // match 7.0zephir_parser...8.3zephir_parser
       case /^(7\.4|8\.[0-3])relay(-v?\d+\.\d+\.\d+)?$/.test(version_extension):
       case /^(5\.[3-6]|7\.[0-4]|8\.[0-3])blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
@@ -282,12 +282,12 @@ export async function addExtensionLinux(
         extension
       ):
       case /(?<!5\.[3-5])intl-\d+\.\d+$/.test(version_extension):
-      case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
+      case /^(5\.[3-6]|7\.[0-4]|8\.[0-2])ioncube$/.test(version_extension):
       case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$|^(7\.4|8\.[0-3])phalcon5?$/.test(
         version_extension
       ):
       case /(?<!5\.[3-6])(pdo_)?sqlsrv$/.test(version_extension):
-      case /^(7\.[0-4]|8\.[0-2])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
+      case /^(7\.[0-4]|8\.[0-3])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
         add_script += await utils.customPackage(

src/scripts/darwin.sh

@@ -164,9 +164,9 @@ add_php() {
   suffix="$(get_php_formula_suffix)"
   php_formula="shivammathur/php/php@$version$suffix"
   if [[ "$existing_version" != "false" && -z "$suffix" ]]; then
-    ([ "$action" = "upgrade" ] && brew upgrade -f "$php_formula") || brew unlink "$php_formula"
+    ([ "$action" = "upgrade" ] && brew upgrade -f --overwrite "$php_formula") || brew unlink "$php_formula"
   else
-    brew install -f "$php_formula"
+    brew install -f --overwrite "$php_formula"
   fi
   sudo chown -R "$(id -un)":"$(id -gn)" "$brew_prefix"
   brew link --force --overwrite "$php_formula"

src/scripts/extensions/add_extensions.ps1

@@ -100,7 +100,7 @@ Function Add-Extension {
     $stability = 'stable',
     [Parameter(Position = 2, Mandatory = $false)]
     [ValidateNotNull()]
-    [ValidatePattern('^\d+(\.\d+){0,2}$')]
+    [ValidatePattern('^\d+(\.\d+){0,3}$')]
     [string]
     $extension_version = ''
   )
@@ -257,4 +257,4 @@ Function Disable-AllShared() {
 # Function to handle request to add PECL.
 Function Add-Pecl() {
   Add-Log $tick "PECL" "Use extensions input to setup PECL extensions on windows"
-}
+}

src/scripts/extensions/blackfire.sh

@@ -8,6 +8,10 @@ add_blackfire() {
   status='Enabled'
   if ! shared_extension blackfire; then
     status='Installed and enabled'
+    arch="$(uname -m)"
+    arch_name="amd64"
+    [[ "$arch" = "aarch64" || "$arch" = "arm64" ]] && arch_name="arm64"
+    [ "${ts:?}" = 'zts' ] && no_dot_version="${no_dot_version}-zts"
     if [ "$extension_version" = "blackfire" ]; then
       if [[ ${version:?} =~ 5.[3-6] ]]; then
         extension_version='1.50.0'
@@ -15,10 +19,14 @@ add_blackfire() {
         extension_version=$(get -s -n "" https://blackfire.io/api/v1/releases | grep -Eo 'php":"([0-9]+.[0-9]+.[0-9]+)' | cut -d '"' -f 3)
       fi
     fi
-    get -q -n "${ext_dir:?}/blackfire.so" https://packages.blackfire.io/binaries/blackfire-php/"$extension_version"/blackfire-php-"$platform"_amd64-php-"$no_dot_version".so >/dev/null 2>&1
+    get -q -n "${ext_dir:?}/blackfire.so" https://packages.blackfire.io/binaries/blackfire-php/"$extension_version"/blackfire-php-"$platform"_"$arch_name"-php-"$no_dot_version".so >/dev/null 2>&1
+  fi
+  if [ -e "${ext_dir:?}/blackfire.so" ]; then
+    disable_extension xdebug >/dev/null 2>&1
+    disable_extension pcov >/dev/null 2>&1
+    enable_extension blackfire extension
+    add_extension_log blackfire "$status"
+  else
+    add_extension_log blackfire "Could not install blackfire on PHP ${semver:?}"
   fi
-  disable_extension xdebug >/dev/null 2>&1
-  disable_extension pcov >/dev/null 2>&1
-  enable_extension blackfire extension
-  add_extension_log blackfire "$status"
 }

src/scripts/extensions/couchbase.sh

@@ -7,15 +7,27 @@ add_couchbase_clibs() {
   else
     release=$(get -s -n "" "$trunk"/latest | grep -Eo -m 1 "[0-9]+\.[0-9]+\.[0-9]+" | head -n 1)
   fi
-  [ "$VERSION_ID" = "22.04" ] && vid=20.04 || vid="$VERSION_ID"
-  [ "$VERSION_CODENAME" = "jammy" ] && vcn=focal || vcn="$VERSION_CODENAME"
+  [ "$VERSION_ID" = "24.04" ] && vid=22.04 || vid="$VERSION_ID"
+  [ "$VERSION_CODENAME" = "noble" ] && vcn=jammy || vcn="$VERSION_CODENAME"
   deb_url="$trunk/download/$release/libcouchbase-${release}_ubuntu${vid/./}_${vcn}_amd64.tar"
   get -q -n /tmp/libcouchbase.tar "$deb_url"
+  if ! [ -e /tmp/libcouchbase.tar ] || ! file /tmp/libcouchbase.tar | grep -q 'tar archive'; then
+    deb_url="$trunk/download/$release/libcouchbase-${release}_ubuntu2004_focal_amd64.tar"
+    get -q -n /tmp/libcouchbase.tar "$deb_url"
+    add_old_libssl
+  fi
   sudo tar -xf /tmp/libcouchbase.tar -C /tmp
   install_packages libev4 libevent-dev
   sudo dpkg -i /tmp/libcouchbase-*/*.deb
 }
 
+add_old_libssl() {
+  if [[ "$VERSION_ID" = "24.04" ]]; then
+    get -q -n /tmp/libssl.deb http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.22_amd64.deb
+    [ -e /tmp/libssl.deb ] && sudo dpkg -i /tmp/libssl.deb || add_extension_log "couchbase" "Could not install libssl1.1"
+  fi
+}
+
 add_couchbase_cxxlibs() {
   if [ "${runner:?}" = "self-hosted" ]; then
     add_list cmake https://apt.kitware.com/ubuntu/ https://apt.kitware.com/keys/kitware-archive-latest.asc "$VERSION_CODENAME" main
@@ -33,7 +45,7 @@ get_couchbase_version() {
   elif [ "${version:?}" = '7.3' ]; then
     echo couchbase-3.2.2
   elif [ "${version:?}" = '7.4' ]; then
-    echo couchbase-4.1.0
+    echo couchbase-4.1.1
   else
     echo couchbase
   fi

src/scripts/extensions/firebird.sh

@@ -1,11 +1,14 @@
 add_firebird_client_darwin() {
-  firebird_tag='R3_0_7'
-  pkg_name=$(get -s -n "" https://api.github.com/repos/FirebirdSQL/firebird/releases/tags/"$firebird_tag" | grep -Eo "Firebird-.*.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-.*.pkg" | head -n 1)
+  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 find /Library/Frameworks/Firebird.framework -name '*.h' -exec cp "{}" /opt/firebird/include \;
+  sudo cp -a /Library/Frameworks/Firebird.framework/Headers/* /opt/firebird/include/
   sudo find /Library/Frameworks/Firebird.framework -name '*.dylib' -exec cp "{}" /opt/firebird/lib \;
 }
 

src/scripts/extensions/ioncube.sh

@@ -10,12 +10,25 @@ add_ioncube() {
   status='Enabled'
   if ! shared_extension ioncube; then
     status='Installed and enabled'
-    os_name='lin' && [ "$(uname -s)" = "Darwin" ] && os_name='mac'
-    get -s -n "" https://downloads.ioncube.com/loader_downloads/ioncube_loaders_"$os_name"_x86-64.tar.gz | tar -xzf - -C /tmp
-    sudo mv /tmp/ioncube/ioncube_loader_"$os_name"_"${version:?}".so "${ext_dir:?}/ioncube.so"
-    sudo cp /tmp/ioncube/LICENSE.txt "$ext_dir"/IONCUBE_LICENSE.txt
+    arch="$(uname -m)"
+    if [ "$(uname -s)" = "Darwin" ]; then
+      [ "$arch" = "arm64" ] && os_suffix="dar_arm64" || os_suffix="mac_x86-64"
+    else
+      [[ "$arch" = "i386" || "$arch" = "i686" ]] && arch=x86
+      [[ "$arch" = "x86_64" ]] && arch=x86-64
+      os_suffix="lin_$arch"
+    fi
+    ts_part="" && [ "${ts:?}" = "zts" ] && ts_part="_ts"
+    get -s -n "" https://downloads.ioncube.com/loader_downloads/ioncube_loaders_"$os_suffix".tar.gz | tar -xzf - -C /tmp
+    loader_file=/tmp/ioncube/ioncube_loader_"${os_suffix%%_*}_${version:?}$ts_part".so
+    if [ -e "$loader_file" ]; then
+      sudo mv /tmp/ioncube/ioncube_loader_"${os_suffix%%_*}_${version:?}$ts_part".so "${ext_dir:?}/ioncube.so"
+      sudo cp /tmp/ioncube/LICENSE.txt "$ext_dir"/IONCUBE_LICENSE.txt
+      echo "zend_extension=$ext_dir/ioncube.so" | sudo tee "${scan_dir:?}/00-ioncube.ini" >/dev/null 2>&1
+    fi
+  else
+    echo "zend_extension=$ext_dir/ioncube.so" | sudo tee "${scan_dir:?}/00-ioncube.ini" >/dev/null 2>&1
   fi
-  echo "zend_extension=$ext_dir/ioncube.so" | sudo tee "${scan_dir:?}/00-ioncube.ini" >/dev/null 2>&1
   add_extension_log "ioncube" "$status"
   check_extension "ioncube" && add_license_log
 }

src/scripts/extensions/oci.sh

@@ -30,6 +30,10 @@ add_client() {
       sudo mv "$icdir"/* "$oracle_client"/
     done
     sudo ln -sf /opt/oracle/instantclient/*.$lib_ext* $libs
+    if [ "$os" = "Linux" ]; then
+      arch="$(uname -m)"
+      [ -e "$libs/$arch"-linux-gnu/libaio.so.1t64 ] && sudo ln -sf "$libs/$arch"-linux-gnu/libaio.so.1t64 "$libs/$arch"-linux-gnu/libaio.so.1
+    fi
   fi
 }
 

src/scripts/extensions/phalcon.sh

@@ -1,7 +1,11 @@
 # Helper function to get phalcon version
 get_phalcon_version() {
   if [ "$extension" = "phalcon5" ]; then
-    get_pecl_version phalcon stable 5
+    if [ "${version:?}" = "7.4" ]; then
+      echo '5.4.0'
+    else
+      get_pecl_version phalcon stable 5
+    fi
   elif [ "$extension" = "phalcon4" ]; then
     echo '4.1.2'
   elif [ "$extension" = "phalcon3" ]; then

src/scripts/extensions/relay.sh

@@ -2,7 +2,11 @@
 get_relay_version() {
  local ext=$1
   if [[ "$ext" =~ ^relay$ ]]; then
-    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
+    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
   else
     relay_version="${ext##*-}"
     echo "v${relay_version/v//}"
@@ -40,6 +44,7 @@ change_library_paths() {
     install_name_tool -change "$(echo "${dylibs}" | grep -E "liblz4.*dylib" | xargs)" "$brew_prefix"/opt/lz4/lib/liblz4.dylib "$ext_dir"/relay.so
     install_name_tool -change "$(echo "${dylibs}" | grep -E "libssl.*dylib" | xargs)" "$brew_prefix"/opt/openssl@"$openssl_version"/lib/libssl.dylib "$ext_dir"/relay.so
     install_name_tool -change "$(echo "${dylibs}" | grep -E "libcrypto.*dylib" | xargs)" "$brew_prefix"/opt/openssl@"$openssl_version"/lib/libcrypto.dylib "$ext_dir"/relay.so
+    install_name_tool -change "$(echo "${dylibs}" | grep -E "libck.*dylib" | xargs)" "$brew_prefix"/opt/concurrencykit/lib/libck.dylib "$ext_dir"/relay.so
   fi
 }
 
@@ -51,7 +56,7 @@ add_relay_dependencies() {
   if [ "$os" = "Darwin" ]; then
     . "${0%/*}"/tools/brew.sh
     configure_brew
-    brew install hiredis lz4 zstd
+    brew install hiredis lz4 zstd concurrencykit
   fi
 }
 
@@ -92,8 +97,7 @@ enable_relay() {
 # Patch binary id in relay extension
 init_relay_binary_id() {
   if [ -e "${ext_dir:?}"/relay.so ]; then
-    grep -aq 00000000 "${ext_dir:?}"/relay.so && \
-      sudo LC_ALL=C sed -i.bak "s/00000000-0000-0000-0000-000000000000/$(uuidgen)/" "$ext_dir"/relay.so
+    sudo LC_ALL=C sed -i.bak "s/00000000-0000-0000-0000-000000000000/$(uuidgen)/" "$ext_dir"/relay.so || true
   fi
 }
 

src/scripts/linux.sh

@@ -6,6 +6,14 @@ add_sudo() {
   fi
 }
 
+# Function to link apt-fast to apt-get
+link_apt_fast() {
+  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
+  fi
+}
+
 # Function to setup environment for self-hosted runners.
 self_hosted_helper() {
   if ! command -v apt-fast >/dev/null; then
@@ -23,6 +31,10 @@ fix_broken_packages() {
 # Function to install a package
 install_packages() {
   packages=("$@")
+  if ! [ -e /etc/dpkg/dpkg.cfg.d/force-confnew ]; then
+    echo "force-confnew" | sudo tee /etc/dpkg/dpkg.cfg.d/force-confnew >/dev/null 2>&1
+    trap "sudo rm -f /etc/dpkg/dpkg.cfg.d/force-confnew 2>/dev/null" exit
+  fi
   $apt_install "${packages[@]}" >/dev/null 2>&1 || (update_lists && fix_broken_packages && $apt_install "${packages[@]}" >/dev/null 2>&1)
 }
 
@@ -285,6 +297,7 @@ apt_install="sudo $debconf_fix apt-fast install -y --no-install-recommends"
 scripts="$src"/scripts
 
 add_sudo >/dev/null 2>&1
+link_apt_fast >/dev/null 2>&1
 
 . /etc/os-release
 # shellcheck source=.

src/scripts/tools/ppa.sh

@@ -55,7 +55,7 @@ update_lists() {
   if [[ -n "$ppa" && -n "$ppa_search" ]]; then
     list="$list_dir"/"$(basename "$(grep -lr "$ppa_search" "$list_dir")")"
     status_file=/tmp/"${ppa/\//_}"
-  elif [ -e "$list_file" ] && grep -Eq '^deb ' "$list_file"; then
+  elif [ -e "$list_file" ] && grep -Eq '^deb |^Types deb' "$list_file"; then
     list="$list_file"
   fi
   if [ ! -e "$status_file" ]; then
@@ -88,7 +88,7 @@ add_key() {
   key_source=$4
   key_file=$5
   key_urls=("$key_source")
-  if [[ "$key_source" =~ launchpad.net|debian.org|setup-php.com ]]; then
+  if [[ "$key_source" =~ launchpad.net|debian.org ]]; then
     fingerprint="$("${ID}"_fingerprint "$ppa" "$ppa_url" "$package_dist")"
     sks_params="op=get&options=mr&exact=on&search=0x$fingerprint"
     key_urls=("${sks[@]/%/\/pks\/lookup\?"$sks_params"}")
@@ -153,18 +153,39 @@ check_ppa() {
 # Function to remove a PPA.
 remove_list() {
   ppa=${1-ondrej/php}
-  ppa_url=${2:-"$lp_ppa/$ppa/ubuntu"}
-  grep -lr "$ppa_url" "$list_dir" | xargs -n1 sudo rm -f
+  [ -n "$2" ] && ppa_urls=("$2") || ppa_urls=("$lp_ppa/$ppa/ubuntu" "$lpc_ppa/$ppa/ubuntu")
+  for ppa_url in "${ppa_urls[@]}"; do
+    grep -lr "$ppa_url" "$list_dir" | xargs -n1 sudo rm -f
+  done
   sudo rm -f "$key_dir"/"${ppa/\//-}"-keyring || true
 }
 
+# Function to check if ubuntu ppa is up
+is_ubuntu_ppa_up() {
+  ppa=${1:-ondrej/php}
+  curl -s --connect-timeout 5 --max-time 5 --head --fail "$lp_ppa/$ppa/ubuntu/dists/$VERSION_CODENAME/Release" > /dev/null
+}
+
+# Function to add the PPA mirror.
+add_ppa_sp_mirror() {
+  ppa=$1
+  ppa_name="$(basename "$ppa")"
+  remove_list "$ppa" || true
+  [ "${debug:?}" = "debug" ] && add_list sp/"$ppa_name" "$sp/$ppa/ubuntu" "$sp/$ppa/ubuntu/key.gpg" "$VERSION_CODENAME" "main/debug"
+  add_list sp/"$ppa_name" "$sp/$ppa/ubuntu" "$sp/$ppa/ubuntu/key.gpg"
+}
+
 # Function to add a PPA.
 add_ppa() {
   set_base_version
   ppa=${1:-ondrej/php}
   if [[ "$ID" = "ubuntu" || "$ID_LIKE" =~ ubuntu ]] && [[ "$ppa" =~ "ondrej/" ]]; then
-    [ "${debug:?}" = "debug" ] && add_list "$ppa" "$lp_ppa/$ppa/ubuntu" "$lp_ppa/$ppa/ubuntu" "$VERSION_CODENAME" "main/debug"
-    add_list "$ppa"
+    if is_ubuntu_ppa_up "$ppa" ; then
+      [ "${debug:?}" = "debug" ] && add_list "$ppa" "$lp_ppa/$ppa/ubuntu" "$lp_ppa/$ppa/ubuntu" "$VERSION_CODENAME" "main/debug"
+      add_list "$ppa"
+    else
+      add_ppa_sp_mirror "$ppa"
+    fi
   elif [[ "$ID" = "debian" || "$ID_LIKE" =~ debian ]] && [[ "$ppa" =~ "ondrej/" ]]; then
     [ "${debug:?}" = "debug" ] && add_list "$ppa" "$sury"/"${ppa##*/}"/ "$sury"/"${ppa##*/}"/apt.gpg "$VERSION_CODENAME" "main/debug"
     add_list "$ppa" "$sury"/"${ppa##*/}"/ "$sury"/"${ppa##*/}"/apt.gpg
@@ -189,14 +210,17 @@ update_ppa() {
 }
 
 # Variables
-list_file='/etc/apt/sources.list'
-list_dir="$list_file.d"
+list_dir='/etc/apt/sources.list.d'
+list_file="/etc/apt/sources.list.d/$ID.sources"
+[ -e "$list_file" ] || list_file='/etc/apt/sources.list'
 upstream_lsb='/etc/upstream-release/lsb-release'
 lp_api='https://api.launchpad.net/1.0'
 lp_ppa='http://ppa.launchpad.net'
+lpc_ppa='https://ppa.launchpadcontent.net'
 key_dir='/usr/share/keyrings'
 dist_info_dir='/usr/share/distro-info'
 sury='https://packages.sury.org'
+sp='https://setup-php.com'
 sks=(
   'https://keyserver.ubuntu.com'
   'https://pgp.mit.edu'