chore(osx): clean up PHP installation PATH handling

- Append LLVM to PATH instead of prepending to preserve PHP access
- Add brew bin directory to PATH for better PHP discovery
- Remove hide_dynamic_libs/restore_dynamic_libs mechanism as unneeded
- Add PHP verification step for ext-php-rs build

Author: donhardman

build-bash-base.sh

@@ -90,7 +90,11 @@ if [ "$(uname)" == "Darwin" ]; then
 	LIBCLANG_PATH="$LLVM_PREFIX/lib"
 	LLVM_CONFIG_PATH="$LLVM_PREFIX/bin/llvm-config"
 	LLVM_PATH="$LLVM_PREFIX/bin"
-	export LIBCLANG_PATH="$LIBCLANG_PATH" LLVM_CONFIG_PATH="$LLVM_CONFIG_PATH" PATH="$LLVM_PATH:$PATH"
+	# Ensure PHP is still accessible by appending LLVM to PATH instead of prepending
+	export LIBCLANG_PATH="$LIBCLANG_PATH" LLVM_CONFIG_PATH="$LLVM_CONFIG_PATH" PATH="$PATH:$LLVM_PATH"
+	# Verify PHP is accessible
+	echo "Verifying PHP is accessible for ext-php-rs build..."
+	which php && php --version || echo "WARNING: php not found in PATH!"
 fi
 cd ../..
 

build-osx

@@ -14,9 +14,10 @@ install_deps() {
   brew install shivammathur/php/php@8.4 bash curl autoconf automake bison re2c zstd git openssl zlib cmake libzip librdkafka libiconv llvm@17
   brew link --overwrite --force shivammathur/php/php@8.4
 
-  # Add PHP to PATH
+  # Add PHP to PATH - include both versioned path and brew bin directory
   PHP_PREFIX="$(brew --prefix shivammathur/php/php@8.4)"
-  export PATH="${PHP_PREFIX}/bin:${PATH}"
+  BREW_PREFIX="$(brew --prefix)"
+  export PATH="${PHP_PREFIX}/bin:${BREW_PREFIX}/bin:${PATH}"
 
   OPENSSL_PREFIX="$(brew --prefix openssl)"
   LIBRDKAFKA_PREFIX="$(brew --prefix librdkafka)"
@@ -40,33 +41,6 @@ install_dev_deps() {
 export -f install_deps install_dev_deps install_rust
 . ./build-bash-base.sh "$@"
 
-hide_dynamic_libs() {
-  ! which brew && return
-  for lib in "$@"; do
-    LIB_PATH=$(brew --prefix "$lib")
-    if ls "$LIB_PATH"/lib/*.dylib; then
-      for f in "$LIB_PATH"/lib/*.dylib; do
-        mv "$f" "$f.bak"
-      done
-    fi
-  done
-}
-
-restore_dynamic_libs() {
-  ! which brew && return
-  for lib in "$@"; do
-    LIB_PATH=$(brew --prefix "$lib")
-    if ls "$LIB_PATH"/lib/*.dylib.bak; then
-      for f in "$LIB_PATH"/lib/*.dylib.bak; do
-        mv "$f" "${f%*.bak}"
-      done
-    fi
-  done
-}
-
-# Leave only static libs on
-hide_dynamic_libs zstd zlib
-
 MAKE_LDFLAGS=
 ENABLE_SHARED=yes
 ENABLE_STATIC=no
@@ -120,5 +94,3 @@ make LDFLAGS=$MAKE_LDFLAGS -j8
 make install-cli
 strip dist/bin/php
 
-# Return skipped dynamic libs
-restore_dynamic_libs zstd zlib