Bump version 2.31.1

Update Node.js dependencies

.github/workflows/codeql.yml

@@ -20,13 +20,13 @@ jobs:
           fetch-depth: 2
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           config-file: ./.github/codeql/codeql-configuration.yml
           languages: javascript
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3

.github/workflows/docs.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-22.04, ubuntu-20.04, windows-2022, macos-12]
+        operating-system: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, windows-2022, macos-12]
         php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
     steps:
       - name: Setup PHP
@@ -45,9 +45,9 @@ jobs:
           php -m | Out-File -FilePath "$env:file" -Append
           Write-Output "```````n" | Out-File -FilePath "$env:file" -Append
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: lists
+          name: lists-php${{ matrix.php-versions }}-${{ matrix.operating-system }}.md
           path: php${{ matrix.php-versions }}-${{ matrix.operating-system }}.md
   update:
     permissions:
@@ -61,16 +61,18 @@ jobs:
         with:
           repository: ${{ github.repository }}.wiki
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          path: ${{ github.workspace }}
+          path: ${{ github.workspace }}/lists
+          pattern: lists-*
+          merge-multiple: true
       - name: Configure Git
         run : |
           git config --local user.email "${{ secrets.email }}"
           git config --local user.name "${{ github.repository_owner }}"
       - name: Combine
         run: |
-          for os in ubuntu-22.04 ubuntu-20.04 windows-2022 windows-2019 macos-11 macos-12 macos-13; do
+          for os in ubuntu-24.04 ubuntu-22.04 ubuntu-20.04 windows-2022 windows-2019 macos-11 macos-12 macos-13; do
             echo "These are extensions which are loaded by default on the following PHP versions. More extensions which are available as packages and available on pecl are supported by setup-php. Refer to [php extension support](https://github.com/shivammathur/setup-php#heavy_plus_sign-php-extension-support) for more details." > Php-extensions-loaded-on-"$os".md
             for version in 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4; do
               if [[ "$os" = "macos-11" || "$os" = "macos-13" ]]; then

.github/workflows/node.yml

@@ -54,7 +54,7 @@ jobs:
         run: npm audit
 
       - name: Send Coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage/lcov.info

.github/workflows/php.yml

@@ -28,10 +28,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-22.04, ubuntu-20.04, windows-2019, macos-latest]
+        operating-system: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, windows-2019, macos-13]
         php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
         include:
-          - operating-system: ubuntu-22.04
+          - operating-system: ubuntu-24.04
             php-versions: ''
             php-version-file: 'php-version-file'
     env:
@@ -50,7 +50,7 @@ jobs:
           key: ${{ env.key }}
 
       - name: Cache extensions
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.cache-env.outputs.dir }}
           key: ${{ steps.cache-env.outputs.key }}
@@ -90,4 +90,4 @@ jobs:
           php -r "if(ini_get('memory_limit')!='-1') {throw new Exception('memory_limit not disabled');}"
           php -r "if(ini_get('post_max_size')!='256M') {throw new Exception('post_max_size not added');}"
           php -r "if(ini_get('short_open_tag')!=1) {throw new Exception('short_open_tag not added');}"
-          php -r "if(ini_get('date.timezone')!='Asia/Kolkata') {throw new Exception('date.timezone not added');}"
+          php -r "if(ini_get('date.timezone')!='Asia/Kolkata') {throw new Exception('date.timezone not added');}"

README.md

@@ -70,17 +70,20 @@ Both `GitHub-hosted` and `self-hosted` runners are supported by `setup-php` on t
 
 | Virtual environment | YAML workflow label                | Pre-installed PHP      |
 |---------------------|------------------------------------|------------------------|
+| Ubuntu 24.04        | `ubuntu-24.04`                     | `PHP 8.3`              |
 | Ubuntu 22.04        | `ubuntu-latest` or `ubuntu-22.04`  | `PHP 8.1`              |
-| Ubuntu 20.04        | `ubuntu-20.04`                     | `PHP 7.4` to `PHP 8.2` |
-| Windows Server 2022 | `windows-latest` or `windows-2022` | `PHP 8.2`              |
-| Windows Server 2019 | `windows-2019`                     | `PHP 8.2`              |
-| macOS Ventura 13.x  | `macos-13`                         | `PHP 8.2`              |
-| macOS Monterey 12.x | `macos-latest` or `macos-12`       | `PHP 8.2`              |
+| Ubuntu 20.04        | `ubuntu-20.04`                     | `PHP 7.4` to `PHP 8.3` |
+| Windows Server 2022 | `windows-latest` or `windows-2022` | `PHP 8.3`              |
+| Windows Server 2019 | `windows-2019`                     | `PHP 8.3`              |
+| macOS Sonoma 14.x   | `macos-14`                         | -                      |
+| macOS Ventura 13.x  | `macos-13`                         | `PHP 8.3`              |
+| macOS Monterey 12.x | `macos-latest` or `macos-12`       | `PHP 8.3`              |
 
 ### Self-Hosted Runners
 
 | Host OS/Virtual environment      | YAML workflow label        |
 |----------------------------------|----------------------------|
+| Ubuntu 24.04                     | `self-hosted` or `Linux`   |
 | Ubuntu 22.04                     | `self-hosted` or `Linux`   |
 | Ubuntu 20.04                     | `self-hosted` or `Linux`   |
 | Debian 11                        | `self-hosted` or `Linux`   |
@@ -99,7 +102,8 @@ Both `GitHub-hosted` and `self-hosted` runners are supported by `setup-php` on t
 
 On all supported OS/Platforms the following PHP versions can be set up as per the runner.
 
-- PHP 5.3 to PHP 8.4 on GitHub-hosted runners.
+- PHP 5.3 to PHP 8.4 on GitHub-hosted runners, except for macOS ARM64 runners (macos-14).
+- PHP 5.6 to PHP 8.4 on GitHub-hosted macOS ARM64 runners (macos-14).
 - PHP 5.6 to PHP 8.4 on self-hosted runners.
 
 | PHP Version | Stability | Release Support       | Runner Support                 |
@@ -116,7 +120,7 @@ On all supported OS/Platforms the following PHP versions can be set up as per th
 | `8.0`       | `Stable`  | `End of life`         | `GitHub-hosted`, `self-hosted` |
 | `8.1`       | `Stable`  | `Security fixes only` | `GitHub-hosted`, `self-hosted` |
 | `8.2`       | `Stable`  | `Active`              | `GitHub-hosted`, `self-hosted` |
-| `8.3`       | `Nightly` | `In development`      | `GitHub-hosted`, `self-hosted` |
+| `8.3`       | `Stable`  | `Active`              | `GitHub-hosted`, `self-hosted` |
 | `8.4`       | `Nightly` | `In development`      | `GitHub-hosted`, `self-hosted` |
 
 **Notes:**
@@ -222,7 +226,7 @@ PHP extensions can be set up using the `extensions` input. It accepts a `string`
 
 These tools can be set up globally using the `tools` input. It accepts a string in csv-format.
 
