Merge branch '2.7' into 2.8

fabpot · fabpot · commit 25a2ce062b88 · 2017-03-08T17:47:20.000-08:00
* 2.7:
  Rename StackOverflow to Stack Overflow
  [travis] Test with hhvm 3.18
diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,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
diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ Community
 ---------
 
 * [Join the Symfony Community][11] and meet other members at the [Symfony events][12].
-* [Get Symfony support][13] on StackOverflow, Slack, IRC, etc.
+* [Get Symfony support][13] on Stack Overflow, Slack, IRC, etc.
 * Follow us on [GitHub][14], [Twitter][15] and [Facebook][16].
 
 Contributing
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/WebTestCase.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/WebTestCase.php
@@ -25,7 +25,7 @@ public static function assertRedirect($response, $location)
 
     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;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public static function assertRedirect($response, $location)`
`25`	`25`
`26`	`26`	`protected static function deleteTmpDir($testCase)`
`27`	`27`	`{`
`28`		`- if (!file_exists($dir = sys_get_temp_dir().'/'.Kernel::VERSION.'/'.$testCase)) {`
	`28`	`+ if (defined('HHVM_VERSION_ID') \|\| !file_exists($dir = sys_get_temp_dir().'/'.Kernel::VERSION.'/'.$testCase)) {`
`29`	`29`	`return;`
`30`	`30`	`}`
`31`	`31`