Merge pull request phpmyadmin#19274 from MauricioFauth/phpunit-11-compat

Fix compatibility with PHPUnit 11

psalm-baseline.xml

@@ -13188,6 +13188,11 @@
       <code><![CDATA[Config::getInstance()]]></code>
     </DeprecatedMethod>
   </file>
+  <file src="tests/unit/Controllers/Table/Structure/MoveColumnsControllerTest.php">
+    <PossiblyUnusedMethod>
+      <code><![CDATA[providerForTestGenerateAlterTableSql]]></code>
+    </PossiblyUnusedMethod>
+  </file>
   <file src="tests/unit/Controllers/Table/Structure/SpatialControllerTest.php">
     <DeprecatedMethod>
       <code><![CDATA[DatabaseInterface::getInstance()]]></code>
@@ -13895,6 +13900,8 @@
       <code><![CDATA[provGetColumnAlphaName]]></code>
       <code><![CDATA[provGetColumnNumberFromName]]></code>
       <code><![CDATA[provGetDecimalSize]]></code>
+      <code><![CDATA[provPMACheckIfRollbackPossibleNegative]]></code>
+      <code><![CDATA[provPMACheckIfRollbackPossiblePositive]]></code>
       <code><![CDATA[providerContentWithByteOrderMarks]]></code>
     </PossiblyUnusedMethod>
     <TypeDoesNotContainNull>

tests/unit/Config/ConfigFileTest.php

@@ -8,13 +8,14 @@
 use PhpMyAdmin\Config\Settings;
 use PhpMyAdmin\Tests\AbstractTestCase;
 use PHPUnit\Framework\Attributes\CoversClass;
-use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Medium;
 use stdClass;
 
 use function array_keys;
 use function count;
 
 #[CoversClass(ConfigFile::class)]
