Update phpts section in README

Fix linking grpc on macos but installed along protoc
Disable xdebug and pcov when blackfire extension is installed
2025-07-24 15:49:07 +07:00 · 2023-11-27 18:07:02 +05:30 · 2023-11-27 17:08:32 +05:30 · 2023-11-27 16:39:18 +05:30 · 2023-11-27 15:47:27 +05:30 · 2023-11-27 14:52:14 +05:30
22 changed files with 363 additions and 349 deletions
--- a/.github/SECURITY.md
+++ b/.github/SECURITY.md
@ -10,10 +10,9 @@ This security policy only applies to the latest patches of the following PHP ver

 | Version | Supported          |
 |---------|--------------------|
-| 7.4     | :white_check_mark: |
-| 8.0     | :white_check_mark: |
 | 8.1     | :white_check_mark: |
 | 8.2     | :white_check_mark: |
+| 8.3     | :white_check_mark: |

 ## Reporting a Vulnerability

--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@ -15,8 +15,8 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        operating-system: [ubuntu-22.04, ubuntu-20.04, windows-2022, macos-11]
-        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']
+        operating-system: [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
        uses: shivammathur/setup-php@v2
@ -70,11 +70,11 @@ jobs:
          git config --local user.name "${{ github.repository_owner }}"
      - name: Combine
        run: |
-          for os in ubuntu-22.04 ubuntu-20.04 windows-2022 windows-2019 macos-11 macos-10.15; do
+          for os in 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; do
-              if [ "$os" = "macos-10.15" ]; then
-                cat lists/php"$version"-macos-11.md >> 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
+                cat lists/php"$version"-macos-12.md >> Php-extensions-loaded-on-"$os".md
              elif [ "$os" = "windows-2019" ]; then
                cat lists/php"$version"-windows-2022.md >> Php-extensions-loaded-on-"$os".md
              else
--- a/.github/workflows/node.yml
+++ b/.github/workflows/node.yml
@ -34,7 +34,7 @@ jobs:
          fetch-depth: 2

      - name: Setup Node.js 16.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        with:
          node-version: 16.x

--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@ -28,7 +28,7 @@ jobs:
          ref: ${{ github.event.inputs.tag }}

      - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        with:
          node-version: '16.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@v3
+        uses: actions/setup-node@v4
        with:
          registry-url: https://npm.pkg.github.com
          scope: '@shivammathur'
--- a/README.md
+++ b/README.md
@ -17,9 +17,6 @@
  <a href="https://twitter.com/setup_php" title="setup-php twitter"><img alt="setup-php twitter" src="https://img.shields.io/badge/twitter-follow-1DA1F2?logo=twitter&logoColor=1DA1F2&labelColor=555555"></a>
  <a href="https://status.setup-php.com" title="setup-php status"><img alt="setup-php status" src="https://img.shields.io/badge/status-subscribe-28A745?logo=statuspage&logoColor=28A745&labelColor=555555"></a>
 </p>
-<p align="center">
-  <a href="https://setup-php.com/support-ukraine" title="#StandWithUkraine"><img alt="#StandWithUkraine" src="https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/badges/StandWithUkraine.svg"></a>
-</p>

 Setup PHP with required extensions, php.ini configuration, code-coverage support and various tools like composer in [GitHub Actions](https://github.com/features/actions "GitHub Actions"). This action gives you a cross-platform interface to set up the PHP environment you need to test your application. Refer to [Usage](#memo-usage "How to use this") section and [examples](#examples "Examples of use") to see how to use this.

@ -116,14 +113,14 @@ On all supported OS/Platforms the following PHP versions can be set up as per th
 | `7.2`       | `Stable`  | `End of life`         | `GitHub-hosted`, `self-hosted` |
 | `7.3`       | `Stable`  | `End of life`         | `GitHub-hosted`, `self-hosted` |
 | `7.4`       | `Stable`  | `End of life`         | `GitHub-hosted`, `self-hosted` |
-| `8.0`       | `Stable`  | `Security fixes only` | `GitHub-hosted`, `self-hosted` |
-| `8.1`       | `Stable`  | `Active`              | `GitHub-hosted`, `self-hosted` |
+| `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.4`       | `Nightly` | `In development`      | `GitHub-hosted`, `self-hosted` |

 **Notes:**
- Specifying `8.3` and `8.4` in `php-version` input installs a nightly build of `PHP 8.3.0-dev` and `PHP 8.4.0-dev` respectively. See [nightly build setup](#nightly-build-setup) for more information.
+- Specifying `8.4` in `php-version` input installs a nightly build of `PHP 8.4.0-dev`. 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
@ -136,7 +133,7 @@ PHP extensions can be set up using the `extensions` input. It accepts a `string`
 - name: Setup PHP with PECL extension
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
+    php-version: '8.3'
    extensions: imagick, swoole
 ```

@ -164,7 +161,7 @@ PHP extensions can be set up using the `extensions` input. It accepts a `string`
 - name: Setup PHP with pre-release PECL extension
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
+    php-version: '8.3'
    extensions: xdebug-beta
 ```

@ -176,7 +173,7 @@ PHP extensions can be set up using the `extensions` input. It accepts a `string`
 - name: Setup PHP and disable opcache
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
+    php-version: '8.3'
    extensions: :opcache
 ```

@ -188,7 +185,7 @@ PHP extensions can be set up using the `extensions` input. It accepts a `string`
 - name: Setup PHP without any shared extensions except mbstring
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
+    php-version: '8.3'
    extensions: none, mbstring
 ```

@ -198,7 +195,7 @@ PHP extensions can be set up using the `extensions` input. It accepts a `string`
 - name: Setup PHP with intl
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
+    php-version: '8.3'
    extensions: intl-70.1
 ```

@ -215,7 +212,7 @@ PHP extensions can be set up using the `extensions` input. It accepts a `string`
 - name: Setup PHP with fail-fast
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
+    php-version: '8.3'
    extensions: oci8
  env:
    fail-fast: true
@ -231,7 +228,7 @@ These tools can be set up globally using the `tools` input. It accepts a string
 - name: Setup PHP with tools
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
+    php-version: '8.3'
    tools: php-cs-fixer, phpunit
 ```

@ -241,7 +238,7 @@ These tools can be set up globally using the `tools` input. It accepts a string
 - name: Setup PHP with tools
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
+    php-version: '8.3'
    tools: vimeo/psalm
 ```

@ -261,8 +258,8 @@ These tools can be set up globally using the `tools` input. It accepts a string
 - name: Setup PHP with tools
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
-    tools: php-cs-fixer:3.5, phpunit:9.5
+    php-version: '8.3'
+    tools: php-cs-fixer:3.39, phpunit:10.4
  env:
    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 ```
@ -273,7 +270,7 @@ These tools can be set up globally using the `tools` input. It accepts a string
 - name: Setup PHP with composer v2
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
+    php-version: '8.3'
    tools: composer:v2
 ```

@ -283,7 +280,7 @@ These tools can be set up globally using the `tools` input. It accepts a string
 - name: Setup PHP without composer
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
+    php-version: '8.3'
    tools: none
 ```

@ -299,7 +296,7 @@ These tools can be set up globally using the `tools` input. It accepts a string
 - name: Setup PHP with fail-fast
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
+    php-version: '8.3'
    tools: deployer
  env:
    fail-fast: true
@ -322,7 +319,7 @@ Runs on all [PHP versions supported](#tada-php-support "List of PHP versions sup
 - name: Setup PHP with Xdebug
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
+    php-version: '8.3'
    coverage: xdebug
 ```

@ -350,7 +347,7 @@ Runs on PHP 7.1 and newer PHP versions.
 - name: Setup PHP with PCOV
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
+    php-version: '8.3'
    ini-values: pcov.directory=api #optional, see above for usage.
    coverage: pcov
 ```
@ -380,7 +377,7 @@ Disable coverage for these reasons:
 - name: Setup PHP with no coverage driver
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
+    php-version: '8.3'
    coverage: none
 ```

@ -453,7 +450,7 @@ On GitHub Actions you can assign the `setup-php` step an `id`, you can use the s
  id: setup-php
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
+    php-version: '8.3'

 - name: Print PHP version
  run: echo ${{ steps.setup-php.outputs.php-version }}
@ -473,7 +470,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.
- Accepts `ts` and `nts`.
+- 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.

@ -495,7 +492,7 @@ steps:
 - name: Setup PHP
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
+    php-version: '8.3'
    extensions: mbstring, intl
    ini-values: post_max_size=256M, max_execution_time=180
    coverage: xdebug
@ -534,7 +531,7 @@ jobs:

 ### Nightly Build Setup

-> Set up a nightly build of `PHP 8.3` or `PHP 8.4`.
+> Set up a nightly build of `PHP 8.4`.

 - 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.
@ -544,7 +541,7 @@ steps:
 - name: Setup nightly PHP
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.3'
+    php-version: '8.4'
    extensions: mbstring
    ini-values: post_max_size=256M, max_execution_time=180
    coverage: xdebug
@ -563,7 +560,7 @@ steps:
 - name: Setup PHP with debugging symbols
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
+    php-version: '8.3'
  env:
    debug: true # specify true or false
 ```
@ -585,7 +582,7 @@ jobs:
    - name: Setup PHP
      uses: shivammathur/setup-php@v2
      with:
-        php-version: '8.2'
+        php-version: '8.3'
      env:
        phpts: ts # specify ts or nts
 ```
@ -602,7 +599,7 @@ jobs:
 - name: Setup PHP with latest versions
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
+    php-version: '8.3'
  env:
    update: true # specify true or false
 ```
@ -617,14 +614,14 @@ To debug any issues, you can use the `verbose` tag instead of `v2`.
 - name: Setup PHP with logs
  uses: shivammathur/setup-php@verbose
  with:
-    php-version: '8.2'
+    php-version: '8.3'
 ```

 ### Multi-Arch Setup

 > Set up PHP on multiple architecture on Ubuntu GitHub Runners.

- `PHP 5.6` to `PHP 8.2` are supported by `setup-php` on multiple architecture on `Ubuntu`.
+- `PHP 5.6` to `PHP 8.3` are supported by `setup-php` on multiple architecture on `Ubuntu`.
 - For this, you can use `shivammathur/node` images as containers. These have compatible `Nodejs` installed for `setup-php`.
 - Currently, for `ARM` based setup, you will need [self-hosted runners](#self-hosted-setup).

@ -640,7 +637,7 @@ jobs:
      - name: Install PHP
        uses: shivammathur/setup-php@v2
        with:
-          php-version: '8.2'
+          php-version: '8.3'
 ```

 ### Self Hosted Setup
@ -662,7 +659,7 @@ jobs:
    runs-on: self-hosted
    strategy:
      matrix:
-        php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
+        php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
    name: PHP ${{ matrix.php-versions }}
    steps:
    - name: Setup PHP
@ -690,7 +687,7 @@ jobs:
    - name: Setup PHP
      uses: shivammathur/setup-php@v2
      with:
-        php-version: '8.2'
+        php-version: '8.3'
 ```

 Run the workflow locally with `act` using [`shivammathur/node`](https://github.com/shivammathur/node-docker "Docker image to run setup-php") docker images.
@ -723,7 +720,7 @@ For example to enable JIT in `tracing` mode with buffer size of `64 MB`.
 - name: Setup PHP with JIT in tracing mode
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
+    php-version: '8.3'
    coverage: none
    ini-values: opcache.enable_cli=1, opcache.jit=tracing, opcache.jit_buffer_size=64M
 ```
@ -776,7 +773,7 @@ The `COMPOSER_TOKEN` environment variable has been deprecated in favor of `GITHU
 - name: Setup PHP
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
+    php-version: '8.3'
  env:
    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 ```
@ -789,7 +786,7 @@ If you use Private Packagist for your private composer dependencies, you can set
 - name: Setup PHP
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
+    php-version: '8.3'
  env:
    PACKAGIST_TOKEN: ${{ secrets.PACKAGIST_TOKEN }}
 ```
@ -803,7 +800,7 @@ Please refer to the authentication section in [`composer documentation`](https:/
 - name: Setup PHP
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
+    php-version: '8.3'
  env:
    COMPOSER_AUTH_JSON: |
      {
@ -826,7 +823,7 @@ Put the code in the run property of a step and specify the shell as `php {0}`.
 - name: Setup PHP
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
+    php-version: '8.3'

 - name: Run PHP code
  shell: php {0}
@ -866,7 +863,7 @@ PHPStan supports error reporting in GitHub Actions, so it does not require probl
 - name: Setup PHP
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
+    php-version: '8.3'
    tools: phpstan

 - name: Run PHPStan
@ -881,7 +878,7 @@ Psalm supports error reporting in GitHub Actions with an output format `github`.
 - name: Setup PHP
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
+    php-version: '8.3'
    tools: psalm

 - name: Run Psalm
@ -899,7 +896,7 @@ For examples refer to the [cs2pr documentation](https://github.com/staabm/annota
 - name: Setup PHP
  uses: shivammathur/setup-php@v2
  with:
-    php-version: '8.2'
+    php-version: '8.3'
    tools: cs2pr, phpcs

 - name: Run phpcs
--- a/dist/index.js
+++ b/dist/index.js
@ -249,7 +249,7 @@ async function addExtensionDarwin(extension_csv, version) {
                add_script += await utils.parseExtensionSource(extension, ext_prefix);
                return;
            case /^(7\.4|8\.[0-3])relay(-v?\d+\.\d+\.\d+)?$/.test(version_extension):
-            case /^(5\.[3-6]|7\.[0-4]|8\.[0-2])blackfire(-\d+\.\d+\.\d+)?$/.test(version_extension):
+            case /^(5\.[3-6]|7\.[0-4]|8\.[0-3])blackfire(-\d+\.\d+\.\d+)?$/.test(version_extension):
            case /^couchbase|^event|^gearman$|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(extension):
            case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
            case /(5\.6|7\.[0-3])phalcon3|7\.[2-4]phalcon4|(7\.4|8\.[0-2])phalcon5/.test(version_extension):
@ -299,7 +299,7 @@ async function addExtensionWindows(extension_csv, version) {
            case /^none$/.test(ext_name):
                add_script += '\nDisable-AllShared';
                break;
-            case /^(5\.[3-6]|7\.[0-4]|8\.[0-2])blackfire(-\d+\.\d+\.\d+)?$/.test(version_extension):
+            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(version_extension):
@ -367,7 +367,7 @@ async function addExtensionLinux(extension_csv, version) {
                add_script += await utils.parseExtensionSource(extension, ext_prefix);
                return;
            case /^(7\.4|8\.[0-3])relay(-v?\d+\.\d+\.\d+)?$/.test(version_extension):
-            case /^(5\.[3-6]|7\.[0-4]|8\.[0-2])blackfire(-\d+\.\d+\.\d+)?$/.test(version_extension):
+            case /^(5\.[3-6]|7\.[0-4]|8\.[0-3])blackfire(-\d+\.\d+\.\d+)?$/.test(version_extension):
            case /^((5\.[3-6])|(7\.[0-2]))pdo_cubrid$|^((5\.[3-6])|(7\.[0-4]))cubrid$/.test(version_extension):
            case /^couchbase|^event|^gearman$|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(extension):
            case /(?<!5\.[3-5])intl-\d+\.\d+$/.test(version_extension):
@ -550,7 +550,7 @@ const extensions = __importStar(__nccwpck_require__(3390));
 const tools = __importStar(__nccwpck_require__(7740));
 const utils = __importStar(__nccwpck_require__(918));
 async function getScript(os) {
-    const url = 'https://setup-php.com/support-ukraine';
+    const url = 'https://setup-php.com/sponsor';
    const filename = os + (await utils.scriptExtension(os));
    const script_path = path_1.default.join(__dirname, '../src/scripts', filename);
    const run_path = script_path.replace(os, 'run');
@ -572,8 +572,8 @@ async function getScript(os) {
    if (ini_values_csv) {
        script += await config.addINIValues(ini_values_csv, os);
    }
-    script += '\n' + (await utils.stepLog(`#StandWithUkraine`, os));
-    script += '\n' + (await utils.addLog('$tick', 'read-more', url, os));
+    script += '\n' + (await utils.stepLog(`Sponsor setup-php`, os));
+    script += '\n' + (await utils.addLog('$tick', 'setup-php', url, os));
    fs_1.default.writeFileSync(run_path, script, { mode: 0o755 });
    return run_path;
 }
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
  "name": "setup-php",
-  "version": "2.27.0",
+  "version": "2.28.0",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "setup-php",
-      "version": "2.27.0",
+      "version": "2.28.0",
      "license": "MIT",
      "dependencies": {
        "@actions/core": "^1.10.1",
@ -15,23 +15,23 @@
        "compare-versions": "^6.1.0"
      },
      "devDependencies": {
-        "@types/jest": "^29.5.7",
-        "@types/node": "^20.8.10",
-        "@typescript-eslint/eslint-plugin": "^6.9.1",
-        "@typescript-eslint/parser": "^6.9.1",
+        "@types/jest": "^29.5.10",
+        "@types/node": "^20.10.0",
+        "@typescript-eslint/eslint-plugin": "^6.12.0",
+        "@typescript-eslint/parser": "^6.12.0",
        "@vercel/ncc": "^0.38.1",
-        "eslint": "^8.52.0",
+        "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",
        "jest": "^29.7.0",
        "jest-circus": "^29.7.0",
-        "nock": "^13.3.7",
-        "prettier": "^3.0.3",
+        "nock": "^13.3.8",
+        "prettier": "^3.1.0",
        "simple-git-hooks": "^2.9.0",
        "ts-jest": "^29.1.1",
-        "typescript": "^5.2.2"
+        "typescript": "^5.3.2"
      }
    },
    "node_modules/@aashutoshrathi/word-wrap": {
@ -784,9 +784,9 @@
      }
    },
    "node_modules/@eslint/eslintrc": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
-      "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz",
+      "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==",
      "dev": true,
      "dependencies": {
        "ajv": "^6.12.4",
@ -807,9 +807,9 @@
      }
    },
    "node_modules/@eslint/js": {
-      "version": "8.52.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz",
-      "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz",
+      "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==",
      "dev": true,
      "engines": {
        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@ -1412,9 +1412,9 @@
      }
    },
    "node_modules/@types/jest": {
-      "version": "29.5.7",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.7.tgz",
-      "integrity": "sha512-HLyetab6KVPSiF+7pFcUyMeLsx25LDNDemw9mGsJBkai/oouwrjTycocSDYopMEwFhN2Y4s9oPyOCZNofgSt2g==",
+      "version": "29.5.10",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.10.tgz",
+      "integrity": "sha512-tE4yxKEphEyxj9s4inideLHktW/x6DwesIwWZ9NN1FKf9zbJYsnhBoA9vrHA/IuIOKwPa5PcFBNV4lpMIOEzyQ==",
      "dev": true,
      "dependencies": {
        "expect": "^29.0.0",
@ -1434,9 +1434,9 @@
      "dev": true
    },
    "node_modules/@types/node": {
-      "version": "20.8.10",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.10.tgz",
-      "integrity": "sha512-TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w==",
+      "version": "20.10.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.0.tgz",
+      "integrity": "sha512-D0WfRmU9TQ8I9PFx9Yc+EBHw+vSpIub4IDvQivcp26PtPrdMGAq5SDcpXEo/epqa/DXotVpekHiLNTg3iaKXBQ==",
      "dev": true,
      "dependencies": {
        "undici-types": "~5.26.4"
@ -1470,16 +1470,16 @@
      "dev": true
    },
    "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.9.1.tgz",
-      "integrity": "sha512-w0tiiRc9I4S5XSXXrMHOWgHgxbrBn1Ro+PmiYhSg2ZVdxrAJtQgzU5o2m1BfP6UOn7Vxcc6152vFjQfmZR4xEg==",
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.12.0.tgz",
+      "integrity": "sha512-XOpZ3IyJUIV1b15M7HVOpgQxPPF7lGXgsfcEIu3yDxFPaf/xZKt7s9QO/pbk7vpWQyVulpJbu4E5LwpZiQo4kA==",
      "dev": true,
      "dependencies": {
        "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.9.1",
-        "@typescript-eslint/type-utils": "6.9.1",
-        "@typescript-eslint/utils": "6.9.1",
-        "@typescript-eslint/visitor-keys": "6.9.1",
+        "@typescript-eslint/scope-manager": "6.12.0",
+        "@typescript-eslint/type-utils": "6.12.0",
+        "@typescript-eslint/utils": "6.12.0",
+        "@typescript-eslint/visitor-keys": "6.12.0",
        "debug": "^4.3.4",
        "graphemer": "^1.4.0",
        "ignore": "^5.2.4",
@ -1505,13 +1505,13 @@
      }
    },
    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.9.1.tgz",
-      "integrity": "sha512-38IxvKB6NAne3g/+MyXMs2Cda/Sz+CEpmm+KLGEM8hx/CvnSRuw51i8ukfwB/B/sESdeTGet1NH1Wj7I0YXswg==",
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.12.0.tgz",
+      "integrity": "sha512-5gUvjg+XdSj8pcetdL9eXJzQNTl3RD7LgUiYTl8Aabdi8hFkaGSYnaS6BLc0BGNaDH+tVzVwmKtWvu0jLgWVbw==",
      "dev": true,
      "dependencies": {
-        "@typescript-eslint/types": "6.9.1",
-        "@typescript-eslint/visitor-keys": "6.9.1"
+        "@typescript-eslint/types": "6.12.0",
+        "@typescript-eslint/visitor-keys": "6.12.0"
      },
      "engines": {
        "node": "^16.0.0 || >=18.0.0"
@ -1522,9 +1522,9 @@
      }
    },
    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.9.1.tgz",
