Update script to support new homebrew php packages (#16)

* Update script to support new homebrew php packages

* Update documentation

Author: endelwar

README.md

@@ -20,12 +20,6 @@ You can follow the _OS X Apache Setup_ guide, divided in two parts, to get the p
 curl -L https://raw.githubusercontent.com/w00fz/xdebug-osx/master/xdebug-toggle > /usr/local/bin/xdebug-toggle
 ```
 
-## Installation with homebrew
-
-```
-brew install xdebug-osx
-```
-
 ## Installation with clone
 
 ```
@@ -50,6 +44,35 @@ ln -s `pwd`/xdebug-toggle /usr/local/bin/xdebug-toggle
 chmod +x /usr/local/bin/xdebug-toggle
 ```
 
+## Xdebug installation and configuration
+
+Homebrew does not provide a keg for Xdebug anymore, so you must install Xdebug extension via pecl
+
+```bash
+pecl channel-update pecl.php.net
+pecl install xdebug
+```
+
+`xdebug-toggle` needs a file called `ext-xdebug.ini` in brew's php conf.d directory to work, which must contain, at least, the following:
+
+```ini
+zend_extension="xdebug.so"
+```
+
+Make sure that `php.ini` doesn't contain this line too.
+
+It's recommended to keep al xdebug config in this file, as an example:
+
+```ini
+[xdebug]
+zend_extension="xdebug.so"
+
+xdebug.var_display_max_depth=24
+xdebug.remote_port=9000
+xdebug.remote_enable=1
+xdebug.remote_connect_back=1
+```
+
 ## Usage
 ```
 xdebug-toggle                            # outputs the current status

xdebug-toggle

@@ -8,20 +8,19 @@
 app="$(basename "$0")"
 command="$1"
 options="$2"
-
-php_version_dot=$(php -r "\$v=explode('.', phpversion() ); echo implode('.', array_splice(\$v, 0, -1));")
+php_version_dot=$(php -r "\$v=explode('.', PHP_VERSION ); echo implode('.', array_splice(\$v, 0, -1));")
 php_version="${php_version_dot//./}"
 
 xdebug_conf_path="$(brew --prefix)/etc/php/$php_version_dot/conf.d"
 xdebug_conf_file="ext-xdebug.ini"
-xdebug_conf=$xdebug_conf_path/$xdebug_conf_file
-function keg_exists() { brew list php"${php_version}"-xdebug 2> /dev/null > /dev/null; }
+xdebug_conf=${xdebug_conf_path}/${xdebug_conf_file}
+extension_dir=$(php -r "echo PEAR_EXTENSION_DIR;")
 
-if keg_exists; then
+if [ ! -f "extension_dir"/xdebug.so ]; then
     if [ ! -f "$xdebug_conf" ] && [ ! -f "$xdebug_conf.disabled" ]; then
         echo ""
         echo "The ini file for Xdebug was not found at '$xdebug_conf_path'"
-        echo "Did you install Xdebug via Homebrew?"
+        echo "Did you install Xdebug via PECL?"
         echo "For more informations: http://github.com/w00fz/xdebug-osx/blob/master/README.md"
         echo ""
 
@@ -51,7 +50,17 @@ if keg_exists; then
                 STATUS="disabled"
             fi
 
-            if [ -f ~/Library/LaunchAgents/homebrew.mxcl.php"${php_version}".plist ]; then
+            current_stable_php_path="/usr/local/opt/php/bin/php"
+            if [ -f $(eval echo ${current_stable_php_path}) ]; then
+                current_stable_php_version=$(${current_stable_php_path} -r "\$v=explode('.', PHP_VERSION ); echo implode('.', array_splice(\$v, 0, -1));")
+            fi
+
+            php_plist_file="~/Library/LaunchAgents/homebrew.mxcl.php@$php_version_dot.plist"
+            if [ "${php_version_dot}" == "${current_stable_php_version}" ]; then
+                php_plist_file="~/Library/LaunchAgents/homebrew.mxcl.php.plist"
+            fi
+
+            if [ -f $(eval echo ${php_plist_file}) ]; then
                 IS_PHP_FPM=true
                 SERVER_NAME="php-fpm"
             fi
@@ -84,7 +93,7 @@ if keg_exists; then
     fi
 else
     echo ""
-    echo "Xdebug for PHP $php_version_dot was never installed or not installed via Brew."
+    echo "Xdebug for PHP $php_version_dot was never installed or not installed via PECL."
     echo "For more informations: http://github.com/w00fz/xdebug-osx/blob/master/README.md"
     echo ""
     exit 1