xhprof removed their composer.json file, adding it to our composer.json file so we can still use composer to manage xhprof. Added an extra script to make sure the update is clean for git users.

2 files changed, 12 insertions, 3 deletions

diff --git a/misc/composer/build-xhprof.sh b/misc/composer/build-xhprof.sh
index 46637f2bbb..f4a9999678 100755
--- a/misc/composer/build-xhprof.sh
+++ b/misc/composer/build-xhprof.sh
@@ -6,9 +6,6 @@ cd vendor/facebook/xhprof/extension
 
 echo "Building xhprof..."
 
-git fetch origin pull/33/head:33_pull_request
-git merge 33_pull_request
-
 echo "Running phpize..."
 if ! phpize &> ../../../../tmp/xhprof-logs/phpize.log; then
     echo "Fatal error: phpize failed! View tmp/xhprof-logs/phpize.log for more info."
diff --git a/misc/composer/clean-xhprof.sh b/misc/composer/clean-xhprof.sh
new file mode 100755
index 0000000000..d20c17dd48
--- /dev/null
+++ b/misc/composer/clean-xhprof.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# if xhprof exists but points to a non-master branch, checkout master so composer won't fail
+
+if [ -d "vendor/facebook/xhprof/extension" ]; then
+    cd vendor/facebook/xhprof/extension
+
+    GIT_BRANCH=$(git symbolic-ref HEAD 2>/dev/null)
+
+    git reset --hard &> /dev/null
+    git checkout master &> /dev/null
+fi
\ No newline at end of file