-      "integrity": "sha512-BUGslGOb14zUHOUmDB2FfT6SI1CcZEJYfF3qFwBeUrU6srJfzANonwRYHDpLBuzbq3HaoF2XL2hcr01c8f8OaQ==",
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.12.0.tgz",
+      "integrity": "sha512-MA16p/+WxM5JG/F3RTpRIcuOghWO30//VEOvzubM8zuOOBYXsP+IfjoCXXiIfy2Ta8FRh9+IO9QLlaFQUU+10Q==",
      "dev": true,
      "engines": {
        "node": "^16.0.0 || >=18.0.0"
@ -1535,13 +1535,13 @@
      }
    },
    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.9.1.tgz",
-      "integrity": "sha512-U+mUylTHfcqeO7mLWVQ5W/tMLXqVpRv61wm9ZtfE5egz7gtnmqVIw9ryh0mgIlkKk9rZLY3UHygsBSdB9/ftyw==",
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.12.0.tgz",
+      "integrity": "sha512-vw9E2P9+3UUWzhgjyyVczLWxZ3GuQNT7QpnIY3o5OMeLO/c8oHljGc8ZpryBMIyympiAAaKgw9e5Hl9dCWFOYw==",
      "dev": true,
      "dependencies": {
-        "@typescript-eslint/types": "6.9.1",
-        "@typescript-eslint/visitor-keys": "6.9.1",
+        "@typescript-eslint/types": "6.12.0",
+        "@typescript-eslint/visitor-keys": "6.12.0",
        "debug": "^4.3.4",
        "globby": "^11.1.0",
        "is-glob": "^4.0.3",
@ -1562,17 +1562,17 @@
      }
    },
    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.9.1.tgz",
