Skip to content

Commit de4ca93

Browse files
Merge branch '3.0' into 3.1
* 3.0: [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 document method name changes in Voter class Conflicts: .travis.yml
2 parents 18ff0c8 + 2ec0d48 commit de4ca93

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
@@ -113,7 +113,7 @@ public function testFlush()
113113
$line = __LINE__ - 1;
114114

115115
ob_start();
116-
$collector = null;
116+
$collector->__destruct();
117117
$this->assertSame("DumpDataCollectorTest.php on line {$line}:\n456\n", ob_get_clean());
118118
}
119119
}

0 commit comments

Comments
 (0)