Merge branch 'master' into php5

* master:
  runkit is currently not compatible with PHP 5.6.0 Beta 4
This commit is contained in:
Andreas Fischer 2014-06-19 15:49:59 +02:00
commit d314065329

View File

@ -20,6 +20,9 @@ function install_php_extension
echo "extension=$1.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"` echo "extension=$1.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
} }
# runkit if [ "$TRAVIS_PHP_VERSION" != "5.6" ]
git clone git://github.com/zenovich/runkit.git then
install_php_extension 'runkit' # runkit
git clone git://github.com/zenovich/runkit.git
install_php_extension 'runkit'
fi