-      "integrity": "sha512-L1T0A5nFdQrMVunpZgzqPL6y2wVreSyHhKGZryS6jrEN7bD9NplVAyMryUhXsQ4TWLnZmxc2ekar/lSGIlprCA==",
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.12.0.tgz",
+      "integrity": "sha512-LywPm8h3tGEbgfyjYnu3dauZ0U7R60m+miXgKcZS8c7QALO9uWJdvNoP+duKTk2XMWc7/Q3d/QiCuLN9X6SWyQ==",
      "dev": true,
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.4.0",
        "@types/json-schema": "^7.0.12",
        "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.9.1",
-        "@typescript-eslint/types": "6.9.1",
-        "@typescript-eslint/typescript-estree": "6.9.1",
+        "@typescript-eslint/scope-manager": "6.12.0",
+        "@typescript-eslint/types": "6.12.0",
+        "@typescript-eslint/typescript-estree": "6.12.0",
        "semver": "^7.5.4"
      },
      "engines": {
@ -1587,12 +1587,12 @@
      }
    },
    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.9.1.tgz",
-      "integrity": "sha512-MUaPUe/QRLEffARsmNfmpghuQkW436DvESW+h+M52w0coICHRfD6Np9/K6PdACwnrq1HmuLl+cSPZaJmeVPkSw==",
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.12.0.tgz",
+      "integrity": "sha512-rg3BizTZHF1k3ipn8gfrzDXXSFKyOEB5zxYXInQ6z0hUvmQlhaZQzK+YmHmNViMA9HzW5Q9+bPPt90bU6GQwyw==",
      "dev": true,
      "dependencies": {
-        "@typescript-eslint/types": "6.9.1",
+        "@typescript-eslint/types": "6.12.0",
        "eslint-visitor-keys": "^3.4.1"
      },
      "engines": {
@ -1604,15 +1604,15 @@
      }
    },
    "node_modules/@typescript-eslint/parser": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.9.1.tgz",
-      "integrity": "sha512-C7AK2wn43GSaCUZ9do6Ksgi2g3mwFkMO3Cis96kzmgudoVaKyt62yNzJOktP0HDLb/iO2O0n2lBOzJgr6Q/cyg==",
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.12.0.tgz",
+      "integrity": "sha512-s8/jNFPKPNRmXEnNXfuo1gemBdVmpQsK1pcu+QIvuNJuhFzGrpD7WjOcvDc/+uEdfzSYpNu7U/+MmbScjoQ6vg==",
      "dev": true,
      "dependencies": {
-        "@typescript-eslint/scope-manager": "6.9.1",
-        "@typescript-eslint/types": "6.9.1",
-        "@typescript-eslint/typescript-estree": "6.9.1",
-        "@typescript-eslint/visitor-keys": "6.9.1",
+        "@typescript-eslint/scope-manager": "6.12.0",
+        "@typescript-eslint/types": "6.12.0",
+        "@typescript-eslint/typescript-estree": "6.12.0",
+        "@typescript-eslint/visitor-keys": "6.12.0",
        "debug": "^4.3.4"
      },
      "engines": {
@ -1632,13 +1632,13 @@
      }
    },
    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.9.1.tgz",
-      "integrity": "sha512-38IxvKB6NAne3g/+MyXMs2Cda/Sz+CEpmm+KLGEM8hx/CvnSRuw51i8ukfwB/B/sESdeTGet1NH1Wj7I0YXswg==",
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.12.0.tgz",
+      "integrity": "sha512-5gUvjg+XdSj8pcetdL9eXJzQNTl3RD7LgUiYTl8Aabdi8hFkaGSYnaS6BLc0BGNaDH+tVzVwmKtWvu0jLgWVbw==",
      "dev": true,
      "dependencies": {
-        "@typescript-eslint/types": "6.9.1",
-        "@typescript-eslint/visitor-keys": "6.9.1"
+        "@typescript-eslint/types": "6.12.0",
+        "@typescript-eslint/visitor-keys": "6.12.0"
      },
      "engines": {
        "node": "^16.0.0 || >=18.0.0"
@ -1649,9 +1649,9 @@
      }
    },
    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.9.1.tgz",
-      "integrity": "sha512-BUGslGOb14zUHOUmDB2FfT6SI1CcZEJYfF3qFwBeUrU6srJfzANonwRYHDpLBuzbq3HaoF2XL2hcr01c8f8OaQ==",
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.12.0.tgz",
+      "integrity": "sha512-MA16p/+WxM5JG/F3RTpRIcuOghWO30//VEOvzubM8zuOOBYXsP+IfjoCXXiIfy2Ta8FRh9+IO9QLlaFQUU+10Q==",
      "dev": true,
      "engines": {
        "node": "^16.0.0 || >=18.0.0"
@ -1662,13 +1662,13 @@
      }
    },
    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.9.1.tgz",
