Skip to content

Commit 7eebef5

Browse files
BackEndTeaBackEndTea
committed
Use attributes over annotations for phpunit
Since this project is PHPUnit 10, we might as well use the new attributes instead of the annotations
1 parent 10817ca commit 7eebef5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+306
-156
lines changed

‎phpunit.xml.dist‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
3+
xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
44
bootstrap="vendor/autoload.php"
55
cacheDirectory="build/.phpunit.cache"
66
executionOrder="random"
@@ -36,10 +36,12 @@
3636
</testsuite>
3737
</testsuites>
3838

39-
<coverage>
39+
<source>
4040
<include>
4141
<directory suffix=".php">src</directory>
4242
</include>
43+
</source>
44+
<coverage>
4345
<report>
4446
<clover outputFile="build/logs/clover.xml"/>
4547
<xml outputDirectory="build/logs/coverage-xml"/>

‎psalm-baseline.xml‎

Lines changed: 197 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="5.13.1@086b94371304750d1c673315321a55d15fc59015">
2+
<files psalm-version="5.14.1@b9d355e0829c397b9b3b47d0c0ed042a8a70284d">
33
<file src="src/Components/AlterOperation.php">
44
<ArgumentTypeCoercion>
55
<code><![CDATA[$component->partitions]]></code>
@@ -1481,6 +1481,11 @@
14811481
<code><![CDATA[$list->tokens]]></code>
14821482
</UndefinedPropertyFetch>
14831483
</file>
1484+
<file src="tests/Builder/AlterStatementTest.php">
1485+
<PossiblyUnusedMethod>
1486+
<code>provideBuilderForRenameColumn</code>
1487+
</PossiblyUnusedMethod>
1488+
</file>
14841489
<file src="tests/Builder/CreateStatementTest.php">
14851490
<PossiblyInvalidArgument>
14861491
<code><![CDATA[$stmt->fields]]></code>
@@ -1498,8 +1503,19 @@
14981503
<code>isEmpty</code>
14991504
<code>isEmpty</code>
15001505
</PossiblyNullReference>
1506+
<PossiblyUnusedMethod>
1507+
<code>partitionQueriesProvider</code>
1508+
</PossiblyUnusedMethod>
1509+
</file>
1510+
<file src="tests/Builder/StatementTest.php">
1511+
<PossiblyUnusedMethod>
1512+
<code>getAliasesProvider</code>
1513+
</PossiblyUnusedMethod>
15011514
</file>
15021515
<file src="tests/Components/ArrayObjTest.php">
1516+
<PossiblyUnusedMethod>
1517+
<code>parseProvider</code>
1518+
</PossiblyUnusedMethod>
15031519
<UndefinedMethod>
15041520
<code>$components</code>
15051521
<code>$components</code>
@@ -1564,6 +1580,15 @@
15641580
<code><![CDATA[$component->table]]></code>
15651581
<code><![CDATA[$component->table]]></code>
15661582
</PossiblyNullPropertyFetch>
1583+
<PossiblyUnusedMethod>
1584+
<code>mysqlCommandsProvider</code>
1585+
<code>parseErrProvider</code>
1586+
</PossiblyUnusedMethod>
1587+
</file>
1588+
<file src="tests/Components/GroupKeywordTest.php">
1589+
<PossiblyUnusedMethod>
1590+
<code>provideExpressions</code>
1591+
</PossiblyUnusedMethod>
15671592
</file>
15681593
<file src="tests/Components/JoinKeywordTest.php">
15691594
<DocblockTypeContradiction>
@@ -1578,7 +1603,15 @@
15781603
<code>assertNull</code>
15791604
</DocblockTypeContradiction>
15801605
</file>
1606+
<file src="tests/Components/LimitTest.php">
1607+
<PossiblyUnusedMethod>
1608+
<code>parseProvider</code>
1609+
</PossiblyUnusedMethod>
1610+
</file>
15811611
<file src="tests/Components/LockExpressionTest.php">
1612+
<PossiblyUnusedMethod>
1613+
<code>parseErrProvider</code>
1614+
</PossiblyUnusedMethod>
15821615
<RedundantConditionGivenDocblockType>
15831616
<code>assertNotNull</code>
15841617
<code>assertNotNull</code>
@@ -1595,10 +1628,85 @@
15951628
<code>$component</code>
15961629
</InvalidArgument>
15971630
</file>
1631+
<file src="tests/Lexer/ContextTest.php">
1632+
<PossiblyUnusedMethod>
1633+
<code>contextLoadingProvider</code>
1634+
<code>contextNamesProvider</code>
1635+
<code>providerForTestMode</code>
1636+
</PossiblyUnusedMethod>
1637+
</file>
1638+
<file src="tests/Lexer/LexerTest.php">
1639+
<PossiblyUnusedMethod>
1640+
<code>lexProvider</code>
1641+
</PossiblyUnusedMethod>
1642+
</file>
1643+
<file src="tests/Misc/BugsTest.php">
1644+
<PossiblyUnusedMethod>
1645+
<code>bugProvider</code>
1646+
</PossiblyUnusedMethod>
1647+
</file>
1648+
<file src="tests/Misc/ParameterTest.php">
1649+
<PossiblyUnusedMethod>
1650+
<code>parameterProvider</code>
1651+
</PossiblyUnusedMethod>
1652+
</file>
1653+
<file src="tests/Misc/UtfStringTest.php">
1654+
<PossiblyUnusedMethod>
1655+
<code>utf8StringsProvider</code>
1656+
</PossiblyUnusedMethod>
1657+
</file>
1658+
<file src="tests/Parser/AlterStatementTest.php">
1659+
<PossiblyUnusedMethod>
1660+
<code>alterProvider</code>
1661+
</PossiblyUnusedMethod>
1662+
</file>
1663+
<file src="tests/Parser/AnalyzeStatementTest.php">
1664+
<PossiblyUnusedMethod>
1665+
<code>analyzeProvider</code>
1666+
</PossiblyUnusedMethod>
1667+
</file>
1668+
<file src="tests/Parser/CallStatementTest.php">
1669+
<PossiblyUnusedMethod>
1670+
<code>callProvider</code>
1671+
</PossiblyUnusedMethod>
1672+
</file>
1673+
<file src="tests/Parser/CreateStatementTest.php">
1674+
<PossiblyUnusedMethod>
1675+
<code>createProvider</code>
1676+
</PossiblyUnusedMethod>
1677+
</file>
1678+
<file src="tests/Parser/DeleteStatementTest.php">
1679+
<PossiblyUnusedMethod>
1680+
<code>deleteProvider</code>
1681+
</PossiblyUnusedMethod>
1682+
</file>
1683+
<file src="tests/Parser/DropStatementTest.php">
1684+
<PossiblyUnusedMethod>
1685+
<code>dropProvider</code>
1686+
</PossiblyUnusedMethod>
1687+
</file>
1688+
<file src="tests/Parser/ExplainStatementTest.php">
1689+
<PossiblyUnusedMethod>
1690+
<code>explainProvider</code>
1691+
</PossiblyUnusedMethod>
1692+
</file>
1693+
<file src="tests/Parser/InsertStatementTest.php">
1694+
<PossiblyUnusedMethod>
1695+
<code>insertProvider</code>
1696+
</PossiblyUnusedMethod>
1697+
</file>
15981698
<file src="tests/Parser/LoadStatementTest.php">
15991699
<PossiblyNullReference>
16001700
<code>has</code>
16011701
</PossiblyNullReference>
1702+
<PossiblyUnusedMethod>
1703+
<code>loadProvider</code>
1704+
</PossiblyUnusedMethod>
1705+
</file>
1706+
<file src="tests/Parser/LockStatementTest.php">
1707+
<PossiblyUnusedMethod>
1708+
<code>lockProvider</code>
1709+
</PossiblyUnusedMethod>
16021710
</file>
16031711
<file src="tests/Parser/ParserLongExportsTest.php">
16041712
<MixedAssignment>
@@ -1607,11 +1715,62 @@
16071715
<PossiblyNullIterator>
16081716
<code><![CDATA[$statement->statements]]></code>
16091717
</PossiblyNullIterator>
1718+
<PossiblyUnusedMethod>
1719+
<code>exportFileProvider</code>
1720+
</PossiblyUnusedMethod>
1721+
</file>
1722+
<file src="tests/Parser/ParserTest.php">
1723+
<PossiblyUnusedMethod>
1724+
<code>parseProvider</code>
1725+
</PossiblyUnusedMethod>
1726+
</file>
1727+
<file src="tests/Parser/PurgeStatementTest.php">
1728+
<PossiblyUnusedMethod>
1729+
<code>purgeProvider</code>
1730+
</PossiblyUnusedMethod>
1731+
</file>
1732+
<file src="tests/Parser/RenameStatementTest.php">
1733+
<PossiblyUnusedMethod>
1734+
<code>renameProvider</code>
1735+
</PossiblyUnusedMethod>
1736+
</file>
1737+
<file src="tests/Parser/ReplaceStatementTest.php">
1738+
<PossiblyUnusedMethod>
1739+
<code>replaceProvider</code>
1740+
</PossiblyUnusedMethod>
1741+
</file>
1742+
<file src="tests/Parser/RestoreStatementTest.php">
1743+
<PossiblyUnusedMethod>
1744+
<code>restoreProvider</code>
1745+
</PossiblyUnusedMethod>
16101746
</file>
16111747
<file src="tests/Parser/SelectStatementTest.php">
16121748
<PossiblyNullReference>
16131749
<code>has</code>
16141750
</PossiblyNullReference>
1751+
<PossiblyUnusedMethod>
1752+
<code>selectProvider</code>
1753+
</PossiblyUnusedMethod>
1754+
</file>
1755+
<file src="tests/Parser/SetStatementTest.php">
1756+
<PossiblyUnusedMethod>
1757+
<code>setProvider</code>
1758+
</PossiblyUnusedMethod>
1759+
</file>
1760+
<file src="tests/Parser/TransactionStatementTest.php">
1761+
<PossiblyUnusedMethod>
1762+
<code>transactionProvider</code>
1763+
</PossiblyUnusedMethod>
1764+
</file>
1765+
<file src="tests/Parser/UpdateStatementTest.php">
1766+
<PossiblyUnusedMethod>
1767+
<code>updateProvider</code>
1768+
</PossiblyUnusedMethod>
1769+
</file>
1770+
<file src="tests/Parser/WithStatementTest.php">
1771+
<PossiblyUnusedMethod>
1772+
<code>parseWith</code>
1773+
</PossiblyUnusedMethod>
16151774
</file>
16161775
<file src="tests/TestCase.php">
16171776
<InvalidReturnStatement>
@@ -1635,7 +1794,27 @@
16351794
<code>TestContext</code>
16361795
</UnusedClass>
16371796
</file>
1797+
<file src="tests/Utils/BufferedQueryTest.php">
1798+
<PossiblyUnusedMethod>
1799+
<code>extractProvider</code>
1800+
</PossiblyUnusedMethod>
1801+
</file>
1802+
<file src="tests/Utils/CLITest.php">
1803+
<PossiblyUnusedMethod>
1804+
<code>highlightParamsProvider</code>
1805+
<code>highlightParamsStdInProvider</code>
1806+
<code>lintParamsProvider</code>
1807+
<code>lintParamsStdInProvider</code>
1808+
<code>stdinParamsProvider</code>
1809+
<code>tokenizeParamsProvider</code>
1810+
<code>tokenizeParamsStdInProvider</code>
1811+
</PossiblyUnusedMethod>
1812+
</file>
16381813
<file src="tests/Utils/FormatterTest.php">
1814+
<PossiblyUnusedMethod>
1815+
<code>formatQueriesProviders</code>
1816+
<code>mergeFormatsProvider</code>
1817+
</PossiblyUnusedMethod>
16391818
<UnusedMethodCall>
16401819
<code>setAccessible</code>
16411820
</UnusedMethodCall>
@@ -1659,6 +1838,10 @@
16591838
<code><![CDATA[$parser->list]]></code>
16601839
<code><![CDATA[$parser->list]]></code>
16611840
</PossiblyNullArgument>
1841+
<PossiblyUnusedMethod>
1842+
<code>getFlagsProvider</code>
1843+
<code>getTablesProvider</code>
1844+
</PossiblyUnusedMethod>
16621845
<UnusedVariable>
16631846
<code>$delimiter</code>
16641847
<code>$delimiter</code>
@@ -1669,6 +1852,11 @@
16691852
<ArgumentTypeCoercion>
16701853
<code><![CDATA[$parser->statements[0]]]></code>
16711854
</ArgumentTypeCoercion>
1855+
<PossiblyUnusedMethod>
1856+
<code>getParameterProvider</code>
1857+
<code>getParametersProvider</code>
1858+
<code>getReturnTypeProvider</code>
1859+
</PossiblyUnusedMethod>
16721860
</file>
16731861
<file src="tests/Utils/TableTest.php">
16741862
<ArgumentTypeCoercion>
@@ -1777,11 +1965,19 @@
17771965
* expr?: string
17781966
* }>}>]]></code>
17791967
</InvalidReturnType>
1968+
<PossiblyUnusedMethod>
1969+
<code>getFieldsProvider</code>
1970+
<code>getForeignKeysProvider</code>
1971+
</PossiblyUnusedMethod>
17801972
</file>
17811973
<file src="tests/Utils/TokensTest.php">
17821974
<InvalidArgument>
17831975
<code>$find</code>
17841976
</InvalidArgument>
1977+
<PossiblyUnusedMethod>
1978+
<code>matchProvider</code>
1979+
<code>replaceTokensProvider</code>
1980+
</PossiblyUnusedMethod>
17851981
</file>
17861982
<file src="tests/benchmarks/UtfStringBench.php">
17871983
<MissingConstructor>