-[`behat`], [`blackfire`], [`blackfire-player`], [`castor`], [`churn`], [`codeception`], [`composer`], [`composer-normalize`], [`composer-prefetcher`], [`composer-require-checker`], [`composer-unused`], [`cs2pr`], [`deployer`], [`flex`], [`grpc_php_plugin`], [`infection`], [`parallel-lint`], [`pecl`], [`phan`], [`phing`], [`phinx`], [`phive`], [`php-config`], [`php-cs-fixer`], [`phpcbf`], [`phpcpd`], [`phpcs`], [`phpdoc`] or [`phpDocumentor`], [`phpize`], [`phplint`], [`phpmd`], [`phpspec`], [`phpstan`], [`phpunit`], [`phpunit-bridge`], [`phpunit-polyfills`], [`pint`], [`prestissimo`], [`protoc`], [`psalm`], [`rector`], [`symfony`] or [`symfony-cli`], [`vapor`] or [`vapor-cli`], [`wp`] or [`wp-cli`]
+[`behat`], [`blackfire`], [`blackfire-player`], [`box`], [`castor`], [`churn`], [`codeception`], [`composer`], [`composer-normalize`], [`composer-prefetcher`], [`composer-require-checker`], [`composer-unused`], [`cs2pr`], [`deployer`], [`ecs`], [`flex`], [`grpc_php_plugin`], [`infection`], [`parallel-lint`], [`pecl`], [`phan`], [`phing`], [`phinx`], [`phive`], [`php-config`], [`php-cs-fixer`], [`php-scoper`], [`phpcbf`], [`phpcpd`], [`phpcs`], [`phpdoc`] or [`phpDocumentor`], [`phpize`], [`phplint`], [`phpmd`], [`phpspec`], [`phpstan`], [`phpunit`], [`phpunit-bridge`], [`phpunit-polyfills`], [`pint`], [`prestissimo`], [`protoc`], [`psalm`], [`rector`], [`symfony`] or [`symfony-cli`], [`vapor`] or [`vapor-cli`], [`wp`] or [`wp-cli`]
 
 ```yaml
 - name: Setup PHP with tools
@@ -307,6 +311,16 @@ These tools can be set up globally using the `tools` input. It accepts a string
 - If you do not want to use all your dev-dependencies in workflow, you can run composer with `--no-dev` and install required tools using `tools` input to speed up your workflow.
 - By default, `COMPOSER_NO_INTERACTION` is set to `1` and `COMPOSER_PROCESS_TIMEOUT` is set to `0`. In effect, this means that Composer commands in your scripts do not need to specify `--no-interaction`.
 - Also, `COMPOSER_NO_AUDIT` is set to `1`. So if you want to audit your dependencies for security vulnerabilities, it is recommended to add a `composer audit` step before you install them.
+- If you want to set a different `COMPOSER_PROCESS_TIMEOUT`, you can set it in your workflow file using the `env` keyword.
+
+```yaml
+- name: Setup PHP with composer and custom process timeout
+  uses: shivammathur/setup-php@v2
+  with:
+    php-version: '8.3'
+  env:
+    COMPOSER_PROCESS_TIMEOUT: 300
+```
 
 ## :signal_strength: Coverage Support
 
@@ -390,12 +404,16 @@ Disable coverage for these reasons:
 #### `php-version` (optional)
 
 - Specify the PHP version you want to set up.
-- Accepts a `string`. For example `'8.0'`.
-- Accepts `latest` to set up the latest stable PHP version.
+- Accepts a `string`. For example `'8.3'`.
+- Accepts `lowest` to set up the lowest supported PHP version.
+- Accepts `highest` or `latest` to set up the latest stable PHP version.
 - Accepts `nightly` to set up a nightly build from the master branch of PHP.
 - Accepts the format `d.x`, where `d` is the major version. For example `5.x`, `7.x` and `8.x`.  
 - See [PHP support](#tada-php-support) for the supported PHP versions.
-- If not specified, it looks for `php-version-file` input.
+- If not specified, it looks for the following in order:
+  - 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
 
 #### `php-version-file` (optional)
 
@@ -469,7 +487,7 @@ On GitHub Actions you can assign the `setup-php` step an `id`, you can use the s
 
 #### `phpts` (optional)
 
-- Specify to set up a thread-safe build of PHP on Linux and Windows.
+- Specify to set up a thread-safe build of PHP.
 - Accepts `nts` for non-thread-safe and `zts` or `ts` for thread-safe.
 - By default, it is set to `nts`.
 - See [thread safe setup](#thread-safe-setup) for more info.
@@ -555,6 +573,11 @@ steps:
 - Production release builds of PHP without debugging symbols are set up by default.
 - You can use the `debug` environment variable to set up a build with debugging symbols for PHP 5.6 and above.
 
+**Notes**
+- On Linux, the debug symbols are added as [debug info files](https://sourceware.org/gdb/current/onlinedocs/gdb.html/Separate-Debug-Files.html) in the `/usr/lib/debug/.build-id` directory. These files match the `build-id` in the ELF section of the PHP binaries and debugging tools like `gdb` are able to resolve the symbols from these files.
+- On Windows, the debug symbols are added as `pdb` files in the PHP installation directory.
+- On macOS, the debug symbols are compiled into the binaries.
+
 ```yaml
 steps:
 - name: Setup PHP with debugging symbols
@@ -567,16 +590,14 @@ steps:
 
 ### Thread Safe Setup
 
-> Set up `TS` or `NTS` PHP on `Linux` and `Windows`.
+> Set up `TS` or `NTS` PHP.
 
 - `NTS` versions are set up by default.
-- On `macOS` only `NTS` versions are supported currently.
-- On `Linux` and `Windows` both `TS` and `NTS` versions are supported.
 
 ```yaml
 jobs:
   run:
-    runs-on: [ubuntu-latest, windows-latest]
+    runs-on: [ubuntu-latest, windows-latest, macos-latest]
     name: Setup PHP TS
     steps:
     - name: Setup PHP
@@ -698,6 +719,9 @@ Choose the image tag which matches the `runs-on` property in your workflow. For
 # For runs-on: ubuntu-latest
 act -P ubuntu-latest=shivammathur/node:latest
 
+# For runs-on: ubuntu-24.04
+act -P ubuntu-24.04=shivammathur/node:2404
+
 # For runs-on: ubuntu-22.04
 act -P ubuntu-22.04=shivammathur/node:2204
 
@@ -740,7 +764,7 @@ If your project uses composer, you can persist the composer's internal cache dir
   run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
 - name: Cache dependencies
-  uses: actions/cache@v3
+  uses: actions/cache@v4
   with:
     path: ${{ steps.composer-cache.outputs.dir }}
     key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -941,7 +965,7 @@ Examples of using `setup-php` with various PHP frameworks and packages.
 - A new major version of the action will only be tagged when there are breaking changes in the setup-php API i.e. inputs, outputs, and environment flags.
 - For debugging any issues `verbose` tag can be used temporarily. It outputs all the logs and is also synced with the latest releases.
 - It is highly discouraged to use the `main` branch as version, it might break your workflow after major releases as they have breaking changes.
-- If you are using the `v1` tag or a `1.x.y` version, you should [switch to v2](https://github.com/shivammathur/setup-php/wiki/Switch-to-v2 "Guide for switching from setup-php v1 to v2") as `v1` only gets critical bug fixes. Maintenance support for `v1` will be dropped with the last `PHP 8.0` release.
+- If you are using the `v1` tag or a `1.x.y` version, you should [switch to v2](https://github.com/shivammathur/setup-php/wiki/Switch-to-v2 "Guide for switching from setup-php v1 to v2") as `v1` is not supported anymore.
 
 ## :scroll: License
 
@@ -977,25 +1001,18 @@ These companies generously provide setup-php their products and services to aid
 
 <p>
   <a href="https://www.jetbrains.com/?from=setup-php">
-    <img src="https://setup-php.com/sponsors/jetbrains.svg" alt="JetBrains" width="106" height="60">
+    <img src="https://setup-php.com/sponsors/jetbrains.svg" alt="JetBrains" width="212" height="120">
   </a>
   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
   <a href="https://www.macstadium.com/opensource/members#gh-light-mode-only">
-    <img src="https://setup-php.com/sponsors/macstadium.png" alt="Mac Stadium" width="148" height="60">
+    <img src="https://setup-php.com/sponsors/macstadium.png" alt="Mac Stadium" width="296" height="120">
   </a>
   <a href="https://www.macstadium.com/opensource/members#gh-dark-mode-only">
-    <img src="https://setup-php.com/sponsors/macstadium-white.png" alt="Mac Stadium" width="148" height="60">
+    <img src="https://setup-php.com/sponsors/macstadium-white.png" alt="Mac Stadium" width="296" height="120">
   </a>
   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
   <a href="https://tidelift.com/subscription/pkg/npm-setup-php">
-    <img src="https://setup-php.com/sponsors/tidelift.png" alt="Tidelift" width="70" height="60">
-  </a>
-  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-  <a href="https://www.scaleway.com/en/about-us/open-source-program#gh-light-mode-only">
-    <img src="https://setup-php.com/sponsors/scaleway.png" alt="Scaleway" width="174" height="60">
-  </a>
-  <a href="https://www.scaleway.com/en/about-us/open-source-program#gh-dark-mode-only">
-    <img src="https://setup-php.com/sponsors/scaleway-white.png" alt="Scaleway" width="174" height="60">
+    <img src="https://setup-php.com/sponsors/tidelift.png" alt="Tidelift" width="140" height="120">
   </a>
 </p>
 
@@ -1027,6 +1044,7 @@ These companies generously provide setup-php their products and services to aid
 [`behat`]:                    https://docs.behat.org/en/latest/
 [`blackfire`]:                https://blackfire.io/docs/php/index
 [`blackfire-player`]:         https://blackfire.io/docs/builds-cookbooks/player
+[`box`]:                      https://github.com/humbug/box
 [`castor`]:                   https://github.com/jolicode/castor
 [`churn`]:                    https://github.com/bmitch/churn-php
 [`codeception`]:              https://codeception.com/
@@ -1037,6 +1055,7 @@ These companies generously provide setup-php their products and services to aid
 [`composer-unused`]:          https://github.com/composer-unused/composer-unused
 [`cs2pr`]:                    https://github.com/staabm/annotate-pull-request-from-checkstyle
 [`deployer`]:                 https://deployer.org/
+[`ecs`]:                      https://github.com/easy-coding-standard/easy-coding-standard
 [`flex`]:                     https://flex.symfony.com/
 [`grpc_php_plugin`]:          https://grpc.io/
 [`infection`]:                https://infection.github.io/
@@ -1048,9 +1067,10 @@ These companies generously provide setup-php their products and services to aid
 [`phive`]:                    https://phar.io/
 [`php-config`]:               https://www.php.net/manual/en/install.pecl.php-config.php
 [`php-cs-fixer`]:             https://cs.symfony.com/
-[`phpcbf`]:                   https://github.com/squizlabs/php_codesniffer
+[`php-scoper`]:               https://github.com/humbug/php-scoper
+[`phpcbf`]:                   https://github.com/PHPCSStandards/php_codesniffer
 [`phpcpd`]:                   https://github.com/sebastianbergmann/phpcpd
-[`phpcs`]:                    https://github.com/squizlabs/php_codesniffer
+[`phpcs`]:                    https://github.com/PHPCSStandards/php_codesniffer
 [`phpdoc`]:                   https://phpdoc.org/
 [`phpDocumentor`]:            https://phpdoc.org/
 [`phpize`]:                   https://www.php.net/manual/en/install.pecl.phpize.php

__tests__/install.test.ts

@@ -38,25 +38,30 @@ jest.mock('../src/install', () => ({
  */
 jest.mock('../src/fetch', () => ({
   fetch: jest.fn().mockImplementation(() => {
-    return {data: '{ "latest": "8.1", "5.x": "5.6" }'};
+    return {
+      data: '{ "latest": "8.3", "lowest": "8.1", "highest": "8.3", "nightly": "8.4", "5.x": "5.6" }'
+    };
   })
 }));
 
 describe('Install', () => {
   it.each`