-      "integrity": "sha512-U+mUylTHfcqeO7mLWVQ5W/tMLXqVpRv61wm9ZtfE5egz7gtnmqVIw9ryh0mgIlkKk9rZLY3UHygsBSdB9/ftyw==",
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.12.0.tgz",
+      "integrity": "sha512-vw9E2P9+3UUWzhgjyyVczLWxZ3GuQNT7QpnIY3o5OMeLO/c8oHljGc8ZpryBMIyympiAAaKgw9e5Hl9dCWFOYw==",
      "dev": true,
      "dependencies": {
-        "@typescript-eslint/types": "6.9.1",
-        "@typescript-eslint/visitor-keys": "6.9.1",
+        "@typescript-eslint/types": "6.12.0",
+        "@typescript-eslint/visitor-keys": "6.12.0",
        "debug": "^4.3.4",
        "globby": "^11.1.0",
        "is-glob": "^4.0.3",
@ -1689,12 +1689,12 @@
      }
    },
    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.9.1.tgz",
-      "integrity": "sha512-MUaPUe/QRLEffARsmNfmpghuQkW436DvESW+h+M52w0coICHRfD6Np9/K6PdACwnrq1HmuLl+cSPZaJmeVPkSw==",
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.12.0.tgz",
+      "integrity": "sha512-rg3BizTZHF1k3ipn8gfrzDXXSFKyOEB5zxYXInQ6z0hUvmQlhaZQzK+YmHmNViMA9HzW5Q9+bPPt90bU6GQwyw==",
      "dev": true,
      "dependencies": {
-        "@typescript-eslint/types": "6.9.1",
+        "@typescript-eslint/types": "6.12.0",
        "eslint-visitor-keys": "^3.4.1"
      },
      "engines": {
@ -1723,13 +1723,13 @@
      }
    },
    "node_modules/@typescript-eslint/type-utils": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.9.1.tgz",
-      "integrity": "sha512-eh2oHaUKCK58qIeYp19F5V5TbpM52680sB4zNSz29VBQPTWIlE/hCj5P5B1AChxECe/fmZlspAWFuRniep1Skg==",
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.12.0.tgz",
+      "integrity": "sha512-WWmRXxhm1X8Wlquj+MhsAG4dU/Blvf1xDgGaYCzfvStP2NwPQh6KBvCDbiOEvaE0filhranjIlK/2fSTVwtBng==",
      "dev": true,
      "dependencies": {
-        "@typescript-eslint/typescript-estree": "6.9.1",
-        "@typescript-eslint/utils": "6.9.1",
+        "@typescript-eslint/typescript-estree": "6.12.0",
+        "@typescript-eslint/utils": "6.12.0",
        "debug": "^4.3.4",
        "ts-api-utils": "^1.0.1"
      },
@ -1750,13 +1750,13 @@
      }
    },
    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.9.1.tgz",
-      "integrity": "sha512-38IxvKB6NAne3g/+MyXMs2Cda/Sz+CEpmm+KLGEM8hx/CvnSRuw51i8ukfwB/B/sESdeTGet1NH1Wj7I0YXswg==",
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.12.0.tgz",
+      "integrity": "sha512-5gUvjg+XdSj8pcetdL9eXJzQNTl3RD7LgUiYTl8Aabdi8hFkaGSYnaS6BLc0BGNaDH+tVzVwmKtWvu0jLgWVbw==",
      "dev": true,
      "dependencies": {
-        "@typescript-eslint/types": "6.9.1",
-        "@typescript-eslint/visitor-keys": "6.9.1"
+        "@typescript-eslint/types": "6.12.0",
+        "@typescript-eslint/visitor-keys": "6.12.0"
      },
      "engines": {
        "node": "^16.0.0 || >=18.0.0"
@ -1767,9 +1767,9 @@
      }
    },
    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.9.1.tgz",
-      "integrity": "sha512-BUGslGOb14zUHOUmDB2FfT6SI1CcZEJYfF3qFwBeUrU6srJfzANonwRYHDpLBuzbq3HaoF2XL2hcr01c8f8OaQ==",
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.12.0.tgz",
+      "integrity": "sha512-MA16p/+WxM5JG/F3RTpRIcuOghWO30//VEOvzubM8zuOOBYXsP+IfjoCXXiIfy2Ta8FRh9+IO9QLlaFQUU+10Q==",
      "dev": true,
      "engines": {
        "node": "^16.0.0 || >=18.0.0"
@ -1780,13 +1780,13 @@
      }
    },
    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.9.1.tgz",
-      "integrity": "sha512-U+mUylTHfcqeO7mLWVQ5W/tMLXqVpRv61wm9ZtfE5egz7gtnmqVIw9ryh0mgIlkKk9rZLY3UHygsBSdB9/ftyw==",
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.12.0.tgz",
+      "integrity": "sha512-vw9E2P9+3UUWzhgjyyVczLWxZ3GuQNT7QpnIY3o5OMeLO/c8oHljGc8ZpryBMIyympiAAaKgw9e5Hl9dCWFOYw==",
      "dev": true,
      "dependencies": {
-        "@typescript-eslint/types": "6.9.1",
-        "@typescript-eslint/visitor-keys": "6.9.1",
+        "@typescript-eslint/types": "6.12.0",
+        "@typescript-eslint/visitor-keys": "6.12.0",
        "debug": "^4.3.4",
        "globby": "^11.1.0",
        "is-glob": "^4.0.3",
@ -1807,17 +1807,17 @@
      }
    },
    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.9.1.tgz",
-      "integrity": "sha512-L1T0A5nFdQrMVunpZgzqPL6y2wVreSyHhKGZryS6jrEN7bD9NplVAyMryUhXsQ4TWLnZmxc2ekar/lSGIlprCA==",
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.12.0.tgz",
+      "integrity": "sha512-LywPm8h3tGEbgfyjYnu3dauZ0U7R60m+miXgKcZS8c7QALO9uWJdvNoP+duKTk2XMWc7/Q3d/QiCuLN9X6SWyQ==",
      "dev": true,
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.4.0",
        "@types/json-schema": "^7.0.12",
        "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.9.1",
-        "@typescript-eslint/types": "6.9.1",
-        "@typescript-eslint/typescript-estree": "6.9.1",
+        "@typescript-eslint/scope-manager": "6.12.0",
+        "@typescript-eslint/types": "6.12.0",
+        "@typescript-eslint/typescript-estree": "6.12.0",
        "semver": "^7.5.4"
      },
      "engines": {
@ -1832,12 +1832,12 @@
      }
    },
    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.9.1.tgz",
-      "integrity": "sha512-MUaPUe/QRLEffARsmNfmpghuQkW436DvESW+h+M52w0coICHRfD6Np9/K6PdACwnrq1HmuLl+cSPZaJmeVPkSw==",
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.12.0.tgz",
+      "integrity": "sha512-rg3BizTZHF1k3ipn8gfrzDXXSFKyOEB5zxYXInQ6z0hUvmQlhaZQzK+YmHmNViMA9HzW5Q9+bPPt90bU6GQwyw==",
      "dev": true,
      "dependencies": {
-        "@typescript-eslint/types": "6.9.1",
+        "@typescript-eslint/types": "6.12.0",
        "eslint-visitor-keys": "^3.4.1"
      },
      "engines": {
@ -1947,9 +1947,9 @@
      }
    },
    "node_modules/acorn": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
+      "version": "8.11.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
+      "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==",
      "dev": true,
      "bin": {
        "acorn": "bin/acorn"
@ -3008,15 +3008,15 @@
      }
    },
    "node_modules/eslint": {
-      "version": "8.52.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz",
-      "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz",
+      "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==",
      "dev": true,
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.2.0",
        "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.52.0",
+        "@eslint/eslintrc": "^2.1.3",
+        "@eslint/js": "8.54.0",
        "@humanwhocodes/config-array": "^0.11.13",
        "@humanwhocodes/module-importer": "^1.0.1",
        "@nodelib/fs.walk": "^1.2.8",
@ -3763,9 +3763,9 @@
      }
    },
    "node_modules/globals": {
-      "version": "13.21.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
-      "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
+      "version": "13.23.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
+      "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
      "dev": true,
      "dependencies": {
        "type-fest": "^0.20.2"
@ -5225,9 +5225,9 @@
      "dev": true
    },
    "node_modules/nock": {
-      "version": "13.3.7",
-      "resolved": "https://registry.npmjs.org/nock/-/nock-13.3.7.tgz",
-      "integrity": "sha512-z3voRxo6G0JxqCsjuzERh1ReFC4Vp2b7JpSgcMJB6jnJbUszf88awAeQLIID2UNMwbMh9/Zm5sFscagj0QYHEg==",
+      "version": "13.3.8",
+      "resolved": "https://registry.npmjs.org/nock/-/nock-13.3.8.tgz",
+      "integrity": "sha512-96yVFal0c/W1lG7mmfRe7eO+hovrhJYd2obzzOZ90f6fjpeU/XNvd9cYHZKZAQJumDfhXgoTpkpJ9pvMj+hqHw==",
      "dev": true,
      "dependencies": {
        "debug": "^4.1.0",
@ -5584,9 +5584,9 @@
      }
    },
    "node_modules/prettier": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz",
-      "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz",
+      "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==",
      "dev": true,
      "bin": {
        "prettier": "bin/prettier.cjs"
@ -5659,9 +5659,9 @@
      }
    },
    "node_modules/punycode": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
      "dev": true,
      "engines": {
        "node": ">=6"
@ -6477,9 +6477,9 @@
      }
    },
    "node_modules/typescript": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz",
