Fix check_lists in ppa.sh

Update Node.js dependencies

.github/SECURITY.md

@@ -2,23 +2,20 @@
 
 ## Supported Versions
 
-The latest patch versions of `v1` and `v2` releases of this project are supported for security updates.
+The latest patch version of `v2` release of this project is supported for security updates.
 
 ## Supported PHP Versions
 
-This security policy only applies to the latest patches of the following PHP versions.
+This security policy only applies to the latest patch releases of the following PHP versions.
 
 | Version | Supported          |
 |---------|--------------------|
 | 8.1     | :white_check_mark: |
 | 8.2     | :white_check_mark: |
 | 8.3     | :white_check_mark: |
+| 8.4     | :white_check_mark: |
 
 ## Reporting a Vulnerability
 
-If you have found any issues that might have security implications in the versions supported, please send a report privately to [contact@shivammathur.com](mailto:contact@shivammathur.com).
+If you have found any issues that might have security implications in the versions supported, please send a report privately to [contact@setup-php.com](mailto:contact@setup-php.com).
 Do not report security reports publicly.
-
-## Tidelift
-
-If you use this GitHub Action through a Tidelift subscription, please refer to [https://tidelift.com/security](https://tidelift.com/security).

.github/workflows/codeql.yml

@@ -16,18 +16,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 2
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           config-file: ./.github/codeql/codeql-configuration.yml
           languages: javascript
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v3
+        uses: github/codeql-action/autobuild@v4
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4

.github/workflows/docs.yml

@@ -16,8 +16,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-24.04, ubuntu-22.04, windows-2022, 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', '8.5']
+        operating-system: [ubuntu-24.04, ubuntu-22.04, windows-2022, macos-15-intel]
+        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', '8.5', '8.6']
     steps:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -88,7 +88,7 @@ jobs:
           Remove-Item "$env:file.all" -Force
           Remove-Item "$env:file.builtin" -Force
       - name: Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: lists-php${{ matrix.php-versions }}-${{ matrix.operating-system }}.md
           path: php${{ matrix.php-versions }}-${{ matrix.operating-system }}.md
@@ -101,11 +101,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: ${{ github.repository }}.wiki
       - name: Download artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           path: ${{ github.workspace }}/lists
           pattern: lists-*
@@ -116,11 +116,11 @@ jobs:
           git config --local user.name "${{ github.repository_owner }}"
       - name: Combine
         run: |
-          for os in ubuntu-24.04 ubuntu-22.04 windows-2022 windows-2019 macos-13 macos-14 macos-15; do
+          for os in ubuntu-24.04 ubuntu-22.04 windows-2025 windows-2022 windows-2019 macos-13 macos-14 macos-15 macos-26; 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 8.5; do
+            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 8.5 8.6; do
               if [[ "${os%-*}" = "macos" ]]; then
-                cat lists/php"$version"-macos-13.md >> Php-extensions-loaded-on-"$os".md
+                cat lists/php"$version"-macos-15-intel.md >> Php-extensions-loaded-on-"$os".md
               elif [ "${os%-*}" = "windows" ]; then
                 cat lists/php"$version"-windows-2022.md >> Php-extensions-loaded-on-"$os".md
               else

.github/workflows/node.yml

@@ -29,12 +29,12 @@ jobs:
         operating-system: [ubuntu-latest, windows-latest, macos-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 2
 
       - name: Setup Node.js 20.x
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: 20.x
 

.github/workflows/php.yml

@@ -28,8 +28,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-24.04, ubuntu-22.04, windows-2022, 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', '8.5']
+        operating-system: [ubuntu-24.04, ubuntu-22.04, windows-2022, macos-15-intel]
+        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', '8.5', '8.6']
         include:
           - operating-system: ubuntu-24.04
             php-versions: ''
@@ -39,7 +39,7 @@ jobs:
       key: cache-v5
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup cache environment
         id: cache-env

.github/workflows/publish.yml

@@ -19,16 +19,16 @@ jobs:
     steps:
       - name: Checkout release
         if: github.event_name != 'workflow_dispatch'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Checkout tag
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         if: github.event_name == 'workflow_dispatch'
         with:
           ref: ${{ github.event.inputs.tag }}
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '20.x'
           registry-url: https://registry.npmjs.org
@@ -46,7 +46,7 @@ jobs:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - name: Change to GitHub Packages registry
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           registry-url: https://npm.pkg.github.com
           scope: '@shivammathur'

README.md

@@ -10,7 +10,7 @@
   <a href="https://github.com/shivammathur/setup-php" title="GitHub action to setup PHP"><img alt="GitHub Actions status" src="https://github.com/shivammathur/setup-php/workflows/Main%20workflow/badge.svg"></a>
   <a href="https://codecov.io/gh/shivammathur/setup-php" title="Code coverage"><img alt="Codecov Code Coverage" src="https://img.shields.io/codecov/c/github/shivammathur/setup-php?logo=codecov"></a>
   <a href="https://github.com/shivammathur/setup-php/blob/main/LICENSE" title="license"><img alt="LICENSE" src="https://img.shields.io/badge/license-MIT-428f7e.svg?logo=open%20source%20initiative&logoColor=white&labelColor=555555"></a>
-  <a href="#tada-php-support" title="PHP Versions Supported"><img alt="PHP Versions Supported" src="https://img.shields.io/badge/php-5.3%20to%208.5-777bb3.svg?logo=php&logoColor=white&labelColor=555555"></a>
+  <a href="#tada-php-support" title="PHP Versions Supported"><img alt="PHP Versions Supported" src="https://img.shields.io/badge/php-5.3%20to%208.6-777bb3.svg?logo=php&logoColor=white&labelColor=555555"></a>
 </p>
 <p align="center">
   <a href="https://reddit.com/r/setup_php" title="setup-php reddit"><img alt="setup-php reddit" src="https://img.shields.io/badge/reddit-join-FF5700?logo=reddit&logoColor=FF5700&labelColor=555555"></a>
@@ -69,16 +69,17 @@ Both `GitHub-hosted` and `self-hosted` runners are supported by `setup-php` on t
 ### GitHub-Hosted Runners
 
 | Virtual environment | Arch    | YAML workflow label                | Pre-installed PHP |
-|---------------------|---------|------------------------------------|------------------------|
+|---------------------|---------|------------------------------------|-------------------|
 | Ubuntu 24.04        | x86_64  | `ubuntu-latest` or `ubuntu-24.04`  | `PHP 8.3`         |
 | Ubuntu 22.04        | x86_64  | `ubuntu-22.04`                     | `PHP 8.1`         |
 | Ubuntu 24.04        | aarch64 | `ubuntu-24.04-arm`                 | `PHP 8.3`         |
 | Ubuntu 22.04        | aarch64 | `ubuntu-22.04-arm`                 | `PHP 8.1`         |
 | Windows Server 2025 | x64     | `windows-2025`                     | `PHP 8.3`         |
 | Windows Server 2022 | x64     | `windows-latest` or `windows-2022` | `PHP 8.3`         |
-| Windows Server 2019 | x64     | `windows-2019`                     | `PHP 8.3`              |
-| macOS Sequoia 15.x  | arm64   | `macos-15`                         | -                      |
-| macOS Sonoma 14.x   | arm64   | `macos-latest` or `macos-14`       | -                      |
+| macOS Tahoe 26.x    | arm64   | `macos-26`                         | -                 |
+| macOS Sequoia 15.x  | arm64   | `macos-latest` or `macos-15`       | -                 |
+| macOS Sonoma 14.x   | arm64   | `macos-14`                         | -                 |
+| macOS Sequoia 15.x  | x86_64  | `macos-15-intel`                   | `PHP 8.3`         |
 | macOS Ventura 13.x  | x86_64  | `macos-13`                         | `PHP 8.3`         |
 
 ### Self-Hosted Runners
@@ -87,13 +88,14 @@ Both `GitHub-hosted` and `self-hosted` runners are supported by `setup-php` on t
 |----------------------------------|----------------------------|
 | Ubuntu 24.04                     | `self-hosted` or `Linux`   |
 | Ubuntu 22.04                     | `self-hosted` or `Linux`   |
+| Debian 13                        | `self-hosted` or `Linux`   |
 | Debian 12                        | `self-hosted` or `Linux`   |
 | Debian 11                        | `self-hosted` or `Linux`   |
 | Windows 7 and newer              | `self-hosted` or `Windows` |
 | Windows Server 2012 R2 and newer | `self-hosted` or `Windows` |
+| macOS Tahoe 26.x x86_64/arm64    | `self-hosted` or `macOS`   |
 | macOS Sequoia 15.x x86_64/arm64  | `self-hosted` or `macOS`   |
 | macOS Sonoma 14.x x86_64/arm64   | `self-hosted` or `macOS`   |
-| macOS Ventura 13.x x86_64/arm64  | `self-hosted` or `macOS`   |
 
 - Refer to the [self-hosted setup](#self-hosted-setup) to use the action on self-hosted runners.
 - Operating systems based on the above Ubuntu and Debian versions are also supported on best effort basis.
@@ -101,11 +103,11 @@ Both `GitHub-hosted` and `self-hosted` runners are supported by `setup-php` on t
 
 ## :tada: PHP Support
 
-On all supported OS/Platforms the following PHP versions can be set up as per the runner.
+On all supported OS/Platforms, the following PHP versions can be set up as per the runner.
 
-- PHP 5.3 to PHP 8.5 on GitHub-hosted runners, except for macOS ARM64 runners (macos-14).
-- PHP 5.6 to PHP 8.5 on GitHub-hosted macOS ARM64 runners (macos-14).
-- PHP 5.6 to PHP 8.5 on self-hosted runners.
+- PHP 5.3 to PHP 8.6 on GitHub-hosted runners, except for macOS ARM64 runners (macos-14).
+- PHP 5.6 to PHP 8.6 on GitHub-hosted macOS ARM64 runners (macos-14).
+- PHP 5.6 to PHP 8.6 on self-hosted runners.
 
 | PHP Version | Stability | Release Support       | Runner Support                 |
 |-------------|-----------|-----------------------|--------------------------------|
@@ -123,11 +125,12 @@ On all supported OS/Platforms the following PHP versions can be set up as per th
 | `8.2`       | `Stable`  | `Security fixes only` | `GitHub-hosted`, `self-hosted` |
 | `8.3`       | `Stable`  | `Active`              | `GitHub-hosted`, `self-hosted` |
 | `8.4`       | `Stable`  | `Active`              | `GitHub-hosted`, `self-hosted` |
-| `8.5`       | `Nightly` | `In development`      | `GitHub-hosted`, `self-hosted` |
+| `8.5`       | `Stable`  | `Active`              | `GitHub-hosted`, `self-hosted` |
+| `8.6`       | `Nightly` | `In development`      | `GitHub-hosted`, `self-hosted` |
 
 
 > [!Note]
-> - Specifying `8.5` in `php-version` input installs a nightly build of `PHP 8.5.0-dev`. See [nightly build setup](#nightly-build-setup) for more information.
+> - Specifying `8.6` in `php-version` input installs a nightly build of `PHP 8.6.0-dev` from the master branch of PHP. See [nightly build setup](#nightly-build-setup) for more information.
 > - To use JIT on `PHP 8.0` and above, refer to the [JIT configuration](#jit-configuration) section.
 
 ## :heavy_plus_sign: PHP Extension Support
@@ -140,8 +143,8 @@ PHP extensions can be set up using the `extensions` input. It accepts a `string`
 - name: Setup PHP with PECL extension
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
-    extensions: imagick, swoole
+    php-version: '8.5'
+    extensions: imagick, redis
 ```
 
 - On `Windows`, extensions available on `PECL` which have the `DLL` binary can be set up.
@@ -168,7 +171,7 @@ PHP extensions can be set up using the `extensions` input. It accepts a `string`
 - name: Setup PHP with pre-release PECL extension
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
+    php-version: '8.5'
     extensions: xdebug-beta
 ```
 
@@ -180,30 +183,30 @@ PHP extensions can be set up using the `extensions` input. It accepts a `string`
 - name: Setup PHP and disable opcache
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
-    extensions: :opcache
+    php-version: '8.5'
+    extensions: :mbstring
 ```
 
 - All shared extensions can be disabled by specifying `none`. When `none` is specified along with other extensions, it is hoisted to the start of the input. So, all the shared extensions will be disabled first, then rest of the extensions in the input will be processed.
 
-This disables all core and third-party shared extensions and thus, can break some tools which need them. Required extensions are enabled again when the tools are set up on a best-effort basis. So it is recommended to add the extensions required for your tools after `none` in the `extensions` input to avoid any issues.
+This disables all core and third-party shared extensions and thus, can break some tools that need them. Required extensions are enabled again when the tools are set up on a best-effort basis. So it is recommended to add the extensions required for your tools after `none` in the `extensions` input to avoid any issues.
 
 ```yaml
 - name: Setup PHP without any shared extensions except mbstring
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
+    php-version: '8.5'
     extensions: none, mbstring
 ```
 
-- Extension `intl` can be set up with specific `ICU` version for `PHP 5.6` and above in `Ubuntu` workflows by suffixing `intl` with the `ICU` version. `ICU 50.2` and newer versions are supported. Refer to [`ICU builds`](https://github.com/shivammathur/icu-intl#icu4c-builds) for the specific versions supported.
+- Extension `intl` can be set up with specific `ICU` version for `PHP 5.6` and above in `Ubuntu` workflows by suffixing `intl` with the `ICU` version. `ICU 50.2` and newer versions are supported for PHP 8.4 and lower, `ICU 57.2` and newer versions are supported for PHP 8.5 and above. Refer to [`ICU builds`](https://github.com/shivammathur/icu-intl#icu4c-builds) for the specific versions supported.
 
 ```yaml
 - name: Setup PHP with intl
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
-    extensions: intl-70.1
+    php-version: '8.5'
+    extensions: intl-77.1
 ```
 
 - Extensions loaded by default after `setup-php` runs can be found on the [wiki](https://github.com/shivammathur/setup-php/wiki).
@@ -211,7 +214,7 @@ This disables all core and third-party shared extensions and thus, can break som
 - These extensions have custom support:
   - `cubrid` and `pdo_cubrid` on `Ubuntu`.
   - `event`, `gearman`, `geos` and `relay` on `Ubuntu` and `macOS`.
-  - `blackfire`, `couchbase`, `ioncube`, `oci8`, `pdo_firebird`, `pdo_oci`, `pecl_http`, `phalcon3`, `phalcon4`, `phalcon5`, and `zephir_parser` on all supported OS.
+  - `blackfire`, `couchbase`, `ibm_db2`, `ioncube`, `oci8`, `pdo_firebird`, `pdo_ibm`, `pdo_oci`, `pecl_http`, `phalcon3`, `phalcon4`, `phalcon5`, and `zephir_parser` on all supported OS.
 
 - By default, extensions which cannot be added or disabled gracefully leave an error message in the logs, the execution is not interrupted. To change this behaviour you can set `fail-fast` flag to `true`.
 
@@ -219,7 +222,7 @@ This disables all core and third-party shared extensions and thus, can break som
 - name: Setup PHP with fail-fast
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
+    php-version: '8.5'
     extensions: oci8
   env:
     fail-fast: true
@@ -235,7 +238,7 @@ These tools can be set up globally using the `tools` input. It accepts a string
 - name: Setup PHP with tools
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
+    php-version: '8.5'
     tools: php-cs-fixer, phpunit
 ```
 
@@ -245,7 +248,7 @@ These tools can be set up globally using the `tools` input. It accepts a string
 - name: Setup PHP with tools
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
+    php-version: '8.5'
     tools: vimeo/psalm
 ```
 
@@ -264,7 +267,7 @@ These tools can be set up globally using the `tools` input. It accepts a string
 - name: Setup PHP with composer v2
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
+    php-version: '8.5'
     tools: composer:v1
 ```
 
@@ -274,7 +277,7 @@ These tools can be set up globally using the `tools` input. It accepts a string
 - name: Setup PHP without composer
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
+    php-version: '8.5'
     tools: none
 ```
 
@@ -290,7 +293,7 @@ These tools can be set up globally using the `tools` input. It accepts a string
 - name: Setup PHP with fail-fast
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
+    php-version: '8.5'
     tools: deployer
   env:
     fail-fast: true
@@ -302,7 +305,7 @@ These tools can be set up globally using the `tools` input. It accepts a string
 - name: Setup PHP with fail-fast
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
+    php-version: '8.5'
   env:
     COMPOSER_ALLOW_PLUGINS: composer/installers, composer/satis
 ```
@@ -318,7 +321,7 @@ These tools can be set up globally using the `tools` input. It accepts a string
 - name: Setup PHP with composer and custom process timeout
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
+    php-version: '8.5'
   env:
     COMPOSER_PROCESS_TIMEOUT: 300
 ```
@@ -334,7 +337,7 @@ Runs on all [PHP versions supported](#tada-php-support "List of PHP versions sup
 - name: Setup PHP with Xdebug
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
+    php-version: '8.5'
     coverage: xdebug
 ```
 
@@ -363,12 +366,12 @@ Runs on PHP 7.1 and newer PHP versions.
 - name: Setup PHP with PCOV
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
+    php-version: '8.5'
     ini-values: pcov.directory=api #optional, see above for usage.
     coverage: pcov
 ```
 
-- PHPUnit 8.x and above supports PCOV out of the box.
+- PHPUnit 8.x and above support PCOV out of the box.
 - If you are using PHPUnit 5.x, 6.x or 7.x, you need to set up `pcov/clobber` before executing your tests.
 
 ```yaml
@@ -393,7 +396,7 @@ Disable coverage for these reasons:
 - name: Setup PHP with no coverage driver
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
+    php-version: '8.5'
     coverage: none
 ```
 
@@ -406,7 +409,7 @@ Disable coverage for these reasons:
 #### `php-version` (optional)
 
 - Specify the PHP version you want to set up.
-- Accepts a `string`. For example `'8.4'`.
+- Accepts a `string`. For example `'8.5'`.
 - Accepts `lowest` to set up the lowest supported PHP version.
 - Accepts `highest` or `latest` to set up the latest stable PHP version.
 - Accepts `nightly` to set up a nightly build from the master branch of PHP.
@@ -480,7 +483,7 @@ On GitHub Actions you can assign the `setup-php` step an `id`, you can use the s
   id: setup-php
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
+    php-version: '8.5'
 
 - name: Print PHP version
   run: echo ${{ steps.setup-php.outputs.php-version }}
@@ -522,7 +525,7 @@ steps:
 - name: Setup PHP
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
+    php-version: '8.5'
     extensions: mbstring, intl
     ini-values: post_max_size=256M, max_execution_time=180
     coverage: xdebug
@@ -540,7 +543,7 @@ jobs:
     strategy:
       matrix:
         operating-system: ['ubuntu-latest', 'windows-latest', 'macos-latest']
-        php-versions: ['8.2', '8.3', '8.4']
+        php-versions: ['8.2', '8.3', '8.4', '8.5']
         phpunit-versions: ['latest']
         include:
           - operating-system: 'ubuntu-latest'
@@ -559,17 +562,17 @@ jobs:
 
 ### Nightly Build Setup
 
-> Set up a nightly build of `PHP 8.5`.
+> Set up a nightly build of `PHP 8.6`.
 
 - These PHP versions are currently in active development and might contain bugs and breaking changes.
-- Some user space extensions might not support this version currently.
+- Some user space extensions might not support these versions currently.
 
 ```yaml
 steps:
 - name: Setup nightly PHP
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.5'
+    php-version: '8.6'
     extensions: mbstring
     ini-values: post_max_size=256M, max_execution_time=180
     coverage: xdebug
@@ -593,7 +596,7 @@ steps:
 - name: Setup PHP with debugging symbols
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
+    php-version: '8.5'
   env:
     debug: true # specify true or false
 ```
@@ -613,7 +616,7 @@ jobs:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '8.4'
+        php-version: '8.5'
       env:
         phpts: ts # specify ts or nts
 ```
@@ -630,7 +633,7 @@ jobs:
 - name: Setup PHP with latest versions
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
+    php-version: '8.5'
   env:
     update: true # specify true or false
 ```
@@ -645,30 +648,35 @@ To debug any issues, you can use the `verbose` tag instead of `v2`.
 - name: Setup PHP with logs
   uses: shivammathur/setup-php@verbose
   with:
-    php-version: '8.4'
+    php-version: '8.5'
 ```
 
 ### Multi-Arch Setup
 
 > Set up PHP on multiple architecture on Ubuntu GitHub Runners.
 
-- `PHP 5.6` to `PHP 8.4` are supported by `setup-php` on multiple architecture on `Ubuntu`.
-- For this, you can use `shivammathur/node` images as containers. These have compatible `Nodejs` installed for `setup-php`.
-- Currently, for `ARM` based setup, you will need [self-hosted runners](#self-hosted-setup).
+- `PHP 5.6` to `PHP 8.5` are supported by `setup-php` on multiple architecture on `Ubuntu` and `Debian`.
+- For this, you can use `shivammathur/node` images as containers. These have compatible `Nodejs` and `PHP` installed for `setup-php`.
 
 ```yaml
 jobs:
   run:
-    runs-on: ubuntu-latest
-    container: shivammathur/node:latest-${{ matrix.arch }}
+    runs-on: ${{ matrix.os }}
+    container: shivammathur/node:php-${{ matrix.php-versions }}-24.04-${{ matrix.arch }}
     strategy:
       matrix:
-        arch: ["amd64", "i386"]
+        arch: ["amd64", "arm64v8"]
+        php-versions: [8.4, 8.5]
+        include:
+            - arch: "amd64"
+              os: "ubuntu-24.04"
+            - arch: "arm64v8" 
+              os: "ubuntu-24.04-arm"
     steps:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.4'
+          php-version: ${{ matrix.php-versions }}
 ```
 
 ### Self Hosted Setup
@@ -690,7 +698,7 @@ jobs:
     runs-on: self-hosted
     strategy:
       matrix:
-        php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
     name: PHP ${{ matrix.php-versions }}
     steps:
     - name: Setup PHP
@@ -703,7 +711,7 @@ jobs:
 
 > [!NOTE]
 > - Do not set up multiple self-hosted runners on a single server instance as parallel workflow will conflict with each other.
-> - Do not set up self-hosted runners on the side on your development environment or your production server.
+> - Do not set up self-hosted runners on the side of your development environment or your production server.
 > - Avoid using the same labels for your `self-hosted` runners which are used by `GitHub-hosted` runners.
 
 ### Local Testing Setup
@@ -718,22 +726,22 @@ jobs:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '8.4'
+        php-version: '8.5'
 ```
 
 Run the workflow locally with `act` using [`shivammathur/node`](https://github.com/shivammathur/node-docker "Docker image to run setup-php") docker images.
 
-Choose the image tag which matches the `runs-on` property in your workflow. For example, if you are using `ubuntu-22.04` in your workflow, run `act -P ubuntu-22.04=shivammathur/node:2204`.
+Choose the image tag which matches the `runs-on` property in your workflow. For example, if you are using `ubuntu-22.04` in your workflow, run `act -P ubuntu-22.04=shivammathur/node:22.04`.
 
 ```bash
 # 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
+act -P ubuntu-24.04=shivammathur/node:24.04
 
 # For runs-on: ubuntu-22.04
-act -P ubuntu-22.04=shivammathur/node:2204
+act -P ubuntu-22.04=shivammathur/node:22.04
 ```
 
 ### JIT Configuration
@@ -742,7 +750,7 @@ act -P ubuntu-22.04=shivammathur/node:2204
 
 - To enable JIT, enable `opcache` in cli mode by setting `opcache.enable_cli=1`.
 - JIT conflicts with `Xdebug`, `PCOV`, and other extensions which override `zend_execute_ex` function, so set `coverage: none` and disable any such extension if added.
-- By default, `opcache.jit=1235` and `opcache.jit_buffer_size=256M` are set which can be changed using `ini-values` input.
+- By default, `opcache.jit=1235` and `opcache.jit_buffer_size=256M` (`opcache.jit_buffer_size=128M` on ARM-based environments) are set which can be changed using `ini-values` input.
 - For detailed information about JIT related directives refer to the [`official PHP documentation`](https://www.php.net/manual/en/opcache.configuration.php#ini.opcache.jit "opcache.jit documentation").
 
 For example to enable JIT in `tracing` mode with buffer size of `64 MB`.
@@ -751,7 +759,7 @@ For example to enable JIT in `tracing` mode with buffer size of `64 MB`.
 - name: Setup PHP with JIT in tracing mode
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
+    php-version: '8.5'
     coverage: none
     ini-values: opcache.enable_cli=1, opcache.jit=tracing, opcache.jit_buffer_size=64M
 ```
@@ -802,7 +810,7 @@ By default, setup-php uses the `GITHUB_TOKEN` secret that is generated for each
 - name: Setup PHP
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
+    php-version: '8.5'
     github-token: ${{ secrets.YOUR_PAT_TOKEN }}
 ```
 
@@ -818,7 +826,7 @@ If you use Private Packagist for your private composer dependencies, you can set
 - name: Setup PHP
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
+    php-version: '8.5'
   env:
     PACKAGIST_TOKEN: ${{ secrets.PACKAGIST_TOKEN }}
 ```
@@ -832,7 +840,7 @@ Please refer to the authentication section in [`composer documentation`](https:/
 - name: Setup PHP
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
+    php-version: '8.5'
   env:
     COMPOSER_AUTH_JSON: |
       {
@@ -855,7 +863,7 @@ Put the code in the run property of a step and specify the shell as `php {0}`.
 - name: Setup PHP
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
+    php-version: '8.5'
 
 - name: Run PHP code
   shell: php {0}
@@ -895,7 +903,7 @@ PHPStan supports error reporting in GitHub Actions, so it does not require probl
 - name: Setup PHP
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
+    php-version: '8.5'
     tools: phpstan
 
 - name: Run PHPStan
@@ -910,7 +918,7 @@ Psalm supports error reporting in GitHub Actions with an output format `github`.
 - name: Setup PHP
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
+    php-version: '8.5'
     tools: psalm
 
 - name: Run Psalm
@@ -928,7 +936,7 @@ For examples refer to the [cs2pr documentation](https://github.com/staabm/annota
 - name: Setup PHP
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.4'
+    php-version: '8.5'
     tools: cs2pr, phpcs
 
 - name: Run phpcs
@@ -998,18 +1006,14 @@ Examples of using `setup-php` with various PHP frameworks and packages.
 
 ## :sparkling_heart: Support This Project
 
-- Please star the project and share it. If you blog, please share your experience of using `setup-php`.
-- Please [reach out](mailto:contact@setup-php.com) if you have any questions about sponsoring setup-php.
-
-Many users and organisations support setup-php via [GitHub Sponsors](https://github.com/sponsors/shivammathur).
-
-<a href="https://github.com/sponsors/shivammathur"><img src="https://setup-php.com/sponsors.svg?" alt="Sponsor shivammathur"></a>
-
 These companies generously provide setup-php their products and services to aid in the development of this project.
 
 <p>
-  <a target="_blank" href="https://www.jetbrains.com/?from=setup-php">
-    <img src="https://setup-php.com/sponsors/jetbrains.svg" alt="JetBrains" width="140" height="80">
+  <a target="_blank" href="https://www.jetbrains.com/?from=setup-php#gh-light-mode-only">
+    <img src="https://setup-php.com/sponsors/jetbrains.svg" alt="JetBrains" width="140" height="100">
+  </a>
+  <a target="_blank" href="https://www.jetbrains.com/?from=setup-php#gh-dark-mode-only">
+    <img src="https://setup-php.com/sponsors/jetbrains-white.svg" alt="JetBrains" width="140" height="100">
   </a>
   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
   <a target="_blank" href="https://www.cloudflare.com/lp/project-alexandria/#gh-light-mode-only">
@@ -1026,11 +1030,22 @@ These companies generously provide setup-php their products and services to aid
     <img src="https://setup-php.com/sponsors/macstadium-white.png" alt="Mac Stadium" width="200" height="80">
   </a>
   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-  <a target="_blank" href="#">
-    <img src="https://setup-php.com/sponsors/tidelift.png" alt="Tidelift" width="94" height="80">
+  <a target="_blank" href="https://m.do.co/c/f1a8ee1277b0#gh-light-mode-only">
+    <img src="https://setup-php.com/sponsors/digitalocean.svg" alt="Digitalocean" width="100" height="100">
+  </a>
+  <a target="_blank" href="https://m.do.co/c/f1a8ee1277b0#gh-dark-mode-only">
+    <img src="https://setup-php.com/sponsors/digitalocean-white.svg" alt="Digitalocean" width="100" height="100">
   </a>
 </p>
 
+Many users and organizations support setup-php via [GitHub Sponsors](https://github.com/sponsors/shivammathur).
+
+<a href="https://github.com/sponsors/shivammathur"><img src="https://setup-php.com/sponsors.svg?" alt="Sponsor shivammathur"></a>
+
+- If you use setup-php, please consider starring the project and share it. 
+- If you blog, please share your experience of using `setup-php`.
+- Please [reach out](mailto:contact@setup-php.com) if you have any questions about sponsoring setup-php.
+
 ## :package: Dependencies
 
 - [Node.js dependencies](https://github.com/shivammathur/setup-php/network/dependencies "Node.js dependencies")
@@ -1073,7 +1088,7 @@ These companies generously provide setup-php their products and services to aid
 [`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/
+[`flex`]:                     https://github.com/symfony/flex
 [`grpc_php_plugin`]:          https://grpc.io/
 [`infection`]:                https://infection.github.io/
 [`mago`]:                     https://github.com/carthage-software/mago

__tests__/extensions.test.ts

@@ -18,6 +18,8 @@ describe('Extension tests', () => {
     ${'oci8'}                                    | ${'7.4'} | ${'Add-Oci oci8'}
     ${'pcov'}                                    | ${'5.6'} | ${'Add-Log "$cross" "pcov" "pcov is not supported on PHP 5.6"'}
     ${'pdo_oci'}                                 | ${'7.4'} | ${'Add-Oci pdo_oci'}
+    ${'ibm_db2'}                                 | ${'7.4'} | ${'Add-Ibm ibm_db2'}
+    ${'pdo_ibm'}                                 | ${'7.4'} | ${'Add-Ibm pdo_ibm'}
     ${'pecl_http'}                               | ${'7.4'} | ${'Add-Http'}
     ${'pdo_sqlsrv'}                              | ${'7.4'} | ${'Add-Sqlsrv pdo_sqlsrv'}
     ${'phalcon3'}                                | ${'7.2'} | ${'Add-Phalcon phalcon3'}
@@ -56,11 +58,13 @@ describe('Extension tests', () => {
     ${'mongodb-mongodb/mongo-php-driver@master'} | ${'7.3'} | ${'add_extension_from_source mongodb https://github.com mongodb mongo-php-driver master extension'}
     ${'oci8'}                                    | ${'7.3'} | ${'add_oci oci8'}
     ${'pcov'}                                    | ${'5.6'} | ${'add_log "$cross" "pcov" "pcov is not supported on PHP 5.6'}
+    ${'ibm_db2'}                                 | ${'7.3'} | ${'add_ibm ibm_db2'}
     ${'pdo-odbc'}                                | ${'7.4'} | ${'add_pdo_extension odbc'}
     ${'pdo_cubrid'}                              | ${'7.0'} | ${'add_cubrid pdo_cubrid'}
     ${'pdo_cubrid'}                              | ${'7.4'} | ${'add_pdo_extension cubrid'}
     ${'pdo_mysql'}                               | ${'7.4'} | ${'add_pdo_extension mysql'}
     ${'pdo_oci'}                                 | ${'7.3'} | ${'add_oci pdo_oci'}
+    ${'pdo_ibm'}                                 | ${'7.3'} | ${'add_ibm pdo_ibm'}
     ${'pdo_sqlsrv'}                              | ${'7.4'} | ${'add_sqlsrv pdo_sqlsrv'}
     ${'pecl_http'}                               | ${'7.3'} | ${'add_http'}
     ${'phalcon3'}                                | ${'7.3'} | ${'add_phalcon phalcon3'}

__tests__/tools.test.ts

@@ -61,7 +61,23 @@ jest.mock('../src/fetch', () => ({
         } else if (!token || token === 'valid_token') {
           return {data: `[{"ref": "refs/tags/1.2.3", "url": "${url}"}]`};
         } else if (token === 'beta_token') {
-          return {data: `[{"ref": "refs/tags/1.2.3-beta1", "url": "${url}"}]`};
+          return {data: `[{"ref": "refs/tags/1.2.3beta1", "url": "${url}"}]`};
+        } else if (token === 'rc_token') {
+          return {
+            data: `[{"ref":"refs/tags/3.0.0RC1"},{"ref":"refs/tags/3.0.0RC2"}]`
+          };
+        } else if (token === 'non_semver_tags') {
+          return {
+            data: `[{"ref":"refs/tags/release-2025-09-18"},{"ref":"refs/tags/release-2025-09-17"}]`
+          };
+        } else if (token === 'undefined_ref') {
+          return {
+            data: `[{"url":"${url}"},{"ref":"refs/tags/v1.2.4","url":"${url}"}]`
+          };
+        } else if (token === 'multi_refs') {
+          return {
+            data: `[{"ref":"refs/tags/v1.2.3","url":"${url}"},{"ref":"refs/tags/1.2.4","url":"${url}"}]`
+          };
         } else if (token === 'no_data') {
           return {data: '[]'};
         } else {
@@ -92,7 +108,10 @@ describe('Tools tests', () => {
     token                | version
     ${'invalid_token'}   | ${'1.2'}
     ${'valid_token'}     | ${'1.2.3'}
-    ${'beta_token'}    | ${'1.2.3-beta1'}
+    ${'beta_token'}      | ${'1.2.3beta1'}
+    ${'undefined_ref'}   | ${'1.2.4'}
+    ${'multi_refs'}      | ${'1.2.4'}
+    ${'non_semver_tags'} | ${'release-2025-09-18'}
     ${''}                | ${'1.2.3'}
   `('checking getSemverVersion: $token', async ({token, version}) => {
     process.env['GITHUB_TOKEN'] = token;
@@ -101,6 +120,26 @@ describe('Tools tests', () => {
     ).toBe(version);
   });
 
+  it('checking getSemverVersion triggers ?? fallback via Map#get mock', async () => {
+    process.env['GITHUB_TOKEN'] = 'rc_token';
+    const spy = jest
+      .spyOn(Map.prototype as Map<string, string>, 'get')
+      .mockImplementation(function (
+        this: Map<string, string>,
+        key: string
+      ): string | undefined {
+        if (key === '3.0.0-RC2') {
+          return undefined;
+        }
+        return Map.prototype.get.call(this, key);
+      });
+    const result = await tools.getSemverVersion(
+      getData({tool: 'tool', version: '3.0.0'})
+    );
+    expect(result).toBe('3.0.0-RC2');
+    spy.mockRestore();
+  });
+
   it.each`
     tool                 | fetch_latest | version
     ${'tool'}            | ${'true'}    | ${'3.2.1'}
@@ -205,6 +244,19 @@ describe('Tools tests', () => {
     }
   );
 
+  it('checking getUrl handles undefined version without double slash', async () => {
+    const data = getData({
+      tool: 'cs2pr',
+      repository: 'staabm/annotate-pull-request-from-checkstyle',
+      domain: 'https://github.com'
+    });
+    data['extension'] = '';
+    delete data['version'];
+    expect(await tools.getUrl(data)).toBe(
+      'https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/download/cs2pr'
+    );
+  });
+
   it.each`
     version     | version_prefix | url
     ${'latest'} | ${''}          | ${'https://example.com/tool.phar'}
@@ -332,14 +384,20 @@ describe('Tools tests', () => {
     ${'preview'}   | ${'7.4'}    | ${'true'}     | ${'https://dl.cloudsmith.io/public/shivammathur/composer-cache/raw/files/composer-7.4-preview.phar'}    | ${'https://getcomposer.org/composer-preview.phar'}
     ${'1'}         | ${'7.4'}    | ${'false'}    | ${'https://dl.cloudsmith.io/public/shivammathur/composer-cache/raw/files/composer-7.4-1.phar'}          | ${'https://getcomposer.org/composer-1.phar'}
     ${'2'}         | ${'7.4'}    | ${'false'}    | ${'https://dl.cloudsmith.io/public/shivammathur/composer-cache/raw/files/composer-7.4-2.phar'}          | ${'https://getcomposer.org/composer-2.phar'}
+    ${'latest'}    | ${'7.4'}    | ${'true'}     | ${'https://artifacts.setup-php.com/composer/composer-7.4-stable.phar'}                                  | ${'https://getcomposer.org/composer-stable.phar'}
+    ${'stable'}    | ${'7.4'}    | ${'true'}     | ${'https://artifacts.setup-php.com/composer/composer-7.4-stable.phar'}                                  | ${'https://getcomposer.org/composer-stable.phar'}
+    ${'snapshot'}  | ${'7.4'}    | ${'true'}     | ${'https://artifacts.setup-php.com/composer/composer-7.4-snapshot.phar'}                                | ${'https://getcomposer.org/composer.phar'}
+    ${'preview'}   | ${'7.4'}    | ${'true'}     | ${'https://artifacts.setup-php.com/composer/composer-7.4-preview.phar'}                                 | ${'https://getcomposer.org/composer-preview.phar'}
+    ${'1'}         | ${'7.4'}    | ${'false'}    | ${'https://artifacts.setup-php.com/composer/composer-7.4-1.phar'}                                       | ${'https://getcomposer.org/composer-1.phar'}
+    ${'2'}         | ${'7.4'}    | ${'false'}    | ${'https://artifacts.setup-php.com/composer/composer-7.4-2.phar'}                                       | ${'https://getcomposer.org/composer-2.phar'}
     ${'latest'}    | ${'7.1'}    | ${'true'}     | ${'https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.1-stable.phar'}   | ${'https://getcomposer.org/download/latest-2.2.x/composer.phar'}
     ${'stable'}    | ${'7.1'}    | ${'true'}     | ${'https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.1-stable.phar'}   | ${'https://getcomposer.org/download/latest-2.2.x/composer.phar'}
     ${'snapshot'}  | ${'7.1'}    | ${'true'}     | ${'https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.1-snapshot.phar'} | ${'https://getcomposer.org/download/latest-2.2.x/composer.phar'}
     ${'preview'}   | ${'7.1'}    | ${'true'}     | ${'https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.1-preview.phar'}  | ${'https://getcomposer.org/download/latest-2.2.x/composer.phar'}
     ${'1'}         | ${'7.1'}    | ${'false'}    | ${'https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.1-1.phar'}        | ${'https://getcomposer.org/composer-1.phar'}
     ${'2'}         | ${'7.1'}    | ${'false'}    | ${'https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.1-2.phar'}        | ${'https://getcomposer.org/download/latest-2.2.x/composer.phar'}
-    ${'1.2.3'}     | ${'7.4'}    | ${'false'}    | ${'https://github.com/composer/composer/releases/download/1.2.3/composer.phar'}                         | ${'https://getcomposer.org/composer-1.2.3.phar'}
-    ${'1.2.3-RC1'} | ${'7.4'}    | ${'false'}    | ${'https://github.com/composer/composer/releases/download/1.2.3-RC1/composer.phar'}                     | ${'https://getcomposer.org/composer-1.2.3-RC1.phar'}
+    ${'1.2.3'}     | ${'7.4'}    | ${'false'}    | ${'https://github.com/composer/composer/releases/download/1.2.3/composer.phar'}                         | ${'https://getcomposer.org/download/1.2.3/composer.phar'}
+    ${'1.2.3-RC1'} | ${'7.4'}    | ${'false'}    | ${'https://github.com/composer/composer/releases/download/1.2.3-RC1/composer.phar'}                     | ${'https://getcomposer.org/download/1.2.3-RC1/composer.phar'}
   `(
     'checking addComposer: $version, $php_version, $no_tool_cache',
     async ({version, php_version, no_tool_cache, cache_url, source_url}) => {
@@ -395,7 +453,7 @@ describe('Tools tests', () => {
     [
       'blackfire, blackfire-player, box, churn, cs2pr, flex, grpc_php_plugin, mago, name-collision-detector, parallel-lint, php-cs-fixer, php-scoper, phpDocumentor, phplint, phpstan, phpunit, pecl, phing, phinx, phinx:1.2.3, phive, phpunit-bridge, phpunit-polyfills, pint, php-config, phpize, protoc, symfony, vapor, wp, pie',
       [
-        '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_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.4-stable.phar,https://artifacts.setup-php.com/composer/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_blackfire',
         'add_tool https://get.blackfire.io/blackfire-player-v1.22.0.phar blackfire-player "-V"',
         'add_tool https://github.com/box-project/box/releases/latest/download/box.phar box "--version"',
@@ -440,7 +498,7 @@ describe('Tools tests', () => {
     [
       'backward-compatibility-check, behat, blackfire, blackfire-player, churn, composer-dependency-analyser, composer-normalize, composer-require-checker, composer-unused, cs2pr:1.2.3, ecs, flex, grpc_php_plugin:1.2.3, infection, mago:0.26.1, name-collision-detector, 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, pie',
       [
-        '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_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.4-stable.phar,https://artifacts.setup-php.com/composer/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',
         'add_blackfire',
         'add_tool https://get.blackfire.io/blackfire-player-v1.22.0.phar blackfire-player "-V"',
@@ -492,7 +550,7 @@ describe('Tools tests', () => {
     [
       'blackfire, blackfire-player:1.2.3, cs2pr, churn, deployer, does_not_exist, flex, mago, name-collision-detector, phinx, phive:0.13.2, php-config, phpize, phpmd, simple-phpunit, symfony, wp, pie',
       [
-        '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-Tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.4-stable.phar,https://artifacts.setup-php.com/composer/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-Blackfire',
         'blackfire-player is not a windows tool',
         'Add-Tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/latest/download/cs2pr cs2pr "-V"',
@@ -524,7 +582,7 @@ describe('Tools tests', () => {
     [
       'composer:v1, codeception/codeception, prestissimo, hirak/prestissimo, composer-prefetcher, narrowspark/automatic-composer-prefetcher, phinx: 1.2, robmorgan/phinx: ^1.2, user/tool:1.2.3, user/tool:~1.2',
       [
-        'Add-Tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.4-1.phar,https://dl.cloudsmith.io/public/shivammathur/composer-cache/raw/files/composer-7.4-1.phar,https://getcomposer.org/composer-1.phar composer',
+        'Add-Tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.4-1.phar,https://artifacts.setup-php.com/composer/composer-7.4-1.phar,https://dl.cloudsmith.io/public/shivammathur/composer-cache/raw/files/composer-7.4-1.phar,https://getcomposer.org/composer-1.phar composer',
         'Add-ComposerTool codeception codeception codeception/ global',
         'Add-ComposerTool prestissimo prestissimo hirak/ global',
         'Add-ComposerTool automatic-composer-prefetcher automatic-composer-prefetcher narrowspark/ global',
@@ -573,10 +631,10 @@ describe('Tools tests', () => {
   it.each`
     tools_csv                                             | script
     ${'none'}                                             | ${''}
-    ${'none, phpunit'}                                    | ${'\nstep_log "Setup Tools"\nadd_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 latest\n\nadd_tool https://phar.phpunit.de/phpunit-7.4.0.phar,https://phar.phpunit.de/phpunit-7.phar phpunit "--version"'}
-    ${'composer:preview'}                                 | ${'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.4-preview.phar,https://dl.cloudsmith.io/public/shivammathur/composer-cache/raw/files/composer-7.4-preview.phar,https://getcomposer.org/composer-preview.phar composer preview'}
-    ${'composer, composer:v1'}                            | ${'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.4-1.phar,https://dl.cloudsmith.io/public/shivammathur/composer-cache/raw/files/composer-7.4-1.phar,https://getcomposer.org/composer-1.phar composer'}
-    ${'composer:v1, composer:preview, composer:snapshot'} | ${'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.4-snapshot.phar,https://dl.cloudsmith.io/public/shivammathur/composer-cache/raw/files/composer-7.4-snapshot.phar,https://getcomposer.org/composer.phar composer snapshot'}
+    ${'none, phpunit'}                                    | ${'\nstep_log "Setup Tools"\nadd_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.4-stable.phar,https://artifacts.setup-php.com/composer/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 latest\n\nadd_tool https://phar.phpunit.de/phpunit-7.4.0.phar,https://phar.phpunit.de/phpunit-7.phar phpunit "--version"'}
+    ${'composer:preview'}                                 | ${'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.4-preview.phar,https://artifacts.setup-php.com/composer/composer-7.4-preview.phar,https://dl.cloudsmith.io/public/shivammathur/composer-cache/raw/files/composer-7.4-preview.phar,https://getcomposer.org/composer-preview.phar composer preview'}
+    ${'composer, composer:v1'}                            | ${'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.4-1.phar,https://artifacts.setup-php.com/composer/composer-7.4-1.phar,https://dl.cloudsmith.io/public/shivammathur/composer-cache/raw/files/composer-7.4-1.phar,https://getcomposer.org/composer-1.phar composer'}
+    ${'composer:v1, composer:preview, composer:snapshot'} | ${'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.4-snapshot.phar,https://artifacts.setup-php.com/composer/composer-7.4-snapshot.phar,https://dl.cloudsmith.io/public/shivammathur/composer-cache/raw/files/composer-7.4-snapshot.phar,https://getcomposer.org/composer.phar composer snapshot'}
   `('checking composer setup: $tools_csv', async ({tools_csv, script}) => {
     expect(await tools.addTools(tools_csv, '7.4', 'linux')).toContain(script);
   });

examples/bedrock.yml

@@ -11,7 +11,7 @@ jobs:
         php-versions: ['7.4', '8.0', '8.1']
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP

examples/blackfire-player.yml

@@ -19,7 +19,7 @@ jobs:
         # blackfire-player supports PHP >= 5.5
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP

examples/blackfire.yml

@@ -19,7 +19,7 @@ jobs:
         # Blackfire supports PHP >= 5.3 on Ubuntu and macOS, and PHP >= 5.4 on Windows
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP

examples/cakephp-mysql.yml

@@ -28,7 +28,7 @@ jobs:
         options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP
@@ -75,7 +75,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP
@@ -108,7 +108,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP

examples/cakephp-postgres.yml

@@ -28,7 +28,7 @@ jobs:
         options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP
@@ -75,7 +75,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP
@@ -108,7 +108,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP

examples/cakephp.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ${{ matrix.operating-system }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP
@@ -47,7 +47,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP
@@ -79,7 +79,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP

examples/codeigniter.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ${{ matrix.operating-system }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP

examples/laminas-mvc.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ${{ matrix.operating-system }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP

examples/laravel-mysql.yml

@@ -37,7 +37,7 @@ jobs:
         php-versions: ['7.4', '8.0', '8.1']
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP

examples/laravel-postgres.yml

@@ -39,7 +39,7 @@ jobs:
         php-versions: ['7.4', '8.0', '8.1']
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP

examples/laravel.yml

@@ -12,7 +12,7 @@ jobs:
         php-versions: ['7.4', '8.0', '8.1']
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP

examples/lumen-mysql.yml

@@ -37,7 +37,7 @@ jobs:
         php-versions: ['7.4', '8.0', '8.1']
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP

examples/lumen-postgres.yml

@@ -39,7 +39,7 @@ jobs:
         php-versions: ['7.4', '8.0', '8.1']
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP

examples/lumen.yml

@@ -12,7 +12,7 @@ jobs:
         php-versions: ['7.4', '8.0', '8.1']
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP

examples/phalcon-mysql.yml

@@ -36,7 +36,7 @@ jobs:
         # php-versions: ['7.0', '7.1', '7.2', '7.3']
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP

examples/phalcon-postgres.yml

@@ -37,7 +37,7 @@ jobs:
         # php-versions: ['7.0', '7.1', '7.2', '7.3']
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP

examples/sage.yml

@@ -12,10 +12,10 @@ jobs:
         node-versions: ['16']
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v5
         with:
           node-version: ${{ matrix.node-versions }}
 

examples/slim-framework.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ${{ matrix.operating-system }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP

examples/symfony-mysql.yml

@@ -23,7 +23,7 @@ jobs:
         php-versions: ['7.4', '8.0', '8.1']
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP

examples/symfony-postgres.yml

@@ -23,7 +23,7 @@ jobs:
         php-versions: ['7.4', '8.0', '8.1']
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP

examples/symfony.yml

@@ -12,7 +12,7 @@ jobs:
         php-versions: ['7.4', '8.0', '8.1']
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP

examples/yii2-mysql.yml

@@ -29,10 +29,10 @@ jobs:
         php-versions: ['7.4', '8.0']
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set Node.js 10.x
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v5
         with:
           node-version: 10.x
 

examples/yii2-postgres.yml

@@ -29,10 +29,10 @@ jobs:
         php-versions: ['7.4', '8.0']
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set Node.js 10.x
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v5
         with:
           node-version: 10.x
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-php",
-  "version": "2.35.3",
+  "version": "2.36.0",
   "private": false,
   "description": "Setup PHP for use with GitHub Actions",
   "main": "lib/install.js",
@@ -36,33 +36,34 @@
   "dependencies": {
     "@actions/core": "^1.11.1",
     "@actions/exec": "^1.1.1",
-    "@actions/io": "^1.1.3",
+    "@actions/io": "^2.0.0",
     "compare-versions": "^6.1.1"
   },
   "devDependencies": {
-    "@eslint/compat": "^1.3.2",
-    "@eslint/js": "9.33.0",
+    "@eslint/compat": "^2.0.0",
+    "@eslint/js": "9.39.1",
     "@types/jest": "^30.0.0",
-    "@types/node": "^24.2.1",
-    "@typescript-eslint/eslint-plugin": "^8.39.0",
-    "@typescript-eslint/parser": "^8.39.0",
-    "@vercel/ncc": "^0.38.3",
-    "eslint": "9.33.0",
+    "@types/node": "^24.10.1",
+    "@typescript-eslint/eslint-plugin": "^8.48.0",
+    "@typescript-eslint/parser": "^8.48.0",
+    "@vercel/ncc": "^0.38.4",
+    "eslint": "9.39.1",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-jest": "^29.0.1",
+    "eslint-plugin-jest": "^29.2.1",
     "eslint-plugin-prettier": "^5.5.4",
-    "globals": "^16.3.0",
-    "jest": "^30.0.5",
-    "jest-circus": "^30.0.5",
-    "nock": "^14.0.9",
+    "globals": "^16.5.0",
+    "jest": "^30.2.0",
+    "jest-circus": "^30.2.0",
+    "nock": "^14.0.10",
     "prettier": "^3.6.2",
     "simple-git-hooks": "^2.13.1",
-    "ts-jest": "^29.4.1",
-    "typescript": "^5.9.2"
+    "ts-jest": "^29.4.5",
+    "typescript": "^5.9.3"
   },
   "overrides": {
-    "test-exclude": "^7.0.1"
+    "test-exclude": "^7.0.1",
+    "glob": "^11.1.0"
   },
   "bugs": {
     "url": "https://github.com/shivammathur/setup-php/issues"

src/configs/brew_extensions

@@ -29,6 +29,7 @@ protobuf=protobuf
 psr=psr
 raphf=raphf
 rdkafka=rdkafka
+phpredis=redis
 redis=redis
 snmp=snmp
 sqlsrv=sqlsrv

src/configs/darwin_libs

@@ -0,0 +1,22 @@
+amqp=rabbitmq-c
+decimal=mpdecimal
+ev=libev
+event=libevent
+geoip=geoip
+gmagick=graphicsmagick
+gnupg=gpgme
+grpc=grpc protobuf
+imagick=imagemagick
+memcached=libmemcached libevent
+protobuf=protobuf
+rdkafka=librdkafka
+snappy=snappy
+sodium=libsodium
+ssh2=libssh2
+uv=libuv
+uuid=util-linux
+vips=vips
+yaz=yaz
+yaml=libyaml
+zstd=zstd
+zmq=zeromq

src/configs/ini/jit_aarch64.ini

@@ -0,0 +1,3 @@
+opcache.enable=1
+opcache.jit_buffer_size=128M
+opcache.jit=1235

src/configs/linux_libs

@@ -0,0 +1,22 @@
+amqp=librabbitmq-dev
+decimal=libmpdec-dev
+ev=libev-dev
+event=libevent-dev
+geoip=libgeoip-dev
+gmagick=graphicsmagick-libmagick-dev-compat
+gnupg=libgpgme-dev
+grpc=libgrpc-dev libprotobuf-dev protobuf-compiler
+imagick=libmagickwand-dev libmagickcore-dev
+memcached=libmemcached-dev libevent-dev
+protobuf=libprotobuf-dev protobuf-compiler
+rdkafka=librdkafka-dev
+snappy=libsnappy-dev
+sodium=libsodium-dev
+ssh2=libssh2-1-dev
+uv=libuv1-dev
+uuid=uuid-dev
+vips=libvips-dev
+yaz=libyaz-dev
+yaml=libyaml-dev
+zstd=libzstd-dev
+zmq=libzmq3-dev

src/configs/php-versions.json

@@ -1,9 +1,10 @@
 {
   "lowest": "8.1",
-  "highest": "8.4",
-  "latest": "8.4",
-  "nightly": "8.5",
+  "highest": "8.5",
+  "latest": "8.5",
+  "nightly": "8.6",
+  "master": "8.6",
   "5.x": "5.6",
   "7.x": "7.4",
-  "8.x": "8.4"
+  "8.x": "8.5"
 }

src/configs/tools.json

@@ -266,7 +266,8 @@
     "type": "custom-package",
     "repository": "symfony-cli/symfony-cli",
     "domain": "https://github.com",
-    "version_prefix": "-V"
+    "version_prefix": "v",
+    "version_parameter": "-V"
   },
   "blackfire-player": {
     "type": "custom-function",

src/extensions.ts

@@ -32,17 +32,19 @@ export async function addExtensionDarwin(
         add_script += await utils.parseExtensionSource(extension, ext_prefix);
         return;
       // match 7.4relay...8.5relay
-      // match 5.3blackfire...8.4blackfire
-      // match 5.3blackfire-(semver)...8.4blackfire-(semver)
-      // match couchbase, event, geos, pdo_oci, oci8, http, pecl_http
+      // match 5.3blackfire...8.5blackfire
+      // match 5.3blackfire-(semver)...8.5blackfire-(semver)
+      // match couchbase, event, geos, ibm_db2, pdo_ibm, pdo_oci, oci8, http, pecl_http
       // 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-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
+      case /^(7\.4|8\.[0-5])relay(-v?\d+\.\d+\.\d+|-nightly)?$/.test(
         version_extension
       ):
-      case /^couchbase|^event|^gearman$|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(
+      case /^(5\.[3-6]|7\.[0-4]|8\.[0-5])blackfire(-\d+\.\d+\.\d+)?$/.test(
+        version_extension
+      ):
+      case /^couchbase|^event|^gearman$|^geos$|^ibm_db2$|^pdo_ibm$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(
         extension
       ):
       case /^(5\.[3-6]|7\.[0-4]|8\.[0-4])ioncube$/.test(version_extension):
@@ -134,17 +136,19 @@ export async function addExtensionWindows(
       case /^none$/.test(ext_name):
         add_script += '\nDisable-AllShared';
         break;
-      // match 5.3blackfire...8.4blackfire
-      // match 5.3blackfire-(semver)...8.4blackfire-(semver)
-      // match pdo_oci and oci8
+      // match 5.3blackfire...8.5blackfire
+      // match 5.3blackfire-(semver)...8.5blackfire-(semver)
+      // match ibm_db2, pdo_ibm, pdo_oci and oci8
       // 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.4zephir_parser
-      case /^(5\.[3-6]|7\.[0-4]|8\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
+      case /^(5\.[3-6]|7\.[0-4]|8\.[0-5])blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
-      case /^pdo_oci$|^oci8$|^pdo_firebird$/.test(extension):
+      case /^ibm_db2$|^pdo_ibm$|^pdo_oci$|^oci8$|^pdo_firebird$/.test(
+        extension
+      ):
       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
@@ -264,21 +268,23 @@ export async function addExtensionLinux(
         add_script += await utils.parseExtensionSource(extension, ext_prefix);
         return;
       // match 7.4relay...8.5relay
-      // match 5.3blackfire...8.4blackfire
-      // match 5.3blackfire-(semver)...8.4blackfire-(semver)
+      // match 5.3blackfire...8.5blackfire
+      // match 5.3blackfire-(semver)...8.5blackfire-(semver)
       // match 5.3pdo_cubrid...7.2php_cubrid, 5.3cubrid...7.4cubrid
-      // match couchbase, geos, pdo_oci, oci8, http, pecl_http
+      // match couchbase, geos, ibm_db2, pdo_ibm, pdo_oci, oci8, http, pecl_http
       // 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-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
+      case /^(7\.4|8\.[0-5])relay(-v?\d+\.\d+\.\d+|-nightly)?$/.test(
+        version_extension
+      ):
+      case /^(5\.[3-6]|7\.[0-4]|8\.[0-5])blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
       case /^((5\.[3-6])|(7\.[0-2]))pdo_cubrid$|^((5\.[3-6])|(7\.[0-4]))cubrid$/.test(
         version_extension
       ):
-      case /^couchbase|^event|^gearman$|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(
+      case /^couchbase|^event|^gearman$|^geos$|^ibm_db2$|^pdo_ibm$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(
         extension
       ):
       case /(?<!5\.[3-5])intl-\d+\.\d+$/.test(version_extension):

src/install.ts

@@ -59,10 +59,10 @@ export async function setEnv(): Promise<void> {
  * Run the script
  */
 export async function run(): Promise<void> {
+  await setEnv();
   const os: string = process.platform;
   const tool = await utils.scriptTool(os);
   const run_path = await getScript(os);
-  await setEnv();
   await exec(tool + run_path);
 }
 

src/scripts/darwin.sh

@@ -39,10 +39,21 @@ get_extension_from_formula() {
   local formula=$1
   local extension
   extension=$(grep -E "^$formula=" "$src"/configs/brew_extensions | cut -d '=' -f 2)
-  [[ -z "$extension" ]] && extension="$(echo "$formula" | sed -E "s/pecl_|[0-9]//g")"
+  [[ -z "$extension" ]] && extension="$(echo "$formula" | sed -E "s/pecl_|php|[0-9]//g")"
   echo "$extension"
 }
 
+# Function to get renamed formula.
+get_renamed_formula() {
+  local formula=$1
+  formula_renames_json="$tap_dir/$ext_tap/formula_renames.json"
+  if [ -e "$formula_renames_json" ] && grep -q "$formula@$version\":" "$formula_renames_json"; then
+    grep "$formula@$version\":" "$formula_renames_json" | cut -d ':' -f 2 | tr -d ' ",' | cut -d '@' -f 1
+  else
+    echo "$formula"
+  fi
+}
+
 # Function to copy extension binaries to the extension directory.
 copy_brew_extensions() {
   local formula=$1
@@ -69,6 +80,7 @@ add_brew_extension() {
   else
     add_brew_tap "$php_tap"
     add_brew_tap "$ext_tap"
+    formula="$(get_renamed_formula "$formula")"
     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
@@ -134,9 +146,9 @@ patch_brew() {
 update_dependencies() {
   patch_brew
   if ! [ -e /tmp/update_dependencies ]; then
-    for repo in "$brew_repo" "$core_repo"; do
+    for repo in "$brew_repo" "${core_repo:?}"; do
       if [ -e "$repo" ]; then
-        git_retry -C "$repo" fetch origin master && git -C "$repo" reset --hard origin/master
+        git_retry -C "$repo" fetch origin main && git -C "$repo" reset --hard origin/main
       fi
     done
     echo '' | sudo tee /tmp/update_dependencies >/dev/null 2>&1
@@ -148,9 +160,9 @@ get_brewed_php() {
   cellar="$brew_prefix"/Cellar
   php_cellar="$cellar"/php
   if [ -d "$cellar" ] && ! [[ "$(find "$cellar" -maxdepth 1 -name "php@$version*" | wc -l 2>/dev/null)" -eq 0 ]]; then
-    php_semver | cut -c 1-3
+    php_semver
   elif [ -d "$php_cellar" ] && ! [[ "$(find "$php_cellar" -maxdepth 1 -name "$version*" | wc -l 2>/dev/null)" -eq 0 ]]; then
-    php_semver | cut -c 1-3
+    php_semver
   else
     echo 'false';
   fi
@@ -160,17 +172,25 @@ get_brewed_php() {
 add_php() {
   action=$1
   existing_version=$2
-  add_brew_tap "$php_tap"
-  update_dependencies
   suffix="$(get_php_formula_suffix)"
-  php_formula="shivammathur/php/php@$version$suffix"
-  if [[ "$existing_version" != "false" && -z "$suffix" ]]; then
-    ([ "$action" = "upgrade" ] && brew upgrade -f --overwrite "$php_formula") || brew unlink "$php_formula"
-  else
-    brew install -f --overwrite "$php_formula"
+  php_keg="php@$version$suffix"
+  php_formula="shivammathur/php/$php_keg"
+  if [[ "$existing_version" = "false" || -n "$suffix" || "$action" = "upgrade" ]]; then
+    update_dependencies
+    add_brew_tap "$php_tap"
   fi
-  sudo chown -R "$(id -un)":"$(id -gn)" "$brew_prefix"
-  brew link --force --overwrite "$php_formula"
+  if [[ "$existing_version" != "false" && -z "$suffix" ]]; then
+    if [ "$action" = "upgrade" ]; then
+      brew install --only-dependencies "$php_formula"
+      brew upgrade -f --overwrite "$php_formula"
+    else
+      brew unlink "$php_keg"
+    fi
+  else
+    brew install --only-dependencies "$php_formula"
+    brew install -f --overwrite "$php_formula" 2>/dev/null || brew upgrade -f --overwrite "$php_formula"
+  fi
+  brew link --force --overwrite "$php_keg" || (sudo chown -R "$(id -un)":"$(id -gn)" "$brew_prefix" && brew link --force --overwrite "$php_keg")
 }
 
 # Function to get formula suffix
@@ -222,18 +242,18 @@ setup_php() {
   update=true
   check_pre_installed
   existing_version=$(get_brewed_php)
+  status="Found"
   if [[ "$version" =~ ${old_versions:?} ]]; then
     run_script "php5-darwin" "${version/./}" >/dev/null 2>&1
     status="Installed"
-  elif [ "$existing_version" != "$version" ]; then
+  elif [ "${existing_version:0:3}" != "$version" ]; then
     add_php "install" "$existing_version" >/dev/null 2>&1
     status="Installed"
-  elif [ "$existing_version" = "$version" ]; then
-    if [ "${update:?}" = "true" ]; then
+  elif [[ "${existing_version:0:3}" = "$version" && "${update:?}" = "true" ]]; then
+    brew_php_version="$(brew info --json "php@$version" 2>/dev/null | jq -r '.[].versions.stable')"
+    if [ "$brew_php_version" != "$existing_version" ]; then
       add_php "upgrade" "$existing_version" >/dev/null 2>&1
-      status="Updated to"
-    else
-      status="Found"
+      status="Upgraded"
     fi
   fi
   php_config="$(command -v php-config)"
@@ -258,7 +278,7 @@ setup_php() {
 }
 
 # Variables
-version=${1:-'8.4'}
+version=${1:-'8.5'}
 ini=${2:-'production'}
 src=${0%/*}/..
 php_formula=shivammathur/php/php@"$version"

src/scripts/extensions/add_extensions.sh

@@ -1,8 +1,10 @@
 # Function to log result of installing extension.
 add_extension_log() {
-  (
-    check_extension "$(echo "$1" | cut -d '-' -f 1)" && add_log "${tick:?}" "$1" "$2"
-  ) || add_log "${cross:?}" "$1" "Could not install $1 on PHP ${semver:?}"
+  if check_extension ${1%%-*}; then
+    add_log "${tick:?}" "$1" "$2"
+  else
+    add_log "${cross:?}" "$1" "${3:-Could not install $1 on PHP ${semver:?}}"
+  fi
 }
 
 # Function to test if extension is loaded.

src/scripts/extensions/gearman.sh

@@ -4,8 +4,10 @@ add_gearman_helper() {
   enable_extension gearman extension
   if ! check_extension gearman; then
     status="Installed and enabled"
-    if [[ "${version:?}" =~ 5.[3-5] ]]; then
+    if [[ "${version:?}" =~ 5.[3-6] ]]; then
       pecl_install gearman-1.1.2
+    elif [[ "${version:?}" =~ 7.0 ]]; then
+      pecl_install gearman-2.1.3
     else
       install_packages php"${version:?}"-gearman || pecl_install gearman
     fi

src/scripts/extensions/ibm.ps1

@@ -0,0 +1,56 @@
+# Function to log license information for ibm extensions.
+Function Add-LicenseLog() {
+  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 "IBM Db2 ODBC and CLI Driver is required for %s extension.\n" $extension
+  printf "It is provided under the IBM International Program License Agreement.\n"
+  printf "Refer to: \033[35;1m%s \033[0m\n" "https://www.ibm.com/support/pages/db2-odbc-cli-driver-download-and-installation-information"
+  $licensePath = "$php_dir\clidriver\license\odbc_notices.rtf"
+  if (Test-Path $licensePath) {
+    Add-Type -AssemblyName System.Windows.Forms
+    $rtBox = New-Object System.Windows.Forms.RichTextBox
+    $rtBox.Rtf = [System.IO.File]::ReadAllText($licensePath);
+    Write-Host $rtBox.Text;
+  }
+  Write-Output "$env:END_GROUP"
+}
+
+# Function to install IBM Db2 CLI driver.
+Function Add-IbmCli() {
+  $cliPath = "$php_dir\clidriver"
+  if (-not (Test-Path "$cliPath\bin")) {
+    $suffix = if ($arch -eq 'x86') { 'nt32' } else { 'ntx64' }
+    $archive = "$suffix`_odbc_cli.zip"
+    $destination = "$ENV:RUNNER_TOOL_CACHE\ibm_cli.zip"
+    Get-File -Url "https://public.dhe.ibm.com/ibmdl/export/pub/software/data/db2/drivers/odbc_cli/$archive" -OutFile $destination > $null 2>&1
+    Expand-Archive -Path $destination -DestinationPath $php_dir -Force > $null 2>&1
+  }
+  $env:IBM_DB_HOME = $cliPath
+  $env:LD_LIBRARY_PATH = "$cliPath\bin;$cliPath\lib;$env:LD_LIBRARY_PATH"
+  Add-Path "$cliPath\bin"
+  $env:PATH = "$cliPath\bin;$env:PATH"
+}
+
+# Function to install ibm_db2 and pdo_ibm.
+Function Add-Ibm() {
+  Param (
+    [Parameter(Position = 0, Mandatory = $true)]
+    [ValidateNotNull()]
+    [ValidateSet('ibm_db2', 'pdo_ibm')]
+    [string]
+    $extension
+  )
+  try {
+    $status = 'Enabled'
+    Add-IbmCli
+    if (Test-Path "$ext_dir\php_$extension.dll") {
+      Enable-PhpExtension -Extension $extension -Path $php_dir
+    } else {
+      Add-Extension $extension 
+      $status = 'Installed and enabled'
+    }
+    Add-ExtensionLog $extension $status
+    Add-LicenseLog
+  } catch {
+    Add-Log $cross $extension "Could not install $extension on PHP $( $installed.FullVersion )"
+  }
+}

src/scripts/extensions/ibm.sh

@@ -0,0 +1,106 @@
+# Function to log license details for ibm extensions.
+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 "IBM Db2 ODBC and CLI Driver is required for %s extension.\n" "$ext"
+  printf "Refer to: \033[35;1m%s \033[0m\n" "https://www.ibm.com/support/pages/db2-odbc-cli-driver-download-and-installation-information"
+  local license_file="$ibm_cli/license/odbc_notices.txt"
+  if [ -f "$license_file" ]; then
+    cat "$license_file"
+  fi
+  echo "$END_GROUP"
+}
+
+# Function to determine the driver archive for the current platform.
+get_cli_archive() {
+  local os=$1
+  local arch=$2
+  case $os in
+    Linux)
+      case $arch in
+        x86_64|amd64) echo "linuxx64_odbc_cli.tar.gz";;
+        i?86) echo "linuxia32_odbc_cli.tar.gz";;
+        *) return 1;;
+      esac
+      ;;
+    Darwin)
+      case $arch in
+        x86_64) echo "macos64_odbc_cli.tar.gz";;
+        arm64|aarch64) echo "macarm64_odbc_cli.tar.gz";;
+        *) return 1;;
+      esac
+      ;;
+    *)
+      return 1
+      ;;
+  esac
+}
+
+# Function to install IBM Db2 CLI driver.
+add_cli_driver() {
+  local os arch archive url tmp libs
+  if [ -d "$ibm_cli" ]; then
+    return 0
+  fi
+  os=$(uname -s)
+  arch=$(uname -m)
+  archive=$(get_cli_archive "$os" "$arch") || return 1
+  url="https://public.dhe.ibm.com/ibmdl/export/pub/software/data/db2/drivers/odbc_cli/$archive"
+  tmp=/tmp/$archive
+  get -q -n "$tmp" "$url"
+  sudo mkdir -p "$ibm_home"
+  sudo tar -xzf "$tmp" -C "$ibm_home"
+  sudo rm -f "$tmp"
+  if [ ! -d "$ibm_cli" ]; then
+    local extracted
+    extracted=$(find "$ibm_home" -maxdepth 1 -type d -name 'clidriver*' | head -n 1)
+    [ -n "$extracted" ] && sudo mv "$extracted" "$ibm_cli"
+  fi
+  if [ "$os" = "Linux" ]; then
+    echo "$ibm_cli/lib" | sudo tee /etc/ld.so.conf.d/ibm_db2.conf >/dev/null
+    sudo ldconfig
+  else
+    libs='/usr/local/lib'
+    sudo mkdir -p "$libs"
+    sudo ln -sf "$ibm_cli"/lib/*.dylib "$libs" >/dev/null 2>&1 || true
+  fi
+}
+
+# Function to install ibm_db2 and pdo_ibm.
+add_ibm_helper() {
+  if ! shared_extension "$ext"; then
+    status='Installed and enabled'
+    export IBM_DB_HOME="$ibm_cli"
+    export LD_LIBRARY_PATH="$IBM_DB_HOME/lib"
+    add_env DYLD_LIBRARY_PATH "$IBM_DB_HOME/lib"
+    local configure_flag
+    if [ "$ext" = 'ibm_db2' ]; then
+      configure_flag="--with-IBM_DB2=$IBM_DB_HOME"
+    else
+      configure_flag="--with-pdo-ibm=$IBM_DB_HOME"
+    fi
+    read -r "${ext}_CONFIGURE_OPTS" <<< "--with-php-config=$(command -v php-config) $configure_flag"
+    patch_phpize
+    add_extension_from_source "$ext" https://github.com php "pecl-database-$ext" master extension get
+    restore_phpize
+  else
+    enable_extension "$ext" extension
+  fi
+}
+
+# Function to add ibm_db2 and pdo_ibm.
+add_ibm() {
+  ext=$1
+  status='Enabled'
+  ibm_home='/opt/ibm'
+  ibm_cli=$ibm_home/clidriver
+  if ! add_cli_driver >/dev/null 2>&1; then
+    add_log "${cross:?}" "$ext" "IBM Db2 CLI driver is not available on $(uname -s)/$(uname -m)"
+    return 1
+  fi
+  add_ibm_helper >/dev/null 2>&1
+  add_extension_log "$ext" "$status"
+  check_extension "$ext" && add_license_log
+}
+
+# shellcheck source=.
+. "${scripts:?}"/extensions/patches/phpize.sh

src/scripts/extensions/intl.sh

@@ -11,13 +11,14 @@ install_icu() {
 # Function to add ext-intl with the given version of ICU
 add_intl() {
   icu=$(echo "$1" | cut -d'-' -f 2)
-  supported_version=$(get -s -n "" https://api.github.com/repos/shivammathur/icu-intl/releases | grep -Po "${icu//./\\.}" | head -n 1)
-  if [ "$icu" != "$supported_version" ]; then
-    add_log "${cross:?}" "intl" "ICU $icu is not supported"
+  supported_version=$(get -s -n "" https://api.github.com/repos/shivammathur/icu-intl/releases/tags/intl-"$icu" | grep -Po "php${version?}-intl-$icu" | head -n 1)
+  [ -z "$supported_version" ] && supported_version=$(get -s -n "" https://github.com/shivammathur/icu-intl/releases/expanded_assets/intl-"$icu" | grep -Po "php$version-intl-$icu" | head -n 1)
+  if [ "php$version-intl-$icu" != "$supported_version" ]; then
+    add_log "${cross:?}" "intl" "ICU $icu is not supported for PHP $version"
   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$arch_suffix.so"
+    get -q -n "${ext_dir:?}/intl.so" "https://github.com/shivammathur/icu-intl/releases/download/intl-$icu/php${version:?}-intl-$icu$suffix$arch_suffix.so"
     enable_extension intl extension
     add_extension_log intl "Installed and enabled with ICU $icu"
   fi

src/scripts/extensions/oci.sh

@@ -38,7 +38,7 @@ add_client() {
       sudo mv "$icdir"/* "$oracle_client"/
     done
     sudo mkdir -p "$libs"
-    sudo ln -sf /opt/oracle/instantclient/*.$lib_ext* $libs
+    sudo ln -sf /opt/oracle/instantclient/*."$lib_ext"* "$libs"
     if [ "$os" = "Linux" ]; then
       [ -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
@@ -49,6 +49,7 @@ add_client() {
 add_oci_helper() {
   if ! shared_extension "$ext"; then
     status='Installed and enabled'
+    read -r "${ext}_CONFIGURE_PREFIX_OPTS" <<< "CFLAGS=-Wno-incompatible-function-pointer-types"
     read -r "${ext}_LINUX_LIBS" <<< "libaio-dev"
     read -r "${ext}_CONFIGURE_OPTS" <<< "--with-php-config=$(command -v php-config) --with-${ext/_/-}=instantclient,$oracle_client"
     patch_phpize

src/scripts/extensions/patches/amqp.sh

@@ -0,0 +1,5 @@
+patch_amqp() {
+  if [[ $(printf '%s\n%s\n' "${version:?}" "8.5" | sort -V | head -n1) == "8.5" ]]; then
+    get -q -n amqp_connection_resource.c https://raw.githubusercontent.com/remicollet/php-amqp/977449987412a3d5c59a036dbab8b6d67764bb3e/amqp_connection_resource.c
+  fi
+}

src/scripts/extensions/patches/common.sh

@@ -1,12 +1,35 @@
-process_file() {
-    local file=$1
-    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"
+patch_84() {
+  sed -i.bak \
+    -e '0,/#include.*\(php_lcg.h\|php_mt_rand.h\|php_rand.h\|standard\/php_random\.h\).*/s//#include <ext\/random\/php_random.h>/' \
+    -e '/#include.*\(php_lcg.h\|php_mt_rand.h\|php_rand.h\|standard\/php_random\.h\)/d' \
+    "$1" && rm -rf *.bak
 }
 
-export -f process_file
+patch_85() {
+  sed -i.bak \
+    -e 's#ext/standard/php_smart_string.h#Zend/zend_smart_string.h#g' \
+    -e 's#ext/standard/php_smart_string_public.h#Zend/zend_smart_string.h#g' \
+    -e 's#zend_exception_get_default(TSRMLS_C)#zend_ce_exception#g' \
+    -e 's#zend_exception_get_default()#zend_ce_exception#g' \
+    "$1" && rm -rf *.bak
+}
 
-# Compare with 8.3 so it runs only on 8.4 and above
-if [[ $(printf "%s\n%s" "${version:?}" "8.3" | sort -V | head -n1) != "$version" ]]; then
-  find . -type f \( -name "*.c" -o -name "*.h" \) -exec bash -c 'process_file "$0"' {} \;
+version_ge() {
+  ver=$1
+  min=$2
+  [[ $(printf '%s\n%s\n' "$ver" "$min" | sort -V | head -n1) == "$min" ]]
+}
+
+if version_ge "${version:?}" "8.4"; then
+  while IFS= read -r file; do
+    patch_84 "$file"
+  done < <(grep -rlE 'php_lcg\.h|php_mt_rand\.h|php_rand\.h|standard/php_random\.h' \
+           --include='*.c' --include='*.h' . || true)
+fi
+
+if version_ge "${version:?}" "8.5"; then
+  while IFS= read -r file; do
+    patch_85 "$file"
+  done < <(grep -rlE 'ext/standard/php_smart_string(_public)?\.h|zend_exception_get_default' \
+           --include='*.c' --include='*.h' . || true)
 fi

src/scripts/extensions/patches/gearman.sh

@@ -1,5 +0,0 @@
-patch_gearman() {
-  if [[ "${version:?}" =~ ${nightly_versions:?} ]]; then
-    sed -i~ -e "s/zend_exception_get_default()/zend_ce_exception/" php_gearman.c
-  fi
-}

src/scripts/extensions/patches/geos.sh

@@ -1,11 +1,7 @@
 patch_geos() {
-  php_version_id="$(php -r "echo PHP_VERSION_ID;")"
-  if [ "$php_version_id" -ge 70000 ]; then
+  if [[ $(printf '%s\n%s\n' "${version:?}" "7.0" | sort -V | head -n1) == "7.0" ]]; then
     sed -i~ -e "s/, ce->name/, ZSTR_VAL(ce->name)/; s/ulong /zend_ulong /" geos.c
   fi
-  if [ "$php_version_id" -ge 80500 ]; then
-    sed -i~ -e "s/zend_exception_get_default(TSRMLS_C)/zend_ce_exception/" geos.c
-  fi
   get -q -n /tmp/php8.patch https://git.remirepo.net/cgit/rpms/php/php-geos.git/plain/0003-add-all-arginfo-and-fix-build-with-PHP-8.patch
   get -q -n /tmp/toString.patch https://git.remirepo.net/cgit/rpms/php/php-geos.git/plain/0006-fix-__toString-with-8.2.patch
   patch -p1 < /tmp/php8.patch 2>/dev/null || true

src/scripts/extensions/patches/pdo_oci.sh

@@ -1,5 +1,8 @@
 patch_pdo_oci() {
   get -q -n config.m4 https://raw.githubusercontent.com/php/php-src/PHP-8.0/ext/pdo_oci/config.m4
+  if [[ $(printf '%s\n%s\n' "${version:?}" "8.5" | sort -V | head -n1) == "8.5" ]]; then
+    get -q -n pdo_oci.c https://raw.githubusercontent.com/shivammathur/pecl-database-pdo_oci/a9cf2c53b6de46f9e5f523bcd11fd344e3beeb85/pdo_oci.c
+  fi
   if [[ ${version:?} =~ 5.[3-6] ]]; then
     sudo sed -i '' "/PHP_CHECK_PDO_INCLUDES/d" config.m4 2>/dev/null || sudo sed -i "/PHP_CHECK_PDO_INCLUDES/d" config.m4
   fi

src/scripts/extensions/patches/pdo_sqlsrv.sh

@@ -0,0 +1,5 @@
+if [[ $(printf '%s\n%s\n' "${version:?}" "8.5" | sort -V | head -n1) == "8.5" ]]; then
+  sed -i.bak -e 's/zval_ptr_dtor( &dbh->query_stmt_zval );/OBJ_RELEASE(dbh->query_stmt_obj);dbh->query_stmt_obj = NULL;/' php_pdo_sqlsrv_int.h
+  sed -i.bak -e 's/pdo_error_mode prev_err_mode/uint8_t prev_err_mode/g' pdo_dbh.cpp
+  rm -rf *.bak
+fi

src/scripts/extensions/patches/phpize.sh

@@ -3,7 +3,8 @@ get_phpize() {
   if [[ "${version:?}" =~ 5.[3-5] ]]; then
     echo '/opt/local/bin/phpize'
   else
-    echo "/usr/local/bin/$(readlink /usr/local/bin/phpize)"
+    [ -n "$brew_prefix" ] && phpize_dir="$brew_prefix" || phpize_dir="/usr/local/bin"
+    echo "${phpize_dir}/bin/$(readlink ${phpize_dir}/bin/phpize)"
   fi
 }
 

src/scripts/extensions/relay.sh

@@ -2,11 +2,9 @@
 get_relay_version() {
  local ext=$1
   if [[ "$ext" =~ ^relay$ ]]; then
-    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
+    get -s -n "" "${relay_release:?}"
+  elif [[ $ext =~ ^relay-nightly$ ]]; then
+    echo "dev"
   else
     relay_version="${ext##*-}"
     echo "v${relay_version/v//}"
@@ -48,19 +46,6 @@ change_library_paths() {
   fi
 }
 
-# Add hiredis library
-add_hiredis_1.1.0() {
-  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
@@ -69,13 +54,8 @@ add_relay_dependencies() {
   if [ "$os" = "Darwin" ]; then
     . "${0%/*}"/tools/brew.sh
     configure_brew
-    if [ "$relay_version" = "v0.7.0" ]; then
-      brew install lz4 zstd concurrencykit
-      add_hiredis_1.1.0 >/dev/null 2>&1
-    else
     brew install lz4 hiredis zstd concurrencykit
   fi
-  fi
 }
 
 # Initialize relay extension ini configuration
@@ -128,7 +108,7 @@ configure_relay() {
 
 # Helper function to add relay extension
 add_relay_helper() {
-  arch="$(uname -m | sed 's/_/-/')"
+  local arch=$1
   os_suffix="$(get_os_suffix)"
   openssl_suffix="$(get_openssl_suffix)"
   artifact_file_name="relay-$relay_version-php${version:?}-$os_suffix-$arch$openssl_suffix.tar.gz"
@@ -152,17 +132,24 @@ add_relay() {
   local ext=$1
   local arch
   local url
+  local message
+  local error
   os=$(uname -s)
-  relay_releases=https://github.com/cachewerk/relay/releases
+  arch="$(uname -m | sed 's/_/-/')"
+  relay_release=https://builds.r2.relay.so/meta/latest
   relay_trunk=https://builds.r2.relay.so
+  if [[ "$arch" = "x86-64" && "$os" = "Darwin" ]]; then
+    error="Relay extension is not available for macOS x86_64 architecture"
+  else
     relay_version=$(get_relay_version "$ext")
     add_relay_dependencies >/dev/null 2>&1
     if shared_extension relay; then
       message="Enabled"
     else
-    add_relay_helper >/dev/null 2>&1
-    message="Installed and enabled"
+      add_relay_helper "$arch" >/dev/null 2>&1
+      message="Installed and enabled ${relay_version}"
     fi
     configure_relay >/dev/null 2>&1
-  add_extension_log relay "$message"
+  fi
+  add_extension_log relay "$message" "$error"
 }

src/scripts/extensions/source.sh

@@ -1,3 +1,7 @@
+os="$(uname -s)"
+os_lower=$(echo "$os" | tr '[:upper:]' '[:lower:]')
+os_capital=$(echo "$os" | tr '[:lower:]' '[:upper:]')
+
 # Function to parse extension environment variables
 parse_args() {
   local extension=${1%-*}
@@ -36,7 +40,7 @@ add_lib_log() {
 # Function to check if a library is installed
 check_lib() {
   local lib=$1
-  if [ "$(uname -s)" = "Linux" ]; then
+  if [ "$os" = "Linux" ]; then
     [ "x$(dpkg -s "$lib" 2>/dev/null | grep Status)" != "x" ]
   else
     [ "x$(find "${brew_prefix:?}"/Cellar -maxdepth 1 -name "$lib")" != "x" ]
@@ -68,7 +72,7 @@ add_darwin_libs() {
 add_libs() {
   local all_libs=("$@")
   for lib in "${all_libs[@]}"; do
-    if [ "$(uname -s)" = "Linux" ]; then
+    if [ "$os" = "Linux" ]; then
       add_linux_libs "$lib"
     else
       add_darwin_libs "$lib"
@@ -76,6 +80,19 @@ add_libs() {
   done
 }
 
+# Function to get required libraries for an extension
+get_libraries() {
+  local extension=$1
+  {
+    parse_args "$extension" LIBS
+    parse_args "$extension" "$os_capital"_LIBS
+    [ -r "${src:?}/configs/${os_lower}_libs" ] && \
+      grep -E "^[[:space:]]*${extension}[[:space:]]*=" "${src:?}/configs/${os_lower}_libs" | \
+      head -n1 | \
+      sed -E "s/^[[:space:]]*${extension}[[:space:]]*=[[:space:]]*//"
+  } | xargs -n 1 2>/dev/null | sort -u | xargs 2>/dev/null
+}
+
 # Function to run command in a group
 run_group() {
   local command=$1
@@ -119,9 +136,10 @@ fetch_extension() {
   elif [ "$fetch" = "pecl" ]; then
     source="pecl"
     pecl_name=${extension/http/pecl_http}
-    get -q -n /tmp/"$pecl_name".tgz https://pecl.php.net/get/"$pecl_name"-"$release".tgz
+    capital_pecl_name=$(echo "$pecl_name" | tr '[:lower:]' '[:upper:]')
+    get -q -n /tmp/"$pecl_name".tgz https://pecl.php.net/get/"$pecl_name"-"$release".tgz https://pecl.php.net/get/"$capital_pecl_name"-"$release".tgz
     tar -xzf /tmp/"$pecl_name".tgz -C /tmp
-    cd /tmp/"$pecl_name"-"$release" || exit
+    cd /tmp/"$pecl_name"-"$release" 2>/dev/null || cd /tmp/"$capital_pecl_name"-"$release" 2>/dev/null || exit
   fi
 }
 
@@ -136,7 +154,7 @@ add_extension_from_source() {
   local fetch=${7:-clone}
   slug="$extension-$release"
   source="$url/$org/$repo"
-  libraries="$(parse_args "$extension" LIBS) $(parse_args "$extension" "$(uname -s)"_LIBS)"
+  libraries="$(get_libraries "$extension")"
   opts="$(parse_args "$extension" CONFIGURE_OPTS)"
   prefix_opts="$(parse_args "$extension" CONFIGURE_PREFIX_OPTS)"
   suffix_opts="$(parse_args "$extension" CONFIGURE_SUFFIX_OPTS)"

src/scripts/linux.sh

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

src/scripts/tools/add_tools.sh

@@ -200,8 +200,12 @@ add_tool() {
     elif [ -e /tmp/"$tool" ]; then
       sudo cp -a /tmp/"$tool" "$tool_path"
     fi
+    if [ "$status_code" = "404" ]; then
+      add_log "$cross" "$tool" "Failed to download $tool from ${url[*]}"
+    else
       add_log "$cross" "$tool" "Could not setup $tool"
     fi
+  fi
 }
 
 # Function to setup a tool using composer in a different scope.

src/scripts/tools/brew.sh

@@ -49,7 +49,7 @@ add_brew() {
   brew_prefix="$(get_brew_prefix)"
   if ! [ -d "$brew_prefix"/bin ]; then
     step_log "Setup Brew"
-    get -s "" "/tmp/install.sh" "https://raw.githubusercontent.com/Homebrew/install/master/install.sh" | bash -s >/dev/null 2>&1
+    get -s "" "/tmp/install.sh" "https://raw.githubusercontent.com/Homebrew/install/main/install.sh" | bash -s >/dev/null 2>&1
     add_log "${tick:?}" "Brew" "Installed Homebrew"
   fi
   add_brew_bins_to_path "$brew_prefix"

src/scripts/tools/ppa.sh

@@ -50,12 +50,23 @@ update_lists_helper() {
 update_lists() {
   local ppa=${1:-}
   local ppa_search=${2:-}
+  local status_token=${3:-$ppa_search}
   local list=
-  status_file=/tmp/os_lists
+  local status_file=/tmp/os_lists
+  local hash_cmd
   if [[ -n "$ppa" && -n "$ppa_search" ]]; then
-    list="$list_dir"/"$(basename "$(grep -lr "$ppa_search" "$list_dir")")"
-    status_file=/tmp/"$(echo -n "$ppa_search" | shasum -a 256 | cut -d ' ' -f 1)"
-  elif [ -e "$list_file" ] && grep -Eq '^deb |^Types deb' "$list_file"; then
+    if [ -f "$ppa_search" ]; then
+      list="$ppa_search"
+    else
+      list="$(grep -Elr "$ppa_search" "$list_dir" 2>/dev/null | head -n 1)"
+    fi
+    hash_cmd="$(command -v sha256sum || command -v shasum)"
+    if [ -n "$status_token" ] && [ -n "$hash_cmd" ]; then
+      status_file=/tmp/os_lists_"$(echo -n "$status_token" | $hash_cmd | awk '{print $1}')"
+    elif [ -n "$status_token" ]; then
+      status_file=/tmp/os_lists_$(date +%s)
+    fi
+  elif [ -e "$list_file" ] && grep -Eq '^deb |^Types: *deb' "$list_file"; then
     list="$list_file"
   fi
   if [ ! -e "$status_file" ]; then
@@ -64,12 +75,91 @@ update_lists() {
   fi
 }
 
+# Determine whether deb822 sources are the default on this system.
+get_sources_format() {
+  if [ -n "$sources_format" ]; then
+    echo "$sources_format"
+    return
+  fi
+  sources_format=deb
+  if [ -e "$list_dir"/ubuntu.sources ] || [ -e "$list_dir"/debian.sources ]; then
+    sources_format="deb822"
+  elif ! [[ "$ID" =~ ubuntu|debian ]]; then
+    find "$list_dir" -type f -name '*.sources' | grep -q . && sources_format="deb822"
+  fi
+  echo "$sources_format"
+}
+
+# Function to get sources file extension.
+get_sources_extension() {
+  [ "$1" = "deb822" ] && echo "sources" || echo "list"
+}
+
+# Function to escape regex special characters.
+escape_regex() {
+  printf '%s' "$1" | sed -e 's/[][\.^$*+?{}()|\/]/\\&/g'
+}
+
+# Function to merge two components strings.
+merge_components() {
+  local out=() t
+  for t in $1 $2; do [[ $t && " ${out[*]} " != *" $t "* ]] && out+=("$t"); done
+  printf '%s\n' "${out[*]}"
+}
+
+# Function to merge components from a file.
+merge_components_from_file() {
+  local path=$1
+  local incoming=$2
+  local current=
+  if [ -n "$path" ] && [ -e "$path" ]; then
+    if grep -Eq '^Components:' "$path"; then
+      current="$(grep -E '^Components:' "$path" | head -n 1 | cut -d ':' -f 2 | xargs)"
+    else
+      current="$(sed -E -n 's/^deb[[:space:]]+(\[[^]]*\][[:space:]]+)?[^[:space:]]+[[:space:]]+[^[:space:]]+[[:space:]]+//p' "$path" | head -n 1 | xargs)"
+    fi
+  fi
+  local merged
+  merged="$(merge_components "$current" "$incoming")"
+  if [ -z "$merged" ] || [ "$merged" = "$current" ]; then
+    return 1
+  fi
+  printf '%s\n' "$merged"
+}
+
+# Function to get repo patterns based on format.
+get_repo_patterns() {
+  local list_format=$1
+  local ppa_url=$2
+  local package_dist=$3
+  local branches=$4
+  local escaped_url
+  local escaped_dist
+  local escaped_branches
+  escaped_url="$(escape_regex "$ppa_url")"
+  escaped_dist="$(escape_regex "$package_dist")"
+  escaped_branches="$(escape_regex "$branches")"
+  local deb_primary="^deb[[:space:]]+(\\[[^]]*\\][[:space:]]+)?${escaped_url}[[:space:]]+${escaped_dist}[[:space:]]"
+  local deb_secondary="^deb[[:space:]]+(\\[[^]]*\\][[:space:]]+)?${escaped_url}[[:space:]]+${escaped_dist}[[:space:]]+.*${escaped_branches}([[:space:]]|$)"
+  local deb822_primary="^URIs: ${escaped_url}$"
+  local deb822_secondary="^Suites: ${escaped_dist}$"
+  if [ "$list_format" = "deb822" ]; then
+    printf '%s|%s\n' "$deb822_primary" "$deb822_secondary"
+  else
+    printf '%s|%s\n' "$deb_primary" "$deb_secondary"
+  fi
+}
+
 # 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'
+  ppa="$1"
+  ppa_uri="~${ppa%/*}/+archive/ubuntu/${ppa##*/}"
+  get -s -n "" "${lp_api[0]}/$ppa_uri" | jq -er '.signing_key_fingerprint' 2>/dev/null \
+  || get -s -n "" "${lp_api[1]}/$ppa_uri" | jq -er '.signing_key_fingerprint' 2>/dev/null \
+  || get -s -n "" "$ppa_sp/keys/$ppa.fingerprint"
 }
 
+
 # Function to get fingerprint from a Debian PPA.
 debian_fingerprint() {
   ppa=$1
@@ -93,25 +183,85 @@ add_key() {
     sks_params="op=get&options=mr&exact=on&search=0x$fingerprint"
     key_urls=("${sks[@]/%/\/pks\/lookup\?"$sks_params"}")
   fi
+  key_urls+=("$ppa_sp/keys/$ppa.gpg")
   [ ! -e "$key_source" ] && get -q -n "$key_file" "${key_urls[@]}"
   if [[ "$(file "$key_file")" =~ .*('Public-Key (old)'|'Secret-Key') ]]; then
     sudo gpg --batch --yes --dearmor "$key_file" >/dev/null 2>&1 && sudo mv "$key_file".gpg "$key_file"
   fi
 }
 
+# Function to handle existing list files.
+handle_existing_list() {
+  local ppa=$1
+  local list_format=$2
+  local branches=$3
+  local merged_components
+  if [ -z "$check_lists_file" ]; then
+    echo "Repository $ppa ($branches) already exists" && return 1
+  fi
+  if merged_components="$(merge_components_from_file "$check_lists_file" "$branches")"; then
+    sudo rm -f "$check_lists_file" && printf '%s\n' "$merged_components" && return 0
+  fi
+  if [[ "$list_format" = "deb822" && "$check_lists_file" = *.list ]]; then
+    sudo rm -f "$check_lists_file" && printf '%s\n' "$branches" && return 0
+  fi
+  echo "Repository $ppa ($branches) already exists" && return 1
+}
+
+# Function to write a list file.
+write_list() {
+  local type=$1
+  local ppa=$2
+  local url=$3
+  local suite=$4
+  local components=$5
+  local key_file=$6
+  local list_basename="${ppa%%/*}"-"$ID"-"${ppa#*/}"-"$suite"
+  local arch
+  arch="$(dpkg --print-architecture)"
+  sudo rm -f "$list_dir"/"${ppa/\//-}".list "$list_dir"/"${ppa/\//-}".sources "$list_dir"/"$list_basename".list "$list_dir"/"$list_basename".sources || true
+  if [ "$type" = "deb822" ]; then
+    cat <<EOF | sudo tee "$list_dir"/"$list_basename".sources >/dev/null
+Types: deb
+URIs: $url
+Suites: $suite
+Components: $components
+Architectures: $arch
+Signed-By: $key_file
+EOF
+  else
+    echo "deb [arch=$arch signed-by=$key_file] $url $suite $components" | sudo tee "$list_dir"/"$list_basename".list >/dev/null 2>&1
+  fi
+}
+
 # Function to check if a PPA and its lists exist
 check_lists() {
-  ppa=$1
-  ppa_search=$2
-  if grep -Eqr "$ppa_search" "$list_dir"; then
+  local ppa=$1
+  local primary=${2:-}
+  local secondary=${3:-}
+  local status_token=${4:-$primary}
+  local match_file=
+  check_lists_file=
+  if [ -n "$primary" ]; then
+    match_file=$(grep -Elr "$primary" "$list_dir" 2>/dev/null | head -n 1)
+  fi
+  if [ -z "$match_file" ] && [ -n "$secondary" ]; then
+    local candidate
+    candidate=$(grep -Elr "$secondary" "$list_dir" 2>/dev/null | head -n 1)
+    if [ -n "$candidate" ] && { [ -z "$primary" ] || grep -Eq "$primary" "$candidate"; }; then
+      match_file="$candidate"
+    fi
+  fi
+  if [ -n "$match_file" ]; then
+    local list_count
     list_count="$(sudo find /var/lib/apt/lists -type f -name "*${ppa/\//_}*" | wc -l)"
     if [ "$list_count" = "0" ]; then
-      update_lists "$ppa" "$ppa_search"
+      update_lists "$ppa" "$match_file" "$status_token"
     fi
-    return 0;
-  else
-    return 1;
+    check_lists_file="$match_file"
+    return 0
   fi
+  return 1
 }
 
 # Function to add a sources list.
@@ -121,19 +271,32 @@ add_list() {
   key_source=${3:-"$ppa_url"}
   package_dist=${4:-"$VERSION_CODENAME"}
   branches=${5:-main}
-  ppa_search="deb .*$ppa_url $package_dist .*$branches$"
-  if check_lists "$ppa" "$ppa_search"; then
-    echo "Repository $ppa already exists";
-    return 1;
+  local list_format
+  local list_extension
+  local status_token
+  local resolved_branches
+  local list_path=
+  list_format="$(get_sources_format)"
+  list_extension="$(get_sources_extension "$list_format")"
+  status_token="${ppa_url}|${package_dist}|${branches}"
+  IFS='|' read -r primary_pattern secondary_pattern <<< "$(get_repo_patterns "$list_format" "$ppa_url" "$package_dist" "$branches")"
+  if check_lists "$ppa" "$primary_pattern" "$secondary_pattern" "$status_token"; then
+    list_path="$check_lists_file"
+    if resolved_branches="$(handle_existing_list "$ppa" "$list_format" "$branches")"; then
+      branches="$resolved_branches"
     else
-    arch=$(dpkg --print-architecture)
+      [ -n "$resolved_branches" ] && echo "$resolved_branches" && return 1
+    fi
+    check_lists_file=
+    IFS='|' read -r primary_pattern secondary_pattern <<< "$(get_repo_patterns "$list_format" "$ppa_url" "$package_dist" "$branches")"
+    status_token="${ppa_url}|${package_dist}|${branches}"
+  fi
   [ -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"
-    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"
+  write_list "$list_format" "$ppa" "$ppa_url" "$package_dist" "$branches" "$key_file"
+  list_path="$list_dir"/"${ppa%%/*}"-"$ID"-"${ppa#*/}"-"$package_dist"."$list_extension"
+  update_lists "$ppa" "$list_path" "$status_token"
   . /etc/os-release
-  fi
   return 0;
 }
 
@@ -143,8 +306,12 @@ check_ppa() {
   ppa_url=${2:-"$lpc_ppa/$ppa/ubuntu"}
   package_dist=${3:-"$VERSION_CODENAME"}
   branches=${4:-main}
-  ppa_search="deb .*$ppa_url $package_dist .*$branches$"
-  if check_lists "$ppa" "$ppa_search"; then
+  local list_format
+  list_format="$(get_sources_format)"
+  IFS='|' read -r primary_pattern secondary_pattern <<< "$(get_repo_patterns "$list_format" "$ppa_url" "$package_dist" "$branches")"
+  local status_token
+  status_token="${ppa_url}|${package_dist}|${branches}"
+  if check_lists "$ppa" "$primary_pattern" "$secondary_pattern" "$status_token"; then
     return 0;
   else
     return 1;
@@ -158,7 +325,7 @@ remove_list() {
   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
+  sudo rm -f "$key_dir"/"${ppa/\//-}"-keyring /tmp/os_lists* || true
 }
 
 # Function to check if ubuntu ppa is up
@@ -208,12 +375,23 @@ update_ppa() {
   ppa_url=${2:-"$lpc_ppa/$ppa/ubuntu"}
   package_dist=${4:-"$VERSION_CODENAME"}
   branches=${5:-main}
-  ppa_search="deb .*$ppa_url $package_dist .*$branches"
-  update_lists "$ppa" "$ppa_search"
+  local list_format
+  list_format="$(get_sources_format)"
+  IFS='|' read -r primary_pattern secondary_pattern <<< "$(get_repo_patterns "$list_format" "$ppa_url" "$package_dist" "$branches")"
+  local list_path
+  list_path="$(grep -Elr "$primary_pattern" "$list_dir" 2>/dev/null | head -n 1)"
+  if [ -z "$list_path" ] && [ -n "$secondary_pattern" ]; then
+    list_path="$(grep -Elr "$secondary_pattern" "$list_dir" 2>/dev/null | head -n 1)"
+  fi
+  local status_token
+  status_token="${ppa_url}|${package_dist}|${branches}"
+  update_lists "$ppa" "${list_path:-$primary_pattern}" "$status_token"
   . /etc/os-release
 }
 
 # Variables
+sources_format=
+check_lists_file=
 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'

src/scripts/tools/protoc.ps1

@@ -35,6 +35,6 @@ Function Add-Protoc() {
   Add-ToProfile $current_profile 'protoc' "New-Alias protoc $bin_dir\protoc.exe"
   Add-Log $tick "protoc" "Added protoc $($protobuf_tag -replace 'v', '')"
   printf "$env:GROUP\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "protoc" "Click to read the protoc related license information"
-  Write-Output (Invoke-WebRequest https://raw.githubusercontent.com/protocolbuffers/protobuf/master/LICENSE).Content
+  Write-Output (Invoke-WebRequest https://raw.githubusercontent.com/protocolbuffers/protobuf/main/LICENSE).Content
   Write-Output "$env:END_GROUP"
 }

src/scripts/tools/protoc.sh

@@ -25,6 +25,6 @@ add_protoc() {
   ) >/dev/null 2>&1
   add_log "${tick:?}" "protoc" "Added protoc ${protobuf_tag:1}"
   printf "$GROUP\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "protoc" "Click to read the protoc related license information"
-  curl "${curl_opts[@]:?}" https://raw.githubusercontent.com/protocolbuffers/protobuf/master/LICENSE
+  curl "${curl_opts[@]:?}" https://raw.githubusercontent.com/protocolbuffers/protobuf/main/LICENSE
   echo "$END_GROUP"
 }

src/scripts/tools/symfony.ps1

@@ -1,9 +1,22 @@
 Function Add-Symfony() {
+  param(
+    [Parameter(Mandatory = $true, Position = 0, HelpMessage = 'Symfony version to be installed')]
+    [string] $protobuf_tag
+  )
+  $protobuf_tag = $protobuf_tag.replace('v', '')
+  if($protobuf_tag -ne 'latest' -and $protobuf_tag -notmatch '^\d+(\.\d+)*$') {
+    Add-Log $cross "symfony-cli" "Invalid symfony version: $protobuf_tag"
+  } else {
     $arch_name = 'amd64'
     if (-not ([Environment]::Is64BitOperatingSystem) -or $version -lt '7.0') {
       $arch_name = '386'
     }
-  $url = "https://github.com/symfony-cli/symfony-cli/releases/latest/download/symfony-cli_windows_${arch_name}.zip"
+    $symfony_releases = "https://github.com/symfony-cli/symfony-cli/releases"
+    if ($protobuf_tag -eq 'latest') {
+      $url = "$symfony_releases/latest/download/symfony-cli_windows_${arch_name}.zip"
+    } else {
+      $url = "$symfony_releases/download/v$protobuf_tag/symfony-cli_windows_${arch_name}.zip"
+    }
     Get-File -Url $url -OutFile $bin_dir\symfony.zip > $null 2>&1
     Expand-Archive -Path $bin_dir\symfony.zip -DestinationPath $bin_dir -Force > $null 2>&1
     if (Test-Path $bin_dir\symfony.exe) {
@@ -16,3 +29,4 @@ Function Add-Symfony() {
       Add-Log $cross "symfony-cli" "Could not setup symfony-cli"
     }
   }
+}

src/scripts/tools/symfony.sh

@@ -1,35 +1,37 @@
-add_symfony_with_brew() {
-  add_brew_tap symfony-cli/homebrew-tap
-  brew install symfony-cli/tap/symfony-cli
-}
-
 get_symfony_artifact_url() {
-    arch=$(dpkg --print-architecture)
-    url=$(get -s -n "" https://raw.githubusercontent.com/symfony-cli/homebrew-tap/main/Formula/symfony-cli.rb 2<&1 | grep -m 1 "url.*linux.*${arch}" | cut -d\" -f 2)
-    if [ -z "$url" ]; then
-      url=$(get -s -n "" https://api.github.com/repos/symfony-cli/symfony-cli/releases 2<&1 | grep -m 1 "url.*linux.*${arch}.*gz\"" | cut -d\" -f 4)
+  local symfony_tag=$1
+  local os
+  local arch
+  os="$(uname -s | tr '[:upper:]' '[:lower:]')"
+  arch="$(uname -m)"
+  case "$arch" in
+    arm|armv6*|armv7*) arch="armv6" ;;
+    aarch64*|armv8*|arm64) arch="arm64" ;;
+    i[36]86) arch="386" ;;
+    x86_64|amd64) arch="amd64" ;;
+  esac
+  [ "$os" = "darwin" ] && arch="all"
+  symfony_releases="https://github.com/symfony-cli/symfony-cli/releases"
+  if [ "$symfony_tag" = "latest" ]; then
+    echo "$symfony_releases/latest/download/symfony-cli_${os}_${arch}.tar.gz"
+  else
+    echo "$symfony_releases/download/v$symfony_tag/symfony-cli_${os}_${arch}.tar.gz"
   fi
-    echo "$url"
 }
 
 add_symfony_helper() {
-  if [ "$(uname -s)" = "Linux" ]; then
-    url="$(get_symfony_artifact_url)"
-    if [ -z "$url" ]; then
-      . "${0%/*}"/tools/brew.sh
-      configure_brew
-      add_symfony_with_brew
-    else
-      get -s -n "" "$url" | sudo tar -xz -C "${tool_path_dir:?}" 2>/dev/null
-      sudo chmod a+x /usr/local/bin/symfony
-    fi
-  elif [ "$(uname -s)" = "Darwin" ]; then
-    add_symfony_with_brew
-  fi
+  local install_dir=/usr/local/bin
+  [ "$(uname -s)" = "Darwin" ] && install_dir=${brew_prefix:?}/bin
+  get -s -n "" "$(get_symfony_artifact_url "$symfony_tag")" | sudo tar -xz -C "$install_dir" 2>/dev/null
+  sudo chmod a+x "$install_dir"/symfony
 }
 
 add_symfony() {
-  add_symfony_helper >/dev/null 2>&1
+  local symfony_tag="${1/v/}"
+  if ! [[ "$symfony_tag" =~ ^[0-9]+(\.[0-9]+)*$ || "$symfony_tag" == 'latest' ]]; then
+      add_log "${cross:?}" "symfony-cli" "Version '$symfony_tag' is not valid for symfony-cli"
+  else
+    add_symfony_helper "$symfony_tag" >/dev/null 2>&1
     symfony_path="$(command -v symfony)"
     if [[ -n "$symfony_path" ]]; then
       sudo ln -s "$symfony_path" "${tool_path_dir:?}"/symfony-cli
@@ -38,4 +40,5 @@ add_symfony() {
     else
       add_log "${cross:?}" "symfony-cli" "Could not setup symfony-cli"
     fi
+  fi
 }

src/scripts/unix.sh

@@ -145,7 +145,7 @@ get() {
       status_code=$(sudo curl -w "%{http_code}" -o "$file_path" "${curl_opts[@]}" "$link")
       [ "$status_code" = "200" ] && break
     done
-    [ "$execute" = "-e" ] && sudo chmod a+x "$file_path"
+    [[ "$execute" = "-e" && -e "$file_path" ]] && sudo chmod a+x "$file_path"
     [ "$mode" = "-v" ] && echo "$status_code"
     [ "$runner" = "self-hosted" ] && release_lock "$lock_path"
   fi
@@ -244,7 +244,9 @@ configure_php() {
   add_php_config
   ini_config_dir="${src:?}"/configs/ini
   ini_config_files=("$ini_config_dir"/php.ini)
-  jit_config_files=("$ini_config_dir"/jit.ini)
+  arch="$(uname -m)"
+  [[ "$arch" = "arm64" || "$arch" = "aarch64" ]] && jit_ini="$ini_config_dir"/jit_aarch64.ini || jit_ini="$ini_config_dir"/jit.ini
+  jit_config_files=("$jit_ini")
   [[ "$version" =~ $xdebug3_versions ]] && ini_config_files+=("$ini_config_dir"/xdebug.ini)
   cat "${ini_config_files[@]}" | sudo tee -a "${ini_file[@]:?}" >/dev/null 2>&1
   [[ "$version" =~ $jit_versions ]] && cat "${jit_config_files[@]}" | sudo tee -a "${pecl_file:-${ini_file[@]}}" >/dev/null 2>&1

src/scripts/win32.ps1

@@ -323,7 +323,7 @@ $php_builder = "$github/shivammathur/php-builder-windows"
 $current_profile = "$env:TEMP\setup-php.ps1"
 $ProgressPreference = 'SilentlyContinue'
 $jit_versions = '8.[0-9]'
-$nightly_versions = '8.[2-9]'
+$nightly_versions = '8.[6-9]'
 $xdebug3_versions = "7.[2-4]|8.[0-9]"
 $enable_extensions = ('openssl', 'curl', 'mbstring')
 
@@ -444,9 +444,12 @@ if($installed.MajorMinorVersion -ne $version) {
 }
 if($version -lt "5.5") {
   ('libeay32.dll', 'ssleay32.dll') | ForEach-Object -Parallel { Invoke-WebRequest -Uri "$using:php_builder/releases/download/openssl-1.0.2u/$_" -OutFile $using:php_dir\$_ >$null 2>&1 }
-} else {
+} elseif($version -lt "8.5") {
   $enable_extensions += ('opcache')
 }
+if($version -ge "8.5" -and (Test-Path $ext_dir\php_opcache.dll)) {
+  Remove-Item $ext_dir\php_opcache.dll -Force
+}
 Enable-PhpExtension -Extension ($enable_extensions | Where-Object { Test-Path $ext_dir\php_$_.dll }) -Path $php_dir
 Add-PhpCAInfo
 Add-OpenSSLConf

src/tools.ts

@@ -1,5 +1,6 @@
 import path from 'path';
 import fs from 'fs';
+import * as cv from 'compare-versions';
 import * as fetch from './fetch';
 import * as packagist from './packagist';
 import * as utils from './utils';
@@ -20,6 +21,11 @@ interface IRef {
  * @param data
  */
 export async function getSemverVersion(data: RS): Promise<string> {
+  const fixSemver = (t: string): string => {
+    if (/^\d+\.\d+\.\d+(-|$)/.test(t)) return t;
+    const m = t.match(/^(\d+\.\d+\.\d+)([A-Za-z]+[0-9A-Za-z.]+)$/);
+    return m ? `${m[1]}-${m[2]}` : t;
+  };
   const search: string = data['version_prefix'] + data['version'];
   const url = `https://api.github.com/repos/${data['repository']}/git/matching-refs/tags%2F${search}.`;
   const github_token: string =
@@ -30,10 +36,24 @@ export async function getSemverVersion(data: RS): Promise<string> {
     data['error'] = response.error ?? `No version found with prefix ${search}.`;
     return data['version'];
   } else {
-    const refs = JSON.parse(response['data']).reverse();
-    const ref = refs.find((i: IRef) => /.*\d+.\d+.\d+$/.test(i['ref']));
-    const tag: string = (ref || refs[0])['ref'].split('/').pop();
-    return tag.replace(/^v(\d)/, '$1');
+    const refs: IRef[] = JSON.parse(response['data']);
+    const tags = refs
+      .map((i: IRef) => (i.ref?.split('/').pop() ?? '').replace(/^v(?=\d)/, ''))
+      .filter((t: string) => t.length > 0);
+    const fixedToOriginal = new Map<string, string>();
+    const fixed = tags.map(t => {
+      const f = fixSemver(t);
+      fixedToOriginal.set(f, t);
+      return f;
+    });
+    fixed.sort((a, b) => {
+      try {
+        return cv.compareVersions(b, a);
+      } catch {
+        return b.localeCompare(a, 'en', {numeric: true, sensitivity: 'base'});
+      }
+    });
+    return fixedToOriginal.get(fixed[0]) ?? fixed[0];
   }
 }
 
@@ -136,7 +156,7 @@ export async function filterList(tools_list: string[]): Promise<string[]> {
  * @param data
  */
 export async function getUrl(data: RS): Promise<string> {
-  if (data['version'] === 'latest') {
+  if ((data['version'] ?? 'latest') === 'latest') {
     return [
       data['domain'],
       data['repository'],
@@ -263,30 +283,33 @@ export async function addComposer(data: RS): Promise<string> {
   const github = data['github'];
   const getcomposer = data['domain'];
   const cds = 'https://dl.cloudsmith.io';
+  const spc = 'https://artifacts.setup-php.com';
   const filename = `composer-${data['php_version']}-${channel}.phar`;
   const releases_url = `${github}/shivammathur/composer-cache/releases/latest/download/${filename}`;
   const cds_url = `${cds}/public/shivammathur/composer-cache/raw/files/${filename}`;
+  const spc_url = `${spc}/composer/${filename}`;
   const lts_url = `${getcomposer}/download/latest-2.2.x/composer.phar`;
   const is_lts = /^5\.[3-6]$|^7\.[0-1]$/.test(data['php_version']);
-  const version_source_url = `${getcomposer}/composer-${channel}.phar`;
-  let cache_url = `${releases_url},${cds_url}`;
+  const channel_source_url = `${getcomposer}/composer-${channel}.phar`;
+  const version_source_url = `${getcomposer}/download/${channel}/composer.phar`;
+  let cache_url = `${releases_url},${spc_url},${cds_url}`;
   let source_url = `${getcomposer}/composer.phar`;
   switch (true) {
     case /^snapshot$/.test(channel):
       source_url = is_lts ? lts_url : source_url;
       break;
     case /^preview$|^2$/.test(channel):
-      source_url = is_lts ? lts_url : version_source_url;
+      source_url = is_lts ? lts_url : channel_source_url;
       break;
     case /^1$/.test(channel):
-      source_url = version_source_url;
+      source_url = channel_source_url;
       break;
     case /^\d+\.\d+\.\d+[\w-]*$/.test(data['version']):
       cache_url = `${github}/${data['repository']}/releases/download/${data['version']}/composer.phar`;
       source_url = version_source_url;
       break;
     default:
-      source_url = is_lts ? lts_url : version_source_url;
+      source_url = is_lts ? lts_url : channel_source_url;
   }
   const use_cache: boolean = (await utils.readEnv('NO_TOOLS_CACHE')) !== 'true';
   data['url'] = use_cache ? `${cache_url},${source_url}` : source_url;

src/utils.ts

@@ -400,7 +400,7 @@ export async function customPackage(
   version: string,
   os: string
 ): Promise<string> {
-  const pkg_name: string = pkg.replace(/\d+|(pdo|pecl)[_-]/, '');
+  const pkg_name: string = pkg.replace(/\d+|(pdo|pecl)[_-]|[_-]db2/, '');
   const script_extension: string = await scriptExtension(os);
   const script: string = path.join(
     __dirname,