Merge branch '2.8' into 3.2

* 2.8:
  Rename StackOverflow to Stack Overflow
  [travis] Test with hhvm 3.18
This commit is contained in:
Fabien Potencier 2017-03-08 17:47:54 -08:00
commit 575b7987bf
3 changed files with 3 additions and 3 deletions

View File

@ -20,7 +20,7 @@ env:
matrix:
include:
# Use the newer stack for HHVM as HHVM does not support Precise anymore since a long time and so Precise has an outdated version
- php: hhvm-3.15
- php: hhvm-3.18
sudo: required
dist: trusty
group: edge

View File

@ -25,7 +25,7 @@ class WebTestCase extends BaseWebTestCase
protected static function deleteTmpDir($testCase)
{
if (!file_exists($dir = sys_get_temp_dir().'/'.Kernel::VERSION.'/'.$testCase)) {
if (defined('HHVM_VERSION_ID') || !file_exists($dir = sys_get_temp_dir().'/'.Kernel::VERSION.'/'.$testCase)) {
return;
}