Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 6b4565d359a5 · 2019-08-01T23:16:14.000+02:00
* 3.4:
  cs fix
  Replace calls to setExpectedException by Pollyfill
diff --git a/Tests/CookieTest.php b/Tests/CookieTest.php
@@ -12,10 +12,13 @@
 namespace Symfony\Component\BrowserKit\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\BrowserKit\Cookie;
 
 class CookieTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     public function testToString()
     {
         $cookie = new Cookie('foo', 'bar', strtotime('Fri, 20-May-2011 15:25:52 GMT'), '/', '.myfoodomain.com', true);

Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,13 @@`
`12`	`12`	`namespace Symfony\Component\BrowserKit\Tests;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
	`15`	`+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`15`	`16`	`use Symfony\Component\BrowserKit\Cookie;`
`16`	`17`
`17`	`18`	`class CookieTest extends TestCase`
`18`	`19`	`{`
	`20`	`+ use ForwardCompatTestTrait;`
	`21`	`+`
`19`	`22`	`public function testToString()`
`20`	`23`	`{`
`21`	`24`	`$cookie = new Cookie('foo', 'bar', strtotime('Fri, 20-May-2011 15:25:52 GMT'), '/', '.myfoodomain.com', true);`