‎tests/Builder/AlterStatementTest.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Generator;
88
use PhpMyAdmin\SqlParser\Parser;
99
use PhpMyAdmin\SqlParser\Tests\TestCase;
10+
use PHPUnit\Framework\Attributes\DataProvider;
1011

1112
class AlterStatementTest extends TestCase
1213
{
@@ -184,9 +185,7 @@ public static function provideBuilderForRenameColumn(): Generator
184185
yield 'Mixed RENAME table + RENAME INDEX + RENAME COLUMNS' => [$query];
185186
}
186187

187-
/**
188-
* @dataProvider provideBuilderForRenameColumn
189-
*/
188+
#[DataProvider('provideBuilderForRenameColumn')]
190189
public function testBuilderRenameColumn(string $query): void
191190
{
192191
$parser = new Parser($query);

‎tests/Builder/CreateStatementTest.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use PhpMyAdmin\SqlParser\Statements\CreateStatement;
1515
use PhpMyAdmin\SqlParser\Tests\TestCase;
1616
use PhpMyAdmin\SqlParser\TokensList;
17+
use PHPUnit\Framework\Attributes\DataProvider;
1718

1819
class CreateStatementTest extends TestCase
1920
{
@@ -299,9 +300,7 @@ public static function partitionQueriesProvider(): array
299300
];
300301
}
301302

