Merge pull request #1018 from shivammathur/dependabot/github_actions/develop/actions/download-artifact-6

Bump actions/download-artifact from 5 to 6

.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

@@ -8,6 +8,7 @@ permissions:
 
 jobs:
   codeql:
+    if: github.event.repository.fork == false
     permissions:
       actions: read  # for github/codeql-action/init to get workflow details
       contents: read  # for actions/checkout to fetch code
@@ -15,18 +16,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         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

@@ -8,6 +8,7 @@ permissions:
 
 jobs:
   create:
+    if: github.event.repository.fork == false
     permissions:
       contents: none
     name: Create
@@ -15,8 +16,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-24.04, ubuntu-22.04, windows-2022, macos-13]
+        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']
+        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
@@ -87,11 +88,12 @@ 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
   update:
+    if: github.event.repository.fork == false
     permissions:
       contents: write  # for Git to git push
     name: Update
@@ -99,11 +101,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         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-*
@@ -114,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

@@ -2,7 +2,7 @@ name: Node workflow
 on:
   pull_request:
     branches:
-      - master
+      - main
       - develop
       - verbose
     paths-ignore:
@@ -10,7 +10,7 @@ on:
       - 'examples/**'
   push:
     branches:
-      - master
+      - main
       - develop
       - verbose
     paths-ignore:
@@ -29,12 +29,12 @@ jobs:
         operating-system: [ubuntu-latest, windows-latest, macos-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         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

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
   pull_request:
     branches:
-      - master
+      - main
       - develop
       - verbose
     paths-ignore:
@@ -11,7 +11,7 @@ on:
       - 'examples/**'
   push:
     branches:
-      - master
+      - main
       - develop
       - verbose
     paths-ignore:
@@ -28,8 +28,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-24.04, ubuntu-22.04, windows-2022, macos-13]
+        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']
+        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@v5
 
       - 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@v5
 
       - name: Checkout tag
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         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'

.gitignore