+#[Medium]
 class ConfigFileTest extends AbstractTestCase
 {
     /**
@@ -275,7 +276,6 @@ public function testConfigFileSetInUserPreferences(): void
     /**
      * Test for ConfigFile::getFlatDefaultConfig
      */
-    #[Group('medium')]
     public function testGetFlatDefaultConfig(): void
     {
         $flatDefaultConfig = $this->object->getFlatDefaultConfig();

tests/unit/Config/FormDisplayTest.php

@@ -11,14 +11,15 @@
 use PhpMyAdmin\Current;
 use PhpMyAdmin\Tests\AbstractTestCase;
 use PHPUnit\Framework\Attributes\CoversClass;
-use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Medium;
 use ReflectionClass;
 use ReflectionMethod;
 use ReflectionProperty;
 
 use function function_exists;
 
 #[CoversClass(FormDisplay::class)]
+#[Medium]
 class FormDisplayTest extends AbstractTestCase
 {
     protected FormDisplay $object;
@@ -50,7 +51,6 @@ protected function tearDown(): void
     /**
      * Test for FormDisplay::registerForm
      */
-    #[Group('medium')]
     public function testRegisterForm(): void
     {
         $reflection = new ReflectionClass(FormDisplay::class);
@@ -81,7 +81,6 @@ public function testRegisterForm(): void
     /**
      * Test for FormDisplay::process
      */
-    #[Group('medium')]
     public function testProcess(): void
     {
         self::assertFalse(

tests/unit/Config/FormTest.php

@@ -8,14 +8,15 @@
 use PhpMyAdmin\Config\Form;
 use PhpMyAdmin\Tests\AbstractTestCase;
 use PHPUnit\Framework\Attributes\CoversClass;
-use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Medium;
 use ReflectionClass;
 use ReflectionProperty;
 
 use function array_keys;
 use function preg_match;
 
 #[CoversClass(Form::class)]
+#[Medium]
 class FormTest extends AbstractTestCase
 {
     protected Form $object;
@@ -50,7 +51,6 @@ protected function tearDown(): void
     /**
      * Test for Form::__constructor
      */
-    #[Group('medium')]
     public function testContructor(): void
     {
         self::assertSame(1, $this->object->index);

tests/unit/ConfigStorage/UserGroupsTest.php

@@ -16,9 +16,10 @@
 use PhpMyAdmin\Tests\Stubs\DummyResult;
 use PhpMyAdmin\Url;
 use PHPUnit\Framework\Attributes\CoversClass;
-use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Medium;
 
 #[CoversClass(UserGroups::class)]
+#[Medium]
 class UserGroupsTest extends AbstractTestCase
 {
     private ConfigurableMenusFeature $configurableMenusFeature;
@@ -44,7 +45,6 @@ protected function setUp(): void
     /**
      * Tests UserGroups::getHtmlForUserGroupsTable() function when there are no user groups
      */
-    #[Group('medium')]
     public function testGetHtmlForUserGroupsTableWithNoUserGroups(): void
     {
         $expectedQuery = 'SELECT * FROM `pmadb`.`usergroups` ORDER BY `usergroup` ASC';

tests/unit/ConfigTest.php

@@ -13,6 +13,7 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Depends;
 use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Medium;
 use ReflectionProperty;
 
 use function define;
@@ -41,6 +42,7 @@
 use const PHP_OS;
 
 #[CoversClass(Config::class)]
+#[Medium]
 class ConfigTest extends AbstractTestCase
 {
     protected Config $object;
@@ -126,7 +128,6 @@ public function testLoadConfigs(): void
     /**
      * Test for CheckSystem
      */
-    #[Group('medium')]
     public function testCheckSystem(): void
     {
         $this->object->checkSystem();

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

@@ -9,19 +9,20 @@
 use PhpMyAdmin\Template;
 use PhpMyAdmin\Tests\AbstractTestCase;
 use PhpMyAdmin\Tests\Stubs\ResponseRenderer as ResponseStub;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use ReflectionClass;
 
 use function preg_replace;
 
-/** @covers \PhpMyAdmin\Controllers\Table\Structure\MoveColumnsController */
+#[CoversClass(MoveColumnsController::class)]
 class MoveColumnsControllerTest extends AbstractTestCase
 {
     /**
      * @param array<int,string> $columnNames
      * @psalm-param list<string> $columnNames
-     *
-     * @dataProvider providerForTestGenerateAlterTableSql
      */
+    #[DataProvider('providerForTestGenerateAlterTableSql')]
     public function testGenerateAlterTableSql(string $createStatement, array $columnNames, string|null $expected): void
     {
         $class = new ReflectionClass(MoveColumnsController::class);

tests/unit/EncodingTest.php

@@ -8,6 +8,7 @@
 use PhpMyAdmin\Encoding;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Medium;
 use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 
 use function _setlocale;
@@ -23,6 +24,7 @@
 use const PHP_INT_SIZE;
 
 #[CoversClass(Encoding::class)]
+#[Medium]
 class EncodingTest extends AbstractTestCase
 {
     protected function setUp(): void
@@ -42,7 +44,6 @@ protected function tearDown(): void
     /**
      * Test for Encoding::convertString
      */
-    #[Group('medium')]
     public function testNoConversion(): void
     {
         self::assertSame(

tests/unit/Error/ErrorHandlerTest.php

@@ -13,7 +13,7 @@
 use PhpMyAdmin\Tests\AbstractTestCase;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Medium;
 use Throwable;
 
 use function array_keys;
@@ -26,6 +26,7 @@
 use const E_WARNING;
 
 #[CoversClass(ErrorHandler::class)]
+#[Medium]
 class ErrorHandlerTest extends AbstractTestCase
 {
     protected ErrorHandler $object;
@@ -121,7 +122,6 @@ public function testCheckSavedErrors(): void
     /**
      * Test for countErrors
      */
-    #[Group('medium')]
     public function testCountErrors(): void
     {
         $this->object->addError('Compile Error', E_WARNING, 'error.txt', 15);
@@ -134,7 +134,6 @@ public function testCountErrors(): void
     /**
      * Test for sliceErrors
      */
-    #[Group('medium')]
     public function testSliceErrors(): void
     {
         $this->object->addError('Compile Error', E_WARNING, 'error.txt', 15);
@@ -164,7 +163,6 @@ public function testSliceErrors(): void
     /**
      * Test for sliceErrors with 10 elements as an example
      */
-    #[Group('medium')]
     public function testSliceErrorsOtherExample(): void
     {
         for ($i = 0; $i < 10; $i++) {

tests/unit/FooterTest.php

@@ -11,11 +11,12 @@
 use PhpMyAdmin\Footer;
 use PhpMyAdmin\Template;
 use PHPUnit\Framework\Attributes\CoversClass;
-use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Medium;
 
 use function json_encode;
 
 #[CoversClass(Footer::class)]
+#[Medium]
 class FooterTest extends AbstractTestCase
 {
     /** @var mixed[] store private attributes of PhpMyAdmin\Footer */
@@ -64,7 +65,6 @@ protected function tearDown(): void
     /**
      * Test for getDebugMessage
      */
-    #[Group('medium')]
     public function testGetDebugMessage(): void
     {
         $config = Config::getInstance();
@@ -114,7 +114,6 @@ public function testGetScripts(): void
     /**
      * Test for displaying footer
      */
-    #[Group('medium')]
     public function testDisplay(): void
     {
         $footer = new Footer(new Template(), Config::getInstance());

tests/unit/Html/GeneratorTest.php

@@ -15,14 +15,15 @@
 use PhpMyAdmin\Utils\SessionCache;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Medium;
 
 use function __;
 use function _pgettext;
 use function htmlspecialchars;
 use function urlencode;
 
 #[CoversClass(Generator::class)]
+#[Medium]
 class GeneratorTest extends AbstractTestCase
 {
     /**
@@ -38,7 +39,6 @@ protected function setUp(): void
     /**
      * Test for getDbLink
      */
-    #[Group('medium')]
     public function testGetDbLinkNull(): void
     {
         Current::$database = 'test_db';

tests/unit/Import/ImportTest.php

@@ -222,9 +222,8 @@ public static function provDetectType(): array
      * Test for checkIfRollbackPossible
      *
      * @param string $sqlQuery SQL Query for which rollback is possible
-     *
-     * @dataProvider provPMACheckIfRollbackPossiblePositive
      */
+    #[DataProvider('provPMACheckIfRollbackPossiblePositive')]
     public function testCheckIfRollbackPossiblePositive(string $sqlQuery): void
     {
         Current::$database = 'PMA';
@@ -258,9 +257,8 @@ public static function provPMACheckIfRollbackPossiblePositive(): array
      * Negative test for checkIfRollbackPossible
      *
      * @param string $sqlQuery SQL Query for which rollback is possible
-     *
-     * @dataProvider provPMACheckIfRollbackPossibleNegative
      */
+    #[DataProvider('provPMACheckIfRollbackPossibleNegative')]
     public function testCheckIfRollbackPossibleNegative(string $sqlQuery): void
     {
         Current::$database = 'PMA';

tests/unit/LanguageTest.php

@@ -9,7 +9,7 @@
 use PhpMyAdmin\LanguageManager;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Large;
 
 use function _ngettext;
 use function count;
@@ -19,6 +19,7 @@
 
 #[CoversClass(Language::class)]
 #[CoversClass(LanguageManager::class)]
+#[Large]
 class LanguageTest extends AbstractTestCase
 {
     private LanguageManager $manager;
@@ -237,7 +238,6 @@ public static function selectDataProvider(): array
      * @param string $locale locale name
      */
     #[DataProvider('listLocales')]
-    #[Group('large')]
     public function testGettext(string $locale): void
     {
         Config::getInstance()->set('FilterLanguages', '');

tests/unit/Replication/ReplicationGuiTest.php

@@ -13,9 +13,10 @@
 use PhpMyAdmin\Template;
 use PhpMyAdmin\Tests\AbstractTestCase;
 use PHPUnit\Framework\Attributes\CoversClass;
-use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Medium;
 
 #[CoversClass(ReplicationGui::class)]
+#[Medium]
 class ReplicationGuiTest extends AbstractTestCase
 {
     /**
@@ -52,7 +53,6 @@ protected function setUp(): void
         $this->replicationGui = new ReplicationGui(new Replication(DatabaseInterface::getInstance()), new Template());
     }
 
-    #[Group('medium')]
     public function testGetHtmlForPrimaryReplication(): void
     {
         $html = $this->replicationGui->getHtmlForPrimaryReplication(null, false, 'primary_add_user', null, null);

tests/unit/Server/PrivilegesTest.php

@@ -25,7 +25,7 @@
 use PhpMyAdmin\Util;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Medium;
 use ReflectionMethod;
 use ReflectionProperty;
 
@@ -36,6 +36,7 @@
 use function preg_quote;
 
 #[CoversClass(Privileges::class)]
+#[Medium]
 class PrivilegesTest extends AbstractTestCase
 {
     protected DatabaseInterface $dbi;
@@ -567,7 +568,6 @@ public function testUpdatePrivilegesAfterMySql8Dot11(): void
         );
     }
 
-    #[Group('medium')]
     public function testGetHtmlToDisplayPrivilegesTable(): void
     {
         $GLOBALS['hostname'] = 'hostname';
@@ -950,7 +950,6 @@ public function testGetWithClauseForAddUserAndUpdatePrivs(): void
         self::assertStringContainsString($expect, $sqlQuery);
     }
 
-    #[Group('medium')]
     public function testGetHtmlForAddUser(): void
     {
         $dbi = $this->createDatabaseInterface();