Merge remote-tracking branch 'origin/master'

2015-02-26 09:20:42 +01:00 · 2015-02-26 09:20:42 +01:00 · cc130c1d2f
commit cc130c1d2f
parent 0797e0cbab 0449e52a56
1 changed files with 8 additions and 5 deletions
--- a/test/install-runkit
+++ b/test/install-runkit
@ -2,12 +2,15 @@

 set -e

-if [ $TRAVIS_PHP_VERSION = "5.6" ] ; then
-    git clone --depth=1 git://github.com/adrianguenter/runkit.git
-else
-    git clone --depth=1 git://github.com/zenovich/runkit.git
-fi
+git clone --depth=1 git://github.com/zenovich/runkit.git
+
 pushd runkit
+
+if [ $TRAVIS_PHP_VERSION = "5.6" ] ; then
+    wget https://github.com/zenovich/runkit/pull/73.diff
+    patch -p1 < 73.diff
+fi
+
 phpize
 ./configure
 make