simplified PHPUnit exception expectations

fabpot · fabpot · commit 2fd9a08173c6 · 2019-01-16T07:59:14.000+01:00
diff --git a/Tests/Parser/ParserTest.php b/Tests/Parser/ParserTest.php
@@ -89,7 +89,7 @@ public function testParseSeriesException($series)
 
         /** @var FunctionNode $function */
         $function = $selectors[0]->getTree();
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\CssSelector\Exception\SyntaxErrorException');
+        $this->expectException('Symfony\Component\CssSelector\Exception\SyntaxErrorException');
         Parser::parseSeries($function->getArguments());
     }
 
diff --git a/Tests/Parser/TokenStreamTest.php b/Tests/Parser/TokenStreamTest.php
@@ -53,7 +53,7 @@ public function testGetNextIdentifier()
 
     public function testFailToGetNextIdentifier()
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\CssSelector\Exception\SyntaxErrorException');
+        $this->expectException('Symfony\Component\CssSelector\Exception\SyntaxErrorException');
 
         $stream = new TokenStream();
         $stream->push(new Token(Token::TYPE_DELIMITER, '.', 2));
@@ -73,7 +73,7 @@ public function testGetNextIdentifierOrStar()
 
     public function testFailToGetNextIdentifierOrStar()
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\CssSelector\Exception\SyntaxErrorException');
+        $this->expectException('Symfony\Component\CssSelector\Exception\SyntaxErrorException');
 
         $stream = new TokenStream();
         $stream->push(new Token(Token::TYPE_DELIMITER, '.', 2));

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public function testParseSeriesException($series)`
`89`	`89`
`90`	`90`	`/** @var FunctionNode $function */`
`91`	`91`	`$function = $selectors[0]->getTree();`
`92`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\CssSelector\Exception\SyntaxErrorException');`
	`92`	`+ $this->expectException('Symfony\Component\CssSelector\Exception\SyntaxErrorException');`
`93`	`93`	`Parser::parseSeries($function->getArguments());`
`94`	`94`	`}`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function testGetNextIdentifier()`
`53`	`53`
`54`	`54`	`public function testFailToGetNextIdentifier()`
`55`	`55`	`{`
`56`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\CssSelector\Exception\SyntaxErrorException');`
	`56`	`+ $this->expectException('Symfony\Component\CssSelector\Exception\SyntaxErrorException');`
`57`	`57`
`58`	`58`	`$stream = new TokenStream();`
`59`	`59`	`$stream->push(new Token(Token::TYPE_DELIMITER, '.', 2));`
`@@ -73,7 +73,7 @@ public function testGetNextIdentifierOrStar()`
`73`	`73`
`74`	`74`	`public function testFailToGetNextIdentifierOrStar()`
`75`	`75`	`{`
`76`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\CssSelector\Exception\SyntaxErrorException');`
	`76`	`+ $this->expectException('Symfony\Component\CssSelector\Exception\SyntaxErrorException');`
`77`	`77`
`78`	`78`	`$stream = new TokenStream();`
`79`	`79`	`$stream->push(new Token(Token::TYPE_DELIMITER, '.', 2));`