bug #21923 [travis] Test with hhvm 3.18 (nicolas-grekas)

fabpot · fabpot · commit a0945fc182b3 · 2017-03-08T11:42:39.000-08:00
This PR was merged into the 2.7 branch. Discussion ---------- [travis] Test with hhvm 3.18 | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #21900 | License | MIT | Doc PR | - Needs #21922 on master to be green also. Works around facebook/hhvm#7722. Commits ------- 7f1f0cb [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/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`