-      "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz",
+      "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==",
      "dev": true,
      "bin": {
        "tsc": "bin/tsc",
@ -7310,9 +7310,9 @@
      "dev": true
    },
    "@eslint/eslintrc": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
-      "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz",
+      "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==",
      "dev": true,
      "requires": {
        "ajv": "^6.12.4",
@ -7327,9 +7327,9 @@
      }
    },
    "@eslint/js": {
-      "version": "8.52.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz",
-      "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz",
+      "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==",
      "dev": true
    },
    "@humanwhocodes/config-array": {
@ -7830,9 +7830,9 @@
      }
    },
    "@types/jest": {
-      "version": "29.5.7",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.7.tgz",
-      "integrity": "sha512-HLyetab6KVPSiF+7pFcUyMeLsx25LDNDemw9mGsJBkai/oouwrjTycocSDYopMEwFhN2Y4s9oPyOCZNofgSt2g==",
+      "version": "29.5.10",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.10.tgz",
+      "integrity": "sha512-tE4yxKEphEyxj9s4inideLHktW/x6DwesIwWZ9NN1FKf9zbJYsnhBoA9vrHA/IuIOKwPa5PcFBNV4lpMIOEzyQ==",
      "dev": true,
      "requires": {
        "expect": "^29.0.0",
@ -7852,9 +7852,9 @@
      "dev": true
    },
    "@types/node": {
-      "version": "20.8.10",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.10.tgz",
-      "integrity": "sha512-TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w==",
+      "version": "20.10.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.0.tgz",
+      "integrity": "sha512-D0WfRmU9TQ8I9PFx9Yc+EBHw+vSpIub4IDvQivcp26PtPrdMGAq5SDcpXEo/epqa/DXotVpekHiLNTg3iaKXBQ==",
      "dev": true,
      "requires": {
        "undici-types": "~5.26.4"
@ -7888,16 +7888,16 @@
      "dev": true
    },
    "@typescript-eslint/eslint-plugin": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.9.1.tgz",
-      "integrity": "sha512-w0tiiRc9I4S5XSXXrMHOWgHgxbrBn1Ro+PmiYhSg2ZVdxrAJtQgzU5o2m1BfP6UOn7Vxcc6152vFjQfmZR4xEg==",
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.12.0.tgz",
+      "integrity": "sha512-XOpZ3IyJUIV1b15M7HVOpgQxPPF7lGXgsfcEIu3yDxFPaf/xZKt7s9QO/pbk7vpWQyVulpJbu4E5LwpZiQo4kA==",
      "dev": true,
      "requires": {
        "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.9.1",
-        "@typescript-eslint/type-utils": "6.9.1",
-        "@typescript-eslint/utils": "6.9.1",
-        "@typescript-eslint/visitor-keys": "6.9.1",
+        "@typescript-eslint/scope-manager": "6.12.0",
+        "@typescript-eslint/type-utils": "6.12.0",
+        "@typescript-eslint/utils": "6.12.0",
+        "@typescript-eslint/visitor-keys": "6.12.0",
        "debug": "^4.3.4",
        "graphemer": "^1.4.0",
        "ignore": "^5.2.4",
@ -7907,29 +7907,29 @@
      },
      "dependencies": {
        "@typescript-eslint/scope-manager": {
-          "version": "6.9.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.9.1.tgz",
-          "integrity": "sha512-38IxvKB6NAne3g/+MyXMs2Cda/Sz+CEpmm+KLGEM8hx/CvnSRuw51i8ukfwB/B/sESdeTGet1NH1Wj7I0YXswg==",
+          "version": "6.12.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.12.0.tgz",
+          "integrity": "sha512-5gUvjg+XdSj8pcetdL9eXJzQNTl3RD7LgUiYTl8Aabdi8hFkaGSYnaS6BLc0BGNaDH+tVzVwmKtWvu0jLgWVbw==",
          "dev": true,
          "requires": {
-            "@typescript-eslint/types": "6.9.1",
-            "@typescript-eslint/visitor-keys": "6.9.1"
+            "@typescript-eslint/types": "6.12.0",
+            "@typescript-eslint/visitor-keys": "6.12.0"
          }
        },
        "@typescript-eslint/types": {
-          "version": "6.9.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.9.1.tgz",
-          "integrity": "sha512-BUGslGOb14zUHOUmDB2FfT6SI1CcZEJYfF3qFwBeUrU6srJfzANonwRYHDpLBuzbq3HaoF2XL2hcr01c8f8OaQ==",
+          "version": "6.12.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.12.0.tgz",
+          "integrity": "sha512-MA16p/+WxM5JG/F3RTpRIcuOghWO30//VEOvzubM8zuOOBYXsP+IfjoCXXiIfy2Ta8FRh9+IO9QLlaFQUU+10Q==",
          "dev": true
        },
        "@typescript-eslint/typescript-estree": {
-          "version": "6.9.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.9.1.tgz",
-          "integrity": "sha512-U+mUylTHfcqeO7mLWVQ5W/tMLXqVpRv61wm9ZtfE5egz7gtnmqVIw9ryh0mgIlkKk9rZLY3UHygsBSdB9/ftyw==",
+          "version": "6.12.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.12.0.tgz",
+          "integrity": "sha512-vw9E2P9+3UUWzhgjyyVczLWxZ3GuQNT7QpnIY3o5OMeLO/c8oHljGc8ZpryBMIyympiAAaKgw9e5Hl9dCWFOYw==",
          "dev": true,
          "requires": {
-            "@typescript-eslint/types": "6.9.1",
-            "@typescript-eslint/visitor-keys": "6.9.1",
+            "@typescript-eslint/types": "6.12.0",
+            "@typescript-eslint/visitor-keys": "6.12.0",
            "debug": "^4.3.4",
            "globby": "^11.1.0",
            "is-glob": "^4.0.3",
@ -7938,69 +7938,69 @@
          }
        },
        "@typescript-eslint/utils": {
-          "version": "6.9.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.9.1.tgz",
-          "integrity": "sha512-L1T0A5nFdQrMVunpZgzqPL6y2wVreSyHhKGZryS6jrEN7bD9NplVAyMryUhXsQ4TWLnZmxc2ekar/lSGIlprCA==",
+          "version": "6.12.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.12.0.tgz",
+          "integrity": "sha512-LywPm8h3tGEbgfyjYnu3dauZ0U7R60m+miXgKcZS8c7QALO9uWJdvNoP+duKTk2XMWc7/Q3d/QiCuLN9X6SWyQ==",
          "dev": true,
          "requires": {
            "@eslint-community/eslint-utils": "^4.4.0",
            "@types/json-schema": "^7.0.12",
            "@types/semver": "^7.5.0",
-            "@typescript-eslint/scope-manager": "6.9.1",
-            "@typescript-eslint/types": "6.9.1",
-            "@typescript-eslint/typescript-estree": "6.9.1",
+            "@typescript-eslint/scope-manager": "6.12.0",
+            "@typescript-eslint/types": "6.12.0",
+            "@typescript-eslint/typescript-estree": "6.12.0",
            "semver": "^7.5.4"
          }
        },
        "@typescript-eslint/visitor-keys": {
-          "version": "6.9.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.9.1.tgz",
-          "integrity": "sha512-MUaPUe/QRLEffARsmNfmpghuQkW436DvESW+h+M52w0coICHRfD6Np9/K6PdACwnrq1HmuLl+cSPZaJmeVPkSw==",
+          "version": "6.12.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.12.0.tgz",
+          "integrity": "sha512-rg3BizTZHF1k3ipn8gfrzDXXSFKyOEB5zxYXInQ6z0hUvmQlhaZQzK+YmHmNViMA9HzW5Q9+bPPt90bU6GQwyw==",
          "dev": true,
          "requires": {
-            "@typescript-eslint/types": "6.9.1",
+            "@typescript-eslint/types": "6.12.0",
            "eslint-visitor-keys": "^3.4.1"
          }
        }
      }
    },
    "@typescript-eslint/parser": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.9.1.tgz",
-      "integrity": "sha512-C7AK2wn43GSaCUZ9do6Ksgi2g3mwFkMO3Cis96kzmgudoVaKyt62yNzJOktP0HDLb/iO2O0n2lBOzJgr6Q/cyg==",
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.12.0.tgz",
+      "integrity": "sha512-s8/jNFPKPNRmXEnNXfuo1gemBdVmpQsK1pcu+QIvuNJuhFzGrpD7WjOcvDc/+uEdfzSYpNu7U/+MmbScjoQ6vg==",
      "dev": true,
      "requires": {
-        "@typescript-eslint/scope-manager": "6.9.1",
-        "@typescript-eslint/types": "6.9.1",
-        "@typescript-eslint/typescript-estree": "6.9.1",
-        "@typescript-eslint/visitor-keys": "6.9.1",
+        "@typescript-eslint/scope-manager": "6.12.0",
+        "@typescript-eslint/types": "6.12.0",
+        "@typescript-eslint/typescript-estree": "6.12.0",
+        "@typescript-eslint/visitor-keys": "6.12.0",
        "debug": "^4.3.4"
      },
      "dependencies": {
        "@typescript-eslint/scope-manager": {
-          "version": "6.9.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.9.1.tgz",
-          "integrity": "sha512-38IxvKB6NAne3g/+MyXMs2Cda/Sz+CEpmm+KLGEM8hx/CvnSRuw51i8ukfwB/B/sESdeTGet1NH1Wj7I0YXswg==",
+          "version": "6.12.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.12.0.tgz",
+          "integrity": "sha512-5gUvjg+XdSj8pcetdL9eXJzQNTl3RD7LgUiYTl8Aabdi8hFkaGSYnaS6BLc0BGNaDH+tVzVwmKtWvu0jLgWVbw==",
          "dev": true,
          "requires": {
-            "@typescript-eslint/types": "6.9.1",
-            "@typescript-eslint/visitor-keys": "6.9.1"
+            "@typescript-eslint/types": "6.12.0",
+            "@typescript-eslint/visitor-keys": "6.12.0"
          }
        },
        "@typescript-eslint/types": {
-          "version": "6.9.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.9.1.tgz",
-          "integrity": "sha512-BUGslGOb14zUHOUmDB2FfT6SI1CcZEJYfF3qFwBeUrU6srJfzANonwRYHDpLBuzbq3HaoF2XL2hcr01c8f8OaQ==",
+          "version": "6.12.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.12.0.tgz",
+          "integrity": "sha512-MA16p/+WxM5JG/F3RTpRIcuOghWO30//VEOvzubM8zuOOBYXsP+IfjoCXXiIfy2Ta8FRh9+IO9QLlaFQUU+10Q==",
          "dev": true
        },
        "@typescript-eslint/typescript-estree": {
-          "version": "6.9.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.9.1.tgz",
-          "integrity": "sha512-U+mUylTHfcqeO7mLWVQ5W/tMLXqVpRv61wm9ZtfE5egz7gtnmqVIw9ryh0mgIlkKk9rZLY3UHygsBSdB9/ftyw==",
+          "version": "6.12.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.12.0.tgz",
+          "integrity": "sha512-vw9E2P9+3UUWzhgjyyVczLWxZ3GuQNT7QpnIY3o5OMeLO/c8oHljGc8ZpryBMIyympiAAaKgw9e5Hl9dCWFOYw==",
          "dev": true,
          "requires": {
-            "@typescript-eslint/types": "6.9.1",
-            "@typescript-eslint/visitor-keys": "6.9.1",
+            "@typescript-eslint/types": "6.12.0",
+            "@typescript-eslint/visitor-keys": "6.12.0",
            "debug": "^4.3.4",
            "globby": "^11.1.0",
            "is-glob": "^4.0.3",
@ -8009,12 +8009,12 @@
          }
        },
        "@typescript-eslint/visitor-keys": {
-          "version": "6.9.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.9.1.tgz",
-          "integrity": "sha512-MUaPUe/QRLEffARsmNfmpghuQkW436DvESW+h+M52w0coICHRfD6Np9/K6PdACwnrq1HmuLl+cSPZaJmeVPkSw==",
+          "version": "6.12.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.12.0.tgz",
+          "integrity": "sha512-rg3BizTZHF1k3ipn8gfrzDXXSFKyOEB5zxYXInQ6z0hUvmQlhaZQzK+YmHmNViMA9HzW5Q9+bPPt90bU6GQwyw==",
          "dev": true,
          "requires": {
-            "@typescript-eslint/types": "6.9.1",
+            "@typescript-eslint/types": "6.12.0",
            "eslint-visitor-keys": "^3.4.1"
          }
        }
@ -8031,41 +8031,41 @@
      }
    },
    "@typescript-eslint/type-utils": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.9.1.tgz",
