Override undici version

Bump actions/download-artifact from 6 to 7

.github/workflows/docs.yml

@@ -88,7 +88,7 @@ jobs:
           Remove-Item "$env:file.all" -Force
           Remove-Item "$env:file.builtin" -Force
       - name: Upload artifacts
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: lists-php${{ matrix.php-versions }}-${{ matrix.operating-system }}.md
           path: php${{ matrix.php-versions }}-${{ matrix.operating-system }}.md
@@ -105,7 +105,7 @@ jobs:
         with:
           repository: ${{ github.repository }}.wiki
       - name: Download artifacts
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           path: ${{ github.workspace }}/lists
           pattern: lists-*

.github/workflows/php.yml

@@ -50,7 +50,7 @@ jobs:
           key: ${{ env.key }}
 
       - name: Cache extensions
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.cache-env.outputs.dir }}
           key: ${{ steps.cache-env.outputs.key }}

package-lock.json

@@ -882,15 +882,6 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@fastify/busboy": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.1.tgz",
-      "integrity": "sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=14"
-      }
-    },
     "node_modules/@humanfs/core": {
       "version": "0.19.1",
       "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
@@ -7613,15 +7604,12 @@
       }
     },
     "node_modules/undici": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-5.29.0.tgz",
-      "integrity": "sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==",
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-6.23.0.tgz",
+      "integrity": "sha512-VfQPToRA5FZs/qJxLIinmU59u0r7LXqoJkCzinq3ckNJp3vKEh7jTWN589YQ5+aoAC/TGRLyJLCPKcLQbM8r9g==",
       "license": "MIT",
-      "dependencies": {
-        "@fastify/busboy": "^2.0.0"
-      },
       "engines": {
-        "node": ">=14.0"
+        "node": ">=18.17"
       }
     },
     "node_modules/undici-types": {

package.json

@@ -63,7 +63,8 @@
   },
   "overrides": {
     "test-exclude": "^7.0.1",
-    "glob": "^11.1.0"
+    "glob": "^11.1.0",
+    "undici": "^6.23.0"
   },
   "bugs": {
     "url": "https://github.com/shivammathur/setup-php/issues"

src/scripts/extensions/firebird.sh

@@ -31,7 +31,7 @@ add_firebird() {
   if ! check_extension pdo_firebird; then
     status="Installed and enabled"
     if [ "$(uname -s)" = "Linux" ]; then
-      if [[ "${version:?}" =~ 5.3|${nightly_versions:?} ]]; then
+      if [[ "${version:?}" =~ 5.3|${php_builder_versions:?} ]]; then
         add_firebird_helper /usr >/dev/null 2>&1
       else
         add_pdo_extension firebird >/dev/null 2>&1

src/scripts/extensions/http.sh

@@ -61,7 +61,7 @@ add_http_helper() {
   export HTTP_CONFIGURE_OPTS="$http_configure_opts"
   export HTTP_LINUX_LIBS="zlib1g libbrotli-dev libcurl4-openssl-dev libevent-dev libicu-dev libidn2-dev"
   export HTTP_DARWIN_LIBS="brotli curl icu4c libevent libidn2"
-  if [[ "${version:?}" =~ ${nightly_versions:?} ]]; then
+  if ! [[ ${version:?} =~ 5.[3-6]|7.[0-4] ]]; then
     add_extension_from_source http https://github.com m6w6 ext-http master extension
   else
     add_extension_from_source pecl_http https://pecl.php.net http http "${ext##*-}" extension pecl

src/scripts/linux.sh

@@ -187,7 +187,7 @@ update_php() {
 # Function to install PHP.
 add_php() {
   if [ "${runner:?}" = "self-hosted" ] || [ "${use_package_cache:-true}" = "false" ]; then
-    if [[ "$version" =~ ${nightly_versions:?} || "$ts" = "zts" ]]; then
+    if [[ "$version" =~ ${php_builder_versions:?} || "$ts" = "zts" ]]; then
         setup_php_builder
     else
       add_packaged_php

src/scripts/unix.sh

@@ -4,7 +4,7 @@ export cross="✗"
 export curl_opts=(-sL)
 export old_versions="5.[3-5]"
 export jit_versions="8.[0-9]"
-export nightly_versions="8.[3-9]"
+export php_builder_versions="8.[3-9]"
 export xdebug3_versions="7.[2-4]|8.[0-9]"
 export latest="releases/latest/download"
 export github="https://github.com/shivammathur"

src/utils.ts

@@ -62,7 +62,7 @@ export async function getManifestURLS(): Promise<string[]> {
  */
 export async function parseVersion(version: string): Promise<string> {
   switch (true) {
-    case /^(latest|lowest|highest|nightly|\d+\.x)$/.test(version):
+    case /^(latest|lowest|highest|nightly|master|\d+\.x)$/.test(version):
       for (const manifestURL of await getManifestURLS()) {
         const fetchResult = await fetch.fetch(manifestURL);
         if (fetchResult['data'] ?? false) {