Skip to content

Commit cab792d

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #19274 from MauricioFauth/phpunit-11-compat
Fix compatibility with PHPUnit 11
2 parents 7a8887b + 2c597e3 commit cab792d

20 files changed

Lines changed: 52 additions & 49 deletions

‎psalm-baseline.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13188,6 +13188,11 @@
1318813188
<code><![CDATA[Config::getInstance()]]></code>
1318913189
</DeprecatedMethod>
1319013190
</file>
13191+
<file src="tests/unit/Controllers/Table/Structure/MoveColumnsControllerTest.php">
13192+
<PossiblyUnusedMethod>
13193+
<code><![CDATA[providerForTestGenerateAlterTableSql]]></code>
13194+
</PossiblyUnusedMethod>
13195+
</file>
1319113196
<file src="tests/unit/Controllers/Table/Structure/SpatialControllerTest.php">
1319213197
<DeprecatedMethod>
1319313198
<code><![CDATA[DatabaseInterface::getInstance()]]></code>
@@ -13895,6 +13900,8 @@
1389513900
<code><![CDATA[provGetColumnAlphaName]]></code>
1389613901
<code><![CDATA[provGetColumnNumberFromName]]></code>
1389713902
<code><![CDATA[provGetDecimalSize]]></code>
13903+
<code><![CDATA[provPMACheckIfRollbackPossibleNegative]]></code>
13904+
<code><![CDATA[provPMACheckIfRollbackPossiblePositive]]></code>
1389813905
<code><![CDATA[providerContentWithByteOrderMarks]]></code>
1389913906
</PossiblyUnusedMethod>
1390013907
<TypeDoesNotContainNull>

‎tests/unit/Config/ConfigFileTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@
88
use PhpMyAdmin\Config\Settings;
99
use PhpMyAdmin\Tests\AbstractTestCase;
1010
use PHPUnit\Framework\Attributes\CoversClass;
11-
use PHPUnit\Framework\Attributes\Group;
11+
use PHPUnit\Framework\Attributes\Medium;
1212
use stdClass;
1313

1414
use function array_keys;
1515
use function count;
1616

