From 14d457bbefdd01d840931d66383be901a835f78d Mon Sep 17 00:00:00 2001
From: Shivam Mathur <shivam_jpr@hotmail.com>
Date: Tue, 1 Sep 2026 10:42:02 +0530
Subject: [PATCH] Drop Intel macOS support

---
 .github/workflows/docs.yml | 4 ++--
 .github/workflows/php.yml  | 2 +-
 README.md                  | 2 --
 src/scripts/darwin.sh      | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 91bfab51..e0ba2ecb 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-24.04, ubuntu-22.04, windows-2022, macos-15-intel]
+        operating-system: [ubuntu-24.04, ubuntu-22.04, windows-2022, macos-15]
         php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5', '8.6']
     steps:
       - name: Setup PHP
@@ -127,7 +127,7 @@ jobs:
             echo "These are extensions which are loaded by default on the following PHP versions. More extensions which are available as packages and available on pecl are supported by setup-php. Refer to [php extension support](https://github.com/shivammathur/setup-php#heavy_plus_sign-php-extension-support) for more details." > Php-extensions-loaded-on-"$os".md
             for version in 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 8.6; do
               if [[ "${os%-*}" = "macos" ]]; then
-                cat lists/php"$version"-macos-15-intel.md >> Php-extensions-loaded-on-"$os".md
+                cat lists/php"$version"-macos-15.md >> Php-extensions-loaded-on-"$os".md
               elif [ "${os%-*}" = "windows" ]; then
                 cat lists/php"$version"-windows-2022.md >> Php-extensions-loaded-on-"$os".md
               else
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 35e0db11..e6c17b92 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-24.04, ubuntu-22.04, windows-2022, macos-15-intel]
+        operating-system: [ubuntu-24.04, ubuntu-22.04, windows-2022, macos-15]
         php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5', '8.6']
         include:
           - operating-system: ubuntu-24.04
diff --git a/README.md b/README.md
index b93d6f88..82ed7228 100644
--- a/README.md
+++ b/README.md
@@ -81,8 +81,6 @@ Both `GitHub-hosted` and `self-hosted` runners are supported by `setup-php` on t
 | macOS Tahoe 26.x    | arm64   | `macos-26`                         | -                 |
 | macOS Sequoia 15.x  | arm64   | `macos-latest` or `macos-15`       | -                 |
 | macOS Sonoma 14.x   | arm64   | `macos-14`                         | -                 |
-| macOS Tahoe 26.x    | x86_64  | `macos-26-intel`                   | `PHP 8.5`         |
-| macOS Sequoia 15.x  | x86_64  | `macos-15-intel`                   | `PHP 8.5`         |
 
 ### Self-Hosted Runners
 
diff --git a/src/scripts/darwin.sh b/src/scripts/darwin.sh
index 6624fe47..6152cdae 100644
--- a/src/scripts/darwin.sh
+++ b/src/scripts/darwin.sh
@@ -188,7 +188,7 @@ add_php() {
   php_keg="php@$version$suffix"
   php_formula="shivammathur/php/$php_keg"
   if [[ "$existing_version" = "false" || -n "$suffix" || "$action" = "upgrade" ]]; then
-    if [ "${arch:?}" = "arm64" ] && [ "${runner:?}" != "self-hosted" ] && \
+    if [ "$(uname -m)" = "arm64" ] && [ "${runner:?}" != "self-hosted" ] && \
       [ "${use_package_cache:-true}" != "false" ] && setup_cached_versions; then
       return 0
     fi