@@ -3,7 +3,7 @@ node_modules/
 __tests__/runner/*
 lib/
 
-# Rest of the file pulled from https://github.com/github/gitignore/blob/master/Node.gitignore
+# Rest of the file pulled from https://github.com/github/gitignore/blob/main/Node.gitignore
 # Logs
 logs
 *.log

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>
@@ -68,18 +68,20 @@ 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      |
+| Virtual environment | Arch    | YAML workflow label                | Pre-installed PHP |
-|---------------------|---------|------------------------------------|------------------------|
+|---------------------|---------|------------------------------------|-------------------|
-| Ubuntu 24.04        | x86_64  | `ubuntu-latest` or `ubuntu-24.04`  | `PHP 8.3`              |
+| 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 22.04        | x86_64  | `ubuntu-22.04`                     | `PHP 8.1`         |
-| Ubuntu 24.04        | aarch64 | `ubuntu-24.04-arm`                 | `PHP 8.3`              |
+| Ubuntu 24.04        | aarch64 | `ubuntu-24.04-arm`                 | `PHP 8.3`         |
-| Ubuntu 22.04        | aarch64 | `ubuntu-22.04-arm`                 | `PHP 8.1`              |
+| Ubuntu 22.04        | aarch64 | `ubuntu-22.04-arm`                 | `PHP 8.1`         |
-| Windows Server 2025 | x64     | `windows-2025`                     | `PHP 8.3`              |
+| Windows Server 2025 | x64     | `windows-2025`                     | `PHP 8.3`         |
-| Windows Server 2022 | x64     | `windows-latest` or `windows-2022` | `PHP 8.3`              |
+| Windows Server 2022 | x64     | `windows-latest` or `windows-2022` | `PHP 8.3`         |
-| Windows Server 2019 | x64     | `windows-2019`                     | `PHP 8.3`              |
+| Windows Server 2019 | x64     | `windows-2019`                     | `PHP 8.3`         |
-| macOS Sequoia 15.x  | arm64   | `macos-15`                         | -                      |
+| macOS Tahoe 26.x    | arm64   | `macos-26`                         | -                 |
-| macOS Sonoma 14.x   | arm64   | `macos-latest` or `macos-14`       | -                      |
+| macOS Sequoia 15.x  | arm64   | `macos-latest` or `macos-15`       | -                 |
-| macOS Ventura 13.x  | x86_64  | `macos-13`                         | `PHP 8.3`              |
+| 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
 
@@ -91,6 +93,7 @@ Both `GitHub-hosted` and `self-hosted` runners are supported by `setup-php` on t
 | 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`   |
@@ -101,11 +104,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.3 to PHP 8.6 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.6 on GitHub-hosted macOS ARM64 runners (macos-14).
-- PHP 5.6 to PHP 8.5 on self-hosted runners.
+- PHP 5.6 to PHP 8.6 on self-hosted runners.
 
 | PHP Version | Stability | Release Support       | Runner Support                 |
 |-------------|-----------|-----------------------|--------------------------------|
@@ -124,10 +127,11 @@ On all supported OS/Platforms the following PHP versions can be set up as per th
 | `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.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. Specifying `8.5` in `php-version` input installs a nightly build of `PHP 8.5.0-dev` from the PHP-8.5 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
@@ -229,7 +233,7 @@ This disables all core and third-party shared extensions and thus, can break som
 
 These tools can be set up globally using the `tools` input. It accepts a string in csv-format.
 
-[`behat`], [`blackfire`], [`blackfire-player`], [`box`], [`castor`], [`churn`], [`codeception`], [`composer`], [`composer-dependency-analyser`], [`composer-normalize`], [`composer-prefetcher`], [`composer-require-checker`], [`composer-unused`], [`cs2pr`], [`deployer`], [`ecs`], [`flex`], [`grpc_php_plugin`], [`infection`], [`parallel-lint`], [`pecl`], [`phan`], [`phing`], [`phinx`], [`phive`], [`php-config`], [`php-cs-fixer`], [`php-scoper`], [`phpcbf`], [`phpcpd`], [`phpcs`], [`phpdoc`] or [`phpDocumentor`], [`phpize`], [`phplint`], [`phpmd`], [`phpspec`], [`phpstan`], [`phpunit`], [`phpunit-bridge`], [`phpunit-polyfills`], [`pie`], [`pint`], [`prestissimo`], [`protoc`], [`psalm`], [`rector`], [`symfony`] or [`symfony-cli`], [`vapor`] or [`vapor-cli`], [`wp`] or [`wp-cli`]
+[`backward-compatibility-check`], [`behat`], [`blackfire`], [`blackfire-player`], [`box`], [`castor`], [`churn`], [`codeception`], [`composer`], [`composer-dependency-analyser`], [`composer-normalize`], [`composer-prefetcher`], [`composer-require-checker`], [`composer-unused`], [`cs2pr`], [`deployer`], [`ecs`], [`flex`], [`grpc_php_plugin`], [`infection`], [`mago`], [`name-collision-detector`], [`parallel-lint`], [`pecl`], [`phan`], [`phing`], [`phinx`], [`phive`], [`php-config`], [`php-cs-fixer`], [`php-scoper`], [`phpcbf`], [`phpcpd`], [`phpcs`], [`phpdoc`] or [`phpDocumentor`], [`phpize`], [`phplint`], [`phpmd`], [`phpspec`], [`phpstan`], [`phpunit`], [`phpunit-bridge`], [`phpunit-polyfills`], [`pie`], [`pint`], [`prestissimo`], [`protoc`], [`psalm`], [`rector`], [`symfony`] or [`symfony-cli`], [`vapor`] or [`vapor-cli`], [`wp`] or [`wp-cli`]
 
 ```yaml
 - name: Setup PHP with tools
@@ -258,19 +262,6 @@ These tools can be set up globally using the `tools` input. It accepts a string
 
   When you specify just the major version or the version in `major.minor` format, the latest patch version matching the input will be setup.
 
-  With the exception of major versions of `composer`, if you specify only the `major` version or the version in `major.minor` format for a tool you can get rate limited by GitHub's API. To avoid this, it is recommended to provide a [`GitHub` OAuth token](https://github.com/shivammathur/setup-php#composer-github-oauth "Composer GitHub OAuth").
-  You can do that by setting `GITHUB_TOKEN` environment variable. The `COMPOSER_TOKEN` environment variable has been deprecated in favor of `GITHUB_TOKEN` and will be removed in the next major version.
-
-```yaml
-- name: Setup PHP with tools
-  uses: shivammathur/setup-php@v2
-  with:
-    php-version: '8.4'
-    tools: php-cs-fixer:3.64, phpunit:11.4
-  env:
-    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-```
-
 - The latest stable version of `composer` is set up by default. You can set up the required `composer` version by specifying the major version `v1` or `v2`, or the version in `major.minor` or `semver` format. Additionally, for composer `snapshot` and `preview` can also be specified to set up the respective releases.
 
 ```yaml
@@ -278,7 +269,7 @@ These tools can be set up globally using the `tools` input. It accepts a string
   uses: shivammathur/setup-php@v2
   with:
     php-version: '8.4'
-    tools: composer:v2
+    tools: composer:v1
 ```
 
 - If you do not use composer in your workflow, you can specify `tools: none` to skip it.
@@ -430,7 +421,7 @@ Disable coverage for these reasons:
   - The `php-version-file` input if it exists
   - A `composer.lock` file and the `platform-overrides.php` value
   - A `composer.json` file and the `config.platform.php` value
-  - If the `composer.lock` or `composer.json` file is in a sub-directory in your repository, please specify the subdirectory path in `COMPOSER_PROJECT_DIR` env.
+  - If the `composer.lock` or `composer.json` file is in a subdirectory in your repository, please specify the subdirectory path in `COMPOSER_PROJECT_DIR` env.
 
 #### `php-version-file` (optional)
 
@@ -438,7 +429,7 @@ Disable coverage for these reasons:
 - Accepts a `string`. For example `'.phpenv-version'`.
 - See [PHP support](#tada-php-support) for the supported PHP versions.
 - By default, `.php-version` file is used.
-- The file either have the PHP version as its content, or follow the asdf `.tool-versions` format.
+- The file needs to either have the PHP version as its content or follows the asdf `.tool-versions` format.
 - If not specified and the default `.php-version` file is not found, the latest stable PHP version is set up.
 
 #### `extensions` (optional)
@@ -473,6 +464,13 @@ Disable coverage for these reasons:
 - Accepts a `string` in csv-format. For example: `phpunit, phpcs`
 - See [tools support](#wrench-tools-support) for tools supported.
 
+#### `github-token` (optional)
+
+- Specify the GitHub token to use for authentication.
+- Accepts a `string`.
+- By default, `GITHUB_TOKEN` secret provided by GitHub Actions is used.
+- For GitHub Enterprise users, it is recommended to use a Personal Access Token (PAT).
+
 ### Outputs
 
 #### `php-version`
@@ -561,16 +559,14 @@ jobs:
         ini-values: post_max_size=256M, max_execution_time=180
         coverage: xdebug
         tools: php-cs-fixer, phpunit:${{ matrix.phpunit-versions }}
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 ```
 
 ### Nightly Build Setup
 
-> Set up a nightly build of `PHP 8.5`.
+> Set up a nightly build of `PHP 8.5` or `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:
@@ -750,7 +746,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`.
@@ -804,19 +800,20 @@ restore-keys: ${{ runner.os }}-composer-${{ matrix.prefer }}-
 
 ### GitHub Composer Authentication
 
-If you have a number of workflows which set up multiple tools or have many composer dependencies, you might hit the GitHub's rate limit for composer. Also, if you specify only the major version or the version in `major.minor` format, you can hit the rate limit. To avoid this you can specify an `OAuth` token by setting `GITHUB_TOKEN` environment variable. You can use [`GITHUB_TOKEN`](https://help.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token "GITHUB_TOKEN documentation") secret for this purpose.
+By default, setup-php uses the `GITHUB_TOKEN` secret that is generated for each workflow run. In case you want to use a Personal Access Token (PAT) instead, you can set the `github-token` input.
-
-The `COMPOSER_TOKEN` environment variable has been deprecated in favor of `GITHUB_TOKEN` and will be removed in the next major version.
 
 ```yaml
 - name: Setup PHP
   uses: shivammathur/setup-php@v2
   with:
     php-version: '8.4'
-  env:
+    github-token: ${{ secrets.YOUR_PAT_TOKEN }}
-    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 ```
 
+The `COMPOSER_TOKEN` and `GITHUB_TOKEN` environment variables have been deprecated in favor of the `github-token` input and will be removed in the next major version.
+
+For GitHub Enterprise users, the `github-token` input does not default to the `GITHUB_TOKEN` secret. Therefore, it's recommended to set the `github-token` input to a Personal Access Token (PAT).
+
 ### Private Packagist Authentication
 
 If you use Private Packagist for your private composer dependencies, you can set the `PACKAGIST_TOKEN` environment variable to authenticate.
@@ -1005,32 +1002,46 @@ 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 href="https://www.jetbrains.com/?from=setup-php">
+  <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="212" height="120">
+    <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 href="https://www.macstadium.com/opensource/members#gh-light-mode-only">
+  <a target="_blank" href="https://www.cloudflare.com/lp/project-alexandria/#gh-light-mode-only">
-    <img src="https://setup-php.com/sponsors/macstadium.png" alt="Mac Stadium" width="296" height="120">
+    <img src="https://setup-php.com/sponsors/cloudflare.svg" alt="Cloudflare" width="240" height="80">
   </a>
-  <a href="https://www.macstadium.com/opensource/members#gh-dark-mode-only">
+  <a target="_blank" href="https://www.cloudflare.com/lp/project-alexandria/#gh-dark-mode-only">
-    <img src="https://setup-php.com/sponsors/macstadium-white.png" alt="Mac Stadium" width="296" height="120">
+    <img src="https://setup-php.com/sponsors/cloudflare-white.svg" alt="Cloudflare" width="240" height="80">
   </a>
   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-  <a href="https://tidelift.com/subscription/pkg/npm-setup-php">
+  <a target="_blank" href="https://www.macstadium.com/company/opensource#gh-light-mode-only">
-    <img src="https://setup-php.com/sponsors/tidelift.png" alt="Tidelift" width="140" height="120">
+    <img src="https://setup-php.com/sponsors/macstadium.png" alt="Mac Stadium" width="200" height="80">
+  </a>
+  <a target="_blank" href="https://www.macstadium.com/company/opensource#gh-dark-mode-only">
+    <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="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")
@@ -1056,6 +1067,7 @@ These companies generously provide setup-php their products and services to aid
 
 
 <!-- Links to tools -->
+[`backward-compatibility-check`]: https://github.com/Roave/BackwardCompatibilityCheck
 [`behat`]:                    https://docs.behat.org/en/latest/
 [`blackfire`]:                https://blackfire.io/docs/php/index
 [`blackfire-player`]:         https://blackfire.io/docs/builds-cookbooks/player
@@ -1075,6 +1087,8 @@ These companies generously provide setup-php their products and services to aid
 [`flex`]:                     https://flex.symfony.com/
 [`grpc_php_plugin`]:          https://grpc.io/
 [`infection`]:                https://infection.github.io/
+[`mago`]:                     https://github.com/carthage-software/mago
+[`name-collision-detector`]:  https://github.com/shipmonk/name-collision-detector
 [`parallel-lint`]:            https://github.com/php-parallel-lint/PHP-Parallel-Lint
 [`pecl`]:                     https://pecl.php.net/
 [`phan`]:                     https://github.com/phan/phan/wiki

__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 {
@@ -89,11 +105,14 @@ jest.mock('../src/packagist', () => ({
 
 describe('Tools tests', () => {
   it.each`
-    token              | version
+    token                | version
-    ${'invalid_token'} | ${'1.2'}
+    ${'invalid_token'}   | ${'1.2'}
-    ${'valid_token'}   | ${'1.2.3'}
+    ${'valid_token'}     | ${'1.2.3'}
-    ${'beta_token'}    | ${'1.2.3-beta1'}
+    ${'beta_token'}      | ${'1.2.3beta1'}
-    ${''}              | ${'1.2.3'}
+    ${'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;
     expect(
@@ -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'}
@@ -332,6 +371,12 @@ 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'}
@@ -393,9 +438,9 @@ describe('Tools tests', () => {
 
   it.each([
     [
-      'blackfire, blackfire-player, box, churn, cs2pr, flex, grpc_php_plugin, 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',
+      '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"',
@@ -403,6 +448,8 @@ describe('Tools tests', () => {
         'add_tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/latest/download/cs2pr cs2pr "-V"',
         'add_composer_tool flex flex symfony/ global',
         'add_grpc_php_plugin latest',
+        'add_mago',
+        'add_composer_tool name-collision-detector name-collision-detector shipmonk/ scoped',
         'add_tool https://github.com/php-parallel-lint/PHP-Parallel-Lint/releases/latest/download/parallel-lint.phar parallel-lint "--version"',
         'add_tool https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases/download/v3.2.1/php-cs-fixer.phar php-cs-fixer "-V"',
         'add_tool https://github.com/humbug/php-scoper/releases/latest/download/php-scoper.phar php-scoper "--version"',
@@ -436,9 +483,9 @@ describe('Tools tests', () => {
 
   it.each([
     [
-      '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, 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',
+      '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"',
@@ -451,6 +498,8 @@ describe('Tools tests', () => {
         'add_composer_tool flex flex symfony/ global',
         'add_grpc_php_plugin 1.2.3',
         'add_tool https://github.com/infection/infection/releases/latest/download/infection.phar infection "-V"',
+        'add_mago 0.26.1',
+        'add_composer_tool name-collision-detector name-collision-detector shipmonk/ scoped',
         'add_tool https://github.com/phan/phan/releases/latest/download/phan.phar phan "-v"',
         'add_tool https://github.com/phan/phan/releases/download/1.2.3/phan.phar phan "-v"',
         'add_tool https://www.phing.info/get/phing-1.2.3.phar,https://github.com/phingofficial/phing/releases/download/1.2.3/phing-1.2.3.phar phing "-v"',
@@ -469,6 +518,7 @@ describe('Tools tests', () => {
         'add_protoc 1.2.3',
         'add_tool https://github.com/vimeo/psalm/releases/latest/download/psalm.phar psalm "-v"',
         'add_composer_tool rector rector rector/ scoped',
+        'add_composer_tool backward-compatibility-check backward-compatibility-check roave/ scoped',
         'add_symfony latest',
         'add_composer_tool vapor-cli vapor-cli laravel/ scoped',
         'add_tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli "--version"',
@@ -485,9 +535,9 @@ describe('Tools tests', () => {
 
   it.each([
     [
-      'blackfire, blackfire-player:1.2.3, cs2pr, churn, deployer, does_not_exist, flex, phinx, phive:0.13.2, php-config, phpize, phpmd, simple-phpunit, symfony, wp, pie',
+      '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"',
@@ -495,6 +545,8 @@ describe('Tools tests', () => {
         'Add-Tool https://deployer.org/deployer.phar deployer "-V"',
         'Tool does_not_exist is not supported',
         'Add-ComposerTool flex flex symfony/ global',
+        'Add-Mago',
+        'Add-ComposerTool name-collision-detector name-collision-detector shipmonk/ scoped',
         'Add-ComposerTool phinx phinx robmorgan/ scoped',
         'Add-Tool https://github.com/phar-io/phive/releases/download/0.15.3/phive-0.15.3.phar phive "status"',
         'php-config is not a windows tool',
@@ -517,7 +569,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',
@@ -566,10 +618,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"'}
+    ${'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://dl.cloudsmith.io/public/shivammathur/composer-cache/raw/files/composer-7.4-preview.phar,https://getcomposer.org/composer-preview.phar composer preview'}
+    ${'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://dl.cloudsmith.io/public/shivammathur/composer-cache/raw/files/composer-7.4-1.phar,https://getcomposer.org/composer-1.phar composer'}
+    ${'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://dl.cloudsmith.io/public/shivammathur/composer-cache/raw/files/composer-7.4-snapshot.phar,https://getcomposer.org/composer.phar composer snapshot'}
+    ${'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);
   });

action.yml

@@ -27,6 +27,9 @@ inputs:
   tools:
     description: 'Setup popular tools globally.'
     required: false
+  github-token:
+    description: 'GitHub token to use for authentication.'
+    default: ${{ github.token }}
 outputs:
   php-version:
     description: 'PHP version in semver format'

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@v5
 
       # 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@v5
 
       # 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@v5
 
       # 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@v5
 
       # 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@v5
 
       # 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@v5
 
       # 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@v5
 
       # 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@v5
 
       # 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@v5
 
       # 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@v5
 
       # 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@v5
 
       # 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@v5
 
       # 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@v5
 
       # 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@v5
 
       # 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@v5
 
       # 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@v5
 
       # 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@v5
 
       # 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@v5
 
       # 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@v5
 
       # 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@v5
 
       # 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@v5
 
       # 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@v5
 
       # 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@v5
 
       - 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@v5
 
       # 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@v5
 
       # 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@v5
 
       # 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@v5
 
       # 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@v5
 
       - 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@v5
 
       - 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.34.0",
+  "version": "2.35.5",
   "private": false,
   "description": "Setup PHP for use with GitHub Actions",
   "main": "lib/install.js",
@@ -40,26 +40,29 @@
     "compare-versions": "^6.1.1"
   },
   "devDependencies": {
-    "@eslint/compat": "^1.2.9",
+    "@eslint/compat": "^1.3.2",
-    "@eslint/js": "9.28.0",
+    "@eslint/js": "9.35.0",
-    "@types/jest": "^29.5.14",
+    "@types/jest": "^30.0.0",
-    "@types/node": "^22.15.30",
+    "@types/node": "^24.3.1",
-    "@typescript-eslint/eslint-plugin": "^8.33.1",
+    "@typescript-eslint/eslint-plugin": "^8.43.0",
-    "@typescript-eslint/parser": "^8.33.1",
+    "@typescript-eslint/parser": "^8.43.0",
     "@vercel/ncc": "^0.38.3",
-    "eslint": "9.28.0",
+    "eslint": "9.35.0",
-    "eslint-config-prettier": "^10.1.5",
+    "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-jest": "^28.13.0",
+    "eslint-plugin-jest": "^29.0.1",
-    "eslint-plugin-prettier": "^5.4.1",
+    "eslint-plugin-prettier": "^5.5.4",
-    "globals": "^16.2.0",
+    "globals": "^16.3.0",
-    "jest": "^29.7.0",
+    "jest": "^30.1.3",
-    "jest-circus": "^29.7.0",
+    "jest-circus": "^30.1.3",
-    "nock": "^14.0.5",
+    "nock": "^14.0.10",
-    "prettier": "^3.5.3",
+    "prettier": "^3.6.2",
-    "simple-git-hooks": "^2.13.0",
+    "simple-git-hooks": "^2.13.1",
-    "ts-jest": "^29.3.4",
+    "ts-jest": "^29.4.1",
-    "typescript": "^5.8.3"
+    "typescript": "^5.9.2"
+  },
+  "overrides": {
+    "test-exclude": "^7.0.1"
   },
   "bugs": {
     "url": "https://github.com/shivammathur/setup-php/issues"

src/configs/ini/jit_aarch64.ini

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

src/configs/php-versions.json

@@ -3,6 +3,7 @@
   "highest": "8.4",
   "latest": "8.4",
   "nightly": "8.5",
+  "master": "8.6",
   "5.x": "5.6",
   "7.x": "7.4",
   "8.x": "8.4"

src/configs/tools.json

@@ -1,4 +1,9 @@
 {
+  "backward-compatibility-check": {
+    "type": "composer",
+    "repository": "roave/backward-compatibility-check",
+    "scope": "scoped"
+  },
   "box": {
     "type": "phar",
     "repository": "box-project/box",
@@ -45,6 +50,12 @@
     "version_prefix": "",
     "version_parameter": "-V"
   },
+  "easy-coding-standard": {
+    "type": "composer",
+    "alias": "ecs",
+    "repository": "symplify/easy-coding-standard",
+    "scope": "scoped"
+  },
   "infection": {
     "type": "phar",
     "repository": "infection/infection",
@@ -53,6 +64,11 @@
     "version_prefix": "",
     "version_parameter": "-V"
   },
+  "name-collision-detector": {
+    "type": "composer",
+    "repository": "shipmonk/name-collision-detector",
+    "scope": "scoped"
+  },
   "phan": {
     "type": "phar",
     "repository": "phan/phan",
@@ -233,6 +249,12 @@
     "domain": "https://github.com",
     "version_prefix": "v"
   },
+  "mago": {
+    "type": "custom-package",
+    "repository": "carthage-software/mago",
+    "domain": "https://github.com",
+    "version_prefix": ""
+  },
   "protoc": {
     "type": "custom-package",
     "repository": "protocolbuffers/protobuf",
@@ -244,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",
@@ -331,11 +354,5 @@
     "extension": ".phar",
     "version_parameter": "--version",
     "version_prefix": "v"
-  },
-  "easy-coding-standard": {
-    "type": "composer",
-    "alias": "ecs",
-    "repository": "symplify/easy-coding-standard",
-    "scope": "scoped"
   }
 }

src/extensions.ts

@@ -38,7 +38,9 @@ export async function addExtensionDarwin(
       // 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 /^(7\.4|8\.[0-5])relay(-v?\d+\.\d+\.\d+|-nightly)?$/.test(
+        version_extension
+      ):
       case /^(5\.[3-6]|7\.[0-4]|8\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
@@ -271,7 +273,9 @@ export async function addExtensionLinux(
       // 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 /^(7\.4|8\.[0-5])relay(-v?\d+\.\d+\.\d+|-nightly)?$/.test(
+        version_extension
+      ):
       case /^(5\.[3-6]|7\.[0-4]|8\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):

src/install.ts

@@ -18,7 +18,6 @@ export async function getScript(os: string): Promise<string> {
   const filename = os + (await utils.scriptExtension(os));
   const script_path = path.join(__dirname, '../src/scripts', filename);
   const run_path = script_path.replace(os, 'run');
-  process.env['fail_fast'] = await utils.getInput('fail-fast', false);
   const extension_csv: string = await utils.getInput('extensions', false);
   const ini_values_csv: string = await utils.getInput('ini-values', false);
   const coverage_driver: string = await utils.getInput('coverage', false);
@@ -48,10 +47,19 @@ export async function getScript(os: string): Promise<string> {
   return run_path;
 }
 
+/**
+ * Function to set environment variables based on inputs.
+ */
+export async function setEnv(): Promise<void> {
+  process.env['fail_fast'] = await utils.getInput('fail-fast', false);
+  process.env['GITHUB_TOKEN'] ??= await utils.getInput('github-token', false);
+}
+
 /**
  * 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);

src/scripts/darwin.sh

@@ -134,9 +134,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 +148,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 +160,24 @@ 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"
+  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
+  fi
   if [[ "$existing_version" != "false" && -z "$suffix" ]]; then
-    ([ "$action" = "upgrade" ] && brew upgrade -f --overwrite "$php_formula") || brew unlink "$php_formula"
+    if [ "$action" = "upgrade" ]; then
+      brew upgrade -f --overwrite "$php_formula"
+    else
+      brew unlink "$php_keg"
+    fi
   else
     brew install -f --overwrite "$php_formula"
   fi
   sudo chown -R "$(id -un)":"$(id -gn)" "$brew_prefix"
-  brew link --force --overwrite "$php_formula"
+  brew link --force --overwrite "$php_keg"
 }
 
 # Function to get formula suffix
@@ -212,7 +219,7 @@ get_scan_dir() {
 
 # Function to handle self-hosted runner setup.
 self_hosted_helper() {
-  :
+  sudo mkdir -p /opt/hostedtoolcache >/dev/null 2>&1 || true
 }
 
 # Function to Setup PHP.
@@ -222,18 +229,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
+  elif [[ "${existing_version:0:3}" = "$version" && "${update:?}" = "true" ]]; then
-    if [ "${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"
+      status="Upgraded"
-    else
-      status="Found"
     fi
   fi
   php_config="$(command -v php-config)"

src/scripts/extensions/add_extensions.sh

@@ -1,8 +1,10 @@
 # Function to log result of installing extension.
 add_extension_log() {
-  (
+  if check_extension ${1%%-*}; then
-    check_extension "$(echo "$1" | cut -d '-' -f 1)" && add_log "${tick:?}" "$1" "$2"
+    add_log "${tick:?}" "$1" "$2"
-  ) || add_log "${cross:?}" "$1" "Could not install $1 on PHP ${semver:?}"
+  else
+    add_log "${cross:?}" "$1" "${3:-Could not install $1 on PHP ${semver:?}}"
+  fi
 }
 
 # Function to test if extension is loaded.
@@ -216,7 +218,7 @@ add_pecl_extension() {
     add_log "${tick:?}" "$extension" "Enabled"
   else
     [ -n "$pecl_version" ] && pecl_version="-$pecl_version"
-    pecl_install "$extension$pecl_version" || add_extension "$extension" "$(get_extension_prefix "$extension")" >/dev/null 2>&1
+    pecl_install "$extension$pecl_version" || ( [ "${fail_fast:?}" = "false" ] && add_extension "$extension" "$(get_extension_prefix "$extension")" >/dev/null 2>&1)
     extension_version="$(php -r "echo phpversion('$extension');")"
     [ -n "$extension_version" ] && extension_version="-$extension_version"
     add_extension_log "$extension$extension_version" "Installed and enabled"

src/scripts/extensions/cubrid.sh

@@ -7,15 +7,6 @@ add_license_log() {
   echo "$END_GROUP"
 }
 
-# Function to setup gcc-7 and g++-7
-setup_compiler() {
-  if ! command -v gcc-7 >/dev/null || ! command -v g++-7 >/dev/null; then
-    add_ppa ubuntu-toolchain-r/test
-    add_packages gcc-7 g++-7 -y
-  fi
-  printf "gcc g++" | xargs -d ' ' -I {} sudo update-alternatives --install /usr/bin/{} {} /usr/bin/{}-7 7
-}
-
 # Function to set cubrid repo for the extension.
 set_cubrid_repo() {
   case "${ext:?}" in

src/scripts/extensions/gearman.sh

@@ -1,6 +1,5 @@
 # Helper function to add gearman extension.
 add_gearman_helper() {
-  add_ppa ondrej/pkg-gearman
   install_packages libgearman-dev
   enable_extension gearman extension
   if ! check_extension gearman; then

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)
+  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)
-  if [ "$icu" != "$supported_version" ]; then
+  [ -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)
-    add_log "${cross:?}" "intl" "ICU $icu is not supported"
+  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/patches/gearman.sh

@@ -0,0 +1,5 @@
+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,7 +1,11 @@
 patch_geos() {
-  if [ "$(php -r "echo PHP_VERSION_ID;")" -ge 70000 ]; then
+  php_version_id="$(php -r "echo PHP_VERSION_ID;")"
+  if [ "$php_version_id" -ge 70000 ]; 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/relay.sh

@@ -2,11 +2,9 @@
 get_relay_version() {
  local ext=$1
   if [[ "$ext" =~ ^relay$ ]]; then
-    if [ "${version:?}" = "7.4" ]; then
+    get -s -n "" "${relay_release:?}"
-      echo 'v0.7.0'
+  elif [[ $ext =~ ^relay-nightly$ ]]; then
-    else
+    echo "dev"
-      get -s -n "" "${relay_releases:?}"/latest 2<&1 | grep -m 1 -Eo "tag/(v[0-9]+(\.[0-9]+)?(\.[0-9]+)?)" | head -n 1 | cut -d '/' -f 2
-    fi
   else
     relay_version="${ext##*-}"
     echo "v${relay_version/v//}"
@@ -48,19 +46,6 @@ change_library_paths() {
   fi
 }
 
-# Add hiredis library
-add_hiredis() {
-  hiredis_url=https://github.com/redis/hiredis/archive/v1.1.0.tar.gz
-  hiredis_sha=fe6d21741ec7f3fc9df409d921f47dfc73a4d8ff64f4ac6f1d95f951bf7f53d6
-  sed -Ei.bak -e "s#^  url.*#  url \"$hiredis_url\"#" -e "s#^  sha256.*#  sha256 \"$hiredis_sha\"#" ${core_repo:?}/Formula/h/hiredis.rb
-  brew install -s hiredis
-  lib_dir="${brew_prefix:?}"/opt/hiredis/lib
-  if [ -e "$lib_dir"/libhiredis_ssl.1.1.0.dylib ]; then
-    sudo ln -sf "$lib_dir"/libhiredis_ssl.1.1.0.dylib "$lib_dir"/libhiredis_ssl.dylib.1.1.0
-  fi
-  mv ${core_repo:?}/Formula/h/hiredis.rb.bak ${core_repo:?}/Formula/h/hiredis.rb
-}
-
 # Add relay dependencies
 add_relay_dependencies() {
   add_extension json
@@ -69,8 +54,7 @@ add_relay_dependencies() {
   if [ "$os" = "Darwin" ]; then
     . "${0%/*}"/tools/brew.sh
     configure_brew
-    brew install lz4 zstd concurrencykit
+    brew install lz4 hiredis zstd concurrencykit
-    add_hiredis
   fi
 }
 
@@ -124,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"
@@ -148,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
-  relay_version=$(get_relay_version "$ext")
+  if [[ "$arch" = "x86-64" && "$os" = "Darwin" ]]; then
-  add_relay_dependencies >/dev/null 2>&1
+    error="Relay extension is not available for macOS x86_64 architecture"
-  if shared_extension relay; then
-    message="Enabled"
   else
-    add_relay_helper >/dev/null 2>&1
+    relay_version=$(get_relay_version "$ext")
-    message="Installed and enabled"
+    add_relay_dependencies >/dev/null 2>&1
+    if shared_extension relay; then
+      message="Enabled"
+    else
+      add_relay_helper "$arch" >/dev/null 2>&1
+      message="Installed and enabled ${relay_version}"
+    fi
+    configure_relay >/dev/null 2>&1
   fi
-  configure_relay >/dev/null 2>&1
+  add_extension_log relay "$message" "$error"
-  add_extension_log relay "$message"
 }

src/scripts/extensions/source.sh

@@ -119,9 +119,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
 }
 

src/scripts/linux.sh

@@ -20,6 +20,7 @@ self_hosted_helper() {
     sudo ln -sf /usr/bin/apt-get /usr/bin/apt-fast
     trap "sudo rm -f /usr/bin/apt-fast 2>/dev/null" exit
   fi
+  sudo mkdir -p /opt/hostedtoolcache >/dev/null 2>&1 || true
   install_packages apt-transport-https ca-certificates curl file make jq unzip autoconf automake gcc g++ gnupg
 }
 

src/scripts/tools/add_tools.ps1

@@ -28,6 +28,52 @@ Function Edit-ComposerConfig() {
   Set-ComposerAuth
 }
 
+# Function to update auth.json.
+Function Update-AuthJson {
+  [CmdletBinding()]
+  param(
+    [Parameter(Mandatory)][string[]] $ComposerAuth
+  )
+  if (Test-Path $composer_home\auth.json) {
+    try {
+      $existing = Get-Content $composer_home\auth.json -Raw | ConvertFrom-Json
+    } catch {
+      $existing = [PSCustomObject]@{}
+    }
+  } else {
+    $existing = [PSCustomObject]@{}
+  }
+  foreach ($fragment in $ComposerAuth) {
+    $piece = ('{' + $fragment + '}') | ConvertFrom-Json
+    foreach ($prop in $piece.PSObject.Properties) {
+      if ($prop.Name -eq 'http-basic') {
+        if (-not $existing.'http-basic') {
+          $existing | Add-Member -MemberType NoteProperty -Name 'http-basic' -Value ([PSCustomObject]@{}) -Force
+        }
+        foreach ($domainProp in $prop.Value.PSObject.Properties) {
+          $existing.'http-basic' | Add-Member -MemberType NoteProperty -Name $domainProp.Name -Value $domainProp.Value -Force
+        }
+      } else {
+        $existing | Add-Member -MemberType NoteProperty -Name $prop.Name -Value $prop.Value -Force
+      }
+    }
+  }
+  Set-Content -Path $composer_home\auth.json -Value ($existing | ConvertTo-Json -Depth 5)
+}
+
+function Test-GitHubPublicAccess {
+  param(
+    [Parameter(Mandatory=$true)]
+    [string]$Token
+  )
+  try {
+    Invoke-RestMethod -Uri 'https://api.github.com/' -Headers @{ Authorization = "token $Token" } -ErrorAction Stop | Out-Null
+    return $true
+  } catch {
+    return $false
+  }
+}
+
 # Function to setup authentication in composer.
 Function Set-ComposerAuth() {
   if(Test-Path env:COMPOSER_AUTH_JSON) {
@@ -41,14 +87,18 @@ Function Set-ComposerAuth() {
   if(Test-Path env:PACKAGIST_TOKEN) {
     $composer_auth += '"http-basic": {"repo.packagist.com": { "username": "token", "password": "' + $env:PACKAGIST_TOKEN + '"}}'
   }
-  if(-not(Test-Path env:GITHUB_TOKEN) -and (Test-Path env:COMPOSER_TOKEN)) {
+  $write_token = $true
-    $env:GITHUB_TOKEN = $env:COMPOSER_TOKEN
+  $token = if ($env:COMPOSER_TOKEN) { $env:COMPOSER_TOKEN } else { $env:GITHUB_TOKEN }
-  }
+  if ($token) {
-  if (Test-Path env:GITHUB_TOKEN) {
+    if ($env:GITHUB_SERVER_URL -ne "https://github.com" -and -not(Test-GitHubPublicAccess $token)) {
-    $composer_auth += '"github-oauth": {"github.com": "' + $env:GITHUB_TOKEN + '"}'
+      $write_token = $false
+    }
+    if($write_token) {
+      $composer_auth += '"github-oauth": {"github.com": "' + $token + '"}'
+    }
   }
   if($composer_auth.length) {
-    Add-Env COMPOSER_AUTH ('{' + ($composer_auth -join ',') + '}')
+    Update-AuthJson $composer_auth
   }
 }
 

src/scripts/tools/add_tools.sh

@@ -11,7 +11,7 @@ get_tool_version() {
   alp="[a-zA-Z0-9\.]"
   version_regex="[0-9]+((\.{1}$alp+)+)(\.{0})(-$alp+){0,1}"
   if [ "$tool" = "composer" ]; then
-    composer_alias_version="$(grep -Ea "const\sBRANCH_ALIAS_VERSION" "$tool_path_dir/composer" | grep -Eo "$version_regex")"
+    composer_alias_version="$(grep -Ea "const\sBRANCH_ALIAS_VERSION" "${tool_path_dir:?}/composer" | grep -Eo "$version_regex")"
     if [[ -n "$composer_alias_version" ]]; then
       composer_version="$composer_alias_version+$(grep -Ea "const\sVERSION" "$tool_path_dir/composer" | grep -Eo "$alp+" | tail -n 1)"
     else
@@ -46,6 +46,30 @@ configure_composer() {
   set_composer_auth
 }
 
+# Function to merge auth.json fragments.
+update_auth_json() {
+  local auth_file="$composer_home/auth.json"
+  local merged
+  [[ -f "$auth_file" ]] && merged=$(<"$auth_file") || merged='{}'
+  for frag in "$@"; do
+    local obj="{$frag}"
+    merged=$(jq -n --argjson b "$merged" --argjson n "$obj" '
+      if $n|has("http-basic") then
+        (($b["http-basic"]//{}) + $n["http-basic"]) as $hb
+        | ($b + $n) | .["http-basic"] = $hb
+      else
+        $b + $n
+      end
+    ')
+  done
+  printf '%s' "$merged" > "$composer_home/auth.json"
+}
+
+# Function to check if public GitHub token authentication is possible.
+can_access_public_github() {
+  curl --fail -s -H "Authorization: token $1" 'https://api.github.com/' >/dev/null 2>&1
+}
+
 # Function to setup authentication in composer.
 set_composer_auth() {
   if [ -n "$COMPOSER_AUTH_JSON" ]; then
@@ -59,11 +83,18 @@ set_composer_auth() {
   if [ -n "$PACKAGIST_TOKEN" ]; then
     composer_auth+=( '"http-basic": {"repo.packagist.com": { "username": "token", "password": "'"$PACKAGIST_TOKEN"'"}}' )
   fi
-  if [ -n "${GITHUB_TOKEN:-$COMPOSER_TOKEN}" ]; then
+  token="${COMPOSER_TOKEN:-$GITHUB_TOKEN}"
-    composer_auth+=( '"github-oauth": {"github.com": "'"${GITHUB_TOKEN:-$COMPOSER_TOKEN}"'"}' )
+  if [ -n "$token" ]; then
+    write_token=true
+    if [ "$GITHUB_SERVER_URL" != "https://github.com" ]; then
+      can_access_public_github "$token" || write_token=false
+    fi
+    if [ "$write_token" = 'true' ]; then
+      composer_auth+=( '"github-oauth": {"github.com": "'"$token"'"}' )
+    fi
   fi
   if ((${#composer_auth[@]})); then
-    add_env COMPOSER_AUTH "{$(IFS=$','; echo "${composer_auth[*]}")}"
+    update_auth_json "${composer_auth[@]}"
   fi
 }
 
@@ -169,7 +200,11 @@ add_tool() {
     elif [ -e /tmp/"$tool" ]; then
       sudo cp -a /tmp/"$tool" "$tool_path"
     fi
-    add_log "$cross" "$tool" "Could not setup $tool"
+    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
 }
 

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/mago.ps1

@@ -0,0 +1,36 @@
+Function Get-MagoTag() {
+  $releases = 'https://github.com/carthage-software/mago/releases'
+  if("$mago_tag" -eq "latest") {
+    $mago_tag = (Get-File -Url $releases/latest).BaseResponse.RequestMessage.RequestUri.Segments[-1]
+  } else {
+    try {
+      [net.httpWebRequest] $request = [net.webRequest]::create("$releases/tag/$mago_tag")
+      $request.Method = "HEAD"
+      [net.httpWebResponse] $response = $request.getResponse()
+      $response.Close()
+      $mago_tag = "$mago_tag"
+    } catch {
+      $mago_tag = (Get-File -Url $releases/latest).BaseResponse.RequestMessage.RequestUri.Segments[-1]
+    }
+  }
+  return $mago_tag
+}
+
+Function Add-Mago() {
+  param(
+    [Parameter(Mandatory = $true, Position = 0, HelpMessage = 'The mago version to be installed')]
+    [ValidatePattern('^latest$|^\d+\.\d+\.\d+$')]
+    [string] $mago_tag
+  )
+  $mago_tag = Get-MagoTag
+  $arch_name = 'x86_64'
+  if(-not([Environment]::Is64BitOperatingSystem)) {
+    $arch_name = 'i686'
+  }
+  $url = "https://github.com/carthage-software/mago/releases/download/$mago_tag/mago-$mago_tag-$arch_name-pc-windows-msvc.zip"
+  Get-File -Url $url -OutFile $bin_dir\mago.zip >$null 2>&1
+  Expand-Archive -Path $bin_dir\mago.zip -DestinationPath $bin_dir\mago -Force >$null 2>&1
+  Move-Item -Path $bin_dir\mago\mago-$mago_tag-$arch_name-pc-windows-msvc\mago.exe -Destination $bin_dir\mago.exe -Force
+  Add-ToProfile $current_profile 'mago' "New-Alias mago $bin_dir\mago.exe"
+  Add-Log $tick "mago" "Added mago $mago_tag"
+}

src/scripts/tools/mago.sh

@@ -0,0 +1,29 @@
+get_mago_tag() {
+  if [ "$mago_tag" = "latest" ]; then
+    mago_tag=$(get -s -n "" https://github.com/carthage-software/mago/releases/latest 2<&1 | grep -m 1 -Eo "tag/([0-9]+(\.[0-9]+)?(\.[0-9]+)?)" | head -n 1 | cut -d '/' -f 2)
+  else
+    status_code=$(get -v -n /tmp/mago.tmp "https://github.com/carthage-software/mago/releases/tag/$mago_tag")
+    if [ "$status_code" = "200" ]; then
+      mago_tag="$mago_tag"
+    else
+      mago_tag=$(get -s -n "" https://github.com/carthage-software/mago/releases/latest 2<&1 | grep -m 1 -Eo "tag/([0-9]+(\.[0-9]+)?(\.[0-9]+)?)" | head -n 1 | cut -d '/' -f 2)
+    fi
+  fi
+}
+
+add_mago() {
+  mago_tag=$1
+  get_mago_tag
+  (
+    platform='unknown-linux-gnu'
+    [ "$(uname -s)" = "Darwin" ] && platform='apple-darwin'
+    arch="$(uname -m)"
+    [[ "$arch" = 'arm64' || "$arch" = 'aarch64' ]] && arch='aarch64'
+    [[ "$arch" = 'x86_64' || "$arch" = 'amd64' ]] && arch='x86_64'
+    get -q -n /tmp/mago.tar.gz "https://github.com/carthage-software/mago/releases/download/$mago_tag/mago-$mago_tag-$arch-$platform.tar.gz"
+    sudo tar -xzf /tmp/mago.tar.gz -C /tmp/
+    sudo mv /tmp/mago-$mago_tag-$arch-$platform/mago /usr/local/bin/mago
+    sudo chmod +x /usr/local/bin/mago
+  ) >/dev/null 2>&1
+  add_log "${tick:?}" "mago" "Added mago $mago_tag"
+}

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")")"
+    if [ -f "$ppa_search" ]; then
-    status_file=/tmp/"$(echo -n "$ppa_search" | shasum -a 256 | cut -d ' ' -f 1)"
+      list="$ppa_search"
-  elif [ -e "$list_file" ] && grep -Eq '^deb |^Types deb' "$list_file"; then
+    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,77 @@ 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"
+}
+
+escape_regex() {
+  printf '%s' "$1" | sed -e 's/[][\.^$*+?{}()|\/]/\\&/g'
+}
+
+merge_components() {
+  local out=() t
+  for t in $1 $2; do [[ $t && " ${out[*]} " != *" $t "* ]] && out+=("$t"); done
+  printf '%s\n' "${out[*]}"
+}
+
+merge_components_from_file() {
+  local path=$1
+  local incoming=$2
+  local current=
+  if [ -n "$path" ] && [ -e "$path" ]; then
+    current="$(grep -E '^Components:' "$path" | head -n 1 | cut -d ':' -f 2 | xargs)"
+  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_pattern="^deb .*${escaped_url} ${escaped_dist} .*${escaped_branches}$"
+  local deb822_pattern="^URIs: ${escaped_url}$"
+  if [ "$list_format" = "deb822" ]; then
+    printf '%s|%s\n' "$deb822_pattern" "$deb_pattern"
+  else
+    printf '%s|%s\n' "$deb_pattern" "$deb822_pattern"
+  fi
+}
+
 # Function to get fingerprint from an Ubuntu PPA.
 ubuntu_fingerprint() {
-  ppa=$1
+  ppa="$1"
-  get -s -n "" "${lp_api[@]/%//~${ppa%/*}/+archive/${ppa##*/}}" | jq -r '.signing_key_fingerprint'
+  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 +169,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
 }
 
