Replace calls to setExpectedException by Pollyfill

jderusse · jderusse · commit 6a05effc1831 · 2019-08-01T22:42:50.000+02:00
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);
@@ -100,7 +103,7 @@ public function testFromStringWithUrl()
 
     public function testFromStringThrowsAnExceptionIfCookieIsNotValid()
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('InvalidArgumentException');
+        $this->expectException('InvalidArgumentException');
         Cookie::fromString('foo');
     }
 
@@ -113,7 +116,7 @@ public function testFromStringIgnoresInvalidExpiresDate()
 
     public function testFromStringThrowsAnExceptionIfUrlIsNotValid()
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('InvalidArgumentException');
+        $this->expectException('InvalidArgumentException');
         Cookie::fromString('foo=bar', 'foobar');
     }
 

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);`
`@@ -100,7 +103,7 @@ public function testFromStringWithUrl()`
`100`	`103`
`101`	`104`	`public function testFromStringThrowsAnExceptionIfCookieIsNotValid()`
`102`	`105`	`{`
`103`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('InvalidArgumentException');`
	`106`	`+ $this->expectException('InvalidArgumentException');`
`104`	`107`	`Cookie::fromString('foo');`
`105`	`108`	`}`
`106`	`109`
`@@ -113,7 +116,7 @@ public function testFromStringIgnoresInvalidExpiresDate()`
`113`	`116`
`114`	`117`	`public function testFromStringThrowsAnExceptionIfUrlIsNotValid()`
`115`	`118`	`{`
`116`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('InvalidArgumentException');`
	`119`	`+ $this->expectException('InvalidArgumentException');`
`117`	`120`	`Cookie::fromString('foo=bar', 'foobar');`
`118`	`121`	`}`
`119`	`122`