Merge pull request #53 from nick-zh/fix-master-build

fix master build

Author: BanzaiMan

.travis.yml

@@ -316,10 +316,6 @@ install:
     cp default_configure_options.$RELEASE $HOME/.php-build/share/php-build/default_configure_options
   fi
 - cat custom_configure_options >> $HOME/.php-build/share/php-build/default_configure_options
-- | # disable xdebug on master
-  if [[ $VERSION = master && $RELEASE != xenial ]]; then
-    sed -i -e '/install_xdebug_master/d' $HOME/.php-build/share/php-build/definitions/$VERSION
-  fi
 - |
   if [[ $(lsb_release -cs) = "trusty" || $(lsb_release -cs) = "xenial" || $(lsb_release -cs) = "bionic" ]]; then
     if [[ $HOSTTYPE == "powerpc64le" ]]; then

bin/compile

@@ -60,6 +60,10 @@ set -o xtrace
 
 export PATH="$HOME/.phpenv/bin:$HOME/.php-build/bin:$PATH"
 
+if [[ $VERSION == nightly* || $VERSION == master* ]]; then
+    VERSION=8.0snapshot
+fi
+
 php-build -i development "${VERSION}" "${INSTALL_DEST}/${VERSION}"
 
 pushd "${INSTALL_DEST}/${VERSION}"
@@ -83,7 +87,7 @@ ln -sv ../sbin/php-fpm bin/php-fpm
 
 # composer and phpunit
 curl -fsSL -o bin/composer http://getcomposer.org/composer.phar
-if [[ $VERSION == nightly* || $VERSION == master* || $VERSION == 7* ]]; then
+if [[ $VERSION == nightly* || $VERSION == master* || $VERSION == 7* || $VERSION == 8.0snapshot ]]; then
 	PHPUNIT_ARCHIVE=phpunit.phar
 elif [[ $VERSION == 5.6* ]]; then
 	PHPUNIT_ARCHIVE=phpunit-5.7.phar