Fix php on macos

yandeu · Dec 2, 2024 · 362efca · 362efca
1 parent 69a4bf6
commit 362efca
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -32,6 +32,12 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
+      - name: Setup PHP for macos
+        if: matrix.os == 'macos-latest'
+        uses: shivammathur/setup-php@v2
+        with:
+          tools: none
+
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:

diff --git a/src/misc.ts b/src/misc.ts
@@ -22,10 +22,13 @@ export const fileDoesExist = (path: string): Promise<boolean> => {
   })
 }
 
-export const defaultPHPPath = () => {
+export const defaultPHPPath = (is_ci: boolean = false) => {
+  // is_ci is for macos on github actions for shivammathur/setup-php@v2
+  // (https://github.com/marketplace/actions/setup-php-action)
+
   switch (os.platform()) {
     case 'darwin':
-      return '/usr/local/bin/php'
+      return is_ci ? '/opt/homebrew/bin/php' : '/usr/local/bin/php'
     case 'linux':
       return '/usr/bin/php'
     case 'win32':

diff --git a/test/execPHP.test.js b/test/execPHP.test.js
@@ -2,7 +2,7 @@ const path = require('path')
 const { defaultPHPPath } = require('../lib/misc')
 const { ExecPHP } = require('../lib/utils/execPHP')
 
-let phpPath = defaultPHPPath()
+let phpPath = defaultPHPPath(true)
 
 const PHP = new ExecPHP()
 PHP.php = phpPath

diff --git a/test/php.test.js b/test/php.test.js
@@ -5,7 +5,7 @@ const LiveServer = require('../lib').default
 
 const liveServer = new LiveServer()
 
-let phpPath = defaultPHPPath()
+let phpPath = defaultPHPPath(true)
 
 const open = async () => {
   await liveServer.start({