-      "integrity": "sha512-eh2oHaUKCK58qIeYp19F5V5TbpM52680sB4zNSz29VBQPTWIlE/hCj5P5B1AChxECe/fmZlspAWFuRniep1Skg==",
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.12.0.tgz",
+      "integrity": "sha512-WWmRXxhm1X8Wlquj+MhsAG4dU/Blvf1xDgGaYCzfvStP2NwPQh6KBvCDbiOEvaE0filhranjIlK/2fSTVwtBng==",
      "dev": true,
      "requires": {
-        "@typescript-eslint/typescript-estree": "6.9.1",
-        "@typescript-eslint/utils": "6.9.1",
+        "@typescript-eslint/typescript-estree": "6.12.0",
+        "@typescript-eslint/utils": "6.12.0",
        "debug": "^4.3.4",
        "ts-api-utils": "^1.0.1"
      },
      "dependencies": {
        "@typescript-eslint/scope-manager": {
-          "version": "6.9.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.9.1.tgz",
-          "integrity": "sha512-38IxvKB6NAne3g/+MyXMs2Cda/Sz+CEpmm+KLGEM8hx/CvnSRuw51i8ukfwB/B/sESdeTGet1NH1Wj7I0YXswg==",
+          "version": "6.12.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.12.0.tgz",
+          "integrity": "sha512-5gUvjg+XdSj8pcetdL9eXJzQNTl3RD7LgUiYTl8Aabdi8hFkaGSYnaS6BLc0BGNaDH+tVzVwmKtWvu0jLgWVbw==",
          "dev": true,
          "requires": {
-            "@typescript-eslint/types": "6.9.1",
-            "@typescript-eslint/visitor-keys": "6.9.1"
+            "@typescript-eslint/types": "6.12.0",
+            "@typescript-eslint/visitor-keys": "6.12.0"
          }
        },
        "@typescript-eslint/types": {
-          "version": "6.9.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.9.1.tgz",
-          "integrity": "sha512-BUGslGOb14zUHOUmDB2FfT6SI1CcZEJYfF3qFwBeUrU6srJfzANonwRYHDpLBuzbq3HaoF2XL2hcr01c8f8OaQ==",
+          "version": "6.12.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.12.0.tgz",
+          "integrity": "sha512-MA16p/+WxM5JG/F3RTpRIcuOghWO30//VEOvzubM8zuOOBYXsP+IfjoCXXiIfy2Ta8FRh9+IO9QLlaFQUU+10Q==",
          "dev": true
        },
        "@typescript-eslint/typescript-estree": {
-          "version": "6.9.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.9.1.tgz",
-          "integrity": "sha512-U+mUylTHfcqeO7mLWVQ5W/tMLXqVpRv61wm9ZtfE5egz7gtnmqVIw9ryh0mgIlkKk9rZLY3UHygsBSdB9/ftyw==",
+          "version": "6.12.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.12.0.tgz",
+          "integrity": "sha512-vw9E2P9+3UUWzhgjyyVczLWxZ3GuQNT7QpnIY3o5OMeLO/c8oHljGc8ZpryBMIyympiAAaKgw9e5Hl9dCWFOYw==",
          "dev": true,
          "requires": {
-            "@typescript-eslint/types": "6.9.1",
-            "@typescript-eslint/visitor-keys": "6.9.1",
+            "@typescript-eslint/types": "6.12.0",
+            "@typescript-eslint/visitor-keys": "6.12.0",
            "debug": "^4.3.4",
            "globby": "^11.1.0",
            "is-glob": "^4.0.3",
@ -8074,27 +8074,27 @@
          }
        },
        "@typescript-eslint/utils": {
-          "version": "6.9.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.9.1.tgz",
-          "integrity": "sha512-L1T0A5nFdQrMVunpZgzqPL6y2wVreSyHhKGZryS6jrEN7bD9NplVAyMryUhXsQ4TWLnZmxc2ekar/lSGIlprCA==",
+          "version": "6.12.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.12.0.tgz",
+          "integrity": "sha512-LywPm8h3tGEbgfyjYnu3dauZ0U7R60m+miXgKcZS8c7QALO9uWJdvNoP+duKTk2XMWc7/Q3d/QiCuLN9X6SWyQ==",
          "dev": true,
          "requires": {
            "@eslint-community/eslint-utils": "^4.4.0",
            "@types/json-schema": "^7.0.12",
            "@types/semver": "^7.5.0",
-            "@typescript-eslint/scope-manager": "6.9.1",
-            "@typescript-eslint/types": "6.9.1",
-            "@typescript-eslint/typescript-estree": "6.9.1",
+            "@typescript-eslint/scope-manager": "6.12.0",
+            "@typescript-eslint/types": "6.12.0",
+            "@typescript-eslint/typescript-estree": "6.12.0",
            "semver": "^7.5.4"
          }
        },
        "@typescript-eslint/visitor-keys": {
-          "version": "6.9.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.9.1.tgz",
-          "integrity": "sha512-MUaPUe/QRLEffARsmNfmpghuQkW436DvESW+h+M52w0coICHRfD6Np9/K6PdACwnrq1HmuLl+cSPZaJmeVPkSw==",
+          "version": "6.12.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.12.0.tgz",
+          "integrity": "sha512-rg3BizTZHF1k3ipn8gfrzDXXSFKyOEB5zxYXInQ6z0hUvmQlhaZQzK+YmHmNViMA9HzW5Q9+bPPt90bU6GQwyw==",
          "dev": true,
          "requires": {
-            "@typescript-eslint/types": "6.9.1",
+            "@typescript-eslint/types": "6.12.0",
            "eslint-visitor-keys": "^3.4.1"
          }
        }
@ -8160,9 +8160,9 @@
      "dev": true
    },
    "acorn": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
