Skip to content

Commit 70df10d

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '7.4' into 8.0
* 7.4: replace PHPUnit annotations with attributes
2 parents d2fc42e + 810c1bb commit 70df10d

File tree

10 files changed

+33
-23
lines changed

10 files changed

+33
-23
lines changed

‎Tests/CssSelectorConverterTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\CssSelector\Tests;
1313

14+
use PHPUnit\Framework\Attributes\DataProvider;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\CssSelector\CssSelectorConverter;
1617
use Symfony\Component\CssSelector\Exception\ParseException;
@@ -51,7 +52,7 @@ public function testParseExceptions()
5152
(new CssSelectorConverter())->toXPath('h1:');
5253
}
5354

54-
/** @dataProvider getCssToXPathWithoutPrefixTestData */
55+
#[DataProvider('getCssToXPathWithoutPrefixTestData')]
5556
public function testCssToXPathWithoutPrefix($css, $xpath)
5657
{
5758
$converter = new CssSelectorConverter();

‎Tests/Node/AbstractNodeTestCase.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,19 @@
1111

1212
namespace Symfony\Component\CssSelector\Tests\Node;
1313

14+
use PHPUnit\Framework\Attributes\DataProvider;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\CssSelector\Node\NodeInterface;
1617

1718
abstract class AbstractNodeTestCase extends TestCase
1819
{
19-
/** @dataProvider getToStringConversionTestData */
20+
#[DataProvider('getToStringConversionTestData')]
2021
public function testToStringConversion(NodeInterface $node, $representation)
2122
{
2223
$this->assertEquals($representation, (string) $node);
2324
}
2425

25-
/** @dataProvider getSpecificityValueTestData */
26+
#[DataProvider('getSpecificityValueTestData')]
2627
public function testSpecificityValue(NodeInterface $node, $value)
2728
{
2829
$this->assertEquals($value, $node->getSpecificity()->getValue());

‎Tests/Node/SpecificityTest.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,19 @@
1111

1212
namespace Symfony\Component\CssSelector\Tests\Node;
1313

14+
use PHPUnit\Framework\Attributes\DataProvider;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\CssSelector\Node\Specificity;
1617

1718
class SpecificityTest extends TestCase
1819
{
19-
/** @dataProvider getValueTestData */
20+
#[DataProvider('getValueTestData')]
2021
public function testValue(Specificity $specificity, $value)
2122
{
2223
$this->assertEquals($value, $specificity->getValue());
2324
}
2425

25-
/** @dataProvider getValueTestData */
26+
#[DataProvider('getValueTestData')]
2627
public function testPlusValue(Specificity $specificity, $value)
2728
{
2829
$this->assertEquals($value + 123, $specificity->plus(new Specificity(1, 2, 3))->getValue());
@@ -39,7 +40,7 @@ public static function getValueTestData()
3940
];
4041
}
4142

42-
/** @dataProvider getCompareTestData */
43+
#[DataProvider('getCompareTestData')]
4344
public function testCompareTo(Specificity $a, Specificity $b, $result)
4445
{
4546
$this->assertEquals($result, $a->compareTo($b));

‎Tests/Parser/Handler/AbstractHandlerTestCase.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\CssSelector\Tests\Parser\Handler;
1313

14+
use PHPUnit\Framework\Attributes\DataProvider;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\CssSelector\Parser\Reader;
1617
use Symfony\Component\CssSelector\Parser\Token;
@@ -21,7 +22,7 @@
2122
*/
2223
abstract class AbstractHandlerTestCase extends TestCase
2324
{
24-
/** @dataProvider getHandleValueTestData */
25+
#[DataProvider('getHandleValueTestData')]
2526
public function testHandleValue($value, Token $expectedToken, $remainingContent)
2627
{
2728
$reader = new Reader($value);
@@ -32,7 +33,7 @@ public function testHandleValue($value, Token $expectedToken, $remainingContent)
3233
$this->assertRemainingContent($reader, $remainingContent);
3334
}
3435

35-
/** @dataProvider getDontHandleValueTestData */
36+
#[DataProvider('getDontHandleValueTestData')]
3637
public function testDontHandleValue($value)
3738
{
3839
$reader = new Reader($value);

‎Tests/Parser/Handler/CommentHandlerTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@
1111

1212
namespace Symfony\Component\CssSelector\Tests\Parser\Handler;
1313

14+
use PHPUnit\Framework\Attributes\DataProvider;
1415
use Symfony\Component\CssSelector\Parser\Handler\CommentHandler;
1516
use Symfony\Component\CssSelector\Parser\Reader;
1617
use Symfony\Component\CssSelector\Parser\Token;
1718
use Symfony\Component\CssSelector\Parser\TokenStream;
1819

1920
class CommentHandlerTest extends AbstractHandlerTestCase
2021
{
21-
/** @dataProvider getHandleValueTestData */
22+
#[DataProvider('getHandleValueTestData')]
2223
public function testHandleValue($value, Token $unusedArgument, $remainingContent)
2324
{
2425
$reader = new Reader($value);

‎Tests/Parser/ParserTest.php‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\CssSelector\Tests\Parser;
1313

14+
use PHPUnit\Framework\Attributes\DataProvider;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\CssSelector\Exception\SyntaxErrorException;
1617
use Symfony\Component\CssSelector\Node\FunctionNode;
@@ -20,15 +21,15 @@
2021

2122
class ParserTest extends TestCase
2223
{
23-
/** @dataProvider getParserTestData */
24+
#[DataProvider('getParserTestData')]
2425
public function testParser($source, $representation)
2526
{
2627
$parser = new Parser();
2728

2829
$this->assertEquals($representation, array_map(fn (SelectorNode $node) => (string) $node->getTree(), $parser->parse($source)));
2930
}
3031

31-
/** @dataProvider getParserExceptionTestData */
32+
#[DataProvider('getParserExceptionTestData')]
3233
public function testParserException($source, $message)
3334
{
3435
$parser = new Parser();
@@ -41,7 +42,7 @@ public function testParserException($source, $message)
4142
}
4243
}
4344

44-
/** @dataProvider getPseudoElementsTestData */
45+
#[DataProvider('getPseudoElementsTestData')]
4546
public function testPseudoElements($source, $element, $pseudo)
4647
{
4748
$parser = new Parser();
@@ -54,7 +55,7 @@ public function testPseudoElements($source, $element, $pseudo)
5455
$this->assertEquals($pseudo, (string) $selector->getPseudoElement());
5556
}
5657

57-
/** @dataProvider getSpecificityTestData */
58+
#[DataProvider('getSpecificityTestData')]
5859
public function testSpecificity($source, $value)
5960
{
6061
$parser = new Parser();
@@ -66,7 +67,7 @@ public function testSpecificity($source, $value)
6667
$this->assertEquals($value, $selector->getSpecificity()->getValue());
6768
}
6869

69-
/** @dataProvider getParseSeriesTestData */
70+
#[DataProvider('getParseSeriesTestData')]
7071
public function testParseSeries($series, $a, $b)
7172
{
7273
$parser = new Parser();
@@ -78,7 +79,7 @@ public function testParseSeries($series, $a, $b)
7879
$this->assertEquals([$a, $b], Parser::parseSeries($function->getArguments()));
7980
}
8081

81-
/** @dataProvider getParseSeriesExceptionTestData */
82+
#[DataProvider('getParseSeriesExceptionTestData')]
8283
public function testParseSeriesException($series)
8384
{
8485
$parser = new Parser();

‎Tests/Parser/Shortcut/ClassParserTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\CssSelector\Tests\Parser\Shortcut;
1313

14+
use PHPUnit\Framework\Attributes\DataProvider;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\CssSelector\Node\SelectorNode;
1617
use Symfony\Component\CssSelector\Parser\Shortcut\ClassParser;
@@ -20,7 +21,7 @@
2021
*/
2122
class ClassParserTest extends TestCase
2223
{
23-
/** @dataProvider getParseTestData */
24+
#[DataProvider('getParseTestData')]
2425
public function testParse($source, $representation)
2526
{
2627
$parser = new ClassParser();

‎Tests/Parser/Shortcut/ElementParserTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\CssSelector\Tests\Parser\Shortcut;
1313

14+
use PHPUnit\Framework\Attributes\DataProvider;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\CssSelector\Node\SelectorNode;
1617
use Symfony\Component\CssSelector\Parser\Shortcut\ElementParser;
@@ -20,7 +21,7 @@
2021
*/
2122
class ElementParserTest extends TestCase
2223
{
23-
/** @dataProvider getParseTestData */
24+
#[DataProvider('getParseTestData')]
2425
public function testParse($source, $representation)
2526
{
2627
$parser = new ElementParser();

‎Tests/Parser/Shortcut/HashParserTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\CssSelector\Tests\Parser\Shortcut;
1313

14+
use PHPUnit\Framework\Attributes\DataProvider;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\CssSelector\Node\SelectorNode;
1617
use Symfony\Component\CssSelector\Parser\Shortcut\HashParser;
@@ -20,7 +21,7 @@
2021
*/
2122
class HashParserTest extends TestCase
2223
{
23-
/** @dataProvider getParseTestData */
24+
#[DataProvider('getParseTestData')]
2425
public function testParse($source, $representation)
2526
{
2627
$parser = new HashParser();

‎Tests/XPath/TranslatorTest.php‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\CssSelector\Tests\XPath;
1313

14+
use PHPUnit\Framework\Attributes\DataProvider;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\CssSelector\Exception\ExpressionErrorException;
1617
use Symfony\Component\CssSelector\Node\ElementNode;
@@ -22,13 +23,13 @@
2223

2324
class TranslatorTest extends TestCase
2425
{
25-
/** @dataProvider getXpathLiteralTestData */
26+
#[DataProvider('getXpathLiteralTestData')]
2627
public function testXpathLiteral($value, $literal)
2728
{
2829
$this->assertEquals($literal, Translator::getXpathLiteral($value));
2930
}
3031

31-
/** @dataProvider getCssToXPathTestData */
32+
#[DataProvider('getCssToXPathTestData')]
3233
public function testCssToXPath($css, $xpath)
3334
{
3435
$translator = new Translator();
@@ -103,7 +104,7 @@ public function testAddAttributeMatchingClassNotExistsClass()
103104
$translator->addAttributeMatching($xpath, '', '', '');
104105
}
105106

106-
/** @dataProvider getXmlLangTestData */
107+
#[DataProvider('getXmlLangTestData')]
107108
public function testXmlLang($css, array $elementsId)
108109
{
109110
$translator = new Translator();
@@ -115,7 +116,7 @@ public function testXmlLang($css, array $elementsId)
115116
}
116117
}
117118

118-
/** @dataProvider getHtmlIdsTestData */
119+
#[DataProvider('getHtmlIdsTestData')]
119120
public function testHtmlIds($css, array $elementsId)
120121
{
121122
$translator = new Translator();
@@ -136,7 +137,7 @@ public function testHtmlIds($css, array $elementsId)
136137
libxml_use_internal_errors($internalErrors);
137138
}
138139

139-
/** @dataProvider getHtmlShakespearTestData */
140+
#[DataProvider('getHtmlShakespearTestData')]
140141
public function testHtmlShakespear($css, $count)
141142
{
142143
$translator = new Translator();

0 commit comments

Comments
 (0)