Skip to content

Commit 023b80e

Browse files
Merge branch '2.7' into 2.8
* 2.7: [travis] Don't use parallel on HHVM [appveyor] Ignore STATUS_HEAP_CORRUPTION errors on Windows Skip some tests on HHVM due to a PHPunit bug Use the Trusty Travis infrastructure for HHVM builds Add 3.1 to PR template branch row, remove 2.3 Improve memory efficiency
2 parents a3a6bd1 + 298c80b commit 023b80e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/DataCollector/DumpDataCollectorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public function testFlush()
128128
$line = __LINE__ - 1;
129129

130130
ob_start();
131-
$collector = null;
131+
$collector->__destruct();
132132
if (PHP_VERSION_ID >= 50400) {
133133
$this->assertSame("DumpDataCollectorTest.php on line {$line}:\n456\n", ob_get_clean());
134134
} else {

0 commit comments

Comments
 (0)