+handle_existing_list() {
+  local ppa=$1
+  local list_format=$2
+  branches=$3
+  [[ "$list_format" = "deb822"  && -n "$check_lists_file" ]] || {
+    echo "Repository $ppa ($branches) already exists"
+    return 1
+  }
+  [[ "$check_lists_file" = *.list ]] && {
+    sudo rm -f "$check_lists_file"
+    return 0
+  }
+  local merged_components
+  merged_components="$(merge_components_from_file "$check_lists_file" "$branches")" && {
+    sudo rm -f "$check_lists_file"
+    branches="$merged_components"
+    return 0
+  }
+  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
+  local ppa=$1
-  ppa_search=$2
+  local primary=${2:-}
-  if grep -Eqr "$ppa_search" "$list_dir"; then
+  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
+    match_file=$(grep -Elr "$secondary" "$list_dir" 2>/dev/null | head -n 1)
+  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;
+    check_lists_file="$match_file"
-  else
+    return 0
-    return 1;
   fi
+  return 1
 }
 
 # Function to add a sources list.
@@ -121,19 +257,24 @@ add_list() {
   key_source=${3:-"$ppa_url"}
   package_dist=${4:-"$VERSION_CODENAME"}
   branches=${5:-main}
-  ppa_search="deb .*$ppa_url $package_dist .*$branches$"
+  local list_format
-  if check_lists "$ppa" "$ppa_search"; then
+  list_format="$(get_sources_format)"
-    echo "Repository $ppa already exists";
+  local status_token
-    return 1;
+  status_token="${ppa_url}|${package_dist}|${branches}"
-  else
+  local list_path=
-    arch=$(dpkg --print-architecture)
+  IFS='|' read -r primary_pattern secondary_pattern <<< "$(get_repo_patterns "$list_format" "$ppa_url" "$package_dist" "$branches")"
-    [ -e "$key_source" ] && key_file=$key_source || key_file="$key_dir"/"${ppa/\//-}"-keyring.gpg
+  if check_lists "$ppa" "$primary_pattern" "$secondary_pattern" "$status_token"; then
-    add_key "$ppa" "$ppa_url" "$package_dist" "$key_source" "$key_file"
+    list_path="$check_lists_file"
-    sudo rm -rf "$list_dir"/"${ppa/\//-}".list || true
+    handle_existing_list "$ppa" "$list_format" "$branches" || return 1;
-    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
+    check_lists_file=
-    update_lists "$ppa" "$ppa_search"
+    IFS='|' read -r primary_pattern secondary_pattern <<< "$(get_repo_patterns "$list_format" "$ppa_url" "$package_dist" "$branches")"
-    . /etc/os-release
+    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"
+  write_list "$list_format" "$ppa" "$ppa_url" "$package_dist" "$branches" "$key_file"
+  update_lists "$ppa" "$primary_pattern" "$status_token"
+  . /etc/os-release
   return 0;
 }
 
