setup-php 2.32.0 → 2.34.0

package/src/configs/tools.json

@@ -18,7 +18,7 @@
   },
   "composer-dependency-analyser": {
     "type": "composer",
-    "repository": "shipmonk-rnd/composer-dependency-analyser",
+    "repository": "shipmonk/composer-dependency-analyser",
     "scope": "scoped"
   },
   "composer-unused": {
@@ -35,7 +35,7 @@
     "extension": ".phar",
     "domain": "https://github.com",
     "version_prefix": "",
-    "version_parameter": "-V"
+    "version_parameter": "diagnose"
   },
   "cs2pr": {
     "type": "phar",
@@ -71,7 +71,7 @@
   },
   "php-cs-fixer": {
     "type": "phar",
-    "repository": "FriendsOfPHP/PHP-CS-Fixer",
+    "repository": "PHP-CS-Fixer/PHP-CS-Fixer",
     "extension": ".phar",
     "domain": "https://github.com",
     "fetch_latest": "true",
@@ -136,6 +136,14 @@
     "version_prefix": "",
     "version_parameter": "-V"
   },
+  "pie": {
+    "type": "phar",
+    "repository": "php/pie",
+    "extension": ".phar",
+    "domain": "https://github.com",
+    "version_prefix": "",
+    "version_parameter": "-V"
+  },
   "pint": {
     "type": "phar",
     "repository": "laravel/pint",

package/src/extensions.ts

@@ -32,25 +32,25 @@ export async function addExtensionDarwin(
         add_script += await utils.parseExtensionSource(extension, ext_prefix);
         return;
       // match 7.4relay...8.5relay
-      // match 5.3blackfire...8.3blackfire
-      // match 5.3blackfire-(semver)...8.3blackfire-(semver)
+      // match 5.3blackfire...8.4blackfire
+      // match 5.3blackfire-(semver)...8.4blackfire-(semver)
       // match couchbase, event, geos, pdo_oci, oci8, http, pecl_http
-      // match 5.3ioncube...8.2ioncube
-      // match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, and 7.4phalcon5...8.3phalcon5
-      // match 7.0zephir_parser...8.3zephir_parser
+      // match 5.3ioncube...8.4ioncube
+      // match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, and 7.4phalcon5...8.4phalcon5
+      // match 7.0zephir_parser...8.4zephir_parser
       case /^(7\.4|8\.[0-5])relay(-v?\d+\.\d+\.\d+)?$/.test(version_extension):
-      case /^(5\.[3-6]|7\.[0-4]|8\.[0-3])blackfire(-\d+\.\d+\.\d+)?$/.test(
+      case /^(5\.[3-6]|7\.[0-4]|8\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
       case /^couchbase|^event|^gearman$|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(
         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(
+      case /^(5\.[3-6]|7\.[0-4]|8\.[0-4])ioncube$/.test(version_extension):
+      case /(5\.6|7\.[0-3])phalcon3|7\.[2-4]phalcon4|(7\.4|8\.[0-4])phalcon5?/.test(
         version_extension
       ):
       case /(?<!5\.[3-6])(pdo_)?sqlsrv$/.test(version_extension):
-      case /^(7\.[0-4]|8\.[0-3])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
+      case /^(7\.[0-4]|8\.[0-4])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
         add_script += await utils.customPackage(
@@ -134,24 +134,24 @@ export async function addExtensionWindows(
       case /^none$/.test(ext_name):
         add_script += '\nDisable-AllShared';
         break;
-      // match 5.3blackfire...8.3blackfire
-      // match 5.3blackfire-(semver)...8.3blackfire-(semver)
+      // match 5.3blackfire...8.4blackfire
+      // match 5.3blackfire-(semver)...8.4blackfire-(semver)
       // match pdo_oci and oci8
-      // match 5.3ioncube...8.2ioncube
-      // match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, and 7.4phalcon5...8.3phalcon5
+      // match 5.3ioncube...8.4ioncube
+      // match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, and 7.4phalcon5...8.4phalcon5
       // match 7.1pecl_http...8.1pecl_http and 7.1http...8.1http
-      // match 7.0zephir_parser...8.3zephir_parser
-      case /^(5\.[3-6]|7\.[0-4]|8\.[0-3])blackfire(-\d+\.\d+\.\d+)?$/.test(
+      // match 7.0zephir_parser...8.4zephir_parser
+      case /^(5\.[3-6]|7\.[0-4]|8\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
       case /^pdo_oci$|^oci8$|^pdo_firebird$/.test(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(
+      case /^(5\.[3-6]|7\.[0-4]|8\.[0-4])ioncube$/.test(version_extension):
+      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$|^(7\.4|8\.[0-4])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-3])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
+      case /^(7\.[0-4]|8\.[0-4])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
         add_script += await utils.customPackage(
@@ -264,15 +264,15 @@ export async function addExtensionLinux(
         add_script += await utils.parseExtensionSource(extension, ext_prefix);
         return;
       // match 7.4relay...8.5relay
-      // match 5.3blackfire...8.3blackfire
-      // match 5.3blackfire-(semver)...8.3blackfire-(semver)
+      // match 5.3blackfire...8.4blackfire
+      // match 5.3blackfire-(semver)...8.4blackfire-(semver)
       // match 5.3pdo_cubrid...7.2php_cubrid, 5.3cubrid...7.4cubrid
       // match couchbase, geos, pdo_oci, oci8, http, pecl_http
-      // match 5.3ioncube...8.2ioncube
-      // match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, 7.4phalcon5...8.3phalcon5
-      // match 7.0zephir_parser...8.3zephir_parser
+      // match 5.3ioncube...8.4ioncube
+      // match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, 7.4phalcon5...8.4phalcon5
+      // match 7.0zephir_parser...8.4zephir_parser
       case /^(7\.4|8\.[0-5])relay(-v?\d+\.\d+\.\d+)?$/.test(version_extension):
-      case /^(5\.[3-6]|7\.[0-4]|8\.[0-3])blackfire(-\d+\.\d+\.\d+)?$/.test(
+      case /^(5\.[3-6]|7\.[0-4]|8\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
       case /^((5\.[3-6])|(7\.[0-2]))pdo_cubrid$|^((5\.[3-6])|(7\.[0-4]))cubrid$/.test(
@@ -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]|8\.[0-2])ioncube$/.test(version_extension):
-      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$|^(7\.4|8\.[0-3])phalcon5?$/.test(
+      case /^(5\.[3-6]|7\.[0-4]|8\.[0-4])ioncube$/.test(version_extension):
+      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$|^(7\.4|8\.[0-4])phalcon5?$/.test(
         version_extension
       ):
       case /(?<!5\.[3-6])(pdo_)?sqlsrv$/.test(version_extension):
-      case /^(7\.[0-4]|8\.[0-3])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
+      case /^(7\.[0-4]|8\.[0-4])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
         add_script += await utils.customPackage(

package/src/scripts/darwin.sh

@@ -69,7 +69,6 @@ add_brew_extension() {
   else
     add_brew_tap "$php_tap"
     add_brew_tap "$ext_tap"
-    sudo mv "$tap_dir"/"$ext_tap"/.github/deps/"$formula"/* "${core_repo:?}/Formula/" 2>/dev/null || true
     update_dependencies >/dev/null 2>&1
     handle_dependency_extensions "$formula" "$extension" >/dev/null 2>&1
     (brew install "${brew_opts[@]}" "$ext_tap/$formula@$version" >/dev/null 2>&1 && copy_brew_extensions "$formula") || pecl_install "$extension" >/dev/null 2>&1
@@ -136,7 +135,9 @@ update_dependencies() {
   patch_brew
   if ! [ -e /tmp/update_dependencies ]; then
     for repo in "$brew_repo" "$core_repo"; do
-      git_retry -C "$repo" fetch origin master && git -C "$repo" reset --hard origin/master
+      if [ -e "$repo" ]; then
+        git_retry -C "$repo" fetch origin master && git -C "$repo" reset --hard origin/master
+      fi
     done
     echo '' | sudo tee /tmp/update_dependencies >/dev/null 2>&1
   fi
@@ -209,6 +210,11 @@ get_scan_dir() {
   fi
 }
 
+# Function to handle self-hosted runner setup.
+self_hosted_helper() {
+  :
+}
+
 # Function to Setup PHP.
 setup_php() {
   step_log "Setup PHP"
@@ -252,7 +258,7 @@ setup_php() {
 }
 
 # Variables
-version=${1:-'8.3'}
+version=${1:-'8.4'}
 ini=${2:-'production'}
 src=${0%/*}/..
 php_formula=shivammathur/php/php@"$version"

package/src/scripts/extensions/add_extensions.ps1

@@ -136,6 +136,10 @@ Function Add-Extension {
         {
           $params["Version"] = $extension_version
         }
+        # If extension for a different version exists
+        if(Test-Path $ext_dir\php_$extension.dll) {
+          Move-Item $ext_dir\php_$extension.dll $ext_dir\php_$extension.bak.dll -Force
+        }
         Install-PhpExtension @params
         Set-ExtensionPrerequisites $extension
       }

package/src/scripts/extensions/couchbase.sh

@@ -23,7 +23,7 @@ add_couchbase_clibs() {
 
 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
+    get -q -n /tmp/libssl.deb http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_amd64.deb
     [ -e /tmp/libssl.deb ] && sudo dpkg -i /tmp/libssl.deb || add_extension_log "couchbase" "Could not install libssl1.1"
   fi
 }

package/src/scripts/extensions/firebird.sh

@@ -15,6 +15,7 @@ add_firebird_client_darwin() {
 add_firebird_helper() {
   firebird_dir=$1
   tag="$(php_src_tag)"
+  export PDO_FIREBIRD_CONFIGURE_PREFIX_OPTS="CFLAGS=-Wno-incompatible-function-pointer-types EXTRA_CFLAGS=-Wno-int-conversion"
   export PDO_FIREBIRD_CONFIGURE_OPTS="--with-pdo-firebird=$firebird_dir"
   export PDO_FIREBIRD_LINUX_LIBS="firebird-dev"
   export PDO_FIREBIRD_PATH="ext/pdo_firebird"

package/src/scripts/extensions/intl.sh

@@ -2,9 +2,9 @@
 install_icu() {
   icu=$1
   if [ "$(php -i | grep "ICU version =>" | sed -e "s|.*=> s*||")" != "$icu" ]; then
-    get -q -n /tmp/icu.tar.zst "https://github.com/shivammathur/icu-intl/releases/download/icu4c/icu4c-$icu.tar.zst"
+    get -q -n /tmp/icu.tar.zst "https://github.com/shivammathur/icu-intl/releases/download/icu4c/icu4c-$icu$arch_suffix.tar.zst"
     sudo tar -I zstd -xf /tmp/icu.tar.zst -C /usr/local
-    sudo cp -r /usr/local/icu/lib/* /usr/lib/x86_64-linux-gnu/
+    sudo cp -r /usr/local/icu/lib/* /usr/lib/"$(uname -m)"-linux-gnu/
   fi
 }
 
@@ -17,8 +17,11 @@ add_intl() {
   else
     [ "${ts:?}" = 'zts' ] && suffix='-zts'
     install_icu "$icu" >/dev/null 2>&1
-    get -q -n "${ext_dir:?}/intl.so" "https://github.com/shivammathur/icu-intl/releases/download/intl/php${version:?}-intl-$icu$suffix.so"
+    get -q -n "${ext_dir:?}/intl.so" "https://github.com/shivammathur/icu-intl/releases/download/intl/php${version:?}-intl-$icu$suffix$arch_suffix.so"
     enable_extension intl extension
     add_extension_log intl "Installed and enabled with ICU $icu"
   fi
 }
+
+arch="$(uname -m)"
+[[ "$arch" = 'arm64' || "$arch" = 'aarch64' ]] && arch_suffix='-arm64' || arch_suffix=''

package/src/scripts/extensions/oci.ps1

@@ -48,6 +48,7 @@ Function Get-Oci8DLL() {
       return $_
     }
   }
+  return $null
 }
 
 # Function to install oci8 and pdo_oci.
@@ -62,22 +63,17 @@ Function Add-Oci() {
   try {
     $status = 'Enabled'
     Add-InstantClient
-    if ($extension -eq "pdo_oci") {
-      Enable-PhpExtension pdo_oci -Path $php_dir
-    } else {
-      if(-not(Test-Path $ext_dir\php_oci8.dll)) {
-        $oci8DLL = Get-Oci8DLL
-        if($oci8DLL) {
-          Copy-Item -Path $oci8DLL -Destination $ext_dir\php_oci8.dll
-        } else {
-          $status = 'Installed and enabled'
-          Get-File -Url (Get-Oci8Url) -OutFile $php_dir\oci8.zip
-          Expand-Archive -Path $php_dir\oci8.zip -DestinationPath $ext_dir -Force
-        }
+    if($version -lt '8.4') {
+      if($version -lt '5.6' -and $extension -eq 'oci8') {
+        Add-Content -Value "`r`nextension=php_oci8.dll" -Path $php_dir\php.ini
+      } else {
+        Enable-PhpExtension $extension -Path $php_dir
       }
-      Add-Content -Value "`r`nextension=php_oci8.dll" -Path $php_dir\php.ini
+    } else {
+      $status = 'Installed and enabled'
+      Add-Extension $extension >$null 2>&1
     }
-    Add-Log $tick $extension $status
+    Add-ExtensionLog $extension $status
     Add-LicenseLog
   } catch {
     Add-Log $cross $extension "Could not install $extension on PHP $( $installed.FullVersion )"

package/src/scripts/extensions/oci.sh

@@ -11,28 +11,36 @@ add_license_log() {
 add_client() {
   if [ ! -e "$oracle_client" ]; then
     sudo mkdir -p -m 777 "$oracle_home" "$oracle_client"
+    arch="$(uname -m)"
     for package in basiclite sdk; do
       if [ "$os" = 'Linux' ]; then
         libs='/usr/lib/'
         os_name='linux'
-        arch='linuxx64'
+        [[ "$arch" = 'arm64' || "$arch" = 'aarch64' ]] && arch_suffix='linux-arm64' || arch_suffix='linuxx64'
         lib_ext='so'
       elif [ "$os" = 'Darwin' ]; then
         libs='/usr/local/lib/'
         os_name='mac'
-        arch='macos'
+        arch_suffix='macos'
         lib_ext='dylib'
       fi
-      get -q -n "/opt/oracle/$package.zip" "https://download.oracle.com/otn_software/$os_name/instantclient/instantclient-$package-$arch.zip"
-      unzip -o "/opt/oracle/$package.zip" -d "$oracle_home"
+      if [[ "$os" = 'Darwin' && ("$arch" = 'arm64' || "$arch" = 'aarch64') ]]; then
+        get -q -n "/opt/oracle/$package.dmg" "https://download.oracle.com/otn_software/$os_name/instantclient/instantclient-$package-macos-arm64.dmg"
+        sudo hdiutil attach "/opt/oracle/$package.dmg"
+        (cd /Volumes/instantclient-"$package"-macos.arm64-* && bash install_ic.sh)
+        sudo cp -a ~/Downloads/instantclient_* /opt/oracle/
+      else
+        get -q -n "/opt/oracle/$package.zip" "https://download.oracle.com/otn_software/$os_name/instantclient/instantclient-$package-$arch_suffix.zip"
+        unzip -o "/opt/oracle/$package.zip" -d "$oracle_home"
+      fi
     done
     for icdir in /opt/oracle/instantclient_*; do
       sudo mv "$icdir"/* "$oracle_client"/
     done
+    sudo mkdir -p "$libs"
     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
+      [ -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
   fi
 }

package/src/scripts/extensions/patches/common.sh

@@ -1,7 +1,7 @@
 process_file() {
     local file=$1
-    sed -i '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 '/#include.*\(php_lcg.h\|php_mt_rand.h\|php_rand.h\|standard\/php_random\.h\)/d' "$file"
+    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"
 }
 
 export -f process_file

package/src/scripts/extensions/phalcon.ps1

@@ -80,9 +80,9 @@ Function Get-PhalconSemver() {
 # Function to install phalcon
 Function Add-PhalconHelper() {
   $semver = Get-PhalconSemver
-  if (($extension_version -eq '3') -or ($extension_version -eq '5')) {
+  if ($extension_version -eq '3') {
     Add-PhalconFromGitHub $semver
-  } elseif ($extension_version -eq '4') {
+  } else {
     Add-Extension -Extension phalcon -Stability stable -Extension_version $semver
   }
 }

package/src/scripts/extensions/phalcon.sh

@@ -73,7 +73,7 @@ add_phalcon4() {
   fi
 }
 
-# Function to add phalcon3.
+# Function to add phalcon5.
 add_phalcon5() {
   if shared_extension phalcon; then
     phalcon_version=$(php -d="extension=phalcon.so" -r "echo phpversion('phalcon');" | cut -d'.' -f 1)

package/src/scripts/extensions/relay.sh

@@ -48,6 +48,19 @@ change_library_paths() {
   fi
 }
 
+# Add hiredis library
+add_hiredis() {
+  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
@@ -56,7 +69,8 @@ add_relay_dependencies() {
   if [ "$os" = "Darwin" ]; then
     . "${0%/*}"/tools/brew.sh
     configure_brew
-    brew install hiredis lz4 zstd concurrencykit
+    brew install lz4 zstd concurrencykit
+    add_hiredis
   fi
 }
 

package/src/scripts/extensions/source.sh

@@ -83,8 +83,10 @@ run_group() {
   echo "$command" | sudo tee ./run_group.sh >/dev/null 2>&1
   echo "$GROUP$log"
   . ./run_group.sh
+  local status=$?
   rm ./run_group.sh
   echo "$END_GROUP"
+  return $status
 }
 
 patch_extension() {
@@ -150,10 +152,10 @@ add_extension_from_source() {
       [[ -n "${libraries// }" ]] && run_group "add_libs $libraries" "add libraries"
       [ "${debug:?}" = "debug" ] && suffix_opts="$suffix_opts --enable-debug"
       patch_extension "$extension" >/dev/null 2>&1
-      run_group "phpize" "phpize"
-      run_group "sudo $prefix_opts ./configure $suffix_opts $opts" "configure"
-      run_group "sudo make -j$(nproc 2>/dev/null || sysctl -n hw.ncpu)" "make"
-      run_group "sudo make install" "make install"
+      run_group "phpize" "phpize" && \
+      run_group "sudo $prefix_opts ./configure $suffix_opts $opts" "configure" && \
+      run_group "sudo $prefix_opts make -j$(nproc 2>/dev/null || sysctl -n hw.ncpu)" "make" && \
+      run_group "sudo make install" "make install" && \
       enable_extension "$extension" "$prefix"
     fi
   )

package/src/scripts/extensions/zephir_parser.ps1

@@ -31,6 +31,9 @@ Function Get-ZephirParserVersion() {
   $repo = 'zephir-lang/php-zephir-parser'
   $zp_releases = "$github/$repo/releases"
   if($extension -eq 'zephir_parser') {
+    if($version -lt '7.2') {
+      return 'v1.6.1'
+    }
     return (Get-File -Url $zp_releases/latest).BaseResponse.RequestMessage.RequestUri.Segments[-1]
   } else {
     return 'v' + ($extension.split('-')[1] -replace 'v')
@@ -71,10 +74,14 @@ Function Add-ZephirParser() {
       Enable-PhpExtension -Extension zephir_parser -Path $php_dir
     } else {
       $status = 'Installed and enabled'
-      Add-ZephirParserFromGitHub $extension
+      try {
+        Add-ZephirParserFromGitHub $extension
+      } catch {
+        Add-Extension $extension >$null 2>&1
+      }
     }
     Add-ExtensionLog zephir_parser $status
   } catch {
     Add-Log $cross $extension "Could not install $extension on PHP $($installed.FullVersion)"
   }
-}
+}

package/src/scripts/extensions/zephir_parser.sh

@@ -17,9 +17,13 @@ add_zephir_parser_helper() {
   [ "$(uname -s)" = "Linux" ] && os_suffix=ubuntu || os_suffix=macos
   build_name=$(get -s -n "" https://api.github.com/repos/"$repo"/releases/tags/"$ext_version" | grep -Eo "zephir_parser-php-${version:?}-$nts-$os_suffix-.*.zip" | head -n 1)
   [ -z "$build_name" ] && build_name=$(get -s -n "" "$zp_releases"/expanded_assets/"$ext_version" | grep -Eo "zephir_parser-php-${version:?}-$nts-$os_suffix-.*.zip" | head -n 1)
-  get -q -e "/tmp/zp.zip" "$zp_releases"/download/"$ext_version"/"$build_name"
-  sudo unzip -o "/tmp/zp.zip" -d "${ext_dir:?}"
-  enable_extension zephir_parser extension
+  if [ -n "$build_name" ]; then
+    get -q -e "/tmp/zp.zip" "$zp_releases"/download/"$ext_version"/"$build_name"
+    sudo unzip -o "/tmp/zp.zip" -d "${ext_dir:?}"
+    enable_extension zephir_parser extension
+  else
+    pecl_install zephir_parser
+  fi
 }
 
 # Add zephir_parser

package/src/scripts/linux.sh

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

package/src/scripts/tools/add_tools.ps1

@@ -58,6 +58,11 @@ Function Set-ComposerEnv() {
     (Get-Content $src\configs\composer.env -Raw) -replace '(?m)^COMPOSER_PROCESS_TIMEOUT=.*$', "COMPOSER_PROCESS_TIMEOUT=$env:COMPOSER_PROCESS_TIMEOUT" | Set-Content $src\configs\composer.env
   }
   Add-EnvPATH $src\configs\composer.env
+  if($env:COMPOSER_ALLOW_PLUGINS) {
+    $env:COMPOSER_ALLOW_PLUGINS -split '\s*,\s*' | Where-Object { $_ } | ForEach-Object {
+      & composer global config --no-plugins "allow-plugins.$_" true > $null 2>&1
+    }
+  }
 }
 
 # Function to extract tool version.

package/src/scripts/tools/add_tools.sh

@@ -1,5 +1,4 @@
 # Variables
-export tool_path_dir="/usr/local/bin"
 export composer_home="$HOME/.composer"
 export composer_bin="$composer_home/vendor/bin"
 export composer_json="$composer_home/composer.json"
@@ -76,6 +75,11 @@ set_composer_env() {
     sed -i "$sed_arg" "$composer_env" 2>/dev/null || sed -i '' "$sed_arg" "$composer_env"
   fi
   add_env_path "$composer_env"
+  if [ -n "$COMPOSER_ALLOW_PLUGINS" ]; then
+    echo "$COMPOSER_ALLOW_PLUGINS" | tr ',' '\n' | sed 's/^[[:space:]]*//;s/[[:space:]]*$//' | grep -v '^$' | while IFS= read -r plugin; do
+      composer global config --no-plugins "allow-plugins.$plugin" true >/dev/null 2>&1
+    done
+  fi
 }
 
 # Helper function to configure tools.

package/src/scripts/tools/grpc_php_plugin.ps1

@@ -9,7 +9,13 @@ Function Add-Msys2() {
 
 Function Add-GrpcPhpPlugin() {
   $msys_location = Add-Msys2
-  $logs = . $msys_location\usr\bin\bash -l -c "pacman -S --noconfirm mingw-w64-x86_64-grpc" >$null 2>&1
+  $arch = arch
+  if($arch -eq 'arm64' -or $arch -eq 'aarch64') {
+    $grpc_package = 'mingw-w64-clang-aarch64-grpc'
+  } else {
+    $grpc_package = 'mingw-w64-x86_64-grpc'
+  }
+  $logs = . $msys_location\usr\bin\bash -l -c "pacman -S --noconfirm $grpc_package" >$null 2>&1
   $grpc_version = Get-ToolVersion 'Write-Output' "$logs"
   Add-Path $msys_location\mingw64\bin
   Set-Output grpc_php_plugin_path "$msys_location\mingw64\bin\grpc_php_plugin.exe"

package/src/scripts/tools/ppa.sh

@@ -67,7 +67,7 @@ update_lists() {
 # Function to get fingerprint from an Ubuntu PPA.
 ubuntu_fingerprint() {
   ppa=$1
-  get -s -n "" "$lp_api"/~"${ppa%/*}"/+archive/"${ppa##*/}" | jq -r '.signing_key_fingerprint'
+  get -s -n "" "${lp_api[@]/%//~${ppa%/*}/+archive/${ppa##*/}}" | jq -r '.signing_key_fingerprint'
 }
 
 # Function to get fingerprint from a Debian PPA.
@@ -88,7 +88,7 @@ add_key() {
   key_source=$4
   key_file=$5
   key_urls=("$key_source")
-  if [[ "$key_source" =~ launchpad.net|debian.org ]]; then
+  if [[ "$key_source" =~ launchpadcontent.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"}")
@@ -117,7 +117,7 @@ check_lists() {
 # Function to add a sources list.
 add_list() {
   ppa=${1-ondrej/php}
-  ppa_url=${2:-"$lp_ppa/$ppa/ubuntu"}
+  ppa_url=${2:-"$lpc_ppa/$ppa/ubuntu"}
   key_source=${3:-"$ppa_url"}
   package_dist=${4:-"$VERSION_CODENAME"}
   branches=${5:-main}
@@ -129,7 +129,8 @@ add_list() {
     arch=$(dpkg --print-architecture)
     [ -e "$key_source" ] && key_file=$key_source || key_file="$key_dir"/"${ppa/\//-}"-keyring.gpg
     add_key "$ppa" "$ppa_url" "$package_dist" "$key_source" "$key_file"
-    echo "deb [arch=$arch signed-by=$key_file] $ppa_url $package_dist $branches" | sudo tee -a "$list_dir"/"${ppa/\//-}".list >/dev/null 2>&1
+    sudo rm -rf "$list_dir"/"${ppa/\//-}".list || true
+    echo "deb [arch=$arch signed-by=$key_file] $ppa_url $package_dist $branches" | sudo tee -a "$list_dir"/"${ppa%%/*}"-"$ID"-"${ppa#*/}"-"$package_dist".list >/dev/null 2>&1
     update_lists "$ppa" "$ppa_search"
     . /etc/os-release
   fi
@@ -139,7 +140,7 @@ add_list() {
 # Function to check if a PPA exists
 check_ppa() {
   ppa=$1
-  ppa_url=${2:-"$lp_ppa/$ppa/ubuntu"}
+  ppa_url=${2:-"$lpc_ppa/$ppa/ubuntu"}
   package_dist=${3:-"$VERSION_CODENAME"}
   branches=${4:-main}
   ppa_search="deb .*$ppa_url $package_dist .*$branches$"
@@ -163,7 +164,7 @@ remove_list() {
 # 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
+  curl -s --connect-timeout 5 --max-time 5 --head --fail "$lpc_ppa/$ppa/ubuntu/dists/$VERSION_CODENAME/Release" > /dev/null
 }
 
 # Function to add the PPA mirror.
@@ -181,7 +182,8 @@ add_ppa() {
   ppa=${1:-ondrej/php}
   if [[ "$ID" = "ubuntu" || "$ID_LIKE" =~ ubuntu ]] && [[ "$ppa" =~ "ondrej/" ]]; then
     if is_ubuntu_ppa_up "$ppa" ; then
-      [ "${debug:?}" = "debug" ] && add_list "$ppa" "$lp_ppa/$ppa/ubuntu" "$lp_ppa/$ppa/ubuntu" "$VERSION_CODENAME" "main/debug"
+      [ "${runner:?}" = "self-hosted" ] && find "$list_dir" -type f -name 'sp*' -exec grep -qF "$sp" {} \; -delete
+      [ "${debug:?}" = "debug" ] && add_list "$ppa" "$lpc_ppa/$ppa/ubuntu" "$lpc_ppa/$ppa/ubuntu" "$VERSION_CODENAME" "main/debug"
       add_list "$ppa"
     else
       add_ppa_sp_mirror "$ppa"
@@ -201,7 +203,7 @@ add_ppa() {
 update_ppa() {
   set_base_version
   ppa=${1:-ondrej/php}
-  ppa_url=${2:-"$lp_ppa/$ppa/ubuntu"}
+  ppa_url=${2:-"$lpc_ppa/$ppa/ubuntu"}
   package_dist=${4:-"$VERSION_CODENAME"}
   branches=${5:-main}
   ppa_search="deb .*$ppa_url $package_dist .*$branches"
@@ -214,7 +216,10 @@ 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_api=(
+  'https://api.launchpad.net/1.0'
+  'https://api.launchpad.net/devel'
+)
 lp_ppa='http://ppa.launchpad.net'
 lpc_ppa='https://ppa.launchpadcontent.net'
 key_dir='/usr/share/keyrings'

package/src/scripts/tools/protoc.sh

@@ -17,7 +17,9 @@ add_protoc() {
   (
     platform='linux'
     [ "$(uname -s)" = "Darwin" ] && platform='osx'
-    get -q -n /tmp/protobuf.zip "https://github.com/protocolbuffers/protobuf/releases/download/$protobuf_tag/protoc-${protobuf_tag:1}-$platform-x86_64.zip"
+    arch="$(uname -m)"
+    [[ "$arch" = 'arm64' || "$arch" = 'aarch64' ]] && arch='aarch_64'
+    get -q -n /tmp/protobuf.zip "https://github.com/protocolbuffers/protobuf/releases/download/$protobuf_tag/protoc-${protobuf_tag:1}-$platform-$arch.zip"
     sudo unzip /tmp/protobuf.zip -d /usr/local/
     sudo chmod -R 777 /usr/local/bin/protoc /usr/local/include/google
   ) >/dev/null 2>&1