1717
#[CoversClass(ConfigFile::class)]
18+
#[Medium]
1819
class ConfigFileTest extends AbstractTestCase
1920
{
2021
/**
@@ -275,7 +276,6 @@ public function testConfigFileSetInUserPreferences(): void
275276
/**
276277
* Test for ConfigFile::getFlatDefaultConfig
277278
*/
278-
#[Group('medium')]
279279
public function testGetFlatDefaultConfig(): void
280280
{
281281
$flatDefaultConfig = $this->object->getFlatDefaultConfig();

‎tests/unit/Config/FormDisplayTest.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@
1111
use PhpMyAdmin\Current;
1212
use PhpMyAdmin\Tests\AbstractTestCase;
1313
use PHPUnit\Framework\Attributes\CoversClass;
14-
use PHPUnit\Framework\Attributes\Group;
14+
use PHPUnit\Framework\Attributes\Medium;
1515
use ReflectionClass;
1616
use ReflectionMethod;
1717
use ReflectionProperty;
1818

1919
use function function_exists;
2020

2121
#[CoversClass(FormDisplay::class)]
22+
#[Medium]
2223
class FormDisplayTest extends AbstractTestCase
2324
{
2425
protected FormDisplay $object;
@@ -50,7 +51,6 @@ protected function tearDown(): void
5051
/**
5152
* Test for FormDisplay::registerForm
5253
*/
53-
#[Group('medium')]
5454
public function testRegisterForm(): void
5555
{
5656
$reflection = new ReflectionClass(FormDisplay::class);
@@ -81,7 +81,6 @@ public function testRegisterForm(): void
8181
/**
8282
* Test for FormDisplay::process
8383
*/
84-
#[Group('medium')]
8584
public function testProcess(): void
8685
{
8786
self::assertFalse(

‎tests/unit/Config/FormTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88
use PhpMyAdmin\Config\Form;
99
use PhpMyAdmin\Tests\AbstractTestCase;
1010
use PHPUnit\Framework\Attributes\CoversClass;
11-
use PHPUnit\Framework\Attributes\Group;
11+
use PHPUnit\Framework\Attributes\Medium;
1212
use ReflectionClass;
1313
use ReflectionProperty;
1414

1515
use function array_keys;
1616
use function preg_match;
1717

1818
#[CoversClass(Form::class)]
19+
#[Medium]
1920
class FormTest extends AbstractTestCase
2021
{
2122
protected Form $object;
@@ -50,7 +51,6 @@ protected function tearDown(): void
5051
/**
5152
* Test for Form::__constructor
5253
*/
53-
#[Group('medium')]
5454
public function testContructor(): void
5555
{
5656
self::assertSame(1, $this->object->index);

‎tests/unit/ConfigStorage/UserGroupsTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
use PhpMyAdmin\Tests\Stubs\DummyResult;
1717
use PhpMyAdmin\Url;
1818
use PHPUnit\Framework\Attributes\CoversClass;
19-
use PHPUnit\Framework\Attributes\Group;
19+
use PHPUnit\Framework\Attributes\Medium;
2020

2121
#[CoversClass(UserGroups::class)]
22+
#[Medium]
2223
class UserGroupsTest extends AbstractTestCase
2324
{
2425
private ConfigurableMenusFeature $configurableMenusFeature;
@@ -44,7 +45,6 @@ protected function setUp(): void
4445
/**
4546
* Tests UserGroups::getHtmlForUserGroupsTable() function when there are no user groups
4647
*/
47-
#[Group('medium')]
4848
public function testGetHtmlForUserGroupsTableWithNoUserGroups(): void
4949
{
5050
$expectedQuery = 'SELECT * FROM `pmadb`.`usergroups` ORDER BY `usergroup` ASC';

‎tests/unit/ConfigTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use PHPUnit\Framework\Attributes\DataProvider;
1414
use PHPUnit\Framework\Attributes\Depends;
1515
use PHPUnit\Framework\Attributes\Group;
16+
use PHPUnit\Framework\Attributes\Medium;
1617
use ReflectionProperty;
1718

1819
use function define;
@@ -41,6 +42,7 @@
4142
use const PHP_OS;
4243

4344
#[CoversClass(Config::class)]
45+
#[Medium]
4446
class ConfigTest extends AbstractTestCase
4547
{
4648
protected Config $object;
@@ -126,7 +128,6 @@ public function testLoadConfigs(): void
126128
/**
127129
* Test for CheckSystem
128130
*/
129-
#[Group('medium')]
130131
public function testCheckSystem(): void
131132
{
132133
$this->object->checkSystem();

‎tests/unit/Controllers/Table/Structure/MoveColumnsControllerTest.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,20 @@
99
use PhpMyAdmin\Template;
1010
use PhpMyAdmin\Tests\AbstractTestCase;
1111
use PhpMyAdmin\Tests\Stubs\ResponseRenderer as ResponseStub;
12+
use PHPUnit\Framework\Attributes\CoversClass;
13+
use PHPUnit\Framework\Attributes\DataProvider;
1214
use ReflectionClass;
1315

1416
use function preg_replace;
1517

16-
/** @covers \PhpMyAdmin\Controllers\Table\Structure\MoveColumnsController */
18+
#[CoversClass(MoveColumnsController::class)]
1719
class MoveColumnsControllerTest extends AbstractTestCase
1820
{
1921
/**
2022
* @param array<int,string> $columnNames
2123
* @psalm-param list<string> $columnNames
22-
*
23-
* @dataProvider providerForTestGenerateAlterTableSql
2424
*/
25+
#[DataProvider('providerForTestGenerateAlterTableSql')]
2526
public function testGenerateAlterTableSql(string $createStatement, array $columnNames, string|null $expected): void
2627
{
2728
$class = new ReflectionClass(MoveColumnsController::class);

‎tests/unit/EncodingTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use PhpMyAdmin\Encoding;
99
use PHPUnit\Framework\Attributes\CoversClass;
1010
use PHPUnit\Framework\Attributes\Group;
11+
use PHPUnit\Framework\Attributes\Medium;
1112
use PHPUnit\Framework\Attributes\RequiresPhpExtension;
1213

1314
use function _setlocale;
@@ -23,6 +24,7 @@
2324
use const PHP_INT_SIZE;
2425

2526
#[CoversClass(Encoding::class)]
27+
#[Medium]
2628
class EncodingTest extends AbstractTestCase
2729
{
2830
protected function setUp(): void
@@ -42,7 +44,6 @@ protected function tearDown(): void
4244
/**
4345
* Test for Encoding::convertString
4446
*/
45-
#[Group('medium')]
4647
public function testNoConversion(): void
4748
{
4849
self::assertSame(

‎tests/unit/Error/ErrorHandlerTest.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
use PhpMyAdmin\Tests\AbstractTestCase;
1414
use PHPUnit\Framework\Attributes\CoversClass;
1515
use PHPUnit\Framework\Attributes\DataProvider;
16-
use PHPUnit\Framework\Attributes\Group;
16+
use PHPUnit\Framework\Attributes\Medium;
1717
use Throwable;
1818

1919
use function array_keys;
@@ -26,6 +26,7 @@
2626
use const E_WARNING;
2727

2828
#[CoversClass(ErrorHandler::class)]
29+
#[Medium]
2930
class ErrorHandlerTest extends AbstractTestCase
3031
{
3132
protected ErrorHandler $object;
@@ -121,7 +122,6 @@ public function testCheckSavedErrors(): void
121122
/**
122123
* Test for countErrors
123124
*/
124-
#[Group('medium')]
125125
public function testCountErrors(): void
126126
{
127127
$this->object->addError('Compile Error', E_WARNING, 'error.txt', 15);
@@ -134,7 +134,6 @@ public function testCountErrors(): void
134134
/**
135135
* Test for sliceErrors
136136
*/
137-
#[Group('medium')]
138137
public function testSliceErrors(): void
139138
{
140139
$this->object->addError('Compile Error', E_WARNING, 'error.txt', 15);
@@ -164,7 +163,6 @@ public function testSliceErrors(): void
164163
/**
165164
* Test for sliceErrors with 10 elements as an example
166165
*/
167-
#[Group('medium')]
168166
public function testSliceErrorsOtherExample(): void
169167
{
170168
for ($i = 0; $i < 10; $i++) {

‎tests/unit/FooterTest.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111
use PhpMyAdmin\Footer;
1212
use PhpMyAdmin\Template;
1313
use PHPUnit\Framework\Attributes\CoversClass;
14-
use PHPUnit\Framework\Attributes\Group;
14+
use PHPUnit\Framework\Attributes\Medium;
1515

1616
use function json_encode;
1717

1818
#[CoversClass(Footer::class)]
19+
#[Medium]
1920
class FooterTest extends AbstractTestCase
2021
{
2122
/** @var mixed[] store private attributes of PhpMyAdmin\Footer */
@@ -64,7 +65,6 @@ protected function tearDown(): void
6465
/**
6566
* Test for getDebugMessage
6667
*/
67-
#[Group('medium')]
6868
public function testGetDebugMessage(): void
6969
{
7070
$config = Config::getInstance();
@@ -114,7 +114,6 @@ public function testGetScripts(): void
114114
/**
115115
* Test for displaying footer
116116
*/
117-
#[Group('medium')]
118117
public function testDisplay(): void
119118
{
120119
$footer = new Footer(new Template(), Config::getInstance());

0 commit comments

Comments
 (0)