@@ -143,8 +284,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$"
+  local list_format
-  if check_lists "$ppa" "$ppa_search"; then
+  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,13 +303,13 @@ 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
 is_ubuntu_ppa_up() {
   ppa=${1:-ondrej/php}
-  curl -s --connect-timeout 5 --max-time 5 --head --fail "$lpc_ppa/$ppa/ubuntu/dists/$VERSION_CODENAME/Release" > /dev/null
+  curl -s --connect-timeout 10 --max-time 10 --head --fail "$lpc_ppa/$ppa/ubuntu/dists/$VERSION_CODENAME/Release" > /dev/null
 }
 
 # Function to add the PPA mirror.
@@ -172,8 +317,8 @@ add_ppa_sp_mirror() {
   ppa=$1
   ppa_name="$(basename "$ppa")"
   remove_list "$ppa" || true
-  [ "${debug:?}" = "debug" ] && add_list sp/"$ppa_name" "$sp/$ppa/ubuntu" "$sp/$ppa/ubuntu/key.gpg" "$VERSION_CODENAME" "main/debug"
+  [ "${debug:?}" = "debug" ] && add_list sp/"$ppa_name" "$ppa_sp/$ppa/ubuntu" "$ppa_sp/$ppa/ubuntu/key.gpg" "$VERSION_CODENAME" "main/debug"
-  add_list sp/"$ppa_name" "$sp/$ppa/ubuntu" "$sp/$ppa/ubuntu/key.gpg"
+  add_list sp/"$ppa_name" "$ppa_sp/$ppa/ubuntu" "$ppa_sp/$ppa/ubuntu/key.gpg"
 }
 
 # Function to add a PPA.
