Fix deprecated phpunit annotation

Author: jderusse

Tests/CssSelectorConverterTest.php

@@ -12,10 +12,13 @@
 namespace Symfony\Component\CssSelector\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\CssSelector\CssSelectorConverter;
 
 class CssSelectorConverterTest extends TestCase
 {
+ use ForwardCompatTestTrait;
+
  public function testCssToXPath()
  {
  $converter = new CssSelectorConverter();
@@ -35,12 +38,10 @@ public function testCssToXPathXml()
  $this->assertEquals('descendant-or-self::H1', $converter->toXPath('H1'));
  }
 
- /**
- * @expectedException \Symfony\Component\CssSelector\Exception\ParseException
- * @expectedExceptionMessage Expected identifier, but <eof at 3> found.
- */
  public function testParseExceptions()
  {
+ $this->expectException('Symfony\Component\CssSelector\Exception\ParseException');
+ $this->expectExceptionMessage('Expected identifier, but <eof at 3> found.');
  $converter = new CssSelectorConverter();
  $converter->toXPath('h1:');
  }

Tests/XPath/TranslatorTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\CssSelector\Tests\XPath;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\CssSelector\Node\ElementNode;
 use Symfony\Component\CssSelector\Node\FunctionNode;
 use Symfony\Component\CssSelector\Parser\Parser;
@@ -21,6 +22,8 @@
 
 class TranslatorTest extends TestCase
 {
+ use ForwardCompatTestTrait;
+
  /** @dataProvider getXpathLiteralTestData */
  public function testXpathLiteral($value, $literal)
  {
@@ -35,31 +38,25 @@ public function testCssToXPath($css, $xpath)
  $this->assertEquals($xpath, $translator->cssToXPath($css, ''));
  }
 
- /**
- * @expectedException \Symfony\Component\CssSelector\Exception\ExpressionErrorException
- */
  public function testCssToXPathPseudoElement()
  {
+ $this->expectException('Symfony\Component\CssSelector\Exception\ExpressionErrorException');
  $translator = new Translator();
  $translator->registerExtension(new HtmlExtension($translator));
  $translator->cssToXPath('e::first-line');
  }
 
- /**
- * @expectedException \Symfony\Component\CssSelector\Exception\ExpressionErrorException
- */
  public function testGetExtensionNotExistsExtension()
  {
+ $this->expectException('Symfony\Component\CssSelector\Exception\ExpressionErrorException');
  $translator = new Translator();
  $translator->registerExtension(new HtmlExtension($translator));
  $translator->getExtension('fake');
  }
 
- /**
- * @expectedException \Symfony\Component\CssSelector\Exception\ExpressionErrorException
- */
  public function testAddCombinationNotExistsExtension()
  {
+ $this->expectException('Symfony\Component\CssSelector\Exception\ExpressionErrorException');
  $translator = new Translator();
  $translator->registerExtension(new HtmlExtension($translator));
  $parser = new Parser();
@@ -68,34 +65,28 @@ public function testAddCombinationNotExistsExtension()
  $translator->addCombination('fake', $xpath, $combinedXpath);
  }
 
- /**
- * @expectedException \Symfony\Component\CssSelector\Exception\ExpressionErrorException
- */
  public function testAddFunctionNotExistsFunction()
  {
+ $this->expectException('Symfony\Component\CssSelector\Exception\ExpressionErrorException');
  $translator = new Translator();
  $translator->registerExtension(new HtmlExtension($translator));
  $xpath = new XPathExpr();
  $function = new FunctionNode(new ElementNode(), 'fake');
  $translator->addFunction($xpath, $function);
  }
 
- /**
- * @expectedException \Symfony\Component\CssSelector\Exception\ExpressionErrorException
- */
  public function testAddPseudoClassNotExistsClass()
  {
+ $this->expectException('Symfony\Component\CssSelector\Exception\ExpressionErrorException');
  $translator = new Translator();
  $translator->registerExtension(new HtmlExtension($translator));
  $xpath = new XPathExpr();
  $translator->addPseudoClass($xpath, 'fake');
  }
 
- /**
- * @expectedException \Symfony\Component\CssSelector\Exception\ExpressionErrorException
- */
  public function testAddAttributeMatchingClassNotExistsClass()
  {
+ $this->expectException('Symfony\Component\CssSelector\Exception\ExpressionErrorException');
  $translator = new Translator();
  $translator->registerExtension(new HtmlExtension($translator));
  $xpath = new XPathExpr();