302-
/**
303-
* @dataProvider partitionQueriesProvider
304-
*/
303+
#[DataProvider('partitionQueriesProvider')]
305304
public function testBuilderPartitionsEngine(string $query): void
306305
{
307306
$parser = new Parser($query);

‎tests/Builder/StatementTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use PhpMyAdmin\SqlParser\Parser;
1212
use PhpMyAdmin\SqlParser\Statements\SelectStatement;
1313
use PhpMyAdmin\SqlParser\Tests\TestCase;
14+
use PHPUnit\Framework\Attributes\DataProvider;
1415

1516
class StatementTest extends TestCase
1617
{
@@ -46,9 +47,8 @@ public function testBuilder(): void
4647
* alias: (string|null),
4748
* tables: array<string, array{alias: (string|null), columns: array<string, string>}>
4849
* }> $expected
49-
*
50-
* @dataProvider getAliasesProvider
5150
*/
51+
#[DataProvider('getAliasesProvider')]
5252
public function testGetAliases(string $query, string $db, array $expected): void
5353
{
5454
$parser = new Parser($query);

‎tests/Components/ArrayObjTest.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use PhpMyAdmin\SqlParser\Components\Expression;
99
use PhpMyAdmin\SqlParser\Parser;
1010
use PhpMyAdmin\SqlParser\Tests\TestCase;
11+
use PHPUnit\Framework\Attributes\DataProvider;
1112

1213
class ArrayObjTest extends TestCase
1314
{
@@ -39,9 +40,7 @@ public function testParseType(): void
3940
$this->assertEquals($components[1]->expr, '3 + 4');
4041
}
4142

42-
/**
43-
* @dataProvider parseProvider
44-
*/
43+
#[DataProvider('parseProvider')]
4544
public function testParse(string $test): void
4645
{
4746
$this->runParserTest($test);

0 commit comments

Comments
 (0)