@@ -182,11 +327,13 @@ add_ppa() {
   ppa=${1:-ondrej/php}
   if [[ "$ID" = "ubuntu" || "$ID_LIKE" =~ ubuntu ]] && [[ "$ppa" =~ "ondrej/" ]]; then
     if is_ubuntu_ppa_up "$ppa" ; then
-      [ "${runner:?}" = "self-hosted" ] && find "$list_dir" -type f -name 'sp*' -exec grep -qF "$sp" {} \; -delete
+      [ "${runner:?}" = "self-hosted" ] && find "$list_dir" -type f -name 'sp*' -exec grep -qF "${sp/https:\/\/}" {} \; -delete
       [ "${debug:?}" = "debug" ] && add_list "$ppa" "$lpc_ppa/$ppa/ubuntu" "$lpc_ppa/$ppa/ubuntu" "$VERSION_CODENAME" "main/debug"
       add_list "$ppa"
-    else
+    elif [ "$ppa" = "ondrej/php" ]; then
       add_ppa_sp_mirror "$ppa"
+    else
+      add_log "${cross:?}" "$ppa" "PPA $ppa is not available"
     fi
   elif [[ "$ID" = "debian" || "$ID_LIKE" =~ debian ]] && [[ "$ppa" =~ "ondrej/" ]]; then
     [ "${debug:?}" = "debug" ] && add_list "$ppa" "$sury"/"${ppa##*/}"/ "$sury"/"${ppa##*/}"/apt.gpg "$VERSION_CODENAME" "main/debug"
@@ -206,12 +353,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"
+  local list_format
-  update_lists "$ppa" "$ppa_search"
+  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'
@@ -225,6 +383,7 @@ lpc_ppa='https://ppa.launchpadcontent.net'
 key_dir='/usr/share/keyrings'
 dist_info_dir='/usr/share/distro-info'
 sury='https://packages.sury.org'
+ppa_sp='https://ppa.setup-php.com'
 sp='https://setup-php.com'
 sks=(
   'https://keyserver.ubuntu.com'

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,18 +1,32 @@
 Function Add-Symfony() {
-  $arch_name ='amd64'
+  param(
-  if(-not([Environment]::Is64BitOperatingSystem) -or $version -lt '7.0') {
+    [Parameter(Mandatory = $true, Position = 0, HelpMessage = 'Symfony version to be installed')]
-    $arch_name = '386'
+    [string] $protobuf_tag
-  }
+  )
-  $url = "https://github.com/symfony-cli/symfony-cli/releases/latest/download/symfony-cli_windows_${arch_name}.zip"
+  $protobuf_tag = $protobuf_tag.replace('v', '')
-  Get-File -Url $url -OutFile $bin_dir\symfony.zip >$null 2>&1
+  if($protobuf_tag -ne 'latest' -and $protobuf_tag -notmatch '^\d+(\.\d+)*$') {
-  Expand-Archive -Path $bin_dir\symfony.zip -DestinationPath $bin_dir -Force >$null 2>&1
+    Add-Log $cross "symfony-cli" "Invalid symfony version: $protobuf_tag"
-  if(Test-Path $bin_dir\symfony.exe) {
-    Copy-Item -Path $bin_dir\symfony.exe -Destination $bin_dir\symfony-cli.exe > $null 2>&1
-    Add-ToProfile $current_profile 'symfony' "New-Alias symfony $bin_dir\symfony.exe"
-    Add-ToProfile $current_profile 'symfony_cli' "New-Alias symfony-cli $bin_dir\symfony-cli.exe"
-    $tool_version = Get-ToolVersion symfony "-V"
-    Add-Log $tick "symfony-cli" "Added symfony-cli $tool_version"
   } else {
-    Add-Log $cross "symfony-cli" "Could not setup symfony-cli"
+    $arch_name = 'amd64'
+    if (-not ([Environment]::Is64BitOperatingSystem) -or $version -lt '7.0') {
+      $arch_name = '386'
+    }
+    $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) {
+      Copy-Item -Path $bin_dir\symfony.exe -Destination $bin_dir\symfony-cli.exe > $null 2>&1
+      Add-ToProfile $current_profile 'symfony' "New-Alias symfony $bin_dir\symfony.exe"
+      Add-ToProfile $current_profile 'symfony_cli' "New-Alias symfony-cli $bin_dir\symfony-cli.exe"
+      $tool_version = Get-ToolVersion symfony "-V"
+      Add-Log $tick "symfony-cli" "Added symfony-cli $tool_version"
+    } else {
+      Add-Log $cross "symfony-cli" "Could not setup symfony-cli"
+    }
   }
 }

src/scripts/tools/symfony.sh

@@ -1,41 +1,44 @@
-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)
+  local symfony_tag=$1
-    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)
+  local os
-    if [ -z "$url" ]; then
+  local arch
-      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)
+  os="$(uname -s | tr '[:upper:]' '[:lower:]')"
-    fi
+  arch="$(uname -m)"
-    echo "$url"
+  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
 }
 
 add_symfony_helper() {
-  if [ "$(uname -s)" = "Linux" ]; then
+  local install_dir=/usr/local/bin
-    url="$(get_symfony_artifact_url)"
+  [ "$(uname -s)" = "Darwin" ] && install_dir=${brew_prefix:?}/bin
-    if [ -z "$url" ]; then
+  get -s -n "" "$(get_symfony_artifact_url "$symfony_tag")" | sudo tar -xz -C "$install_dir" 2>/dev/null
-      . "${0%/*}"/tools/brew.sh
+  sudo chmod a+x "$install_dir"/symfony
-      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
 }
 
 add_symfony() {
-  add_symfony_helper >/dev/null 2>&1
+  local symfony_tag="${1/v/}"
-  symfony_path="$(command -v symfony)"
+  if ! [[ "$symfony_tag" =~ ^[0-9]+(\.[0-9]+)*$ || "$symfony_tag" == 'latest' ]]; then
-  if [[ -n "$symfony_path" ]]; then
+      add_log "${cross:?}" "symfony-cli" "Version '$symfony_tag' is not valid for symfony-cli"
-    sudo ln -s "$symfony_path" "${tool_path_dir:?}"/symfony-cli
-    tool_version=$(get_tool_version "symfony" "-V")
-    add_log "${tick:?}" "symfony-cli" "Added symfony-cli $tool_version"
   else
-    add_log "${cross:?}" "symfony-cli" "Could not setup symfony-cli"
+    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
+      tool_version=$(get_tool_version "symfony" "-V")
+      add_log "${tick:?}" "symfony-cli" "Added symfony-cli $tool_version"
+    else
+      add_log "${cross:?}" "symfony-cli" "Could not setup symfony-cli"
+    fi
   fi
 }