+      "version": "8.11.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
+      "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==",
      "dev": true
    },
    "acorn-jsx": {
@ -8905,15 +8905,15 @@
      "dev": true
    },
    "eslint": {
-      "version": "8.52.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz",
-      "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz",
+      "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==",
      "dev": true,
      "requires": {
        "@eslint-community/eslint-utils": "^4.2.0",
        "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.52.0",
+        "@eslint/eslintrc": "^2.1.3",
+        "@eslint/js": "8.54.0",
        "@humanwhocodes/config-array": "^0.11.13",
        "@humanwhocodes/module-importer": "^1.0.1",
        "@nodelib/fs.walk": "^1.2.8",
@ -9456,9 +9456,9 @@
      }
    },
    "globals": {
-      "version": "13.21.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
-      "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
+      "version": "13.23.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
+      "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
      "dev": true,
      "requires": {
        "type-fest": "^0.20.2"
@ -10523,9 +10523,9 @@
      "dev": true
    },
    "nock": {
-      "version": "13.3.7",
-      "resolved": "https://registry.npmjs.org/nock/-/nock-13.3.7.tgz",
-      "integrity": "sha512-z3voRxo6G0JxqCsjuzERh1ReFC4Vp2b7JpSgcMJB6jnJbUszf88awAeQLIID2UNMwbMh9/Zm5sFscagj0QYHEg==",
+      "version": "13.3.8",
+      "resolved": "https://registry.npmjs.org/nock/-/nock-13.3.8.tgz",
+      "integrity": "sha512-96yVFal0c/W1lG7mmfRe7eO+hovrhJYd2obzzOZ90f6fjpeU/XNvd9cYHZKZAQJumDfhXgoTpkpJ9pvMj+hqHw==",
      "dev": true,
      "requires": {
        "debug": "^4.1.0",
@ -10782,9 +10782,9 @@
      "dev": true
    },
    "prettier": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz",
-      "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz",
+      "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==",
      "dev": true
    },
    "prettier-linter-helpers": {
@ -10832,9 +10832,9 @@
      "dev": true
    },
    "punycode": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
      "dev": true
    },
    "pure-rand": {
@ -11388,9 +11388,9 @@
      }
    },
    "typescript": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz",
