Merge branch '2.7' into 2.8

fabpot · fabpot · commit 052fdb8548fd · 2016-12-19T16:38:44.000+01:00
* 2.7:
  fixed obsolete getMock() usage
  [WebProfilerBundle] Display multiple HTTP headers in WDT
diff --git a/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php b/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php
@@ -62,7 +62,7 @@ class BundleEntryReaderTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->readerImpl = $this->getMock('Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface');
+        $this->readerImpl = $this->getMockBuilder('Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface')->getMock();
         $this->reader = new BundleEntryReader($this->readerImpl);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ class BundleEntryReaderTest extends \PHPUnit_Framework_TestCase`
`62`	`62`
`63`	`63`	`protected function setUp()`
`64`	`64`	`{`
`65`		`- $this->readerImpl = $this->getMock('Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface');`
	`65`	`+ $this->readerImpl = $this->getMockBuilder('Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface')->getMock();`
`66`	`66`	`$this->reader = new BundleEntryReader($this->readerImpl);`
`67`	`67`	`}`
`68`	`68`