Merge branch '2.8' into 3.0

nicolas-grekas · nicolas-grekas · commit 2ec0d480a3b5 · 2016-06-03T13:11:05.000+02:00
* 2.8:
  [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
	UPGRADE-3.0.md
	src/Symfony/Component/HttpKernel/Tests/DataCollector/DumpDataCollectorTest.php
diff --git a/Tests/DataCollector/DumpDataCollectorTest.php b/Tests/DataCollector/DumpDataCollectorTest.php
@@ -113,7 +113,7 @@ public function testFlush()
         $line = __LINE__ - 1;
 
         ob_start();
-        $collector = null;
+        $collector->__destruct();
         $this->assertSame("DumpDataCollectorTest.php on line {$line}:\n456\n", ob_get_clean());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public function testFlush()`
`113`	`113`	`$line = __LINE__ - 1;`
`114`	`114`
`115`	`115`	`ob_start();`
`116`		`- $collector = null;`
	`116`	`+ $collector->__destruct();`
`117`	`117`	`$this->assertSame("DumpDataCollectorTest.php on line {$line}:\n456\n", ob_get_clean());`
`118`	`118`	`}`
`119`	`119`	`}`