src/scripts/unix.sh

@@ -110,11 +110,11 @@ release_lock() {
 # Function to get the SHA256 hash of a string.
 get_sha256() {
   local input=$1
-  if command -v sha256sum >/dev/null 2>&1; then
+  if command -v sha256sum >/dev/null; then
     printf '%s' "$input" | sha256sum | cut -d' ' -f1
-  elif command -v shasum >/dev/null 2>&1; then
+  elif command -v shasum >/dev/null; then
     printf '%s' "$input" | shasum -a 256 | cut -d' ' -f1
-  elif command -v openssl >/dev/null 2>&1; then
+  elif command -v openssl >/dev/null; then
     printf '%s' "$input" | openssl dgst -sha256 | cut -d' ' -f2
   fi
 }
@@ -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
@@ -221,7 +221,7 @@ self_hosted_setup() {
       exit 1
     else
       self_hosted_helper >/dev/null 2>&1
-      add_env RUNNER_TOOL_CACHE /tmp
+      add_env RUNNER_TOOL_CACHE /opt/hostedtoolcache
     fi
   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

@@ -447,7 +447,7 @@ if($version -lt "5.5") {
 } else {
   $enable_extensions += ('opcache')
 }
-Enable-PhpExtension -Extension $enable_extensions -Path $php_dir
+Enable-PhpExtension -Extension ($enable_extensions | Where-Object { Test-Path $ext_dir\php_$_.dll }) -Path $php_dir
 Add-PhpCAInfo
 Add-OpenSSLConf
 Copy-Item -Path $src\configs\pm\*.json -Destination $env:RUNNER_TOOL_CACHE

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 refs: IRef[] = JSON.parse(response['data']);
-    const ref = refs.find((i: IRef) => /.*\d+.\d+.\d+$/.test(i['ref']));
+    const tags = refs
-    const tag: string = (ref || refs[0])['ref'].split('/').pop();
+      .map((i: IRef) => (i.ref?.split('/').pop() ?? '').replace(/^v(?=\d)/, ''))
-    return tag.replace(/^v(\d)/, '$1');
+      .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];
   }
 }
 