-    version     | os          | extension_csv | ini_file         | ini_values_csv | coverage_driver | tools        | output
-    ${'7.3'}    | ${'darwin'} | ${''}         | ${'production'}  | ${''}          | ${''}           | ${''}        | ${'bash darwin.sh 7.3 production'}
-    ${'7.3'}    | ${'darwin'} | ${'a, b'}     | ${'development'} | ${'a=b'}       | ${'x'}          | ${''}        | ${'bash darwin.sh 7.3 development install extensions set coverage driver edit php.ini'}
-    ${'7.4.1'}  | ${'darwin'} | ${''}         | ${'none'}        | ${''}          | ${''}           | ${''}        | ${'bash darwin.sh 7.4 none'}
-    ${'8'}      | ${'darwin'} | ${''}         | ${''}            | ${''}          | ${''}           | ${''}        | ${'bash darwin.sh 8.0 production'}
-    ${'8.0'}    | ${'darwin'} | ${''}         | ${'development'} | ${''}          | ${''}           | ${''}        | ${'bash darwin.sh 8.0 development'}
-    ${'8.1'}    | ${'darwin'} | ${''}         | ${'none'}        | ${''}          | ${''}           | ${''}        | ${'bash darwin.sh 8.1 none'}
-    ${'7.3'}    | ${'linux'}  | ${''}         | ${'invalid'}     | ${''}          | ${''}           | ${''}        | ${'bash linux.sh 7.3 production'}
-    ${'7.3'}    | ${'linux'}  | ${'a, b'}     | ${'development'} | ${'a=b'}       | ${'x'}          | ${'phpunit'} | ${'bash linux.sh 7.3 development install extensions add_tool set coverage driver edit php.ini'}
-    ${'latest'} | ${'linux'}  | ${''}         | ${'none'}        | ${''}          | ${''}           | ${''}        | ${'bash linux.sh 8.1 none'}
-    ${'7.0'}    | ${'win32'}  | ${''}         | ${'production'}  | ${''}          | ${''}           | ${''}        | ${'pwsh win32.ps1 7.0 production'}
-    ${'7.3'}    | ${'win32'}  | ${''}         | ${'development'} | ${''}          | ${''}           | ${''}        | ${'pwsh win32.ps1 7.3 development'}
-    ${'7.3'}    | ${'win32'}  | ${'a, b'}     | ${'none'}        | ${'a=b'}       | ${'x'}          | ${''}        | ${'pwsh win32.ps1 7.3 none install extensions set coverage driver edit php.ini'}
+    version      | os          | extension_csv | ini_file         | ini_values_csv | coverage_driver | tools        | output
+    ${'7.3'}     | ${'darwin'} | ${''}         | ${'production'}  | ${''}          | ${''}           | ${''}        | ${'bash darwin.sh 7.3 production'}
+    ${'7.3'}     | ${'darwin'} | ${'a, b'}     | ${'development'} | ${'a=b'}       | ${'x'}          | ${''}        | ${'bash darwin.sh 7.3 development install extensions set coverage driver edit php.ini'}
+    ${'7.4.1'}   | ${'darwin'} | ${''}         | ${'none'}        | ${''}          | ${''}           | ${''}        | ${'bash darwin.sh 7.4 none'}
+    ${'8'}       | ${'darwin'} | ${''}         | ${''}            | ${''}          | ${''}           | ${''}        | ${'bash darwin.sh 8.0 production'}
+    ${'8.0'}     | ${'darwin'} | ${''}         | ${'development'} | ${''}          | ${''}           | ${''}        | ${'bash darwin.sh 8.0 development'}
+    ${'8.1'}     | ${'darwin'} | ${''}         | ${'none'}        | ${''}          | ${''}           | ${''}        | ${'bash darwin.sh 8.1 none'}
+    ${'7.3'}     | ${'linux'}  | ${''}         | ${'invalid'}     | ${''}          | ${''}           | ${''}        | ${'bash linux.sh 7.3 production'}
+    ${'7.3'}     | ${'linux'}  | ${'a, b'}     | ${'development'} | ${'a=b'}       | ${'x'}          | ${'phpunit'} | ${'bash linux.sh 7.3 development install extensions add_tool set coverage driver edit php.ini'}
+    ${'latest'}  | ${'linux'}  | ${''}         | ${'none'}        | ${''}          | ${''}           | ${''}        | ${'bash linux.sh 8.3 none'}
+    ${'lowest'}  | ${'linux'}  | ${''}         | ${'none'}        | ${''}          | ${''}           | ${''}        | ${'bash linux.sh 8.1 none'}
+    ${'highest'} | ${'linux'}  | ${''}         | ${'none'}        | ${''}          | ${''}           | ${''}        | ${'bash linux.sh 8.3 none'}
+    ${'nightly'} | ${'linux'}  | ${''}         | ${'none'}        | ${''}          | ${''}           | ${''}        | ${'bash linux.sh 8.4 none'}
+    ${'7.0'}     | ${'win32'}  | ${''}         | ${'production'}  | ${''}          | ${''}           | ${''}        | ${'pwsh win32.ps1 7.0 production'}
+    ${'7.3'}     | ${'win32'}  | ${''}         | ${'development'} | ${''}          | ${''}           | ${''}        | ${'pwsh win32.ps1 7.3 development'}
+    ${'7.3'}     | ${'win32'}  | ${'a, b'}     | ${'none'}        | ${'a=b'}       | ${'x'}          | ${''}        | ${'pwsh win32.ps1 7.3 none install extensions set coverage driver edit php.ini'}
   `(
     'Test install on $os for $version with extensions=$extension_csv, ini_values=$ini_values_csv, coverage_driver=$coverage_driver, tools=$tools',
     async ({

__tests__/tools.test.ts

@@ -95,7 +95,7 @@ describe('Tools tests', () => {
     ${'beta_token'}    | ${'1.2.3-beta1'}
     ${''}              | ${'1.2.3'}
   `('checking getSemverVersion: $token', async ({token, version}) => {
-    process.env['COMPOSER_TOKEN'] = token;
+    process.env['GITHUB_TOKEN'] = token;
     expect(
       await tools.getSemverVersion(getData({tool: 'tool', version: '1.2'}))
     ).toBe(version);
@@ -434,7 +434,7 @@ describe('Tools tests', () => {
 
   it.each([
     [
-      'behat, blackfire, blackfire-player, churn, composer-normalize, composer-require-checker, composer-unused, cs2pr:1.2.3, flex, grpc_php_plugin:1.2.3, infection, phan, phan:1.2.3, phing:1.2.3, phinx, phive:1.2.3, php-config, phpcbf, phpcpd, phpcs, phpdoc, phpize, phpmd, phpspec, phpunit-bridge:5.6, phpunit-polyfills:1.0.1, protoc:v1.2.3, psalm, rector, symfony-cli, vapor-cli, wp-cli',
+      'behat, blackfire, blackfire-player, churn, composer-normalize, composer-require-checker, composer-unused, cs2pr:1.2.3, ecs, flex, grpc_php_plugin:1.2.3, infection, phan, phan:1.2.3, phing:1.2.3, phinx, phive:1.2.3, php-config, phpcbf, phpcpd, phpcs, phpdoc, phpize, phpmd, phpspec, phpunit-bridge:5.6, phpunit-polyfills:1.0.1, protoc:v1.2.3, psalm, rector, symfony-cli, vapor-cli, wp-cli',
       [
         'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.4-stable.phar,https://dl.cloudsmith.io/public/shivammathur/composer-cache/raw/files/composer-7.4-stable.phar,https://getcomposer.org/composer-stable.phar composer',
         'add_composer_tool behat behat behat/ scoped',
@@ -454,9 +454,9 @@ describe('Tools tests', () => {
         'add_composer_tool phinx phinx robmorgan/ scoped',
         'add_tool https://github.com/phar-io/phive/releases/download/1.2.3/phive-1.2.3.phar phive',
         'add_devtools php-config',
-        'add_tool https://github.com/squizlabs/PHP_CodeSniffer/releases/latest/download/phpcbf.phar phpcbf "--version"',
+        'add_tool https://github.com/PHPCSStandards/PHP_CodeSniffer/releases/latest/download/phpcbf.phar phpcbf "--version"',
         'add_tool https://phar.phpunit.de/phpcpd.phar phpcpd "--version"',
-        'add_tool https://github.com/squizlabs/PHP_CodeSniffer/releases/latest/download/phpcs.phar phpcs "--version"',
+        'add_tool https://github.com/PHPCSStandards/PHP_CodeSniffer/releases/latest/download/phpcs.phar phpcs "--version"',
         'add_tool https://github.com/phpDocumentor/phpDocumentor/releases/latest/download/phpDocumentor.phar phpDocumentor "--version"',
         'add_devtools phpize',
         'add_tool https://github.com/phpmd/phpmd/releases/latest/download/phpmd.phar phpmd "--version"',
@@ -468,7 +468,8 @@ describe('Tools tests', () => {
         'add_composer_tool rector rector rector/ scoped',
         'add_symfony latest',
         'add_composer_tool vapor-cli vapor-cli laravel/ scoped',
-        'add_tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli "--version"'
+        'add_tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli "--version"',
+        'add_composer_tool easy-coding-standard easy-coding-standard symplify/ scoped'
       ]
     ]
   ])('checking addTools on darwin', async (tools_csv, scripts) => {
@@ -574,7 +575,7 @@ describe('Tools tests', () => {
     ${'phpunit:1.2'} | ${'invalid_token'} | ${'add_log "$cross" "phpunit" "Invalid token"'}
     ${'phpunit:0.1'} | ${'no_data'}       | ${'add_log "$cross" "phpunit" "No version found with prefix 0.1."'}
   `('checking error: $tools_csv', async ({tools_csv, token, script}) => {
-    process.env['COMPOSER_TOKEN'] = token;
+    process.env['GITHUB_TOKEN'] = token;
     expect(await tools.addTools(tools_csv, '7.4', 'linux')).toContain(script);
   });
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-php",
-  "version": "2.28.0",
+  "version": "2.31.1",
   "private": false,
   "description": "Setup PHP for use with GitHub Actions",
   "main": "lib/install.js",
@@ -19,7 +19,7 @@
     "lint": "eslint **/src/*.ts **/__tests__/*.ts --cache --fix",
     "format": "prettier --write **/src/*.ts **/__tests__/*.ts && git add -f __tests__/ ",
     "format-check": "prettier --check **/src/*.ts **/__tests__/*.ts",
-    "release": "ncc build -o dist && git add -f dist/",
+    "release": "ncc build -m -o dist && git add -f dist/",
     "test": "jest"
   },
   "repository": {
@@ -40,23 +40,23 @@
     "compare-versions": "^6.1.0"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.10",
-    "@types/node": "^20.10.0",
-    "@typescript-eslint/eslint-plugin": "^6.12.0",
-    "@typescript-eslint/parser": "^6.12.0",
+    "@types/jest": "^29.5.12",
+    "@types/node": "^20.14.10",
+    "@typescript-eslint/eslint-plugin": "^7.15.0",
+    "@typescript-eslint/parser": "^7.15.0",
     "@vercel/ncc": "^0.38.1",
-    "eslint": "^8.54.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-import": "^2.29.0",
-    "eslint-plugin-jest": "^27.6.0",
-    "eslint-plugin-prettier": "^5.0.1",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-jest": "^28.6.0",
+    "eslint-plugin-prettier": "^5.1.3",
     "jest": "^29.7.0",
     "jest-circus": "^29.7.0",
-    "nock": "^13.3.8",
-    "prettier": "^3.1.0",
-    "simple-git-hooks": "^2.9.0",
-    "ts-jest": "^29.1.1",
-    "typescript": "^5.3.2"
+    "nock": "^13.5.4",
+    "prettier": "^3.3.2",
+    "simple-git-hooks": "^2.11.1",
+    "ts-jest": "^29.1.5",
+    "typescript": "^5.5.3"
   },
   "bugs": {
     "url": "https://github.com/shivammathur/setup-php/issues"

src/configs/brew_extensions

@@ -37,6 +37,7 @@ swoole=swoole
 uuid=uuid
 v8js=v8js
 vips=vips
+vld=vld
 xdebug=xdebug
 xdebug2=xdebug
 xlswriter=xlswriter

src/configs/mod_priority

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

src/configs/php-versions.json

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

src/configs/tools.json

@@ -84,7 +84,7 @@
   },
   "phpcbf": {
     "type": "phar",
-    "repository": "squizlabs/PHP_CodeSniffer",
+    "repository": "PHPCSStandards/PHP_CodeSniffer",
     "extension": ".phar",
     "domain": "https://github.com",
     "version_prefix": "",
@@ -92,7 +92,7 @@
   },
   "phpcs": {
     "type": "phar",
-    "repository": "squizlabs/PHP_CodeSniffer",
+    "repository": "PHPCSStandards/PHP_CodeSniffer",
     "extension": ".phar",
     "domain": "https://github.com",
     "version_prefix": "",
@@ -318,5 +318,11 @@
     "extension": ".phar",
     "version_parameter": "--version",
     "version_prefix": "v"
+  },
+  "easy-coding-standard": {
+    "type": "composer",
+    "alias": "ecs",
+    "repository": "symplify/easy-coding-standard",
+    "scope": "scoped"
   }
-}
+}

src/extensions.ts

@@ -35,9 +35,9 @@ export async function addExtensionDarwin(
       // match 5.3blackfire...8.3blackfire
       // match 5.3blackfire-(semver)...8.3blackfire-(semver)
       // match couchbase, event, geos, pdo_oci, oci8, http, pecl_http
-      // match 5.3ioncube...7.4ioncube
-      // match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, and 7.4phalcon5...8.2phalcon5
-      // match 7.0zephir_parser...8.2zephir_parser
+      // match 5.3ioncube...8.2ioncube
+      // match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, and 7.4phalcon5...8.3phalcon5
+      // match 7.0zephir_parser...8.3zephir_parser
       case /^(7\.4|8\.[0-3])relay(-v?\d+\.\d+\.\d+)?$/.test(version_extension):
       case /^(5\.[3-6]|7\.[0-4]|8\.[0-3])blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
@@ -45,12 +45,12 @@ export async function addExtensionDarwin(
       case /^couchbase|^event|^gearman$|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(
         extension
       ):
-      case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
-      case /(5\.6|7\.[0-3])phalcon3|7\.[2-4]phalcon4|(7\.4|8\.[0-2])phalcon5/.test(
+      case /^(5\.[3-6]|7\.[0-4]|8\.[0-2])ioncube$/.test(version_extension):
+      case /(5\.6|7\.[0-3])phalcon3|7\.[2-4]phalcon4|(7\.4|8\.[0-3])phalcon5?/.test(
         version_extension
       ):
       case /(?<!5\.[3-6])(pdo_)?sqlsrv$/.test(version_extension):
-      case /^(7\.[0-4]|8\.[0-2])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
+      case /^(7\.[0-4]|8\.[0-3])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
         add_script += await utils.customPackage(
@@ -83,7 +83,7 @@ export async function addExtensionDarwin(
         add_script += await utils.getUnsupportedLog('pcov', version, 'darwin');
         return;
       // match brew extensions
-      case /(?<!5\.[3-5])(amqp|apcu|expect|gnupg|grpc|igbinary|imagick|imap|mailparse|mcrypt|memcache|memcached|mongodb|msgpack|protobuf|psr|raphf|rdkafka|redis|snmp|ssh2|swoole|uuid|xdebug|xdebug2|yaml|zmq)/.test(
+      case /(?<!5\.[3-5])(amqp|apcu|expect|gnupg|grpc|igbinary|imagick|imap|mailparse|mcrypt|memcache|memcached|mongodb|msgpack|protobuf|psr|raphf|rdkafka|redis|snmp|ssh2|swoole|uuid|vld|xdebug|xdebug2|yaml|zmq)/.test(
         version_extension
       ):
       case /(?<!5\.[3-6])(ds|v8js)/.test(version_extension):
@@ -137,21 +137,21 @@ export async function addExtensionWindows(
       // match 5.3blackfire...8.3blackfire
       // match 5.3blackfire-(semver)...8.3blackfire-(semver)
       // match pdo_oci and oci8
-      // match 5.3ioncube...7.4ioncube
-      // match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, and 7.4phalcon5...8.2phalcon5
+      // match 5.3ioncube...8.2ioncube
+      // match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, and 7.4phalcon5...8.3phalcon5
       // match 7.1pecl_http...8.1pecl_http and 7.1http...8.1http
-      // match 7.0zephir_parser...8.2zephir_parser
+      // match 7.0zephir_parser...8.3zephir_parser
       case /^(5\.[3-6]|7\.[0-4]|8\.[0-3])blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
       case /^pdo_oci$|^oci8$|^pdo_firebird$/.test(extension):
-      case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
-      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$|^(7\.4|8\.[0-2])phalcon5$/.test(
+      case /^(5\.[3-6]|7\.[0-4]|8\.[0-2])ioncube$/.test(version_extension):
+      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$|^(7\.4|8\.[0-3])phalcon5?$/.test(
         version_extension
       ):
       case /^(7\.[1-4]|8\.1)(pecl_)?http/.test(version_extension):
       case /(?<!5\.[3-6])(pdo_)?sqlsrv$/.test(version_extension):
-      case /^(7\.[0-4]|8\.[0-2])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
+      case /^(7\.[0-4]|8\.[0-3])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
         add_script += await utils.customPackage(
@@ -268,9 +268,9 @@ export async function addExtensionLinux(
       // match 5.3blackfire-(semver)...8.3blackfire-(semver)
       // match 5.3pdo_cubrid...7.2php_cubrid, 5.3cubrid...7.4cubrid
       // match couchbase, geos, pdo_oci, oci8, http, pecl_http
-      // match 5.3ioncube...7.4ioncube
-      // match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, 7.4phalcon5...8.2phalcon5
-      // match 7.0zephir_parser...8.2zephir_parser
+      // match 5.3ioncube...8.2ioncube
+      // match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, 7.4phalcon5...8.3phalcon5
+      // match 7.0zephir_parser...8.3zephir_parser
       case /^(7\.4|8\.[0-3])relay(-v?\d+\.\d+\.\d+)?$/.test(version_extension):
       case /^(5\.[3-6]|7\.[0-4]|8\.[0-3])blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
@@ -282,12 +282,12 @@ export async function addExtensionLinux(
         extension
       ):
       case /(?<!5\.[3-5])intl-\d+\.\d+$/.test(version_extension):
-      case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
-      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$|^(7\.4|8\.[0-2])phalcon5$/.test(
+      case /^(5\.[3-6]|7\.[0-4]|8\.[0-2])ioncube$/.test(version_extension):
+      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$|^(7\.4|8\.[0-3])phalcon5?$/.test(
         version_extension
       ):
       case /(?<!5\.[3-6])(pdo_)?sqlsrv$/.test(version_extension):
-      case /^(7\.[0-4]|8\.[0-2])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
+      case /^(7\.[0-4]|8\.[0-3])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
         add_script += await utils.customPackage(

src/scripts/darwin.sh

@@ -1,13 +1,23 @@
-# Disable dependency extensions
-disable_dependency_extensions() {
-  local extension=$1
+# Handle dependency extensions
+handle_dependency_extensions() {
+  local formula=$1
+  local extension=$2
   formula_file="${tap_dir:?}/$ext_tap/Formula/$extension@${version:?}.rb"
+  [ -e "$formula_file" ] || formula_file="$tap_dir/$ext_tap/Formula/$formula@$version.rb"
   if [ -e "$formula_file" ]; then
     IFS=" " read -r -a dependency_extensions <<< "$(grep -Eo "shivammathur.*@" "$formula_file" | xargs -I {} -n 1 basename '{}' | cut -d '@' -f 1 | tr '\n' ' ')"
     for dependency_extension in "${dependency_extensions[@]}"; do
       sudo sed -Ei '' "/=(.*\/)?\"?$dependency_extension(.so)?$/d" "${ini_file:?}"
     done
   fi
+  suffix="$(get_php_formula_suffix)"
+  if [[ -n "$suffix" ]]; then
+    brew_opts=(-sf)
+    patch_abstract_file >/dev/null 2>&1
+    for dependency_extension in "${dependency_extensions[@]}"; do
+        brew install "${brew_opts[@]}" "$ext_tap/$dependency_extension@$version" >/dev/null 2>&1 && copy_brew_extensions "$dependency_extension"
+    done
+  fi
 }
 
 # Helper function to disable an extension.
@@ -61,12 +71,21 @@ add_brew_extension() {
     add_brew_tap "$ext_tap"
     sudo mv "$tap_dir"/"$ext_tap"/.github/deps/"$formula"/* "${core_repo:?}/Formula/" 2>/dev/null || true
     update_dependencies >/dev/null 2>&1
-    disable_dependency_extensions "$extension" >/dev/null 2>&1
-    (brew install -f "$ext_tap/$formula@$version" >/dev/null 2>&1 && copy_brew_extensions "$formula") || pecl_install "$extension" >/dev/null 2>&1
+    handle_dependency_extensions "$formula" "$extension" >/dev/null 2>&1
+    (brew install "${brew_opts[@]}" "$ext_tap/$formula@$version" >/dev/null 2>&1 && copy_brew_extensions "$formula") || pecl_install "$extension" >/dev/null 2>&1
     add_extension_log "$extension" "Installed and enabled"
   fi
 }
 
+# Function to patch the abstract file in the extensions tap.
+patch_abstract_file() {
+    abstract_path="$tap_dir"/"$ext_tap"/Abstract/abstract-php-extension.rb
+    if [[ -e "$abstract_path" && ! -e /tmp/abstract_patch ]]; then
+        echo '' | sudo tee /tmp/abstract_patch >/dev/null 2>&1
+        sudo sed -i '' -e "s|php@#{\(.*\)}|php@#{\1}$suffix|g" -e "s|php_version /|\"#{php_version}$suffix\" /|g" "$abstract_path"
+    fi
+}
+
 # Helper function to add an extension.
 add_extension_helper() {
   local extension=$1
@@ -94,17 +113,6 @@ add_pecl() {
   add_log "${tick:?}" "PECL" "Found PECL $pear_version"
 }
 
-# Function to link all libraries of a formula.
-link_libraries() {
-  formula=$1
-  formula_prefix="$(brew --prefix "$formula")"
-  sudo mkdir -p "$formula_prefix"/lib
-  for lib in "$formula_prefix"/lib/*.dylib; do
-    lib_name=$(basename "$lib")
-    sudo cp -a "$lib" "$brew_prefix/lib/$lib_name" 2>/dev/null || true
-  done
-}
-
 # Link opcache extension to extensions directory.
 link_opcache() {
   opcache_ini="$brew_prefix"/etc/php/"$version"/conf.d/ext-opcache.ini
@@ -123,45 +131,17 @@ patch_brew() {
   trap "sudo sed -Ei '' 's/$code.*/$code, overwrite: overwrite?\)/' $formula_installer" exit
 }
 
-# Helper function to update the dependencies.
-update_dependencies_helper() {
-  dependency=$1
-  [[ "${dependency:0:3}" = "lib" ]] && prefix=lib || prefix="${dependency:0:1}"
-  get -q -n "$core_repo/Formula/$prefix/$dependency.rb" "https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/$prefix/$dependency.rb"
-  link_libraries "$dependency"
-}
-
 # Function to update dependencies.
 update_dependencies() {
   patch_brew
   if ! [ -e /tmp/update_dependencies ]; then
-    if [ "${runner:?}" != "self-hosted" ] && [ "${ImageOS:-}" != "" ] && [ "${ImageVersion:-}" != "" ]; then
-      deps_file="$tap_dir/$php_tap/.github/deps/${ImageOS:?}_${ImageVersion:?}"
-      if [ -e "$deps_file" ]; then
-        while read -r dependency; do
-          update_dependencies_helper "$dependency" &
-          to_wait+=($!)
-        done <"$deps_file"
-      fi
-      wait "${to_wait[@]}"
-    else
-      git -C "$core_repo" fetch origin master && git -C "$core_repo" reset --hard origin/master
-    fi
+    for repo in "$brew_repo" "$core_repo"; do
+      git_retry -C "$repo" fetch origin master && git -C "$repo" reset --hard origin/master
+    done
     echo '' | sudo tee /tmp/update_dependencies >/dev/null 2>&1
   fi
 }
 
-# Function to fix dependencies on install PHP version.
-fix_dependencies() {
-  broken_deps_paths=$(php -v 2>&1 | grep -Eo '/opt/[a-zA-Z0-9@\.]+')
-  if [ "x$broken_deps_paths" != "x" ]; then
-    update_dependencies
-    IFS=" " read -r -a formulae <<< "$(echo "$broken_deps_paths" | tr '\n' ' ' | sed 's|/opt/||g' 2>&1)$php_formula"
-    brew reinstall "${formulae[@]}"
-    brew link --force --overwrite "$php_formula" || true
-  fi
-}
-
 # Function to get PHP version if it is already installed using Homebrew.
 get_brewed_php() {
   cellar="$brew_prefix"/Cellar
@@ -181,15 +161,25 @@ add_php() {
   existing_version=$2
   add_brew_tap "$php_tap"
   update_dependencies
-  [ "${debug:?}" = "debug" ] && php_formula="$php_formula-debug"
-  if [ "$existing_version" != "false" ]; then
-    ([ "$action" = "upgrade" ] && brew upgrade -f "$php_formula") || brew unlink "$php_formula"
+  suffix="$(get_php_formula_suffix)"
+  php_formula="shivammathur/php/php@$version$suffix"
+  if [[ "$existing_version" != "false" && -z "$suffix" ]]; then
+    ([ "$action" = "upgrade" ] && brew upgrade -f --overwrite "$php_formula") || brew unlink "$php_formula"
   else
-    brew install -f "$php_formula"
+    brew install -f --overwrite "$php_formula"
   fi
+  sudo chown -R "$(id -un)":"$(id -gn)" "$brew_prefix"
   brew link --force --overwrite "$php_formula"
 }
 
+# Function to get formula suffix
+get_php_formula_suffix() {
+  local suffix
+  [ "${debug:?}" = "debug" ] && suffix="-debug"
+  [ "${ts:?}" = "zts" ] && suffix="$suffix-zts"
+  echo "$suffix"
+}
+
 # Function to get extra version.
 php_extra_version() {
   php_formula_file="$tap_dir"/"$php_tap"/Formula/php@"$version".rb
@@ -234,11 +224,11 @@ setup_php() {
     add_php "upgrade" "$existing_version" >/dev/null 2>&1
     status="Updated to"
   else
-    status="Found"
-    fix_dependencies >/dev/null 2>&1
+    add_php "upgrade" "$existing_version" >/dev/null 2>&1
+    status="Updated to"
   fi
   php_config="$(command -v php-config)"
-  ext_dir="$(grep 'extension_dir=' "$php_config" | cut -d "'" -f 2)"
+  ext_dir="$(sed -n "s/.*extension_dir=['\"]\(.*\)['\"].*/\1/p" "$php_config")"
   ini_dir="$(php_ini_path)"
   scan_dir="$(get_scan_dir)"
   ini_file="$ini_dir"/php.ini
@@ -277,6 +267,7 @@ export HOMEBREW_NO_INSTALL_FROM_API=1
 # shellcheck source=.
 . "${scripts:?}"/unix.sh
 . "${scripts:?}"/tools/brew.sh
+. "${scripts:?}"/tools/retry.sh
 . "${scripts:?}"/tools/add_tools.sh
 . "${scripts:?}"/extensions/source.sh
 . "${scripts:?}"/extensions/add_extensions.sh

src/scripts/extensions/add_extensions.ps1

@@ -66,7 +66,7 @@ Function Enable-Extension() {
 }
 
 # Function to add custom built PHP extension for nightly builds.
-Function Add-NightlyExtension {
+Function Add-ExtensionFromGithub {
   Param (
     [Parameter(Position = 0, Mandatory = $true)]
     [ValidateNotNull()]
@@ -100,7 +100,7 @@ Function Add-Extension {
     $stability = 'stable',
     [Parameter(Position = 2, Mandatory = $false)]
     [ValidateNotNull()]
-    [ValidatePattern('^\d+(\.\d+){0,2}$')]
+    [ValidatePattern('^\d+(\.\d+){0,3}$')]
     [string]
     $extension_version = ''
   )
@@ -123,11 +123,11 @@ Function Add-Extension {
     }
     else {
       if(($version -match $nightly_versions) -and (Select-String -Path $src\configs\windows_extensions -Pattern $extension -SimpleMatch -Quiet)) {
-        Add-NightlyExtension $extension
+        Add-ExtensionFromGithub $extension
       } else {
-        # Patch till DLLs for PHP 8.2 and above are released as stable.
+        # Patch till DLLs for PHP 8.1 and above are released as stable.
         $minimumStability = $stability
-        if ($version -match '8.[2-4]' -and $stability -eq 'stable') {
+        if ($version -match '8.[1-4]' -and $stability -eq 'stable') {
           $minimumStability = 'snapshot'
         }
 
@@ -257,4 +257,4 @@ Function Disable-AllShared() {
 # Function to handle request to add PECL.
 Function Add-Pecl() {
   Add-Log $tick "PECL" "Use extensions input to setup PECL extensions on windows"
-}
+}

src/scripts/extensions/add_extensions.sh

@@ -176,21 +176,30 @@ pecl_install() {
   local extension=$1
   local prefix=${2:-extension}
   add_pecl >/dev/null 2>&1
-  cpu_count="$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo '1')"
-  prefix_opts="$(parse_args "$extension" CONFIGURE_PREFIX_OPTS) MAKEFLAGS='-j $cpu_count'"
-  suffix_opts="$(parse_args "$extension" CONFIGURE_OPTS) $(parse_args "$extension" CONFIGURE_SUFFIX_OPTS)"
-  IFS=' ' read -r -a libraries <<<"$(parse_args "$extension" LIBS) $(parse_args "$extension" "$(uname -s)"_LIBS)"
-  (( ${#libraries[@]} )) && add_libs "${libraries[@]}" >/dev/null 2>&1
   disable_extension_helper "${extension%-*}" >/dev/null 2>&1
-  if [ "$version" = "5.3" ]; then
-    yes '' 2>/dev/null | sudo "$prefix_opts" pecl install -f "$extension" >/dev/null 2>&1
+  # Compare version with 8.3 so it runs only on 8.4 and above
+  # Install using the source interface as it allows for patching.
+  if [[ $(printf "%s\n%s" "${version:?}" "8.3" | sort -V | head -n1) != "$version" ]]; then
+    extension_version=${extension##*-};
+    [ "$extension_version" = "${extension%-*}" ] &&  extension_version=$(get_pecl_version "$extension" "stable")
+    add_extension_from_source "${extension%-*}" https://pecl.php.net "${extension%-*}" "${extension%-*}" "$extension_version" "$prefix" pecl
+    check_extension "${extension%-*}" && return 0 || return 1;
   else
-    yes '' 2>/dev/null | sudo "$prefix_opts" pecl install -f -D "$(parse_pecl_configure_options "$suffix_opts")" "$extension" >/dev/null 2>&1
+    cpu_count="$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo '1')"
+    prefix_opts="$(parse_args "$extension" CONFIGURE_PREFIX_OPTS) MAKEFLAGS='-j $cpu_count'"
+    suffix_opts="$(parse_args "$extension" CONFIGURE_OPTS) $(parse_args "$extension" CONFIGURE_SUFFIX_OPTS)"
+    IFS=' ' read -r -a libraries <<<"$(parse_args "$extension" LIBS) $(parse_args "$extension" "$(uname -s)"_LIBS)"
+    (( ${#libraries[@]} )) && add_libs "${libraries[@]}" >/dev/null 2>&1
+    if [ "$version" = "5.3" ]; then
+      yes '' 2>/dev/null | sudo "$prefix_opts" pecl install -f "$extension" >/dev/null 2>&1
+    else
+      yes '' 2>/dev/null | sudo "$prefix_opts" pecl install -f -D "$(parse_pecl_configure_options "$suffix_opts")" "$extension" >/dev/null 2>&1
+    fi
+    local exit_code=$?
+    sudo pecl info "$extension" | grep -iq 'zend extension' && prefix=zend_extension
+    enable_extension "${extension%-*}" "$prefix"
+    return "$exit_code"
   fi
-  local exit_code=$?
-  sudo pecl info "$extension" | grep -iq 'zend extension' && prefix=zend_extension
-  enable_extension "${extension%-*}" "$prefix"
-  return "$exit_code"
 }
 
 # Function to install a specific version of PECL extension.

src/scripts/extensions/blackfire.sh

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

src/scripts/extensions/couchbase.sh

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

src/scripts/extensions/firebird.sh

@@ -1,11 +1,14 @@
 add_firebird_client_darwin() {
-  firebird_tag='R3_0_7'
-  pkg_name=$(get -s -n "" https://api.github.com/repos/FirebirdSQL/firebird/releases/tags/"$firebird_tag" | grep -Eo "Firebird-.*.pkg" | head -n 1)
-  [ -z "$pkg_name" ] && pkg_name=$(get -s -n "" https://github.com/FirebirdSQL/firebird/releases/expanded_assets/"$firebird_tag" | grep -Eo "Firebird-.*.pkg" | head -n 1)
+  firebird_tag='v5.0.0'
+  arch_name='x64'
+  arch="$(uname -m)"
+  [[ "$arch" = "arm64" || "$arch" = "aarch64" ]] && arch_name='arm64'
+  pkg_name=$(get -s -n "" https://api.github.com/repos/FirebirdSQL/firebird/releases/tags/"$firebird_tag" | grep -Eo "Firebird-.*.-$arch_name.pkg" | head -n 1)
+  [ -z "$pkg_name" ] && pkg_name=$(get -s -n "" https://github.com/FirebirdSQL/firebird/releases/expanded_assets/"$firebird_tag" | grep -Eo "Firebird-.*.-$arch_name.pkg" | head -n 1)
   get -q -e "/tmp/firebird.pkg" https://github.com/FirebirdSQL/firebird/releases/download/"$firebird_tag"/"$pkg_name"
   sudo installer -pkg /tmp/firebird.pkg -target /
   sudo mkdir -p /opt/firebird/include /opt/firebird/lib
-  sudo find /Library/Frameworks/Firebird.framework -name '*.h' -exec cp "{}" /opt/firebird/include \;
+  sudo cp -a /Library/Frameworks/Firebird.framework/Headers/* /opt/firebird/include/
   sudo find /Library/Frameworks/Firebird.framework -name '*.dylib' -exec cp "{}" /opt/firebird/lib \;
 }
 

src/scripts/extensions/ioncube.sh

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

src/scripts/extensions/oci.sh

@@ -30,6 +30,10 @@ add_client() {
       sudo mv "$icdir"/* "$oracle_client"/
     done
     sudo ln -sf /opt/oracle/instantclient/*.$lib_ext* $libs
+    if [ "$os" = "Linux" ]; then
+      arch="$(uname -m)"
+      [ -e "$libs/$arch"-linux-gnu/libaio.so.1t64 ] && sudo ln -sf "$libs/$arch"-linux-gnu/libaio.so.1t64 "$libs/$arch"-linux-gnu/libaio.so.1
+    fi
   fi
 }
 
@@ -39,9 +43,13 @@ add_oci_helper() {
     status='Installed and enabled'
     read -r "${ext}_LINUX_LIBS" <<< "libaio-dev"
     read -r "${ext}_CONFIGURE_OPTS" <<< "--with-php-config=$(command -v php-config) --with-${ext/_/-}=instantclient,$oracle_client"
-    read -r "${ext}_PATH" <<< "ext/$ext"
     patch_phpize
-    add_extension_from_source "$ext" https://github.com php php-src "$(php_src_tag)" extension get
+    if [[ $(printf "%s\n%s" "${version:?}" "8.3" | sort -V | head -n1) != "$version" ]]; then
+      add_extension_from_source "$ext" https://github.com php pecl-database-"$ext" main extension get
+    else
+      read -r "${ext}_PATH" <<< "ext/$ext"
+      add_extension_from_source "$ext" https://github.com php php-src "$(php_src_tag)" extension get
+    fi
     restore_phpize
   else
     enable_extension "$ext" extension

src/scripts/extensions/patches/common.sh

@@ -0,0 +1,12 @@
+process_file() {
+    local file=$1
+    sed -i '0,/#include.*\(php_lcg.h\|php_mt_rand.h\|php_rand.h\|standard\/php_random\.h\).*/s//\#include <ext\/random\/php_random.h>/' "$file"
+    sed -i '/#include.*\(php_lcg.h\|php_mt_rand.h\|php_rand.h\|standard\/php_random\.h\)/d' "$file"
+}
+
+export -f process_file
+
+# Compare with 8.3 so it runs only on 8.4 and above
+if [[ $(printf "%s\n%s" "${version:?}" "8.3" | sort -V | head -n1) != "$version" ]]; then
+  find . -type f \( -name "*.c" -o -name "*.h" \) -exec bash -c 'process_file "$0"' {} \;
+fi

src/scripts/extensions/phalcon.ps1

@@ -8,19 +8,36 @@ Function Get-PhalconReleaseAssetUrl() {
   )
   $domain = 'https://api.github.com/repos'
   $releases = 'phalcon/cphalcon/releases'
+  $match = $null
   if($extension_version -match '[3-4]') {
     $nts = if (!$installed.ThreadSafe) { "_nts" } else { "" }
     try {
       $match = (Invoke-RestMethod -Uri "$domain/$releases/tags/v$Semver").assets | Select-String -Pattern "browser_download_url=.*(phalcon_${arch}_.*_php${version}_${extension_version}.*[0-9]${nts}.zip)"
-    } catch {
-      $match = (Get-File -Url "$github/$releases/expanded_assets/v$Semver").Links.href | Select-String -Pattern "(phalcon_${arch}_.*_php${version}_${extension_version}.*[0-9]${nts}.zip)"
+    } catch { }
+    if($null -eq $match) {
+      try {
+        $match = (Get-File -Url "$github/$releases/expanded_assets/v$Semver").Links.href | Select-String -Pattern "(phalcon_${arch}_.*_php${version}_${extension_version}.*[0-9]${nts}.zip)"
+      } catch { }
     }
   } else {
     $nts = if (!$installed.ThreadSafe) { "-nts" } else { "-ts" }
     try {
-      $match = (Invoke-RestMethod -Uri "$domain/$releases/tags/v$Semver").assets | Select-String -Pattern "browser_download_url=.*(phalcon-php${version}${nts}-windows.*-x64.zip)"
-    } catch {
-      $match = (Get-File -Url "$github/$releases/expanded_assets/v$Semver").Links.href | Select-String -Pattern "(phalcon-php${version}${nts}-windows.*-x64.zip)"
+      $match = (Invoke-RestMethod -Uri "$domain/$releases/tags/v$Semver").assets | Select-String -Pattern "browser_download_url=.*(php_phalcon-php${version}${nts}-windows.*-x64.zip)"
+    } catch { }
+    if($null -eq $match) {
+      try {
+        $match = (Get-File -Url "$github/$releases/expanded_assets/v$Semver").Links.href | Select-String -Pattern "(php_phalcon-php${version}${nts}-windows.*-x64.zip)"
+      } catch { }
+    }
+    if($null -eq $match) {
+      try {
+        $match = (Invoke-RestMethod -Uri "$domain/$releases/tags/v$Semver").assets | Select-String -Pattern "browser_download_url=.*(phalcon-php${version}${nts}-windows.*-x64.zip)"
+      } catch { }
+    }
+    if($null -eq $match) {
+      try {
+        $match = (Get-File -Url "$github/$releases/expanded_assets/v$Semver").Links.href | Select-String -Pattern "(phalcon-php${version}${nts}-windows.*-x64.zip)"
+      } catch { }
     }
   }
   if($NULL -ne $match) {
@@ -54,6 +71,8 @@ Function Get-PhalconSemver() {
     return '3.4.5'
   } elseif (($extension_version -eq '4') -and ($version -eq '7.2')) {
     return '4.1.0'
+  } elseif (($extension_version -eq '5') -and ($version -eq '7.4')) {
+    return '5.4.0'
   }
   return Get-PeclPackageVersion phalcon $extension_version stable stable | Select-Object -First 1
 }

src/scripts/extensions/phalcon.sh

@@ -1,7 +1,11 @@
 # Helper function to get phalcon version
 get_phalcon_version() {
   if [ "$extension" = "phalcon5" ]; then
-    get_pecl_version phalcon stable 5
+    if [ "${version:?}" = "7.4" ]; then
+      echo '5.4.0'
+    else
+      get_pecl_version phalcon stable 5
+    fi
   elif [ "$extension" = "phalcon4" ]; then
     echo '4.1.2'
   elif [ "$extension" = "phalcon3" ]; then
@@ -31,7 +35,7 @@ add_phalcon_helper() {
   else
     package="php${version:?}-$extension"
     add_ppa ondrej/php >/dev/null 2>&1 || update_ppa ondrej/php
-    [ "$extension" = "phalcon4" ] && (install_packages "php${version:?}-psr" || pecl_install psr || pecl_install psr-1.1.0)
+    [[ "$extension" =~ phalcon[4|5] ]] && (install_packages "php${version:?}-psr" || pecl_install psr || pecl_install psr-1.1.0)
     (check_package "$package" && install_packages "$package") || pecl_install phalcon-"$(get_phalcon_version)" || add_phalcon_from_repo
   fi
 }
@@ -87,6 +91,7 @@ add_phalcon5() {
 add_phalcon() {
   local extension=$1
   status='Enabled'
+  [ "$extension" = "phalcon" ] && extension=phalcon5
   extension_major_version=${extension: -1}
   if [[ "$extension_major_version" =~ [3-5] ]]; then
     add_phalcon"$extension_major_version" >/dev/null 2>&1

src/scripts/extensions/relay.sh

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

src/scripts/extensions/source.sh

@@ -89,6 +89,8 @@ run_group() {
 
 patch_extension() {
   local extension=$1
+  # shellcheck source=.
+  . "${scripts:?}"/extensions/patches/common.sh
   if [ -e "${scripts:?}"/extensions/patches/"$extension".sh ]; then
     # shellcheck source=.
     . "${scripts:?}"/extensions/patches/"$extension".sh

src/scripts/extensions/sqlsrv.ps1

@@ -7,6 +7,8 @@ Function Get-SqlsrvReleaseVersion() {
     return '5.9.0'
   } elseif ($version -eq '7.4') {
     return '5.10.1'
+  } elseif ($version -eq '8.0') {
+    return '5.11.1'
   } else {
     return 'latest'
   }
@@ -27,7 +29,7 @@ Function Get-SqlsrvReleaseUrl()
 }
 
 # Function to add sqlsrv extension from GitHub.
-Function Add-SqlsrvFromGithub()
+Function Add-SqlsrvFromMSGithub()
 {
   Param (
     [Parameter(Position = 0, Mandatory = $true)]
@@ -35,16 +37,18 @@ Function Add-SqlsrvFromGithub()
     [string]
     $extension
   )
-  $zipUrl = SqlsrvReleaseUrl
-  if($zipUrl) {
-    $nts = if (!$installed.ThreadSafe) { "nts" } else { "ts" }
-    $noDotVersion = $version.replace('.', '')
-    $extensionFilePath = "Windows-$version\$arch\php_${extension}_${noDotVersion}_${nts}.dll"
-    Get-File -Url $zipUrl -OutFile $ENV:RUNNER_TOOL_CACHE\sqlsrv.zip > $null 2>&1
-    Expand-Archive -Path $ENV:RUNNER_TOOL_CACHE\sqlsrv.zip -DestinationPath $ENV:RUNNER_TOOL_CACHE\sqlsrv -Force > $null 2>&1
-    Copy-Item -Path "$ENV:RUNNER_TOOL_CACHE\sqlsrv\$extensionFilePath" -Destination "$ext_dir\php_$extension.dll"
-    Enable-PhpExtension -Extension $extension -Path $php_dir
-  }
+  try {
+    $zipUrl = SqlsrvReleaseUrl
+    if($zipUrl) {
+      $nts = if (!$installed.ThreadSafe) { "nts" } else { "ts" }
+      $noDotVersion = $version.replace('.', '')
+      $extensionFilePath = "Windows-$version\$arch\php_${extension}_${noDotVersion}_${nts}.dll"
+      Get-File -Url $zipUrl -OutFile $ENV:RUNNER_TOOL_CACHE\sqlsrv.zip > $null 2>&1
+      Expand-Archive -Path $ENV:RUNNER_TOOL_CACHE\sqlsrv.zip -DestinationPath $ENV:RUNNER_TOOL_CACHE\sqlsrv -Force > $null 2>&1
+      Copy-Item -Path "$ENV:RUNNER_TOOL_CACHE\sqlsrv\$extensionFilePath" -Destination "$ext_dir\php_$extension.dll"
+      Enable-PhpExtension -Extension $extension -Path $php_dir
+    }
+  } catch { }
 }
 
 # Function to add sqlsrv extension.
@@ -59,7 +63,12 @@ Function Add-Sqlsrv() {
   if (Test-Path $ext_dir\php_$extension.dll) {
     Enable-PhpExtension -Extension $extension -Path $php_dir
   } else {
-    Add-SqlsrvFromGithub $extension >$null 2>&1
+    try {
+      Add-ExtensionFromGithub $extension > $null 2>&1
+    } catch {}
+    if (-not(Test-Extension $extension)) {
+      Add-SqlsrvFromMSGithub $extension >$null 2>&1
+    }
     if (-not(Test-Extension $extension)) {
       Add-Extension $extension >$null 2>&1
     }

src/scripts/extensions/sqlsrv.sh

@@ -4,6 +4,8 @@ get_sqlsrv_version() {
     echo '5.9.0'
   elif [[ "${version:?}" =~ 7.4 ]]; then
     echo '5.10.1'
+  elif [[ "${version:?}" =~ 8.0 ]]; then
+    echo '5.11.1'
   else
     # Return an empty string so that pecl will install the latest version.
     echo ''

src/scripts/linux.sh

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

src/scripts/tools/add_tools.ps1

@@ -23,7 +23,7 @@ Function Edit-ComposerConfig() {
   if (-not(Test-Path $composer_json)) {
     Set-Content -Path $composer_json -Value "{}"
   }
-  Add-EnvPATH $src\configs\composer.env
+  Set-ComposerEnv
   Add-Path $composer_bin
   Set-ComposerAuth
 }
@@ -52,6 +52,14 @@ Function Set-ComposerAuth() {
   }
 }
 
+# Function to set composer environment variables.
+Function Set-ComposerEnv() {
+  if ($env:COMPOSER_PROCESS_TIMEOUT) {
+    (Get-Content $src\configs\composer.env -Raw) -replace '(?m)^COMPOSER_PROCESS_TIMEOUT=.*$', "COMPOSER_PROCESS_TIMEOUT=$env:COMPOSER_PROCESS_TIMEOUT" | Set-Content $src\configs\composer.env
+  }
+  Add-EnvPATH $src\configs\composer.env
+}
+
 # Function to extract tool version.
 Function Get-ToolVersion() {
   Param (

src/scripts/tools/add_tools.sh

@@ -42,7 +42,7 @@ configure_composer() {
     echo '{}' | tee "$composer_json" >/dev/null
     chmod 644 "$composer_json"
   fi
-  add_env_path "${src:?}"/configs/composer.env
+  set_composer_env
   add_path "$composer_bin"
   set_composer_auth
 }
@@ -68,6 +68,16 @@ set_composer_auth() {
   fi
 }
 
+# Function to set composer environment variables.
+set_composer_env() {
+  composer_env="${src:?}"/configs/composer.env
+  if [ -n "$COMPOSER_PROCESS_TIMEOUT" ]; then
+    sed_arg="s/COMPOSER_PROCESS_TIMEOUT.*/COMPOSER_PROCESS_TIMEOUT=$COMPOSER_PROCESS_TIMEOUT/"
+    sed -i "$sed_arg" "$composer_env" 2>/dev/null || sed -i '' "$sed_arg" "$composer_env"
+  fi
+  add_env_path "$composer_env"
+}
+
 # Helper function to configure tools.
 add_tools_helper() {
   tool=$1

src/scripts/tools/brew.sh

@@ -62,6 +62,7 @@ configure_brew() {
     add_brew
     brew_path="$(command -v brew)"
   fi
+  brew_opts=(-f)
   brew_path_dir="$(dirname "$brew_path")"
   brew_prefix="$brew_path_dir"/..
   brew_repo="$brew_path_dir/$(dirname "$(readlink "$brew_path")")"/..
@@ -74,6 +75,7 @@ configure_brew() {
   export HOMEBREW_NO_ENV_HINTS=1
   export HOMEBREW_NO_INSTALL_CLEANUP=1
   export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
+  export brew_opts
   export brew_path
   export brew_path_dir
   export brew_prefix

src/scripts/tools/ppa.sh

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

src/scripts/tools/retry.sh

@@ -0,0 +1,20 @@
+function retry {
+    local try=0
+
+    until "$@"; do
+        exit_code="$?"
+        try=$((try + 1))
+
+        if [ $try -lt 10 ]; then
+            sleep "$((2 ** try))"
+        else
+            return $exit_code
+        fi
+    done
+
+    return 0
+}
+
+function git_retry {
+    retry git "$@"
+}

src/scripts/win32.ps1

@@ -133,14 +133,14 @@ Function Get-File {
   param (
     [string]$Url,
     [string]$FallbackUrl,
-    [string]$OutFile,
+    [string]$OutFile = '',
     [int]$Retries = 3,
     [int]$TimeoutSec = 0
   )
 
   for ($i = 0; $i -lt $Retries; $i++) {
     try {
-      if($null -ne $OutFile) {
+      if($OutFile -ne '') {
         Invoke-WebRequest -Uri $Url -OutFile $OutFile -TimeoutSec $TimeoutSec
       } else {
         Invoke-WebRequest -Uri $Url -TimeoutSec $TimeoutSec
@@ -150,7 +150,7 @@ Function Get-File {
       if ($i -eq ($Retries - 1)) {
         if($FallbackUrl) {
           try {
-            if($null -ne $OutFile) {
+            if($OutFile -ne '') {
               Invoke-WebRequest -Uri $FallbackUrl -OutFile $OutFile -TimeoutSec $TimeoutSec
             } else {
               Invoke-WebRequest -Uri $FallbackUrl -TimeoutSec $TimeoutSec

src/tools.ts

@@ -22,11 +22,9 @@ interface IRef {
 export async function getSemverVersion(data: RS): Promise<string> {
   const search: string = data['version_prefix'] + data['version'];
   const url = `https://api.github.com/repos/${data['repository']}/git/matching-refs/tags%2F${search}.`;
-  let github_token: string = await utils.readEnv('GITHUB_TOKEN');
-  const composer_token: string = await utils.readEnv('COMPOSER_TOKEN');
-  if (composer_token && !github_token) {
-    github_token = composer_token;
-  }
+  const github_token: string =
+    (await utils.readEnv('GITHUB_TOKEN')) ||
+    (await utils.readEnv('COMPOSER_TOKEN'));
   const response: RS = await fetch.fetch(url, github_token);
   if (response.error || response.data === '[]') {
     data['error'] = response.error ?? `No version found with prefix ${search}.`;

src/utils.ts

@@ -59,7 +59,7 @@ export async function getManifestURL(): Promise<string> {
  */
 export async function parseVersion(version: string): Promise<string> {
   switch (true) {
-    case /^(latest|nightly|\d+\.x)$/.test(version):
+    case /^(latest|lowest|highest|nightly|\d+\.x)$/.test(version):
       return JSON.parse((await fetch.fetch(await getManifestURL()))['data'])[
         version
       ];