From: Nikita Popov <nikita.ppv@gmail.com>
Date: Sat, 3 Jun 2017 10:39:50 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c94773124ddf4d5a374c2886bb6b9a30a793a381;p=php

Merge branch 'PHP-7.1'
---

c94773124ddf4d5a374c2886bb6b9a30a793a381
diff --cc .travis.yml
index c5db1fdd1b,7024013fa3..2ea2baf70c
--- a/.travis.yml
+++ b/.travis.yml
@@@ -60,7 -57,4 +60,7 @@@ before_script
  
  # Run PHPs run-tests.php 
  script:
-     - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 1 ]; then echo "-d opcache.enable_cli=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 --set-timeout 120
 -    - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --set-timeout 120
++    - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 --set-timeout 120
 +
 +after_success:
 +    - ccache --show-stats