@@ -263,13 +283,15 @@ 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}`;
+  let cache_url = `${releases_url},${spc_url},${cds_url}`;
   let source_url = `${getcomposer}/composer.phar`;
   switch (true) {
     case /^snapshot$/.test(channel):
@@ -419,6 +441,7 @@ export async function addPhive(data: RS): Promise<string> {
  * @param data
  */
 export async function addPHPUnitTools(data: RS): Promise<string> {
+  /* istanbul ignore next */
   if (data['version'] === 'latest') {
     data['version'] =
       (await packagist.search(data['packagist'], data['php_version'])) ??

src/utils.ts

@@ -456,6 +456,7 @@ export async function readPHPVersion(): Promise<string> {
   const composerLock = path.join(composerProjectDir, 'composer.lock');
   if (fs.existsSync(composerLock)) {
     const lockFileContents = JSON.parse(fs.readFileSync(composerLock, 'utf8'));
+    /* istanbul ignore next */
     if (
       lockFileContents['platform-overrides'] &&
       lockFileContents['platform-overrides']['php']
@@ -469,6 +470,7 @@ export async function readPHPVersion(): Promise<string> {
     const composerFileContents = JSON.parse(
       fs.readFileSync(composerJson, 'utf8')
     );
+    /* istanbul ignore next */
     if (
       composerFileContents['config'] &&
       composerFileContents['config']['platform'] &&