-      "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz",
+      "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==",
      "dev": true
    },
    "unbox-primitive": {
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "setup-php",
-  "version": "2.27.0",
+  "version": "2.28.0",
  "private": false,
  "description": "Setup PHP for use with GitHub Actions",
  "main": "lib/install.js",
@ -40,23 +40,23 @@
    "compare-versions": "^6.1.0"
  },
  "devDependencies": {
-    "@types/jest": "^29.5.7",
-    "@types/node": "^20.8.10",
-    "@typescript-eslint/eslint-plugin": "^6.9.1",
-    "@typescript-eslint/parser": "^6.9.1",
+    "@types/jest": "^29.5.10",
+    "@types/node": "^20.10.0",
+    "@typescript-eslint/eslint-plugin": "^6.12.0",
+    "@typescript-eslint/parser": "^6.12.0",
    "@vercel/ncc": "^0.38.1",
-    "eslint": "^8.52.0",
+    "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",
    "jest": "^29.7.0",
    "jest-circus": "^29.7.0",
-    "nock": "^13.3.7",
-    "prettier": "^3.0.3",
+    "nock": "^13.3.8",
+    "prettier": "^3.1.0",
    "simple-git-hooks": "^2.9.0",
    "ts-jest": "^29.1.1",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.2"
  },
  "bugs": {
    "url": "https://github.com/shivammathur/setup-php/issues"
--- a/src/configs/os_releases.csv
+++ b/src/configs/os_releases.csv
@ -17,3 +17,6 @@
 21.04,hirsute
 21.10,impish
 22.04,jammy
+23.04,lunar
+23.10,mantic
+24.04,noble
--- a/src/configs/php-versions.json
+++ b/src/configs/php-versions.json
@ -1,7 +1,7 @@
 {
-  "latest": "8.2",
-  "nightly": "8.3",
+  "latest": "8.3",
+  "nightly": "8.4",
  "5.x": "5.6",
  "7.x": "7.4",
-  "8.x": "8.2"
+  "8.x": "8.3"
 }
--- a/src/extensions.ts
+++ b/src/extensions.ts
@ -32,14 +32,14 @@ export async function addExtensionDarwin(
        add_script += await utils.parseExtensionSource(extension, ext_prefix);
        return;
      // match 7.4relay...8.3relay
-      // match 5.3blackfire...8.2blackfire
-      // match 5.3blackfire-(semver)...8.1blackfire-(semver)
+      // 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
      case /^(7\.4|8\.[0-3])relay(-v?\d+\.\d+\.\d+)?$/.test(version_extension):
-      case /^(5\.[3-6]|7\.[0-4]|8\.[0-2])blackfire(-\d+\.\d+\.\d+)?$/.test(
+      case /^(5\.[3-6]|7\.[0-4]|8\.[0-3])blackfire(-\d+\.\d+\.\d+)?$/.test(
        version_extension
      ):
      case /^couchbase|^event|^gearman$|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(
@ -134,14 +134,14 @@ export async function addExtensionWindows(
      case /^none$/.test(ext_name):
        add_script += '\nDisable-AllShared';
        break;
-      // match 5.3blackfire...8.2blackfire
-      // match 5.3blackfire-(semver)...8.1blackfire-(semver)
+      // 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 7.1pecl_http...8.1pecl_http and 7.1http...8.1http
      // match 7.0zephir_parser...8.2zephir_parser
-      case /^(5\.[3-6]|7\.[0-4]|8\.[0-2])blackfire(-\d+\.\d+\.\d+)?$/.test(
+      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):
@ -264,15 +264,15 @@ export async function addExtensionLinux(
        add_script += await utils.parseExtensionSource(extension, ext_prefix);
        return;
      // match 7.4relay...8.3relay
-      // match 5.3blackfire...8.2blackfire
-      // match 5.3blackfire-(semver)...8.1blackfire-(semver)
+      // match 5.3blackfire...8.3blackfire
+      // 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
      case /^(7\.4|8\.[0-3])relay(-v?\d+\.\d+\.\d+)?$/.test(version_extension):
-      case /^(5\.[3-6]|7\.[0-4]|8\.[0-2])blackfire(-\d+\.\d+\.\d+)?$/.test(
+      case /^(5\.[3-6]|7\.[0-4]|8\.[0-3])blackfire(-\d+\.\d+\.\d+)?$/.test(
        version_extension
      ):
      case /^((5\.[3-6])|(7\.[0-2]))pdo_cubrid$|^((5\.[3-6])|(7\.[0-4]))cubrid$/.test(
--- a/src/install.ts
+++ b/src/install.ts
@ -14,7 +14,7 @@ import * as utils from './utils';
 * @param os
 */
 export async function getScript(os: string): Promise<string> {
-  const url = 'https://setup-php.com/support-ukraine';
+  const url = 'https://setup-php.com/sponsor';
  const filename = os + (await utils.scriptExtension(os));
  const script_path = path.join(__dirname, '../src/scripts', filename);
  const run_path = script_path.replace(os, 'run');
@ -40,8 +40,8 @@ export async function getScript(os: string): Promise<string> {
  if (ini_values_csv) {
    script += await config.addINIValues(ini_values_csv, os);
  }
-  script += '\n' + (await utils.stepLog(`#StandWithUkraine`, os));
-  script += '\n' + (await utils.addLog('$tick', 'read-more', url, os));
+  script += '\n' + (await utils.stepLog(`Sponsor setup-php`, os));
+  script += '\n' + (await utils.addLog('$tick', 'setup-php', url, os));

  fs.writeFileSync(run_path, script, {mode: 0o755});

--- a/src/scripts/darwin.sh
+++ b/src/scripts/darwin.sh
@ -126,7 +126,8 @@ patch_brew() {
 # Helper function to update the dependencies.
 update_dependencies_helper() {
  dependency=$1
-  get -q -n "$core_repo/Formula/$dependency.rb" "https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/$dependency.rb"
+  [[ "${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"
 }

@ -258,7 +259,7 @@ setup_php() {
 }

 # Variables
-version=${1:-'8.2'}
+version=${1:-'8.3'}
 ini=${2:-'production'}
 src=${0%/*}/..
 php_formula=shivammathur/php/php@"$version"
@ -271,6 +272,7 @@ export HOMEBREW_NO_AUTO_UPDATE=1
 export HOMEBREW_NO_ENV_HINTS=1
 export HOMEBREW_NO_INSTALL_CLEANUP=1
 export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
+export HOMEBREW_NO_INSTALL_FROM_API=1

 # shellcheck source=.
 . "${scripts:?}"/unix.sh
--- a/src/scripts/extensions/add_extensions.ps1
+++ b/src/scripts/extensions/add_extensions.ps1
@ -125,9 +125,9 @@ Function Add-Extension {
      if(($version -match $nightly_versions) -and (Select-String -Path $src\configs\windows_extensions -Pattern $extension -SimpleMatch -Quiet)) {
        Add-NightlyExtension $extension
      } else {
-        # Patch till DLLs for PHP 8.1 and 8.2 are released as stable.
+        # Patch till DLLs for PHP 8.2 and above are released as stable.
        $minimumStability = $stability
-        if ($version -match '8.[1-2]' -and $stability -eq 'stable') {
+        if ($version -match '8.[2-4]' -and $stability -eq 'stable') {
          $minimumStability = 'snapshot'
        }

--- a/src/scripts/extensions/blackfire.ps1
+++ b/src/scripts/extensions/blackfire.ps1
@ -22,6 +22,8 @@ Function Add-Blackfire() {
    } else {
        $nts = if (!$installed.ThreadSafe) { "_nts" } else { "" }
        Get-File -Url "https://packages.blackfire.io/binaries/blackfire-php/${extension_version}/blackfire-php-windows_${arch}-php-${no_dot_version}${nts}.dll" -OutFile $ext_dir\blackfire.dll > $null 2>&1
+        Disable-Extension xdebug > $null 2>&1
+        Disable-Extension pcov > $null 2>&1
        Enable-PhpExtension -Extension blackfire -Path $php_dir
        $status="Installed and enabled"
    }
--- a/src/scripts/extensions/blackfire.sh
+++ b/src/scripts/extensions/blackfire.sh
@ -17,6 +17,8 @@ add_blackfire() {
    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
  fi
+  disable_extension xdebug >/dev/null 2>&1
+  disable_extension pcov >/dev/null 2>&1
  enable_extension blackfire extension
  add_extension_log blackfire "$status"
 }
--- a/src/scripts/extensions/event.sh
+++ b/src/scripts/extensions/event.sh
@ -13,7 +13,7 @@ get_event_configure_opts() {
    )
  else
    event_opts+=(
-        --with-openssl-dir="$(brew --prefix openssl@1.1)"
+        --with-openssl-dir="$(brew --prefix openssl@3)"
        --with-event-libevent-dir="$(brew --prefix libevent)"
    )
  fi
--- a/src/scripts/extensions/patches/geos.sh
+++ b/src/scripts/extensions/patches/geos.sh
@ -3,5 +3,7 @@ patch_geos() {
    sed -i~ -e "s/, ce->name/, ZSTR_VAL(ce->name)/; s/ulong /zend_ulong /" 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
+  patch -p1 < /tmp/toString.patch 2>/dev/null || true
 }
--- a/src/scripts/linux.sh
+++ b/src/scripts/linux.sh
@ -109,6 +109,11 @@ setup_old_versions() {
  run_script "php5-ubuntu" "$version"
 }

+# Function to setup PHP from the cached builds.
+setup_cached_versions() {
+  run_script "php-ubuntu" "$version" "${debug:?}" "${ts:?}"
+}
+
 # Function to add PECL.
 add_pecl() {
  add_devtools phpize >/dev/null 2>&1
@ -149,13 +154,9 @@ get_php_packages() {

 # Function to install packaged PHP
 add_packaged_php() {
-  if [ "$runner" = "self-hosted" ] || [ "${use_package_cache:-true}" = "false" ]; then
-    add_ppa ondrej/php >/dev/null 2>&1 || update_ppa ondrej/php
-    IFS=' ' read -r -a packages <<<"$(get_php_packages)"
-    install_packages "${packages[@]}"
-  else
-    run_script "php-ubuntu" "$version" "${debug:?}"
-  fi
+  add_ppa ondrej/php >/dev/null 2>&1 || update_ppa ondrej/php
+  IFS=' ' read -r -a packages <<<"$(get_php_packages)"
+  install_packages "${packages[@]}"
 }

 # Function to update PHP.
@ -172,14 +173,18 @@ update_php() {

 # Function to install PHP.
 add_php() {
-  if [[ "$version" =~ ${nightly_versions:?} ]] || [[ "${ts:?}" = "zts" ]]; then
-    setup_nightly
+  if [ "${runner:?}" = "self-hosted" ] || [ "${use_package_cache:-true}" = "false" ]; then
+    if [[ "$version" =~ ${nightly_versions:?} ]]; then
+        setup_nightly
+    else
+      add_packaged_php
+      switch_version >/dev/null 2>&1
+      add_pecl
+    fi
  elif [[ "$version" =~ ${old_versions:?} ]]; then
    setup_old_versions
  else
-    add_packaged_php
-    switch_version >/dev/null 2>&1
-    add_pecl
+    setup_cached_versions
  fi
  status="Installed"
 }
@ -272,7 +277,7 @@ setup_php() {
 }

 # Variables
-version=${1:-'8.2'}
+version=${1:-'8.3'}
 ini=${2:-'production'}
 src=${0%/*}/..
 debconf_fix="DEBIAN_FRONTEND=noninteractive"
--- a/src/scripts/tools/grpc_php_plugin.sh
+++ b/src/scripts/tools/grpc_php_plugin.sh
@ -24,8 +24,10 @@ get_grpc_tag() {
 add_grpc_php_plugin_brew() {
  . "${0%/*}"/tools/brew.sh
  configure_brew
+  [ -e /usr/local/bin/protoc ] && sudo mv /usr/local/bin/protoc /tmp/protoc && sudo mv /usr/local/include/google /tmp
  brew install grpc
  brew link --force --overwrite grpc >/dev/null 2>&1
+  [ -e /tmp/protoc ] && sudo mv /tmp/protoc /usr/local/bin/protoc && sudo mv /tmp/google /usr/local/include/
  grpc_tag="v$(brew info grpc | grep "grpc:" | grep -Eo "[0-9]+\.[0-9]+\.[0-9]+")"
  license_path="$(brew --prefix grpc)/LICENSE"
 }
--- a/src/scripts/unix.sh
+++ b/src/scripts/unix.sh
@ -51,7 +51,7 @@ set_output() {
 read_env() {
  update="${update:-${UPDATE:-false}}"
  [ "${debug:-${DEBUG:-false}}" = "true" ] && debug=debug && update=true || debug=release
-  [ "${phpts:-${PHPTS:-nts}}" = "ts" ] && ts=zts && update=true || ts=nts
+  [[ "${phpts:-${PHPTS:-nts}}" = "ts" || "${phpts:-${PHPTS:-nts}}" = "zts" ]] && ts=zts && update=true || ts=nts
  fail_fast="${fail_fast:-${FAIL_FAST:-false}}"
  [[ -z "${ImageOS}" && -z "${ImageVersion}" || -n ${ACT} ]] && _runner=self-hosted || _runner=github
  runner="${runner:-${RUNNER:-$_runner}}"
--- a/src/scripts/win32.ps1
+++ b/src/scripts/win32.ps1
@ -332,8 +332,8 @@ if(-not([Environment]::Is64BitOperatingSystem) -or $version -lt '7.0') {
  $arch = 'x86'
 }

-$ts = $env:PHPTS -eq 'ts'
-if($env:PHPTS -ne 'ts') {
+$ts = ($env:PHPTS -match '^z?ts$')
+if(-not($ts)) {
  $env:PHPTS = '-nts'
 } else {
  $env:PHPTS = ''
Author	SHA1	Message	Date
Shivam Mathur	e6f75134d3	Update `phpts` section in README	2023-11-27 18:07:02 +05:30
Shivam Mathur	1874353919	Fix linking grpc on macos but installed along protoc	2023-11-27 17:08:32 +05:30
Shivam Mathur	eea39ea741	Disable xdebug and pcov when blackfire extension is installed	2023-11-27 16:39:18 +05:30
Shivam Mathur	bac56c8d91	Add patch for geos	2023-11-27 15:47:27 +05:30
Shivam Mathur	124d256c78	Add back support for nightly builds on self-hosted	2023-11-27 14:52:14 +05:30
Shivam Mathur	eeddcfe955	Bump version to 2.28.0 Update Node.js dependencies	2023-11-27 13:57:32 +05:30
Shivam Mathur	de2903ad82	Fix installing zts builds	2023-11-26 03:55:45 +05:30
Shivam Mathur	bbe1204148	Use cached builds for zts	2023-11-26 03:34:57 +05:30
Shivam Mathur	99a92d54d5	Test cache for PHP 8.3 and PHP 8.4	2023-11-24 01:06:24 +05:30
Shivam Mathur	7c6c249257	Mark PHP 8.3 as stable	2023-11-23 17:12:56 +05:30
Shivam Mathur	e6d44f159a	Add PHP 8.4 to wiki extension pages	2023-11-23 12:12:26 +05:30
Shivam Mathur	dc513528da	Update os in docs workflow	2023-11-23 11:57:50 +05:30
Shivam Mathur	bfbd3882c0	Merge pull request #787 from jrfnl/feature/ghactions-update-for-php-8.3 GH Actions/docs workflow: generate extensions page for PHP 8.3	2023-11-22 20:37:08 -08:00
jrfnl	3c525df325	GH Actions/docs workflow: generate extensions page for PHP 8.3	2023-11-23 03:19:38 +01:00
Shivam Mathur	a36e1e52ff	Bump version to 2.27.1 Bump Node.js dependencies	2023-11-07 13:55:37 +05:30
Shivam Mathur	04ff9b08a2	Add HOMEBREW_NO_INSTALL_FROM_API=1 to darwin.sh	2023-11-07 13:43:28 +05:30
Shivam Mathur	65fad67e88	Fix updating homebrew dependencies after sharding in core tap	2023-11-07 13:11:56 +05:30
Shivam Mathur	6668249e24	Merge pull request #778 from shivammathur/dependabot/github_actions/develop/actions/setup-node-4 Bump actions/setup-node from 3 to 4	2023-11-06 04:04:01 -08:00
dependabot[bot]	81c255f988	Bump actions/setup-node from 3 to 4 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3 to 4. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2023-11-06 11:00:34 +00:00