Fix compatibility with PHPUnit 11

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
This commit is contained in:
Maurício Meneghini Fauth 2024-08-29 13:51:46 -03:00
parent 7a8887b06b
commit 2c597e3f79
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
20 changed files with 52 additions and 49 deletions

View File

@ -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>

View File

@ -8,13 +8,14 @@ use PhpMyAdmin\Config\ConfigFile;
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 @@ class ConfigFileTest extends AbstractTestCase
/**
* Test for ConfigFile::getFlatDefaultConfig
*/
#[Group('medium')]
public function testGetFlatDefaultConfig(): void
{
$flatDefaultConfig = $this->object->getFlatDefaultConfig();

View File

@ -11,7 +11,7 @@ use PhpMyAdmin\Config\FormDisplay;
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;
@ -19,6 +19,7 @@ use ReflectionProperty;
use function function_exists;
#[CoversClass(FormDisplay::class)]
#[Medium]
class FormDisplayTest extends AbstractTestCase
{
protected FormDisplay $object;
@ -50,7 +51,6 @@ class FormDisplayTest extends AbstractTestCase
/**
* Test for FormDisplay::registerForm
*/
#[Group('medium')]
public function testRegisterForm(): void
{
$reflection = new ReflectionClass(FormDisplay::class);
@ -81,7 +81,6 @@ class FormDisplayTest extends AbstractTestCase
/**
* Test for FormDisplay::process
*/
#[Group('medium')]
public function testProcess(): void
{
self::assertFalse(

View File

@ -8,7 +8,7 @@ use PhpMyAdmin\Config\ConfigFile;
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;
@ -16,6 +16,7 @@ use function array_keys;
use function preg_match;
#[CoversClass(Form::class)]
#[Medium]
class FormTest extends AbstractTestCase
{
protected Form $object;
@ -50,7 +51,6 @@ class FormTest extends AbstractTestCase
/**
* Test for Form::__constructor
*/
#[Group('medium')]
public function testContructor(): void
{
self::assertSame(1, $this->object->index);

View File

@ -16,9 +16,10 @@ use PhpMyAdmin\Tests\AbstractTestCase;
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 @@ class UserGroupsTest extends AbstractTestCase
/**
* 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';

View File

@ -13,6 +13,7 @@ use PHPUnit\Framework\Attributes\CoversClass;
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 INFO_MODULES;
use const PHP_OS;
#[CoversClass(Config::class)]
#[Medium]
class ConfigTest extends AbstractTestCase
{
protected Config $object;
@ -126,7 +128,6 @@ PHP;
/**
* Test for CheckSystem
*/
#[Group('medium')]
public function testCheckSystem(): void
{
$this->object->checkSystem();

View File

@ -9,19 +9,20 @@ use PhpMyAdmin\Current;
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);

View File

@ -8,6 +8,7 @@ use PhpMyAdmin\Config;
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 LC_ALL;
use const PHP_INT_SIZE;
#[CoversClass(Encoding::class)]
#[Medium]
class EncodingTest extends AbstractTestCase
{
protected function setUp(): void
@ -42,7 +44,6 @@ class EncodingTest extends AbstractTestCase
/**
* Test for Encoding::convertString
*/
#[Group('medium')]
public function testNoConversion(): void
{
self::assertSame(

View File

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

View File

@ -11,11 +11,12 @@ use PhpMyAdmin\DatabaseInterface;
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 @@ class FooterTest extends AbstractTestCase
/**
* Test for getDebugMessage
*/
#[Group('medium')]
public function testGetDebugMessage(): void
{
$config = Config::getInstance();
@ -114,7 +114,6 @@ class FooterTest extends AbstractTestCase
/**
* Test for displaying footer
*/
#[Group('medium')]
public function testDisplay(): void
{
$footer = new Footer(new Template(), Config::getInstance());

View File

@ -15,7 +15,7 @@ use PhpMyAdmin\Util;
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;
@ -23,6 +23,7 @@ use function htmlspecialchars;
use function urlencode;
#[CoversClass(Generator::class)]
#[Medium]
class GeneratorTest extends AbstractTestCase
{
/**
@ -38,7 +39,6 @@ class GeneratorTest extends AbstractTestCase
/**
* Test for getDbLink
*/
#[Group('medium')]
public function testGetDbLinkNull(): void
{
Current::$database = 'test_db';

View File

@ -222,9 +222,8 @@ class ImportTest extends AbstractTestCase
* 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 @@ class ImportTest extends AbstractTestCase
* 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';

View File

@ -9,7 +9,7 @@ use PhpMyAdmin\Language;
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 @@ use function strtolower;
#[CoversClass(Language::class)]
#[CoversClass(LanguageManager::class)]
#[Large]
class LanguageTest extends AbstractTestCase
{
private LanguageManager $manager;
@ -237,7 +238,6 @@ class LanguageTest extends AbstractTestCase
* @param string $locale locale name
*/
#[DataProvider('listLocales')]
#[Group('large')]
public function testGettext(string $locale): void
{
Config::getInstance()->set('FilterLanguages', '');

View File

@ -13,9 +13,10 @@ use PhpMyAdmin\Replication\ReplicationInfo;
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 @@ class ReplicationGuiTest extends AbstractTestCase
$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);

View File

@ -25,7 +25,7 @@ use PhpMyAdmin\UserPrivileges;
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 implode;
use function preg_quote;
#[CoversClass(Privileges::class)]
#[Medium]
class PrivilegesTest extends AbstractTestCase
{
protected DatabaseInterface $dbi;
@ -567,7 +568,6 @@ class PrivilegesTest extends AbstractTestCase
);
}
#[Group('medium')]
public function testGetHtmlToDisplayPrivilegesTable(): void
{
$GLOBALS['hostname'] = 'hostname';
@ -950,7 +950,6 @@ class PrivilegesTest extends AbstractTestCase
self::assertStringContainsString($expect, $sqlQuery);
}
#[Group('medium')]
public function testGetHtmlForAddUser(): void
{
$dbi = $this->createDatabaseInterface();

View File

@ -10,7 +10,7 @@ use PhpMyAdmin\Setup\ConfigGenerator;
use PhpMyAdmin\Tests\AbstractTestCase;
use PhpMyAdmin\Version;
use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\Medium;
use ReflectionClass;
use function explode;
@ -21,12 +21,12 @@ use function str_repeat;
use const SODIUM_CRYPTO_SECRETBOX_KEYBYTES;
#[CoversClass(ConfigGenerator::class)]
#[Medium]
class ConfigGeneratorTest extends AbstractTestCase
{
/**
* Test for ConfigGenerator::getConfigFile
*/
#[Group('medium')]
public function testGetConfigFile(): void
{
unset($_SESSION['eol']);

View File

@ -10,7 +10,7 @@ use PhpMyAdmin\Theme\ThemeManager;
use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\Depends;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\Medium;
use function filemtime;
@ -18,6 +18,7 @@ use const DIRECTORY_SEPARATOR;
use const ROOT_PATH;
#[CoversClass(Theme::class)]
#[Medium]
class ThemeTest extends AbstractTestCase
{
protected Theme $object;
@ -38,7 +39,6 @@ class ThemeTest extends AbstractTestCase
/**
* Test for Theme::loadInfo
*/
#[Group('medium')]
public function testCheckImgPathNotExisted(): void
{
$this->object->setPath('path/to/nowhere');

View File

@ -10,9 +10,11 @@ use PhpMyAdmin\VersionInformation;
use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\Large;
#[CoversClass(VersionInformation::class)]
#[CoversClass(Release::class)]
#[Large]
class VersionInformationTest extends AbstractTestCase
{
/** @var Release[] */
@ -43,7 +45,6 @@ class VersionInformationTest extends AbstractTestCase
/**
* Test version checking
*/
#[Group('large')]
#[Group('network')]
public function testGetLatestVersion(): void
{

View File

@ -5,18 +5,19 @@ declare(strict_types=1);
namespace PhpMyAdmin\Tests\WebAuthn;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\WebAuthn\CBORDecoder;
use PhpMyAdmin\WebAuthn\CustomServer;
use PhpMyAdmin\WebAuthn\DataStream;
use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\TestCase;
use Psr\Http\Message\UriInterface;
use Throwable;
use function hex2bin;
/**
* @covers \PhpMyAdmin\WebAuthn\CustomServer
* @covers \PhpMyAdmin\WebAuthn\CBORDecoder
* @covers \PhpMyAdmin\WebAuthn\DataStream
*/
#[CoversClass(CustomServer::class)]
#[CoversClass(CBORDecoder::class)]
#[CoversClass(DataStream::class)]
final class CustomServerTest extends TestCase
{
public function testGetCredentialCreationOptions(): void

View File

@ -8,6 +8,7 @@ use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\TwoFactor;
use PhpMyAdmin\WebAuthn\WebauthnLibServer;
use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\Attributes\RequiresPhpExtension;
use PHPUnit\Framework\TestCase;
use Psr\Http\Message\UriInterface;
use Webauthn\Server as WebauthnServer;
@ -89,11 +90,8 @@ final class WebauthnLibServerTest extends TestCase
);
}
/**
* @see https://github.com/web-auth/webauthn-framework/blob/v3.3.12/tests/library/Functional/AssertionTest.php#L46
*
* @requires extension bcmath
*/
/** @see https://github.com/web-auth/webauthn-framework/blob/v3.3.12/tests/library/Functional/AssertionTest.php#L46 */
#[RequiresPhpExtension('bcmath')]
public function testParseAndValidateAssertionResponse(): void
{
$twoFactor = self::createStub(TwoFactor::class);